Merge branch 'dev' of https://github.com/2aurore/Gameton-06 into dev

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);
 

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();
         }
     }
 

Gameton-06/Assets/Resources/Monster.csv

@@ -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

Gameton-06/Assets/Resources/Monster.csv.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 11dcce49e0f92e74680420494679e394
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: