From 3a364e953a5ef7ee30bc2f1036de66b7f5c8149b Mon Sep 17 00:00:00 2001
From: NTG_Lenovo <iwnc2020@gmail.com>
Date: Tue, 24 Oct 2023 11:22:07 +0900
Subject: [PATCH] =?UTF-8?q?closed=20#40=20=EC=A3=BD=EC=97=88=EC=9D=84=20?=
 =?UTF-8?q?=EB=95=8C,=20E=ED=82=A4=EB=A1=9C=20=EC=9E=AC=EC=8B=9C=EC=9E=91?=
 =?UTF-8?q?=20=EB=B2=84=ED=8A=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

+ 텐텐 무기(Dagger) 회전값 수정
---
 .../02.Scripts/Character/Crewmate/Crewmate.cs | 22 ++++++++++++++-----
 .../Character/Player/Type/InIslandPlayer.cs   | 15 ++++++-------
 .../Assets/05.Prefabs/Weapon/Dagger.prefab    |  4 ++--
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs
index fb96dc7d7..ad4b89be6 100644
--- a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs
+++ b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs
@@ -382,6 +382,22 @@ namespace BlueWaterProject
                 Rb.isKinematic = true;
             }
             Agent.enabled = false;
+
+            if (GameManager.Inst.CurrentInIslandPlayer == (IInIslandPlayer)this)
+            {
+                foreach (var crewmate in GameManager.Inst.CurrentCrewmateList)
+                {
+                    if (crewmate == null || !crewmate.gameObject.activeSelf || crewmate.CurrentHp <= 0) continue;
+                        
+                    GameManager.Inst.SetCurrentInIslandPlayer(crewmate);
+                    return;
+                }
+                
+                // 게임 종료
+                var overlayCanvas = GameObject.Find("OverlayCanvas");
+                overlayCanvas.transform.Find("RestartPopUp").gameObject.SetActive(true);
+                return;
+            }
             
             Destroy(hpSlider.gameObject, 2f);
             Destroy(gameObject, 2f);
@@ -489,11 +505,7 @@ namespace BlueWaterProject
 
         public void OnMove(InputValue value)
         {
-            if (CurrentHp <= 0)
-            {
-                Rb.velocity = Vector3.zero;
-                return;
-            }
+            if (CurrentHp <= 0) return;
             
             movementInput = value.Get<Vector2>();
         }
diff --git a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs
index f397450d8..5fa8c9d4d 100644
--- a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs
+++ b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs
@@ -366,6 +366,8 @@ namespace BlueWaterProject
             }
             Agent.enabled = false;
 
+            var overlayCanvas = GameObject.Find("OverlayCanvas");
+            
             switch (GameManager.Inst.IslandPlayerMode)
             {
                 case GlobalValue.InIslandPlayerMode.NONE:
@@ -373,7 +375,8 @@ namespace BlueWaterProject
                     break;
                 case GlobalValue.InIslandPlayerMode.ONLY_PLAYER:
                     // 게임 종료
-                    break;
+                    overlayCanvas.transform.Find("RestartPopUp").gameObject.SetActive(true);
+                    return;
                 case GlobalValue.InIslandPlayerMode.CREWMATE:
                     foreach (var crewmate in GameManager.Inst.CurrentCrewmateList)
                     {
@@ -382,9 +385,9 @@ namespace BlueWaterProject
                         GameManager.Inst.SetCurrentInIslandPlayer(crewmate);
                         return;
                     }
-                    
                     // 게임 종료
-                    break;
+                    overlayCanvas.transform.Find("RestartPopUp").gameObject.SetActive(true);
+                    return;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
@@ -452,11 +455,7 @@ namespace BlueWaterProject
 
         public override void OnMove(InputValue value)
         {
-            if (CurrentHp <= 0)
-            {
-                Rb.velocity = Vector3.zero;
-                return;
-            }
+            if (CurrentHp <= 0) return;
             
             base.OnMove(value);
         }
diff --git a/BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab b/BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab
index b8b99f49d..1bf7ac355 100644
--- a/BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab
+++ b/BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab
@@ -25,13 +25,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4974917693782220124}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.6532815, y: 0.27059805, z: -0.27059805, w: 0.6532815}
+  m_LocalRotation: {x: 0.86602545, y: 0, z: 0, w: 0.49999994}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 2, y: 2, z: 2}
   m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 2677528810302803348}
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: -45}
+  m_LocalEulerAnglesHint: {x: 120, y: 0, z: 0}
 --- !u!212 &2067129615080396003
 SpriteRenderer:
   m_ObjectHideFlags: 0