From 069040665b9a8624b4ff488555b1e8dd198ce513 Mon Sep 17 00:00:00 2001 From: yjm484 <171359351@qq.com> Date: Tue, 22 Oct 2024 19:40:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/GameDate/Enemy/Mushroom.asset | 1 + .../Assets/GameDate/Enemy/Polymaw.asset | 1 + .../Assets/GameDate/cardDeckList.asset | 3 +- .../Assets/Scripts/Card/CardEntity.cs | 38 +++++-------------- .../Assets/Scripts/Enemy/EnemyNode.cs | 4 +- .../Scripts/EnemyPlanFunction/EnemyAction.cs | 2 +- .../EnemyActionAction_Aoe.cs | 3 +- .../Scripts/Tool/Data_SO/EnemyState_SO.cs | 2 + .../Assets/Scripts/Tool/Name.cs | 4 ++ .../Assets/data/card_data_3.csv | 22 +++++------ 10 files changed, 35 insertions(+), 45 deletions(-) diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Mushroom.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Mushroom.asset index e5c3dbb3..98dccf6b 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Mushroom.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Mushroom.asset @@ -30,3 +30,4 @@ MonoBehaviour: damageMultiplier: 1 damage: 3 attackRange: 1 + aoeRange: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Polymaw.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Polymaw.asset index 025d2163..255cc136 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Polymaw.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Polymaw.asset @@ -30,3 +30,4 @@ MonoBehaviour: damageMultiplier: 1 damage: 8 attackRange: 1 + aoeRange: 2 diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset index b3bb4bd4..8b531735 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset @@ -16,8 +16,9 @@ MonoBehaviour: - 1002 - 1003 - 1111 - - 1004 + - 1105 - 1004 - 1001 - 1001 - 1001 + - 1104 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs index 1270ceee..8caefce1 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs @@ -125,6 +125,7 @@ public class CardEntity : MonoBehaviour public void createCard(string cardId, int cardIndex,bool needTrueFun) { + Debug.Log("创建ID" + cardId + "needTrueFun是" + needTrueFun); this.cardId = cardId; //Debug.Log(cardId + "-" + CardOriginalDataList.Instance.cardOriginalDataList[cardId]); cardOriginalData = CardOriginalDataList.Instance.existCardOriginalDataList[cardId]; @@ -219,42 +220,23 @@ public class CardEntity : MonoBehaviour } else {*/ - int cardcost = cardOriginalData.Cost; + int cardCost = cardOriginalData.Cost; + int cardCostPlus1= cardOriginalData.Cost+1; if (MapUnityManager.Instance.isPlayerOn(Name.NodeColor.Black)) { - cardcost++; + cost.text = cardCostPlus1.ToString(); + + } + else + { + cost.text = cardCost.ToString(); } - cost.text = cardcost.ToString(); + } public void createCardUI(bool needTrueFun) { - /*if (cardOriginalData.Rarity.Equals(Name.CardRarity.Legendary)) - { - Debug.Log("Legendary成功"); - Sprite midBorderSprite = Resources.Load("Card/UI/gaojikapai/Card_Ui_6Mingcheng_v01"); - if (midBorderSprite != null) - { - Debug.Log("midBorderSprite成功"); - midBorder.sprite = midBorderSprite; - } - Sprite topBorderSprite = Resources.Load("Card/UI/gaojikapai/Card_Ui_4Biankuang_v01"); - if (topBorderSprite != null) - { - Debug.Log("topBorderSprite成功"); - topBorder.sprite = topBorderSprite; - } - Sprite gemSprite = Resources.Load("Card/UI/gaojikapai/Card_Ui_8Xiyoudu_v01.png"); - if (gemSprite != null) - { - Debug.Log("gemSprite"); - gem.sprite = gemSprite; - } - }*/ - //createCardRelease(); - //createEffectRange(); - //createCardType(); //确定条件个数 switch (cardOriginalData.conditionAndFunctionVal.Count) diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs index 910eb52b..31b70b34 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs @@ -822,7 +822,7 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver EnemyState.damageMultiplier = 0; EnemyState.stepRangeMultiplier = 0; } - + abnormalConditionEndCheck(); enemyUIBar.RefreshEnemyBuffIcon(); } @@ -1242,7 +1242,7 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver } } - private void abnormalConditionEndCheck() + public void abnormalConditionEndCheck() { foreach (var key in EnemyState.abnormalCondition.Keys.ToList()) { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction.cs index 4db938fd..d0bf9dde 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction.cs @@ -94,7 +94,7 @@ public class EnemyAction Debug.Log("aoe"); //几-几 EnemyManager.Instance.AttackRangeInfluencedNode(GameManager.Instance.X[enemyNode.positionX].Y[enemyNode.positionY], enemyNode.EnemyState.attackRange, enemyNode.rangePool); - EnemyManager.Instance.AttackRangeInfluencedNode(GameManager.Instance.X[enemyNode.positionX].Y[enemyNode.positionY],3, enemyNode.aoeRangePool); + EnemyManager.Instance.AttackRangeInfluencedNode(GameManager.Instance.X[enemyNode.positionX].Y[enemyNode.positionY], enemyNode.EnemyState.aoeRange, enemyNode.aoeRangePool); ShowAttackRangeAoe(enemyNode); } //魔法 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Aoe.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Aoe.cs index 93818f40..b2a9f267 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Aoe.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Aoe.cs @@ -4,13 +4,12 @@ using UnityEngine; using UnityEngine.UI; public class EnemyActionAction_Aoe : EnemyAction { - public override void AttackRange(EnemyNode enemyNode) { AoeAttackRange(enemyNode); } - public override EnemyAction NewAction() + public override EnemyAction NewAction() { EnemyAction action = new EnemyActionAction_Aoe(); action.sprite = this.sprite; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/EnemyState_SO.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/EnemyState_SO.cs index 094616e3..af6b77ee 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/EnemyState_SO.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/EnemyState_SO.cs @@ -40,4 +40,6 @@ public class EnemyState_SO : ScriptableObject public int attackRange;//攻击范围 + public int aoeRange;//aoe范围 + } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs index ebf8a7ee..4fdea8f9 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs @@ -114,6 +114,7 @@ public static class Name public const string shield = "shield"; public const string weak = "weak"; public const string step = "step"; + public const string wet = "wet"; } public static string switchNumToString(string num) @@ -133,6 +134,9 @@ public static class Name case CardFunction.step: result = CardFunctionString.step; break; + case CardFunction.wet: + result = CardFunctionString.wet; + break; } return result; diff --git a/ColorlessWorld-2024-4-2/Assets/data/card_data_3.csv b/ColorlessWorld-2024-4-2/Assets/data/card_data_3.csv index 87b9875b..e54225b1 100644 --- a/ColorlessWorld-2024-4-2/Assets/data/card_data_3.csv +++ b/ColorlessWorld-2024-4-2/Assets/data/card_data_3.csv @@ -3,14 +3,14 @@ 1002,寰厜,1,1,1,2,0,none,2,5,0,red;red,CardIcon/2 1003,鍏夎緣鏉栧嚮,2,2,1,4_1,0,none;red>3_green>1,1;5_1,9;2_5,0;0_0;0_0_0,red;red;red;red,CardIcon/4_1 1004,鏄熻緣鎶ょ浘,2,2,2,3_2,0,none;red>5,2;2,8;1,2;-2,red;red;red,CardIcon/3_2 -1101,,1,2,1,5_4,0,red>4;red>6,1;25,8;3,0;0_-1;0_1;0_0,red;red;red;red;red,CardIcon/Sslx_Card_Kamizn_Hudun_v01 -1102,,1,1,2,5_5,0,red>3,2,7,1;-1;1_0;-1_0,red;red;red;red;red,CardIcon/Sslx_Card_Kamizn_Hudun_v01 -1103,,1,1,1,4_1,0,red>1,1,10,0;0_0;0_0_0,red;red;red;red,CardIcon/Sslx_Card_Kamizn_Hudun_v01 -1104,,1,1,3,3_4,0,red>2,25,8,0;-1,red;red;red,CardIcon/Sslx_Card_Kamizn_Hudun_v01 -1105,,2,2,2,6_5,0,red>2;red>10,1;5,12;2,0;-1;0_-1;-1_-1;0_0,red;red;red;red;red;red;red,CardIcon/Sslx_Card_Kamizn_Hudun_v01 -1106,,1,1,1,4_1,0,red>3_green>2,1,8,0;0_0;0_0_0,red;red;green;green,CardIcon/Sslx_Card_Kamizn_Hudun_v01 -1107,,2,2,2,6_7,0,red>7;blue<4,25;4,6;4,0;-1;1;0_0;0_0_0,red;red;red;red;green;green,CardIcon/Sslx_Card_Kamizn_Hudun_v01 -1108,,2,2,2,6_4,0,red>7;green>4,1;4,12;6,0;-1;1;0_1;0_-1,red;red;red;red;green;green,CardIcon/Sslx_Card_Kamizn_Hudun_v01 -1109,,2,2,2,7_3,0,red<15;blue<6,1_25;19,7_8;2,0;-1;1;-2;2;0_0,green;green;red;red;red;red;green,CardIcon/Sslx_Card_Kamizn_Hudun_v01 -1110,,1,1,2,3_4,0,red>3,1,6,0;-1,red;red;blue,CardIcon/Sslx_Card_Kamizn_Hudun_v01 -1111,,2,2,0,6_3,0,red>6;blue>2,1;48,6;5,0;1;-1;-2;2;3,None;blue;blue;blue;red;red;red,CardIcon/Sslx_Card_Kamizn_Hudun_v01 +1101,,1,2,1,5_4,0,red>4;red>6,1;25,8;3,0;0_-1;0_1;0_0,red;red;red;red;red,CardIcon/Sslx_Card_Kamizn_Feibiao_v01 +1102,,1,1,2,5_5,0,red>3,2,7,1;-1;1_0;-1_0,red;red;red;red;red,CardIcon/Sslx_Card_Kamizn_Feibiao_v01 +1103,,1,1,1,4_1,0,red>1,1,10,0;0_0;0_0_0,red;red;red;red,CardIcon/Sslx_Card_Kamizn_Feibiao_v01 +1104,,1,1,3,3_4,0,red>2,25,8,0;-1,red;red;red,CardIcon/Sslx_Card_Kamizn_Feibiao_v01 +1105,,2,2,2,6_5,0,red>2;red>10,1;5,12;2,0;-1;0_-1;-1_-1;0_0,red;red;red;red;red;red;red,CardIcon/Sslx_Card_Kamizn_Feibiao_v01 +1106,,1,1,1,4_1,0,red>3_green>2,1,8,0;0_0;0_0_0,red;red;green;green,CardIcon/Sslx_Card_Kamizn_Feibiao_v01 +1107,,2,2,2,6_7,0,red>7;blue<4,25;4,6;4,0;-1;1;0_0;0_0_0,red;red;red;red;green;green,CardIcon/Sslx_Card_Kamizn_Feibiao_v01 +1108,,2,2,2,6_4,0,red>7;green>4,1;4,12;6,0;-1;1;0_1;0_-1,red;red;red;red;green;green,CardIcon/Sslx_Card_Kamizn_Feibiao_v01 +1109,,2,2,2,7_3,0,red<15;blue<6,1_25;19,7_8;2,0;-1;1;-2;2;0_0,green;green;red;red;red;red;green,CardIcon/Sslx_Card_Kamizn_Feibiao_v01 +1110,,1,1,2,3_4,0,red>3,1,6,0;-1,red;red;blue,CardIcon/Sslx_Card_Kamizn_Feibiao_v01 +1111,,2,2,0,6_3,0,red>6;blue>2,1;48,6;5,0;1;-1;-2;2;3,None;blue;blue;blue;red;red;red,CardIcon/Sslx_Card_Kamizn_Feibiao_v01