mcutegs2/M-Gameton-06
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
aube.lee
2025-02-26 17:23:25 +09:00
parent 20f82838d6 4b6efe2788
commit 3b3be5460a
4 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs
View File

@@ -124,8 +124,9 @@ namespace TON
float baseAttack = _monsterData.attackPower; // 기본 공격력 float baseAttack = _monsterData.attackPower; // 기본 공격력
float equipmentAttack = 0; // 장비 공격력 float equipmentAttack = 0; // 장비 공격력
float defense = _monsterData.defencePower; // 방어력 비율 // float defense = _monsterData.defencePower; // 방어력 비율
float defense = PlayerDataManager.Singleton.defensiveIntention; // 캐릭터 방어력
// 기본 데미지 계산 (치명타 없음) // 기본 데미지 계산 (치명타 없음)
float damage = damageCalculator.CalculateBaseDamage(baseAttack, equipmentAttack, defense); float damage = damageCalculator.CalculateBaseDamage(baseAttack, equipmentAttack, defense);

2
Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs
View File

@@ -44,7 +44,7 @@ namespace TON
_state = state; _state = state;
_state.Enter(_monsterBase); _state.Enter(_monsterBase);
_textState.text = _state.ToString(); // _textState.text = _state.ToString();
} }
} }

4
Gameton-06/Assets/Resources/Monster.csv
View File

@@ -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
1 id name level hp attackPower defencePower
2 1 blueDragon 1 10 35 36
3 2 greenDragon 1 10 35 36
4 3 redDragon 1 10 35 36

7
Gameton-06/Assets/Resources/Monster.csv.meta
View File

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