From 56eb1d5f34ab98261b7b7091f0fffc18cda5d2a0 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 23 Oct 2023 10:52:30 +0900 Subject: [PATCH] =?UTF-8?q?closed=20#38=20=EB=95=85=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EA=BA=BC=EC=A7=80=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + HpSlider 크기 축소 + Enemy HpSlider 밝은 빨간색으로 변경 + 카메라 축소 --- .../Assets/01.Scenes/03.Stage_Test.unity | 12 ++++----- .../02.Scripts/Character/Crewmate/Crewmate.cs | 26 ++++++++++++++++--- .../02.Scripts/Character/Enemy/Enemy.cs | 24 ++++++++++++++--- .../Character/Player/Type/InIslandPlayer.cs | 26 ++++++++++++++++--- .../05.Prefabs/HpSliders/EnemyHpSlider.prefab | 10 +++---- .../HpSliders/PlayerHpSlider.prefab | 4 +-- 6 files changed, 78 insertions(+), 24 deletions(-) diff --git a/BlueWater/Assets/01.Scenes/03.Stage_Test.unity b/BlueWater/Assets/01.Scenes/03.Stage_Test.unity index 75eb8f307..e5c504282 100644 --- a/BlueWater/Assets/01.Scenes/03.Stage_Test.unity +++ b/BlueWater/Assets/01.Scenes/03.Stage_Test.unity @@ -2529,8 +2529,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 334724472} serializedVersion: 2 - m_LocalRotation: {x: 0.5257311, y: -0.0000000149568, z: 0.000000009243812, w: 0.85065085} - m_LocalPosition: {x: 30.91, y: 22.217937, z: -37.73} + m_LocalRotation: {x: 0.56062883, y: -0.000000011532333, z: 0.0000000078077695, w: 0.82806724} + m_LocalPosition: {x: 30.91, y: 27.217937, z: -37.73} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5933,14 +5933,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 879331193} serializedVersion: 2 - m_LocalRotation: {x: 0.5257311, y: -0.0000000149568, z: 0.000000009243812, w: 0.85065085} - m_LocalPosition: {x: 30.91, y: 22.217937, z: -37.73} + m_LocalRotation: {x: 0.56062883, y: -0.000000011532333, z: 0.0000000078077695, w: 0.82806724} + m_LocalPosition: {x: 30.91, y: 27.217937, z: -37.73} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1467753325} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 63.41, y: 0, z: 0} --- !u!1 &886612057 GameObject: m_ObjectHideFlags: 0 @@ -10490,7 +10490,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 1 - m_FollowOffset: {x: 0, y: 20, z: -10} + m_FollowOffset: {x: 0, y: 25, z: -10} m_XDamping: 0 m_YDamping: 0 m_ZDamping: 0 diff --git a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs index 877653804..d65290f07 100644 --- a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs +++ b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs @@ -180,10 +180,28 @@ namespace BlueWaterProject protected override void Update() { - if (useHpSlider) + switch (useHpSlider) { - var localOffset = unitRoot.TransformPoint(hpSliderOffset); - hpSlider.transform.position = localOffset; + case true when CurrentHp > 0 && CurrentHp < MaxHp: + { + if (!hpSlider.gameObject.activeSelf) + { + hpSlider.gameObject.SetActive(true); + } + + var localOffset = unitRoot.TransformPoint(hpSliderOffset); + hpSlider.transform.position = localOffset; + break; + } + case true when CurrentHp <= 0 || CurrentHp >= MaxHp: + { + if (hpSlider.gameObject.activeSelf) + { + hpSlider.gameObject.SetActive(false); + } + + break; + } } if (CurrentHp <= 0) return; @@ -309,7 +327,7 @@ namespace BlueWaterProject } else { - rb.velocity = Vector3.zero; + rb.isKinematic = true; } Agent.enabled = false; diff --git a/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs b/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs index bbb3c4b2f..ab7ffbd8e 100644 --- a/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs +++ b/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs @@ -261,10 +261,28 @@ namespace BlueWaterProject protected override void Update() { - if (useHpSlider) + switch (useHpSlider) { - var localOffset = unitRoot.TransformPoint(hpSliderOffset); - hpSlider.transform.position = localOffset; + case true when CurrentHp > 0 && CurrentHp < MaxHp: + { + if (!hpSlider.gameObject.activeSelf) + { + hpSlider.gameObject.SetActive(true); + } + + var localOffset = unitRoot.TransformPoint(hpSliderOffset); + hpSlider.transform.position = localOffset; + break; + } + case true when CurrentHp <= 0 || CurrentHp >= MaxHp: + { + if (hpSlider.gameObject.activeSelf) + { + hpSlider.gameObject.SetActive(false); + } + + break; + } } } diff --git a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs index a6a94161d..81420a6a9 100644 --- a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs +++ b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs @@ -216,10 +216,28 @@ namespace BlueWaterProject protected override void Update() { - if (useHpSlider) + switch (useHpSlider) { - var localOffset = unitRoot.TransformPoint(hpSliderOffset); - hpSlider.transform.position = localOffset; + case true when CurrentHp > 0 && CurrentHp < MaxHp: + { + if (!hpSlider.gameObject.activeSelf) + { + hpSlider.gameObject.SetActive(true); + } + + var localOffset = unitRoot.TransformPoint(hpSliderOffset); + hpSlider.transform.position = localOffset; + break; + } + case true when CurrentHp <= 0 || CurrentHp >= MaxHp: + { + if (hpSlider.gameObject.activeSelf) + { + hpSlider.gameObject.SetActive(false); + } + + break; + } } if (CurrentHp <= 0) return; @@ -347,7 +365,7 @@ namespace BlueWaterProject } else { - Rb.velocity = Vector3.zero; + Rb.isKinematic = true; } Agent.enabled = false; diff --git a/BlueWater/Assets/05.Prefabs/HpSliders/EnemyHpSlider.prefab b/BlueWater/Assets/05.Prefabs/HpSliders/EnemyHpSlider.prefab index 915967202..bfa458837 100644 --- a/BlueWater/Assets/05.Prefabs/HpSliders/EnemyHpSlider.prefab +++ b/BlueWater/Assets/05.Prefabs/HpSliders/EnemyHpSlider.prefab @@ -61,12 +61,12 @@ PrefabInstance: - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} propertyPath: m_LocalScale.x - value: 0.002 + value: 0.001 objectReference: {fileID: 0} - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} propertyPath: m_LocalScale.y - value: 0.01 + value: 0.005 objectReference: {fileID: 0} - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} @@ -146,17 +146,17 @@ PrefabInstance: - target: {fileID: 1525762082425720460, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} propertyPath: m_Color.b - value: 0.20392157 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1525762082425720460, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} propertyPath: m_Color.g - value: 0.17254902 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1525762082425720460, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} propertyPath: m_Color.r - value: 0.5647059 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1525762082425720563, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} diff --git a/BlueWater/Assets/05.Prefabs/HpSliders/PlayerHpSlider.prefab b/BlueWater/Assets/05.Prefabs/HpSliders/PlayerHpSlider.prefab index da1f0b071..e424712fa 100644 --- a/BlueWater/Assets/05.Prefabs/HpSliders/PlayerHpSlider.prefab +++ b/BlueWater/Assets/05.Prefabs/HpSliders/PlayerHpSlider.prefab @@ -61,12 +61,12 @@ PrefabInstance: - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} propertyPath: m_LocalScale.x - value: 0.002 + value: 0.001 objectReference: {fileID: 0} - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} propertyPath: m_LocalScale.y - value: 0.01 + value: 0.005 objectReference: {fileID: 0} - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768, type: 3}