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

@@ -12,4 +12,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d4cac7ba486f106409799af2bd4b4fc8, type: 3}
   m_Name: cardDeckList
   m_EditorClassIdentifier: 
-  cardDeckList: 1327000014270000172700001c2700001e270000162700001a2700001b2700001d2700001f27000020270000222700002327000024270000252700002627000027270000292700002a2700002c27000011270000282700002d270000122700002b270000182700002127000015270000152700002e270000
+  cardDeckList: e9030000e9030000e9030000ea030000ea030000ea030000eb030000eb030000eb030000ec030000

ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs

@@ -460,7 +460,8 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
 
                     Vector3 face = currentNode.transform.position - GameManager.Instance.playerOn.transform.position;
                     float euler = Vector3.SignedAngle(-GameManager.Instance.playerOn.transform.forward, face, GameManager.Instance.playerOn.transform.up) + 180;
-                    setEffectRangePreview(cardEntity.cardOriginalData.EffectRange, euler, currentNode);
+                    getNodeTools.setEffectRangePreview(cardEntity.cardOriginalData.EffectRange, euler, currentNode,cardEntity);
+                    //setEffectRangePreview(cardEntity.cardOriginalData.EffectRange, euler, currentNode);
                     //influencePreviewPool.Add(currentNode);
 
 
@@ -482,47 +483,6 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
         MapUnityManager.Instance.getCastPool(cardEntity.cardOriginalData.EffectRange, castRange);
 
 
-    }
-    private void setEffectRangePreview(string effectRange, float euler, MapUnity currentNode)
-    {
-        MapUnity playerOnNode = GameManager.Instance.playerOn.transform.GetComponent<MapUnity>();
-        var handlers = new Dictionary<string, EffectRangeHandler>
-        {
-            {EffectRange.range1,new EffectRangeHandler1(currentNode,euler) },
-            {EffectRange.range2,new EffectRangeHandler2(currentNode,euler) },
-            {EffectRange.range3_1,new EffectRangeHandler3_1(currentNode,euler) },
-            {EffectRange.range3_2,new EffectRangeHandler3_2(currentNode,euler) },
-            {EffectRange.range3_3,new EffectRangeHandler3_3(currentNode,euler) },
-            {EffectRange.range4_1,new EffectRangeHandler4_1(currentNode,euler) },
-            {EffectRange.range4_2,new EffectRangeHandler4_2(currentNode,euler) },
-            {EffectRange.range4_3,new EffectRangeHandler4_3(currentNode,euler) },
-            {EffectRange.range5_1,new EffectRangeHandler5_1(currentNode,euler) },
-            {EffectRange.range5_2,new EffectRangeHandler5_2(currentNode,euler) },
-            {EffectRange.range5_3,new EffectRangeHandler5_3(currentNode,euler) },
-            {EffectRange.range6_1,new EffectRangeHandler6_1(currentNode,euler) },
-            {EffectRange.range6_2,new EffectRangeHandler6_2(currentNode,euler) },
-            {EffectRange.range6_3,new EffectRangeHandler6_3(playerOnNode,euler) },
-            {EffectRange.range7_1,new EffectRangeHandler7_1(currentNode,euler) },
-            {EffectRange.range7_2,new EffectRangeHandler7_2(currentNode,euler) },
-            {EffectRange.range8_1,new EffectRangeHandler8_1(currentNode,euler) },
-            {EffectRange.range8_2,new EffectRangeHandler8_2(playerOnNode,euler) },
-        };
-
-        if (handlers.TryGetValue(effectRange, out var handler))
-        {
-            cardEntity.influencePreviewPool = handler.HandleAngleWithResult(euler);
-        }
-        //cardEntity.influencePreviewPool=MathTool.RemoveDuplicates(cardEntity.influencePreviewPool);
-        if (effectRange.Equals(EffectRange.range8_2)|| effectRange.Equals(EffectRange.range6_3))
-        {
-            getNodeTools.checkListPass(cardEntity.influencePreviewPool, playerOnNode);
-        }
-        else
-        {
-            getNodeTools.checkListPass(cardEntity.influencePreviewPool, currentNode);
-        }
-        
-
     }
 
 
@@ -548,7 +508,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
                 cardEntity.influencePreviewPool.Add(currentNode);
             }
         }*/
-        setEffectRangePreview(cardEntity.cardOriginalData.EffectRange, 30.0f, currentNode);
+        getNodeTools.setEffectRangePreview(cardEntity.cardOriginalData.EffectRange, 30.0f, currentNode, cardEntity);
     }
 
     public void OnDrag(PointerEventData eventData)

ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs

@@ -346,6 +346,10 @@ public class CardEntity : MonoBehaviour
             {
                 case CardFunction.cardDamage:               
                     sb.Append("造成" + kvp.Value + "点伤害;");
+                    if (cardOriginalData.PierceNum!=-1)
+                    {
+                        sb.Append("穿透:" + cardOriginalData.PierceNum + ";");
+                    }
                     break;
                 case CardFunction.cardShield:
                     sb.Append("获得" + kvp.Value + "点护盾;");
@@ -392,6 +396,9 @@ public class CardEntity : MonoBehaviour
                 case CardFunction.immunity:
                     sb.Append("获得" + kvp.Value + "层魔抗;");
                     break;
+                case CardFunction.recoverHp:
+                    sb.Append("恢复" + kvp.Value + "点血量;");
+                    break;
                 case CardFunction.extraDrawCardsNum:
                     sb.Append("下回合多抽" + kvp.Value + "张牌;");
                     break;

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardFunction.cs

@@ -92,5 +92,7 @@ public class CardFunction
     public const string xCost = "45";
     //随机选择牌库里的一张攻击卡加入手牌
     public const string randomAttactCardToHand = "46";
+    //恢复血量
+    public const string recoverHp = "47";
 
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs

@@ -511,5 +511,47 @@ public class getNodeTools
         return hashSet.ElementAt(random.Next(hashSet.Count));
     }
 
+    public static void setEffectRangePreview(string effectRange, float euler, MapUnity currentNode,CardEntity cardEntity)
+    {
+        MapUnity playerOnNode = GameManager.Instance.playerOn.transform.GetComponent<MapUnity>();
+        var handlers = new Dictionary<string, EffectRangeHandler>
+        {
+            {EffectRange.range1,new EffectRangeHandler1(currentNode,euler) },
+            {EffectRange.range2,new EffectRangeHandler2(currentNode,euler) },
+            {EffectRange.range3_1,new EffectRangeHandler3_1(currentNode,euler) },
+            {EffectRange.range3_2,new EffectRangeHandler3_2(currentNode,euler) },
+            {EffectRange.range3_3,new EffectRangeHandler3_3(currentNode,euler) },
+            {EffectRange.range4_1,new EffectRangeHandler4_1(currentNode,euler) },
+            {EffectRange.range4_2,new EffectRangeHandler4_2(currentNode,euler) },
+            {EffectRange.range4_3,new EffectRangeHandler4_3(currentNode,euler) },
+            {EffectRange.range5_1,new EffectRangeHandler5_1(currentNode,euler) },
+            {EffectRange.range5_2,new EffectRangeHandler5_2(currentNode,euler) },
+            {EffectRange.range5_3,new EffectRangeHandler5_3(currentNode,euler) },
+            {EffectRange.range6_1,new EffectRangeHandler6_1(currentNode,euler) },
+            {EffectRange.range6_2,new EffectRangeHandler6_2(currentNode,euler) },
+            {EffectRange.range6_3,new EffectRangeHandler6_3(playerOnNode,euler) },
+            {EffectRange.range7_1,new EffectRangeHandler7_1(currentNode,euler) },
+            {EffectRange.range7_2,new EffectRangeHandler7_2(currentNode,euler) },
+            {EffectRange.range8_1,new EffectRangeHandler8_1(currentNode,euler) },
+            {EffectRange.range8_2,new EffectRangeHandler8_2(playerOnNode,euler) },
+        };
+
+        if (handlers.TryGetValue(effectRange, out var handler))
+        {
+            cardEntity.influencePreviewPool = handler.HandleAngleWithResult(euler);
+        }
+        //cardEntity.influencePreviewPool=MathTool.RemoveDuplicates(cardEntity.influencePreviewPool);
+        if (effectRange.Equals(EffectRange.range8_2) || effectRange.Equals(EffectRange.range6_3))
+        {
+            getNodeTools.checkListPass(cardEntity.influencePreviewPool, playerOnNode);
+        }
+        else
+        {
+            getNodeTools.checkListPass(cardEntity.influencePreviewPool, currentNode);
+        }
+
+
+    }
+
 
 }

ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs

@@ -324,7 +324,7 @@ public class SettlementManager : Singleton<SettlementManager>
     private void damageWork(int damageVal, List<MapUnity> influencePreviewPool,int pierceNum)
     {
         int pierceCount=0;
-        if (pierceNum!=0)
+        if (pierceNum!=-1)
         {
             for (int i = 0; i < influencePreviewPool.Count; i++)
             {
@@ -468,6 +468,9 @@ public class SettlementManager : Singleton<SettlementManager>
                 case CardFunction.randomAttactCardToHand:
                     randomAttactCardToHand();
                     break;
+                case CardFunction.recoverHp:
+                    Usermanager.Instance.recoverHp(int.Parse(kvp.Value));
+                    break;
                 case CardFunction.ember:
                 case CardFunction.enhanceShield:
                 case CardFunction.firm:

ColorlessWorld-2024-4-2/Assets/data/card_data_2.csv

@@ -1,31 +1,38 @@
 ID,名称,费用,稀有度,功能,数值,施法范围,作用范围,消耗,优势功能,数值,卡牌类型,优势描述,图片路径,穿透,优势穿透,卡牌释放目标,卡牌释放
-10001,纳刀,1,3,35,1,0,0,0,35;33,0;1,1,,CardIcon/Sslx_Card_Kamizn_Huikan_v01,0,0,1,Self
-10002,踏前斩,1,1,41,7,1,1,0,41,7,1,,CardIcon/Sslx_Card_Kamizn_Huikan_v01,0,0,1,Node
-10003,拔刀斩,1,2,1,7,1,2,0,1;25,7;3,1,,CardIcon/Sslx_Card_Kamizn_Huikan_v01,0,0,3,MeleeAttack
-10004,燕返,3,2,1;14,13;0,1,4_1,0,1;38;14,13;1;0,1,两次效果,CardIcon/Sslx_Card_Kamizn_Huikan_v01,0,0,3,Node
-10005,火焰锁链,1,2,43;25,0;4,1,5_1,0,43;25;2,0;4;6,2,额外获得6点护盾,CardIcon/Sslx_Card_Kamizn_Huikan_v01,0,0,2,Missile
-10006,火焰回复,1,3,27,0,8,7_2,1,28,0,2,回复格子数*2的血量,CardIcon/Sslx_Card_Kamizn_Huikan_v01,0,0,1,Node
-10007,绳缚术,2,2,26,1,3,7_2,0,26;19,1;1,2,,CardIcon/Sslx_Card_Kamizn_Huikan_v01,0,0,2,Throw
+10001,纳刀,1,3,35,1,0,0,0,35;33,0;1,1,,CardIcon/Sslx_Card_Kamizn_Huikan_v01,-1,-1,1,Self
+10002,踏前斩,1,1,41,7,1,1,0,41,7,1,,CardIcon/Sslx_Card_Kamizn_Huikan_v01,-1,-1,1,Node
+10003,拔刀斩,1,2,1,7,1,2,0,1;25,7;3,1,,CardIcon/Sslx_Card_Kamizn_Huikan_v01,-1,-1,3,MeleeAttack
+10004,燕返,3,2,1;14,13;0,1,4_1,0,1;38;14,13;1;0,1,两次效果,CardIcon/Sslx_Card_Kamizn_Huikan_v01,-1,-1,3,Node
+10005,火焰锁链,1,2,43;25,0;4,1,5_1,0,43;25;2,0;4;6,2,额外获得6点护盾,CardIcon/Sslx_Card_Kamizn_Huikan_v01,-1,-1,2,Missile
+10006,火焰回复,1,3,27,0,8,7_2,1,28,0,2,回复格子数*2的血量,CardIcon/Sslx_Card_Kamizn_Huikan_v01,-1,-1,1,Node
+10007,绳缚术,2,2,26,1,3,7_2,0,26;19,1;1,2,,CardIcon/Sslx_Card_Kamizn_Huikan_v01,-1,-1,2,Throw
 10008,烈焰手里剑,2,2,1;14,9;0,1,5_1,0,1;14,9;0,1,,CardIcon/Sslx_Card_Kamizn_Huikan_v01,1,2,3,Missile
-10009,瞬身术,2,2,42,0,6,1,0,42;33,0;1,2,,CardIcon/Sslx_Card_Kamizn_Huikan_v01,0,0,1,Node
-10010,装填,0,2,11,1,0,0,1,11;29,1;2,2,获得2点移动力,CardIcon/Sslx_Card_Kamizn_Huikan_v01,0,0,1,Self
-10011,岩浆汲取,1,1,30,10,0,0,0,30,7,2,,CardIcon/Sslx_Card_Kamizn_Huikan_v01,0,0,1,Self
-10012,汲火刃,0,2,1;45;25,2;0;3,1,1,0,1;45;25,2;0;4,1,施加4层火种,CardIcon/Sslx_Card_Kamizn_Huikan_v01,0,0,3,MeleeAttack
-10013,火遁,2,2,2,12,0,0,0,32;2,2;12,2,,CardIcon/Sslx_Card_Kamizn_Huikan_v01,0,0,1,Throw
-10014,快手,1,2,20,1,0,0,1,20,1,1,,CardIcon/Sslx_Card_Kamizn_Hudun_v01,0,0,1,Self
-10015,夺刃,2,2,7,1,1,1,1,7;33,1;1,2,,CardIcon/Sslx_Card_Kamizn_Hudun_v01,0,0,2,MeleeAttack
-10016,愤怒,1,3,16;40,3;-1,0,0,1,16;40,3;-1,3,,CardIcon/Sslx_Card_Kamizn_Hudun_v01,0,0,1,Self
-10017,回旋飞镖,2,1,44,5_3,3,1,0,44,5_3,1,,CardIcon/Sslx_Card_Kamizn_Hudun_v01,0,0,3,Missile
-10018,踏浪,1,1,40,2,0,0,0,40,2,2,,CardIcon/Sslx_Card_Kamizn_Hudun_v01,0,0,1,Self
-10019,必杀剑·夜刃,3,3,15;34,0;0,3,1,0,15;34;33,0;0;1,1,消耗-1,CardIcon/Sslx_Card_Kamizn_Hudun_v01,0,0,3,MeleeAttack
-10020,绝斩,1,1,1;40,13;-2,1,1,0,1;40,13;-2,1,,CardIcon/Sslx_Card_Kamizn_Hudun_v01,0,0,3,MeleeAttack
-10021,飞焰,1,1,14,0,2,4_2,0,14,0,2,,CardIcon/Sslx_Card_Kamizn_Hudun_v01,0,0,1,Node
-10022,盾立,1,1,2;12,7;1,0,0,0,2;12,7;1,2,,CardIcon/Sslx_Card_Kamizn_Hudun_v01,0,0,1,Self
-10023,抽丝,1,1,1;12,10;1,4,1,0,1;12,10;1,1,,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,0,0,3,Throw
-10024,刀背击打,1,1,1;36,8;1,1,1,0,1;36,8;1,1,,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,0,0,3,MeleeAttack
-10025,机关伞,3,1,1;2,10;15,0,6_3,0,1;2,10;15,2,,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,0,0,1,Self
-10026,残影,1,1,12;2,2;6,0,0,0,12;2,2;6,2,,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,0,0,1,Self
-10027,净化,1,3,39,0,0,0,0,39;29,0;1,2,,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,0,0,1,Throw
-10028,凿击,1,1,6,1,1,1,0,1;6,5;1,1,,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,0,0,2,MeleeAttack
-10029,断腿,0,2,37;11,3;1,0,0,0,37;11,3;1,2,,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,0,0,1,Self
-10030,提取,1,1,46,0,0,0,0,46,0,2,,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,0,0,1,Self
+10009,瞬身术,2,2,42,0,6,1,0,42;33,0;1,2,,CardIcon/Sslx_Card_Kamizn_Huikan_v01,-1,-1,1,Node
+10010,装填,0,2,11,1,0,0,1,11;29,1;2,2,获得2点移动力,CardIcon/Sslx_Card_Kamizn_Huikan_v01,-1,-1,1,Self
+10011,岩浆汲取,1,1,30,10,0,0,0,30,7,2,,CardIcon/Sslx_Card_Kamizn_Huikan_v01,-1,-1,1,Self
+10012,汲火刃,0,2,1;45;25,2;0;3,1,1,0,1;45;25,2;0;4,1,施加4层火种,CardIcon/Sslx_Card_Kamizn_Huikan_v01,-1,-1,3,MeleeAttack
+10013,火遁,2,2,2,12,0,0,0,32;2,2;12,2,,CardIcon/Sslx_Card_Kamizn_Huikan_v01,-1,-1,1,Throw
+10014,快手,1,2,20,1,0,0,1,20,1,1,,CardIcon/Sslx_Card_Kamizn_Hudun_v01,-1,-1,1,Self
+10015,夺刃,2,2,7,1,1,1,1,7;33,1;1,2,,CardIcon/Sslx_Card_Kamizn_Hudun_v01,-1,-1,2,MeleeAttack
+10016,愤怒,1,3,16;40,3;-1,0,0,1,16;40,3;-1,3,,CardIcon/Sslx_Card_Kamizn_Hudun_v01,-1,-1,1,Self
+10017,回旋飞镖,2,1,44,5_3,3,1,0,44,5_3,1,,CardIcon/Sslx_Card_Kamizn_Hudun_v01,-1,-1,3,Missile
+10018,踏浪,1,1,40,2,0,0,0,40,2,2,,CardIcon/Sslx_Card_Kamizn_Hudun_v01,-1,-1,1,Self
+10019,必杀剑·夜刃,3,3,15;34,0;0,3,1,0,15;34;33,0;0;1,1,消耗-1,CardIcon/Sslx_Card_Kamizn_Hudun_v01,-1,-1,3,MeleeAttack
+10020,绝斩,1,1,1;40,13;-2,1,1,0,1;40,13;-2,1,,CardIcon/Sslx_Card_Kamizn_Hudun_v01,-1,-1,3,MeleeAttack
+10021,飞焰,1,1,14,0,2,4_2,0,14,0,2,,CardIcon/Sslx_Card_Kamizn_Hudun_v01,-1,-1,1,Node
+10022,盾立,1,1,2;12,7;1,0,0,0,2;12,7;1,2,,CardIcon/Sslx_Card_Kamizn_Hudun_v01,-1,-1,1,Self
+10023,抽丝,1,1,1;12,10;1,4,1,0,1;12,10;1,1,,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,-1,-1,3,Throw
+10024,刀背击打,1,1,1;36,8;1,1,1,0,1;36,8;1,1,,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,-1,-1,3,MeleeAttack
+10025,机关伞,3,1,1;2,10;15,0,6_3,0,1;2,10;15,2,,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,-1,-1,1,Self
+10026,残影,1,1,12;2,2;6,0,0,0,12;2,2;6,2,,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,-1,-1,1,Self
+10027,净化,1,3,39,0,0,0,0,39;29,0;1,2,,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,-1,-1,1,Throw
+10028,凿击,1,1,6,1,1,1,0,1;6,5;1,1,,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,-1,-1,2,MeleeAttack
+10029,断腿,0,2,37;11,3;1,0,0,0,37;11,3;1,2,,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,-1,-1,1,Self
+10030,提取,1,1,46,0,0,0,0,46,0,2,,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,-1,-1,1,Self
+10033,血虱,1,2,1;9,8;3,1,1,0,1;9,8;5,2,额外造成2层流血,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,-1,-1,3,MeleeAttack
+10034,抽血术,2,3,1;47,15;10,3,1,0,1;47;33,15;10;2,2,费用-2,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,-1,-1,2,Throw
+10036,等价交换,1,2,1;47,15;10,0,0,0,1;47;33,15;10;2,2,费用-2,CardIcon/Sslx_Card_Kamizn_Feibiao_v01,-1,-1,1,Self
+1001,挥砍,1,1,1,6,1,1,0,1,6,1,,CardIcon/Sslx_Card_Kamizn_Huikan_v01,-1,-1,3,MeleeAttack
+1002,飞镖,1,2,1,4,1,5_1,0,1,4,1,,CardIcon/Sslx_Card_Kamizn_Huikan_v01,0,0,3,Missile
+1003,护盾,1,1,2,5,0,0,0,2,5,2,,CardIcon/Sslx_Card_Kamizn_Huikan_v01,-1,-1,1,Throw
+1004,烈风斩,2,1,14,0,0,6_3,0,14;25,0;4,1,附加4层火种,CardIcon/Sslx_Card_Kamizn_Huikan_v01,-1,-1,1,Self