Merge pull request '修复BUG' (#53) from dev-0524-1021 into dev-0524

Reviewed-on: #53

ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Mushroom.asset

@@ -30,3 +30,4 @@ MonoBehaviour:
   damageMultiplier: 1
   damage: 3
   attackRange: 1
+  aoeRange: 1

ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Polymaw.asset

@@ -30,3 +30,4 @@ MonoBehaviour:
   damageMultiplier: 1
   damage: 8
   attackRange: 1
+  aoeRange: 2

ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset

@@ -16,8 +16,9 @@ MonoBehaviour:
   - 1002
   - 1003
   - 1111
-  - 1004
+  - 1105
   - 1004
   - 1001
   - 1001
   - 1001
+  - 1104

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 = cardcost.ToString();
+            cost.text = cardCostPlus1.ToString();
             
         }
-
-    public void createCardUI(bool needTrueFun)
-    {
-        /*if (cardOriginalData.Rarity.Equals(Name.CardRarity.Legendary))
-        {
-            Debug.Log("LegendaryłÉšŚ");
-            Sprite midBorderSprite = Resources.Load<Sprite>("Card/UI/gaojikapai/Card_Ui_6Mingcheng_v01");
-            if (midBorderSprite != null)
+        else
         {
-                Debug.Log("midBorderSpritełÉšŚ");
-                midBorder.sprite = midBorderSprite;
+            cost.text = cardCost.ToString();
         }
-            Sprite topBorderSprite = Resources.Load<Sprite>("Card/UI/gaojikapai/Card_Ui_4Biankuang_v01");
-            if (topBorderSprite != null)
-            {
-                Debug.Log("topBorderSpritełÉšŚ");
-                topBorder.sprite = topBorderSprite;
+        
+
     }
-            Sprite gemSprite = Resources.Load<Sprite>("Card/UI/gaojikapai/Card_Ui_8Xiyoudu_v01.png");
-            if (gemSprite != null)
+
+    public void createCardUI(bool needTrueFun)
     {
-                Debug.Log("gemSprite");
-                gem.sprite = gemSprite;
-            }
-        }*/
-        //createCardRelease();
-        //createEffectRange();
-        //createCardType();
 
         //ȡś¨Ěőźţ¸öĘý
         switch (cardOriginalData.conditionAndFunctionVal.Count) 

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())
         {

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);
     }
     //魔法

ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Aoe.cs

@@ -4,7 +4,6 @@ using UnityEngine;
 using UnityEngine.UI;
 public class EnemyActionAction_Aoe : EnemyAction
 {
-   
     public override void AttackRange(EnemyNode enemyNode)
     {
         AoeAttackRange(enemyNode);

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·¶Î§
+
 }

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;

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