Sound最終調整、実装

Assets/Prefabs/PCPlayer.prefab

@@ -994,10 +994,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: Assembly-CSharp::PlayerSound
   jumpSE: {fileID: 8300000, guid: efbe2a8c6596d44ffba7fef0c241d531, type: 3}
   fireSE: {fileID: 8300000, guid: 975618663bd2e405981ad5be9e97e4e8, type: 3}
-  reloadingSE: {fileID: 0}
-  reloadSE: {fileID: 8300000, guid: b596c93e4fec841f1aa31233f36f77d2, type: 3}
+  reloadingSE: {fileID: 8300000, guid: 07305592dcb90440bbb8be6608d0fea8, type: 3}
+  reloadSE: {fileID: 8300000, guid: cf59fa3b78a4948e5b1bab89c1838ee2, type: 3}
   tookDamageSE: {fileID: 8300000, guid: 7c6b927b9997141a994e647700a57cc0, type: 3}
   diedSE: {fileID: 8300000, guid: cf3e9623b169e4445a33e67ff7a9dbc7, type: 3}
+  hitSE: {fileID: 8300000, guid: 915fee8195f974f61b970dbf99c25820, type: 3}
 --- !u!114 &4086869925511800428
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Prefabs/Player.prefab

@@ -1861,6 +1861,7 @@ MonoBehaviour:
   reloadSE: {fileID: 8300000, guid: cf59fa3b78a4948e5b1bab89c1838ee2, type: 3}
   tookDamageSE: {fileID: 8300000, guid: 7c6b927b9997141a994e647700a57cc0, type: 3}
   diedSE: {fileID: 8300000, guid: cf3e9623b169e4445a33e67ff7a9dbc7, type: 3}
+  hitSE: {fileID: 8300000, guid: 915fee8195f974f61b970dbf99c25820, type: 3}
 --- !u!114 &4086869925511800428
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Resources/DevAgentSettings.asset

@@ -13,12 +13,12 @@ MonoBehaviour:
   m_Name: DevAgentSettings
   m_EditorClassIdentifier: Meta.XR.ImmersiveDebugger.DevAgent::Meta.XR.ImmersiveDebugger.DevAgent.RuntimeSettings
   enabled: 1
-  serverAddress: 192.168.0.150
+  serverAddress: 192.168.1.12
   serverPort: 48735
   mcpServerPort: 48736
   witConfiguration: {fileID: 0}
   pushToTalkButton: 1
   handPushToTalkGesture: 0
   enableDelayedRelease: 1
   releaseDelay: 0.8
-  accessToken: f0d6d0808ea94ed5b3c8fc489ad6b04f
+  accessToken: 7c35538a633e47baa308fc5e6c6fb66f

Assets/Resources/PerformanceTestRunInfo.json

@@ -0,0 +1 @@
+{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"MultiThreaded","MtRendering":false,"GraphicsJobs":false,"GpuSkinning":true,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"IL2CPP","AndroidTargetSdkVersion":"AndroidApiLevelAuto","AndroidBuildSystem":"Gradle","BuildTarget":"Android","StereoRenderingPath":"Instancing"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.3.17f1","Branch":"6000.3/staging","Changeset":"cf0352b38e81","Date":1779850344},"Dependencies":["com.meta.xr.mrutilitykit@203.0.0","com.meta.xr.sdk.all@203.0.0","com.meta.xr.sdk.audio@85.0.0","com.meta.xr.sdk.core@203.0.0","com.meta.xr.sdk.haptics@203.0.0","com.meta.xr.sdk.interaction.ovr@203.0.0","com.meta.xr.sdk.interaction@203.0.0","com.meta.xr.sdk.platform@203.0.0","com.meta.xr.sdk.voice@85.0.0","com.unity.2d.sprite@1.0.0","com.unity.ai.assistant@2.13.0-pre.2","com.unity.ai.inference@2.6.1","com.unity.ai.navigation@2.0.12","com.unity.burst@1.8.29","com.unity.cinemachine@3.1.7","com.unity.collab-proxy@2.12.4","com.unity.collections@2.6.6","com.unity.dt.app-ui@2.1.1","com.unity.ext.nunit@2.0.5","com.unity.ide.rider@3.0.40","com.unity.ide.visualstudio@2.0.26","com.unity.ide.vscode@1.2.4","com.unity.inputsystem@1.19.0","com.unity.mathematics@1.3.3","com.unity.modules.accessibility@1.0.0","com.unity.modules.adaptiveperformance@1.0.0","com.unity.modules.ai@1.0.0","com.unity.modules.androidjni@1.0.0","com.unity.modules.animation@1.0.0","com.unity.modules.assetbundle@1.0.0","com.unity.modules.audio@1.0.0","com.unity.modules.cloth@1.0.0","com.unity.modules.director@1.0.0","com.unity.modules.hierarchycore@1.0.0","com.unity.modules.imageconversion@1.0.0","com.unity.modules.imgui@1.0.0","com.unity.modules.jsonserialize@1.0.0","com.unity.modules.particlesystem@1.0.0","com.unity.modules.physics@1.0.0","com.unity.modules.physics2d@1.0.0","com.unity.modules.screencapture@1.0.0","com.unity.modules.subsystems@1.0.0","com.unity.modules.terrain@1.0.0","com.unity.modules.terrainphysics@1.0.0","com.unity.modules.tilemap@1.0.0","com.unity.modules.ui@1.0.0","com.unity.modules.uielements@1.0.0","com.unity.modules.umbra@1.0.0","com.unity.modules.unityanalytics@1.0.0","com.unity.modules.unitywebrequest@1.0.0","com.unity.modules.unitywebrequestassetbundle@1.0.0","com.unity.modules.unitywebrequestaudio@1.0.0","com.unity.modules.unitywebrequesttexture@1.0.0","com.unity.modules.unitywebrequestwww@1.0.0","com.unity.modules.vectorgraphics@1.0.0","com.unity.modules.vehicles@1.0.0","com.unity.modules.video@1.0.0","com.unity.modules.vr@1.0.0","com.unity.modules.wind@1.0.0","com.unity.modules.xr@1.0.0","com.unity.multiplayer.center@1.0.1","com.unity.nuget.mono-cecil@1.11.6","com.unity.nuget.newtonsoft-json@3.2.2","com.unity.postprocessing@3.5.4","com.unity.render-pipelines.core@17.3.0","com.unity.render-pipelines.universal@17.3.0","com.unity.render-pipelines.universal-config@17.0.3","com.unity.searcher@4.9.4","com.unity.settings-manager@2.1.1","com.unity.shadergraph@17.3.0","com.unity.splines@2.8.4","com.unity.test-framework.performance@3.5.0","com.unity.test-framework@1.6.0","com.unity.textmeshpro@5.0.0","com.unity.timeline@1.8.12","com.unity.ugui@2.0.0","com.unity.visualscripting@1.9.11","com.unity.xr.core-utils@2.6.0","com.unity.xr.hands@1.7.3","com.unity.xr.interaction.toolkit@3.3.2","com.unity.xr.legacyinputhelpers@2.1.13","com.unity.xr.management@4.5.4","com.unity.xr.openxr@1.16.1"],"Results":[]}

Assets/Resources/PerformanceTestRunSettings.json

@@ -0,0 +1 @@
+{"MeasurementCount":-1}

Assets/Scripts/Projectile/Projectile.cs

@@ -168,6 +168,16 @@ private void OnTriggerEnter(Collider other)
 
         targetHealth.TakeDamage(damage);
 
+        //ヒットオン鳴らす
+        if (owner != null)
+        {
+            PlayerSound ownerSound = owner.GetComponent<PlayerSound>();
+            if (ownerSound != null)
+            {
+                ownerSound.Rpc_PlayHitMarkerSound();
+            }
+        }
+
         Runner.Despawn(Object);
     }
 
@@ -187,6 +197,9 @@ private void ApplyExplosionDamage(Vector3 explosionPosition)
 
         HashSet<PlayerHealth> damagedTargets = new();
 
+        //当たったかどうかのフラグ
+        bool hasHitEnemy = false;
+
         foreach (Collider hitCollider in hitColliders)
         {
             if (hitCollider == null)
@@ -212,6 +225,17 @@ private void ApplyExplosionDamage(Vector3 explosionPosition)
             }
 
             targetHealth.TakeDamage(explosionDamage);
+
+            hasHitEnemy = true;
+        }
+
+        if (hasHitEnemy && owner != null)
+        {
+            PlayerSound ownerSound = owner.GetComponent<PlayerSound>();
+            if (ownerSound != null)
+            {
+                ownerSound.Rpc_PlayHitMarkerSound();
+            }
         }
     }
 

Assets/Scripts/Sound/PlayerSound.cs

@@ -13,6 +13,7 @@ public class PlayerSound : NetworkBehaviour
     [SerializeField] private AudioClip reloadSE;
     [SerializeField] private AudioClip tookDamageSE;
     [SerializeField] private AudioClip diedSE;
+    [SerializeField] private AudioClip hitSE;
 
     private PlayerController playerController;
     private PlayerMove playerMove;
@@ -96,6 +97,8 @@ public override void Despawned(NetworkRunner runner, bool hasState)
 
     private void PlayJumpSound()
     {
+        if (!Object.HasInputAuthority) return;
+
         if (jumpSE != null && audioSource != null)
         {
             audioSource.PlayOneShot(jumpSE);
@@ -112,6 +115,8 @@ private void PlayFireSound()
 
     private void PlayReloadingSound()
     {
+        if (!Object.HasInputAuthority) return;
+
         if(reloadingSE != null && audioSource != null)
         {
             reloadAudioSource.pitch = Random.Range(0.9f, 1.1f); // 0.95倍 〜 1.05倍
@@ -131,6 +136,8 @@ private void PlayReloadingSound()
 
     private void StopReloadingSound()
     {
+        if (!Object.HasInputAuthority) return;
+
         if (reloadAudioSource != null && reloadAudioSource.isPlaying)
         {
             reloadAudioSource.Stop();
@@ -139,6 +146,8 @@ private void StopReloadingSound()
 
     private void PlayReloadSound()
     {
+        if (!Object.HasInputAuthority) return;
+
         StopReloadingSound();
 
         if (reloadSE != null && audioSource != null)
@@ -149,6 +158,8 @@ private void PlayReloadSound()
 
     private void PlayDamageSound(float current, float max)
     {
+        if (!Object.HasInputAuthority) return;
+
         if (!hasInitializedHealth)
         {
             previousHealth = current;
@@ -173,9 +184,21 @@ private void PlayDamageSound(float current, float max)
 
     private void PlayDiedSound(PlayerHealth target)
     {
+        if (!Object.HasInputAuthority) return;
+
         if (diedSE != null && audioSource != null)
         {
             audioSource.PlayOneShot(diedSE);
         }
     }
+
+    // RpcTargets.InputAuthority を指定することで、このキャラを操作している本人の環境でだけ実行されます
+    [Rpc(RpcSources.StateAuthority | RpcSources.InputAuthority, RpcTargets.InputAuthority)]
+    public void Rpc_PlayHitMarkerSound()
+    {
+        if (hitSE != null && audioSource != null)
+        {
+            audioSource.PlayOneShot(hitSE);
+        }
+    }
 }

Assets/Settings/Mobile_RPAsset.asset

@@ -103,22 +103,22 @@ MonoBehaviour:
   m_PrefilteringModeMainLightShadows: 3
   m_PrefilteringModeAdditionalLight: 4
   m_PrefilteringModeAdditionalLightShadows: 0
-  m_PrefilterXRKeywords: 1
-  m_PrefilteringModeForwardPlus: 1
+  m_PrefilterXRKeywords: 0
+  m_PrefilteringModeForwardPlus: 0
   m_PrefilteringModeDeferredRendering: 0
   m_PrefilteringModeScreenSpaceOcclusion: 0
   m_PrefilterDebugKeywords: 1
   m_PrefilterWriteRenderingLayers: 1
   m_PrefilterHDROutput: 1
-  m_PrefilterAlphaOutput: 0
+  m_PrefilterAlphaOutput: 1
   m_PrefilterSSAODepthNormals: 1
   m_PrefilterSSAOSourceDepthLow: 1
-  m_PrefilterSSAOSourceDepthMedium: 0
+  m_PrefilterSSAOSourceDepthMedium: 1
   m_PrefilterSSAOSourceDepthHigh: 1
-  m_PrefilterSSAOInterleaved: 0
+  m_PrefilterSSAOInterleaved: 1
   m_PrefilterSSAOBlueNoise: 1
   m_PrefilterSSAOSampleCountLow: 1
-  m_PrefilterSSAOSampleCountMedium: 0
+  m_PrefilterSSAOSampleCountMedium: 1
   m_PrefilterSSAOSampleCountHigh: 1
   m_PrefilterDBufferMRT1: 1
   m_PrefilterDBufferMRT2: 1
@@ -128,14 +128,14 @@ MonoBehaviour:
   m_PrefilterSoftShadowsQualityHigh: 1
   m_PrefilterSoftShadows: 0
   m_PrefilterScreenCoord: 1
-  m_PrefilterScreenSpaceIrradiance: 0
+  m_PrefilterScreenSpaceIrradiance: 1
   m_PrefilterNativeRenderPass: 1
   m_PrefilterUseLegacyLightmaps: 0
-  m_PrefilterBicubicLightmapSampling: 0
-  m_PrefilterReflectionProbeRotation: 0
+  m_PrefilterBicubicLightmapSampling: 1
+  m_PrefilterReflectionProbeRotation: 1
   m_PrefilterReflectionProbeBlending: 0
   m_PrefilterReflectionProbeBoxProjection: 0
-  m_PrefilterReflectionProbeAtlas: 0
+  m_PrefilterReflectionProbeAtlas: 1
   m_ShaderVariantLogLevel: 0
   m_ShadowCascades: 0
   m_Textures:

Assets/Settings/UniversalRenderPipelineGlobalSettings.asset

@@ -80,9 +80,7 @@ MonoBehaviour:
       - rid: 8712630790384254976
       - rid: 5149158463307251717
       - rid: 5149158463307251720
-      - rid: 5149158463307251721
       - rid: 5149158463307251723
-      - rid: 5149158463307251724
       - rid: 5149158463307251726
       - rid: 5149158463307251728
   m_AssetVersion: 10

Assets/StreamingAssets/RuntimeActionBindings.json

@@ -0,0 +1 @@
+{"InputActionDefinitions": [],"InputActionSets": []}

ProjectSettings/EditorBuildSettings.asset

@@ -14,10 +14,10 @@ EditorBuildSettings:
   - enabled: 0
     path: Assets/Scenes/VRMainScene.unity
     guid: 9784048f534b84bce9bbe737e3442e33
-  - enabled: 0
+  - enabled: 1
     path: Assets/Scenes/MainScene.unity
     guid: ab489e00a5ec24c6c95b1825e27af476
-  - enabled: 1
+  - enabled: 0
     path: Assets/Scenes/ForPCMainScene.unity
     guid: ffa1dbfa02f624836a1778febfc33c00
   m_configObjects:

ProjectSettings/ProjectSettings.asset

@@ -148,6 +148,8 @@ PlayerSettings:
   preloadedAssets:
   - {fileID: 11400000, guid: bbf4d267f556746dea62a4e21bfbde12, type: 2}
   - {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
+  - {fileID: 7880527123724742603, guid: 9a3f3470db4864933be656fa779d62df, type: 2}
+  - {fileID: 8692284819238879686, guid: ac4474c2c778e475594baca011181b02, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -531,6 +533,9 @@ PlayerSettings:
   - m_BuildTarget: Standalone
     m_StaticBatching: 1
     m_DynamicBatching: 0
+  - m_BuildTarget: Android
+    m_StaticBatching: 1
+    m_DynamicBatching: 0
   m_BuildTargetShaderSettings: []
   m_BuildTargetGraphicsJobs:
   - m_BuildTarget: MacStandaloneSupport

PvPVRGame.slnx

@@ -1,12 +1,12 @@
-<Solution>
-  <Project Path="Assembly-CSharp-firstpass.csproj" />
-  <Project Path="Assembly-CSharp-Editor-firstpass.csproj" />
-  <Project Path="Fusion.Unity.csproj" />
-  <Project Path="Assembly-CSharp-Editor.csproj" />
-  <Project Path="Assembly-CSharp.csproj" />
-  <Project Path="Unity.XR.Interaction.Toolkit.Samples.StarterAssets.csproj" />
-  <Project Path="Fusion.Unity.Editor.csproj" />
-  <Project Path="Unity.Fusion.CodeGen.csproj" />
-  <Project Path="Unity.XR.Interaction.Toolkit.Samples.DeviceSimulator.csproj" />
-  <Project Path="Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.csproj" />
-</Solution>
+<Solution>
+  <Project Path="Assembly-CSharp-firstpass.csproj" />
+  <Project Path="Assembly-CSharp.csproj" />
+  <Project Path="Assembly-CSharp-Editor-firstpass.csproj" />
+  <Project Path="Fusion.Unity.csproj" />
+  <Project Path="Assembly-CSharp-Editor.csproj" />
+  <Project Path="Unity.XR.Interaction.Toolkit.Samples.StarterAssets.csproj" />
+  <Project Path="Fusion.Unity.Editor.csproj" />
+  <Project Path="Unity.Fusion.CodeGen.csproj" />
+  <Project Path="Unity.XR.Interaction.Toolkit.Samples.DeviceSimulator.csproj" />
+  <Project Path="Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.csproj" />
+</Solution>