diff --git a/Gameton-06/Assets/Gameton/Resources/GameData/MonsterSkills.json.meta b/Gameton-06/Assets/Gameton/Resources/GameData/MonsterSkills.json.meta new file mode 100644 index 00000000..2ceeb394 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/GameData/MonsterSkills.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d92f0de2a85e2ad43b438f0291dd2a01 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs b/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs index 55b831eb..cae28634 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs @@ -29,7 +29,6 @@ namespace TON public bool IsDetect { get; set; } // 몬스터가 대상을 인식했는지 여부 public bool IsAttacking { get; set; } // 몬스터가 공격했는지 여부 public bool IsFinishAttack { get; set; } // 몬스터 공격 모션이 끝났는지 여부 - public bool IsSkillAttackable; public int Gold = 0; public int Exp = 0; diff --git a/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSpawner.cs b/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSpawner.cs index a445da42..3456b3bf 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSpawner.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSpawner.cs @@ -103,8 +103,6 @@ namespace TON SoundManager.instance.BgSoundPlay(null); // 필요하다면 gameStarted = false; 등을 설정하여 한 번만 실행되게 함 } - - } private void SpawnBossMonster() diff --git a/Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs b/Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs index 99cb51df..23115ce2 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs @@ -9,9 +9,7 @@ namespace TON private IState _state; private MonsterBase _monsterBase; private TextMeshProUGUI _textState; - - // TODO : 추후 제거 예정 - // public StateMachine(IState state, MonsterBase monsterBase, TextMeshProUGUI textState) + public StateMachine(IState state, MonsterBase monsterBase) { // 초기 상태 객체 생성 @@ -19,10 +17,6 @@ namespace TON _state = state; _state.Enter(_monsterBase); - - // TODO : 추후 제거 예정 - // _textState = textState; - // _textState.text = _state.ToString(); } public void Update() @@ -43,8 +37,6 @@ namespace TON // 다음음 상태로 전환 _state = state; _state.Enter(_monsterBase); - - // _textState.text = _state.ToString(); } } @@ -200,9 +192,6 @@ namespace TON public void Update() { - // TODO : 우선 순위에 따라서 공격 - // TODO : 스킬1 > 스킬2 > 일반 공격 - // 현재 공격 중이 아니고, 쿨다운이 지났다면 공격 if (!_isAttacking && Time.time >= _lastAttackTime + _attackDelayTime) { Attack();