diff --git a/Assets/KSH/DungeonLogic.cs b/Assets/KSH/DungeonLogic.cs index 181ea7d5..78883935 100644 --- a/Assets/KSH/DungeonLogic.cs +++ b/Assets/KSH/DungeonLogic.cs @@ -5,8 +5,8 @@ using UnityEngine; public class DungeonLogic : MonoBehaviour { - public bool isCompleted = false; // 던전 클리어 여부 - public bool isFailed = false; // 던전 실패 여부 + [NonSerialized] public bool isCompleted = false; // 던전 클리어 여부 + [NonSerialized] public bool isFailed = false; // 던전 실패 여부 private PlayerController _player; private EnemyController _enemy; @@ -19,7 +19,7 @@ public class DungeonLogic : MonoBehaviour { // tag를 통해 할당 / 추후 플레이어와 에너미 태그 추가 필요 _player = GameObject.FindGameObjectWithTag("Player").GetComponent(); - _enemy = GameObject.FindGameObjectWithTag("Enemy").GetComponent(); + // _enemy = GameObject.FindGameObjectWithTag("Enemy").GetComponent(); // 죽음 이벤트 구독 if (_player != null) @@ -37,7 +37,7 @@ public class DungeonLogic : MonoBehaviour private void OnPlayerDeath(CharacterBase player) { Debug.Log("player name:" + player.characterName); - if (!isFailed) + if (!isFailed) // 중복 실행 방지 { FailDungeon(); } @@ -47,8 +47,7 @@ public class DungeonLogic : MonoBehaviour private void OnEnemyDeath(CharacterBase enemy) { Debug.Log("enemy name:" + enemy.characterName); - // 보스 처치 확인 - if (!isCompleted) + if (!isCompleted) // 중복 실행 방지 { CompleteDungeon(); } diff --git a/Assets/KSH/DungeonTestScene.unity b/Assets/KSH/DungeonTestScene.unity new file mode 100644 index 00000000..64695faf --- /dev/null +++ b/Assets/KSH/DungeonTestScene.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3f30582fbc2a20bcb5120148edb0a3763e05da15aca0943a54dd5a607c62dcd +size 28918 diff --git a/Assets/KSH/DungeonTestScene.unity.meta b/Assets/KSH/DungeonTestScene.unity.meta new file mode 100644 index 00000000..7bc8601b --- /dev/null +++ b/Assets/KSH/DungeonTestScene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6b3ea352de4a388459a837a1fc1cc6bd +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StoreAssets/Cartoon Game Sound 2.0/s_ef_ce_mine_e.wav b/Assets/StoreAssets/Cartoon Game Sound 2.0/ShootAndBoom.wav similarity index 100% rename from Assets/StoreAssets/Cartoon Game Sound 2.0/s_ef_ce_mine_e.wav rename to Assets/StoreAssets/Cartoon Game Sound 2.0/ShootAndBoom.wav diff --git a/Assets/StoreAssets/Cartoon Game Sound 2.0/s_ef_ce_mine_e.wav.meta b/Assets/StoreAssets/Cartoon Game Sound 2.0/ShootAndBoom.wav.meta similarity index 100% rename from Assets/StoreAssets/Cartoon Game Sound 2.0/s_ef_ce_mine_e.wav.meta rename to Assets/StoreAssets/Cartoon Game Sound 2.0/ShootAndBoom.wav.meta diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index f877966a..9eb1b3cc 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -5,6 +5,7 @@ TagManager: serializedVersion: 2 tags: - FxTemporaire + - Enemy layers: - Default - TransparentFX @@ -16,7 +17,7 @@ TagManager: - - - - - + - Enemy - - -