From 743f48604537018742ff54ad9e31938164f95313 Mon Sep 17 00:00:00 2001 From: Mingu Kim Date: Wed, 26 Feb 2025 16:47:01 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=ED=8C=8C=EC=9D=BC=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gameton-06/Assets/Resources/Monster.csv | 4 ---- Gameton-06/Assets/Resources/Monster.csv.meta | 7 ------- 2 files changed, 11 deletions(-) delete mode 100644 Gameton-06/Assets/Resources/Monster.csv delete mode 100644 Gameton-06/Assets/Resources/Monster.csv.meta 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: From 4b6efe2788024626ec7e7928812ebbebace8f0b1 Mon Sep 17 00:00:00 2001 From: Mingu Kim Date: Wed, 26 Feb 2025 16:47:58 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=AA=AC=EC=8A=A4=ED=84=B0=20=EA=B3=B5?= =?UTF-8?q?=EA=B2=A9=20=EC=8B=9C=20=EB=B0=A9=EC=96=B4=20=EC=88=98=EC=B9=98?= =?UTF-8?q?=20=EC=BA=90=EB=A6=AD=ED=84=B0=20=EC=88=98=EC=B9=98=20=EB=B0=9B?= =?UTF-8?q?=EC=95=84=EC=98=A4=EA=B2=8C=20=EC=BD=94=EB=93=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs | 5 +++-- Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) 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(); } }