diff --git a/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs b/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs index 47fe7b95..a7aa11e2 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs @@ -124,8 +124,9 @@ namespace TON float baseAttack = _monsterData.attackPower; // 기본 공격력 float equipmentAttack = 0; // 장비 공격력 - float defense = _monsterData.defencePower; // 방어력 비율 - + // float defense = _monsterData.defencePower; // 방어력 비율 + float defense = PlayerDataManager.Singleton.defensiveIntention; // 캐릭터 방어력 + // 기본 데미지 계산 (치명타 없음) float damage = damageCalculator.CalculateBaseDamage(baseAttack, equipmentAttack, defense); diff --git a/Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs b/Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs index 21c31764..6bb9a7fa 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs @@ -44,7 +44,7 @@ namespace TON _state = state; _state.Enter(_monsterBase); - _textState.text = _state.ToString(); + // _textState.text = _state.ToString(); } } diff --git a/Gameton-06/Assets/Resources/Monster.csv b/Gameton-06/Assets/Resources/Monster.csv deleted file mode 100644 index bc779ba8..00000000 --- a/Gameton-06/Assets/Resources/Monster.csv +++ /dev/null @@ -1,4 +0,0 @@ -id,name,level,hp,attackPower,defencePower -1,blueDragon,1,10,35,36 -2,greenDragon,1,10,35,36 -3,redDragon,1,10,35,36 diff --git a/Gameton-06/Assets/Resources/Monster.csv.meta b/Gameton-06/Assets/Resources/Monster.csv.meta deleted file mode 100644 index 62faa6ca..00000000 --- a/Gameton-06/Assets/Resources/Monster.csv.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 11dcce49e0f92e74680420494679e394 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: