音效切换

Assets/ArtAsset/Hunter/Models/Wolf/Wolf.prefab

@@ -398,7 +398,7 @@ MonoBehaviour:
   - {fileID: 2100000, guid: bdf0345332cbec142a3f6e91c1c4c985, type: 2}
   state:
     hp: 1
-    staying: 1
+    staying: 0
     moving: 0
     moveSlowly: 0
     moveQuickly: 0

Assets/ArtAsset/Hunter/StylizedNatureBundle/Materials/M_SNB_Cloud.mat

@@ -102,5 +102,5 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _ReflectColor: {r: 1, g: 1, b: 1, a: 0.5}
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
-    - _TintColor: {r: 0.111249544, g: 0.14543821, b: 0.18867922, a: 0.039215688}
+    - _TintColor: {r: 0.111249544, g: 0.14543821, b: 0.18867922, a: 0.023529412}
   m_BuildTextureStacks: []

Assets/BowArrow/Resources/Audios/Animal/rabbit_injured.wav.meta → Assets/BowArrow/Resources/Audios/Animal/arrow_enter.mp3.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1094e4d5f6014264bb82cc57adbcae91
+guid: 9bb7d64b61b48aa46b7e9357261592d0
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Assets/BowArrow/Resources/Audios/Animal/bird_die.mp3.meta → Assets/BowArrow/Resources/Audios/Animal/bird_injured.mp3.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a8e6bc525d87f18429d2ccc79ae820df
+guid: 63ab1b88114248f408d4e7b28bd87520
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Assets/BowArrow/Resources/Audios/Animal/wolf_injured.wav.meta → Assets/BowArrow/Resources/Audios/Animal/rabbit_injured.mp3.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 607331d8c6fa2ac4382f5906a6335de9
+guid: 9dab175034a77ea458a8ff716b501927
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Assets/BowArrow/Resources/Audios/Animal/bird_injured.wav.meta → Assets/BowArrow/Resources/Audios/Animal/wolf_injured.mp3.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: dcae26a1deb34c046845290a3eb2b42f
+guid: 98bb3013ee798454a87ac701c2715f98
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Assets/BowArrow/Scenes/GameChallengeScene/GameChallenge.unity

@@ -20378,7 +20378,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 29.683897, y: 0}
+  m_AnchoredPosition: {x: 28.446756, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1047161075
@@ -23699,7 +23699,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 29.683897, y: 0}
+  m_AnchoredPosition: {x: 28.446756, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1203594963
@@ -41883,7 +41883,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 49.367794, y: 0}
+  m_AnchoredPosition: {x: 46.893513, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2142579590

Assets/BowArrow/Scenes/GameChallengeScene/Rabbit.cs

@@ -73,14 +73,14 @@ public class Rabbit : TargetAnimal
         this.agent.enabled = false;
         PuaseAutoStrategy();
         onDie?.Invoke(this);
-        AudioMgr.ins.PlayCheer(true);
+        AudioMgr.ins.PlayAnimalEffect("rabbit_injured", AudioMgr.GetAudioSource(this.gameObject));
     }
 
     void Hurt() {
         RunAwayFromHunter();
         addHurtFlag();
         PuaseAutoStrategy();
-        AudioMgr.ins.PlayCheer(true);
+        AudioMgr.ins.PlayAnimalEffect("rabbit_injured", AudioMgr.GetAudioSource(this.gameObject));
     }
     
     JC.CS.CountLocker hurtFlag = new JC.CS.CountLocker();

Assets/BowArrow/Scenes/GameChallengeScene/Wolf.cs

@@ -103,7 +103,6 @@ public class Wolf : TargetAnimal
         this.agent.enabled = false;
         onDie?.Invoke(this);
         AudioMgr.ins.PlayAnimalEffect("wolf_die", AudioMgr.GetAudioSource(this.gameObject));
-        AudioMgr.ins.PlayCheer(true);
     }
 
     void Hurt() {
@@ -120,8 +119,7 @@ public class Wolf : TargetAnimal
                 RunAwayFromHunter();
             } 
         }
-        AudioMgr.ins.PlayAnimalEffect("wolf_die", AudioMgr.GetAudioSource(this.gameObject));
-        AudioMgr.ins.PlayCheer(true);
+        AudioMgr.ins.PlayAnimalEffect("wolf_injured", AudioMgr.GetAudioSource(this.gameObject));
     }
     
     //启动寻路

Assets/BowArrow/Scenes/GameChallengeScene/Yeji.cs

@@ -82,7 +82,7 @@ public class Yeji : TargetAnimal
             state.dead = true;
             this.agent.enabled = false;
             onDie?.Invoke(this);
-            AudioMgr.ins.PlayCheer(true);
+            AudioMgr.ins.PlayAnimalEffect("bird_injured", AudioMgr.GetAudioSource(this.gameObject));
             if (currentHeight < 1.5f) {
                 arrow.arrowCameraComp.arrowCameraTemplate.SendMsg(0, null);
             }
@@ -90,7 +90,8 @@ public class Yeji : TargetAnimal
 
         void Hurt() {
             CancelStand();
-            AudioMgr.ins.PlayCheer(true);
+            CancelFlyStay();
+            AudioMgr.ins.PlayAnimalEffect("bird_injured", AudioMgr.GetAudioSource(this.gameObject));
         }
     #endregion
 
@@ -274,6 +275,11 @@ public class Yeji : TargetAnimal
             tryReleaseOccupyTree();
         }
 
+        void CancelFlyStay() {
+            if (!state.flyStaying) return;
+            canFlyStayTime = 0;
+        }
+
         bool tryOccupyTree() {
             if (targetAreaInfo == null) return false;
             if (targetAreaInfo.occupy != null) return false;

Assets/BowArrow/Scripts/Game/Arrow.cs

@@ -259,12 +259,19 @@ public class Arrow : MonoBehaviour
             string partName = targetName.Split(new char[]{'_'})[1];
             GetComponentInChildren<ArrowCamera>().arrowCameraTemplate?.beforeHit();
             raycastHit.transform.GetComponentInParent<TargetAnimal>().OnHit(this, hitPoint, partName);
-        } else if (raycastHit.transform.GetComponent<TargetOutBound>()) {
+            //箭击中的音效
+            AudioMgr.ins.PlayArrowEnter();
+        } else if (raycastHit.transform.GetComponent<TargetOutBound>()) { //撞到空气墙当作超时处理
             FlyTimeOut();
         } else {
             Hit();
             GameMgr.ins.gameMode.HitTarget(0);
-            AudioMgr.ins.PlayCheer(false);
+            //击中其它东西时的音效
+            if (UnityEngine.SceneManagement.SceneManager.GetActiveScene().name == "GameChallenge") {
+                AudioMgr.ins.PlayArrowEnter();
+            } else {
+                AudioMgr.ins.PlayCheer(false);
+            }
         }
     }
 

Assets/BowArrow/Scripts/Manager/AudioMgr.cs

@@ -71,6 +71,10 @@ public class AudioMgr : MonoBehaviour
         this.Play("Audios/win", null);
     }
 
+    public void PlayArrowEnter() {
+        this.Play("Audios/Animal/arrow_enter", null);
+    }
+
     public void PlayAnimalEffect(string name, AudioSource audioSource) {
         this.Play("Audios/Animal/" + name, audioSource);
     }