feat: FlashBang 사용 후 강조 제거 & Alien 사운드 크기 감소 & Layer 이름 변경 (#169)

kookmin-sw · Jun 22, 2024 · ce8d5d1 · ce8d5d1
1 parent 7029be4
commit ce8d5d1
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 32 deletions.
diff --git a/Client/Assets/Scenes/TestScene/TestScene_SJ.unity b/Client/Assets/Scenes/TestScene/TestScene_SJ.unity
@@ -5477,7 +5477,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   PlayerName: Player
   DefaultRoomName: Test
-  Creature: 0
+  Creature: 1
   PrefabNum: 0
   ReadySceneSpawnPosition: {x: 0, y: 0, z: 0}
   ReadySceneSpawnSector: 1

diff --git a/Client/Assets/Scripts/Contents/Controllers/AlienAnimController.cs b/Client/Assets/Scripts/Contents/Controllers/AlienAnimController.cs
@@ -19,21 +19,8 @@ public override void PlayMove()
         XParameter = Lerp(XParameter, Creature.Direction.x, Runner.DeltaTime * 5f);
         ZParameter = Lerp(ZParameter, Creature.Direction.z, Runner.DeltaTime * 5f);
 
-        switch (CreaturePose)
-        {
-            case Define.CreaturePose.Stand:
-                SetFloat("Z", ZParameter);
-                SpeedParameter = Lerp(SpeedParameter, 1f, Runner.DeltaTime * 5f);
-                break;
-            case Define.CreaturePose.Sit:
-                SetFloat("Z", ZParameter);
-                SpeedParameter = Lerp(SpeedParameter, 1f, Runner.DeltaTime * 5f);
-                break;
-            case Define.CreaturePose.Run:
-                SetFloat("Z", ZParameter * 1.8f);
-                SpeedParameter = Lerp(SpeedParameter, 2f, Runner.DeltaTime * 5f);
-                break;
-        }
+        SetFloat("Z", ZParameter);
+        SpeedParameter = Lerp(SpeedParameter, 1f, Runner.DeltaTime * 5f);
 
         SetParameterFalse();
         SetFloat("X", XParameter);

diff --git a/Client/Assets/Scripts/Contents/Controllers/AlienSoundController.cs b/Client/Assets/Scripts/Contents/Controllers/AlienSoundController.cs
@@ -81,13 +81,13 @@ protected void Rpc_PlayBasicAttack()
     [Rpc(RpcSources.StateAuthority, RpcTargets.All)]
     protected void Rpc_PlayRoar()
     {
-        Managers.SoundMng.PlayObjectAudio(CreatureAudioSource, $"{Define.EFFECT_PATH}/Alien/Roar", pitch: 1.3f, volume: 1f, isLoop: false);
+        Managers.SoundMng.PlayObjectAudio(CreatureAudioSource, $"{Define.EFFECT_PATH}/Alien/Roar", pitch: 1.3f, volume: 0.4f, isLoop: false);
     }
 
     [Rpc(RpcSources.StateAuthority, RpcTargets.All)]
     protected void Rpc_PlayCursedHowl()
     {
-        Managers.SoundMng.PlayObjectAudio(CreatureAudioSource, $"{Define.EFFECT_PATH}/Alien/CursedHowl", pitch: 1f, volume: 1f, isLoop: false);
+        Managers.SoundMng.PlayObjectAudio(CreatureAudioSource, $"{Define.EFFECT_PATH}/Alien/CursedHowl", pitch: 1f, volume: 0.5f, isLoop: false);
     }
 
     [Rpc(RpcSources.StateAuthority, RpcTargets.All)]
@@ -118,7 +118,7 @@ public override void CheckChasing()
                      Debug.DrawRay(ray.origin, ray.direction * ChasingDistance, Color.green);
 
                 if (Physics.Raycast(ray, out RaycastHit rayHit, maxDistance: ChasingDistance,
-                        layerMask: LayerMask.GetMask("Crew", "MapObject", "PlanTargetObject")))
+                        layerMask: LayerMask.GetMask("Crew", "MapObject", "InteractableObject")))
                 {
                     if (rayHit.transform.gameObject.TryGetComponent(out Crew crew))
                     {

diff --git a/Client/Assets/Scripts/Contents/Interactables/ItemObject/FlashBangObject.cs b/Client/Assets/Scripts/Contents/Interactables/ItemObject/FlashBangObject.cs
@@ -11,6 +11,12 @@ public override void Init()
         AudioSource = GetComponent<AudioSource>();
     }
 
+    [Rpc(RpcSources.All, RpcTargets.All)]
+    public void Rpc_Explode()
+    {
+        gameObject.SetLayerRecursive(LayerMask.NameToLayer("MapObject"));
+    }
+
     [Rpc(RpcSources.All, RpcTargets.All)]
     public void Rpc_PlaySound()
     {

diff --git a/Client/Assets/Scripts/Contents/Items/FlashBang.cs b/Client/Assets/Scripts/Contents/Items/FlashBang.cs
@@ -31,6 +31,7 @@ protected override void UseItemComplete()
         DOVirtual.DelayedCall(1.5f, () =>
         {
             no.GetComponent<FlashBangObject>().Rpc_PlaySound();
+            no.GetComponent<FlashBangObject>().Rpc_Explode();
             Explode(no.transform.position);
         });
     }

diff --git a/Client/Assets/Scripts/Contents/Items/Inventory.cs b/Client/Assets/Scripts/Contents/Items/Inventory.cs
@@ -118,7 +118,7 @@ public bool DropItem()
 
         Ray ray = new Ray(Owner.Head.transform.position, Owner.Head.transform.forward);
 
-        if (Physics.Raycast(ray, out RaycastHit rayHit, maxDistance: 1f, layerMask: LayerMask.GetMask("MapObject", "PlanTargetObject")))
+        if (Physics.Raycast(ray, out RaycastHit rayHit, maxDistance: 1f, layerMask: LayerMask.GetMask("MapObject", "InteractableObject")))
         {
             Debug.DrawRay(ray.origin, ray.direction * 1f, Color.blue, 0.5f);
             return false;

diff --git a/Client/Assets/Scripts/Contents/Skills/BaseSkill.cs b/Client/Assets/Scripts/Contents/Skills/BaseSkill.cs
@@ -119,7 +119,7 @@ protected virtual void DecideHit(float x, float y)
         Debug.DrawRay(ray.origin, ray.direction * SkillData.Range, Color.red);
 
         if (Physics.Raycast(ray, out RaycastHit rayHit, maxDistance: SkillData.Range,
-                layerMask: LayerMask.GetMask("Crew", "MapObject", "PlanTargetObject")))
+                layerMask: LayerMask.GetMask("Crew", "MapObject", "InteractableObject")))
         {
             if (rayHit.transform.gameObject.TryGetComponent(out Crew crew))
             {

diff --git a/Client/Assets/Scripts/Contents/Skills/Roar.cs b/Client/Assets/Scripts/Contents/Skills/Roar.cs
@@ -41,7 +41,7 @@ protected override void DecideHit(float x, float y)
         Debug.DrawRay(ray.origin, ray.direction * SkillData.Range, Color.red);
 
         if (Physics.Raycast(ray, out RaycastHit rayHit, maxDistance: SkillData.Range,
-                layerMask: LayerMask.GetMask("Crew", "MapObject", "PlanTargetObject")))
+                layerMask: LayerMask.GetMask("Crew", "MapObject", "InteractableObject")))
         {
             if (rayHit.transform.gameObject.TryGetComponent(out Crew crew))
             {

diff --git a/Client/Assets/Scripts/Creatures/Creature.cs b/Client/Assets/Scripts/Creatures/Creature.cs
@@ -224,7 +224,7 @@ protected bool CheckInteractable(bool tryInteract)
 
         //Debug.DrawRay(ray.origin, ray.direction * 1.5f, Color.red);
 
-        if (Physics.Raycast(ray, out RaycastHit rayHit, maxDistance: 1.5f, layerMask: LayerMask.GetMask("MapObject", "PlanTargetObject")))
+        if (Physics.Raycast(ray, out RaycastHit rayHit, maxDistance: 1.5f, layerMask: LayerMask.GetMask("MapObject", "InteractableObject")))
         {
             if (rayHit.transform.gameObject.TryGetComponent(out IInteractable interactable))
             {

diff --git a/Client/Assets/Scripts/Systems/PlanSystem.cs b/Client/Assets/Scripts/Systems/PlanSystem.cs
@@ -24,7 +24,7 @@ public class PlanSystem : NetworkBehaviour
     public void Init()
     {
         Managers.GameMng.PlanSystem = this;
-        if (Managers.ObjectMng.MyCreature is Crew) GameObject.FindGameObjectsWithTag("BatteryCharger").SetLayerRecursive(LayerMask.NameToLayer("PlanTargetObject"));
+        if (Managers.ObjectMng.MyCreature is Crew) GameObject.FindGameObjectsWithTag("BatteryCharger").SetLayerRecursive(LayerMask.NameToLayer("InteractableObject"));
     }
 
     private void OnBatteryCharge()
@@ -49,7 +49,7 @@ private void OnUSBKeyInsert()
         {
             IsUSBKeyInsertFinished = true;
             GameObject.FindGameObjectsWithTag("ElevatorControlComputer").SetLayerRecursive(LayerMask.NameToLayer("MapObject"));
-            GameObject.FindGameObjectsWithTag("ElevatorKeypad").SetLayerRecursive(LayerMask.NameToLayer("PlanTargetObject"));
+            GameObject.FindGameObjectsWithTag("ElevatorKeypad").SetLayerRecursive(LayerMask.NameToLayer("InteractableObject"));
         }
     }
 
@@ -66,7 +66,7 @@ private void OnCentralComputerWorkFinished()
 
         Managers.ObjectMng.MyCrew.CrewIngameUI.PlanUI.OnCentralControlComputerWorkFinished();
         GameObject.FindGameObjectsWithTag("CentralControlComputer").SetLayerRecursive(LayerMask.NameToLayer("MapObject"));
-        GameObject.FindGameObjectsWithTag("CargoPassageControlComputer").SetLayerRecursive(LayerMask.NameToLayer("PlanTargetObject"));
+        GameObject.FindGameObjectsWithTag("CargoPassageControlComputer").SetLayerRecursive(LayerMask.NameToLayer("InteractableObject"));
     }
 
     private void OnCargoPassageOpen()
@@ -75,7 +75,7 @@ private void OnCargoPassageOpen()
 
         Managers.ObjectMng.MyCrew.CrewIngameUI.PlanUI.OnCargoPassageOpen();
         GameObject.FindGameObjectsWithTag("CargoPassageControlComputer").SetLayerRecursive(LayerMask.NameToLayer("MapObject"));
-        GameObject.FindGameObjectsWithTag("CargoPassageGate").SetLayerRecursive(LayerMask.NameToLayer("PlanTargetObject"));
+        GameObject.FindGameObjectsWithTag("CargoPassageGate").SetLayerRecursive(LayerMask.NameToLayer("InteractableObject"));
     }
 
     public void EnablePlanC()
@@ -84,7 +84,7 @@ public void EnablePlanC()
 
         if (!IsBatteryChargeFinished) return;
 
-        GameObject.FindGameObjectsWithTag("EmergencyControlDevice").SetLayerRecursive(LayerMask.NameToLayer("PlanTargetObject"));
+        GameObject.FindGameObjectsWithTag("EmergencyControlDevice").SetLayerRecursive(LayerMask.NameToLayer("InteractableObject"));
         Managers.ObjectMng.MyCrew.CrewIngameUI.PlanUI.EnablePlanC();
     }
 
@@ -94,7 +94,7 @@ private void OnPanicRoomActivated()
 
         Managers.ObjectMng.MyCrew.CrewIngameUI.PlanUI.OnPanicRoomActivated();
         GameObject.FindGameObjectsWithTag("EmergencyControlDevice").SetLayerRecursive(LayerMask.NameToLayer("MapObject"));
-        GameObject.FindGameObjectsWithTag("PanicRoom").SetLayerRecursive(LayerMask.NameToLayer("PlanTargetObject"));
+        GameObject.FindGameObjectsWithTag("PanicRoom").SetLayerRecursive(LayerMask.NameToLayer("InteractableObject"));
     }
 
 }
diff --git a/Client/Assets/Scripts/UI/SubItem/UI_CrewPlan.cs b/Client/Assets/Scripts/UI/SubItem/UI_CrewPlan.cs
@@ -194,8 +194,8 @@ private IEnumerator OnBatteryChargeFinished()
         _planB.SetHintText(MakeHintFromSectorName(new[] {Define.SectorName.CentralControlRoom }));
 
         GameObject.FindGameObjectsWithTag("BatteryCharger").SetLayerRecursive(LayerMask.NameToLayer("MapObject"));
-        GameObject.FindGameObjectsWithTag("CentralControlComputer").SetLayerRecursive(LayerMask.NameToLayer("PlanTargetObject"));
-        GameObject.FindGameObjectsWithTag("ElevatorControlComputer").SetLayerRecursive(LayerMask.NameToLayer("PlanTargetObject"));
+        GameObject.FindGameObjectsWithTag("CentralControlComputer").SetLayerRecursive(LayerMask.NameToLayer("InteractableObject"));
+        GameObject.FindGameObjectsWithTag("ElevatorControlComputer").SetLayerRecursive(LayerMask.NameToLayer("InteractableObject"));
 
         if (Managers.GameMng.GameEndSystem.CrewNum == 1)
         {

diff --git a/Client/ProjectSettings/TagManager.asset b/Client/ProjectSettings/TagManager.asset
@@ -28,7 +28,7 @@ TagManager:
   - Ground
   - Block
   - MapObject
-  - PlanTargetObject
+  - InteractableObject
   - SettingUI
   - 
   -