Merge pull request 'dev45-0204' (#82) from dev45-0204 into dev-1217

Reviewed-on: #82

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

@@ -12,4 +12,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 904fb4225c416d84e891fac047459035, type: 3}
   m_Name: RelicList
   m_EditorClassIdentifier: 
-  relicClassNameList: []
+  relicClassNameList:
+  - LegacyNode_BigBackpack

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

@@ -13,13 +13,9 @@ MonoBehaviour:
   m_Name: cardDeckList
   m_EditorClassIdentifier: 
   cardDeckList:
-  - 1006
+  - 1017
-  - 1006
+  - 1017
-  - 1006
+  - 1017
-  - 1006
+  - 1017
-  - 1006
+  - 1017
-  - 1006
+  - 1017
-  - 1006
-  - 1006
-  - 1006
-  - 1006

ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity

@@ -15515,6 +15515,7 @@ MonoBehaviour:
   whiteNodeCount: 0
   blackNodeCount: 0
   metalNodeCount: 0
+  yellowNodeCount: 0
   playerNodeCount: 0
   neutralNodeCount: 0
   enemyNodeCount: 0
@@ -41803,7 +41804,6 @@ MonoBehaviour:
     type: 3}
   legacyFather: {fileID: 1748859173}
   relicClassNameList: []
-  legacyNodesList: []
 --- !u!1 &1774587053
 GameObject:
   m_ObjectHideFlags: 0

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff.cs

@@ -9,14 +9,17 @@ public class Buff
     public int value;
     public Sprite icon;
     public string iconPath = "BuffIcon_v02/";
+    public int count = 0;
 
     public virtual void Settle()
     {  
        value --;
+       count= 0;
     }
     public virtual void SettleEnemy(EnemyNode enemyNode)
     {
         value--;
+        count = 0;
     }
 
     public virtual void SettleEnemyBegin(EnemyNode enemyNode)

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Bleed3TurnCost.cs

@@ -0,0 +1,27 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_Bleed3TurnCost : Buff
+{
+
+    public override void Settle()
+    {
+        count = 0;
+    }
+
+
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+        count = 0;
+    }
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_Bleed3TurnCost();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Bleed3TurnCost.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 87021152033dd3d4c905bf3e6634b532
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Bleed4TurnCost.cs

@@ -0,0 +1,28 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_Bleed4TurnCost : Buff
+{
+    public override void Settle()
+    {
+        count = 0;
+    }
+
+   
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+        count = 0;
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_Bleed4TurnCost();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Bleed4TurnCost.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cfbad4c429526724dbf97c5aa362ac9d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BleedDamage.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_BleedDamage : Buff
+{
+    public override void Settle()
+    {
+        
+    }
+
+   
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_BleedDamage();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BleedDamage.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 91dfd91b0c739a94d98f01c6d1c20797
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BleedHeal.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_BleedHeal : Buff
+{
+    public override void Settle()
+    {
+        
+    }
+
+   
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_BleedHeal();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BleedHeal.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 74356d9ae2e6b8d43ac7376113dd0ce8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_CantShield.cs

@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_CantShield : Buff
+{
+
+   
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_CantShield();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_CantShield.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8e55cb544c976bf469ae9f5b5364db7a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_CantUserEffectCaed.cs

@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_CantUserEffectCaed : Buff
+{
+    public override void Settle()
+    {
+        value = 0;
+
+    }
+
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_CantUserEffectCaed();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_CantUserEffectCaed.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9276906ae80f6ed479f35ff7fc93b1d4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DeathMark.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_DeathMark : Buff
+{
+    public override void Settle()
+    {
+        base.Settle();
+    }
+
+
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        base.Settle();
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_DeathMark();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "downSpeed");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DeathMark.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0f08d5c214bfb424fad4804da01ad7c5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Disable.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_Disable : Buff
+{
+    public override void Settle()
+    {
+        base.Settle();
+    }
+
+
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        base.Settle();
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_Disable();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "downSpeed");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Disable.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 230c71876e5a24d4a80cd6426f787df5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DyeingCardCostMinusOne.cs

@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_DyeingCardCostMinusOne : Buff
+{
+    public override void Settle()
+    {
+        value = 0;
+
+    }
+
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_DyeingCardCostMinusOne();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DyeingCardCostMinusOne.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 05c4f66402c303a449ef37e1bad6ba3f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_EmberDownOneTurn.cs

@@ -0,0 +1,25 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_EmberDownOneTurn : Buff
+{
+    public override void Settle()
+    {
+        value=0;
+    }
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+        value = 0;
+    }
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_EmberDownOneTurn();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_nuhuo1_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_EmberDownOneTurn.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7f07683220b4e6a419116fcf83af040f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_NextCardCostHp.cs

@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_NextCardCostHp : Buff
+{
+    public override void Settle()
+    {
+        value = 0;
+
+    }
+
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_NextCardCostHp();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_NextCardCostHp.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1155e91d9a4d7f644943511072a0f9eb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_NextCardCostMinusOne.cs

@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_NextCardCostMinusOne : Buff
+{
+    public override void Settle()
+    {
+        value = 0;
+
+    }
+
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_NextCardCostMinusOne();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_NextCardCostMinusOne.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bc6c039d1d5ebaf4d81fa8c9a0159602
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_NextDyeingCardCostZero.cs

@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_NextDyeingCardCostZero : Buff
+{
+    public override void Settle()
+    {
+        //value = 0;
+
+    }
+
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_NextDyeingCardCostZero();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_NextDyeingCardCostZero.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 09f8fcaca70d78544ade8ccb503a8c61
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_NextDyeingCardRangeAddTwo.cs

@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_NextDyeingCardRangeAddTwo : Buff
+{
+    public override void Settle()
+    {
+        value = 0;
+
+    }
+
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_NextDyeingCardRangeAddTwo();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_NextDyeingCardRangeAddTwo.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e9ce019f8ded4f548bcf23ebf202bc20
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_NextEffectCardDoubleSettle.cs

@@ -0,0 +1,22 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_NextEffectCardDoubleSettle : Buff
+{
+    public override void Settle()
+    {
+        value = 0;
+
+    }
+
+
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_NextEffectCardDoubleSettle();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_maozixifa_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_NextEffectCardDoubleSettle.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bcc5d5190b465b9418756386128298a3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -261,7 +261,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
     //检查卡牌的费用是否可以释放
     private void costCheck()
     {
-        switch (cardEntity.cardOriginalData.costType)
+        switch (cardEntity.currentCostType)
         {
             case Name.CostType.energy:
                 energyCostCheck();
@@ -274,15 +274,17 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
                 break;
             case Name.CostType.node:
                 break;
-
+        }
-
+        if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.cantUserEffectCaed) && cardEntity.cardOriginalData.CardType.Equals(Name.CardType.effect))
+        {
+            cardEntity.canUse = false;
         }
 
     }
 
     private void energyCostCheck()
     {
-        int trueCost = cardEntity.cardOriginalData.Cost;
+        int trueCost = cardEntity.currentCost;
         if (MapUnityManager.Instance.isPlayerOn(Name.NodeColor.Black))
         {
             trueCost++;
@@ -495,16 +497,8 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
                 currentNode = raycastHit.collider.transform.GetComponent<MapUnity>();  
                 //重新调用范围预览
                 //GameManager.Instance.player.StepPreviewInfluencedNode(cardEntity.cardOriginalData.CastingRange);
-                int castRange = GameManager.Instance.playerState.castRange;
+                
-                if (MapUnityManager.Instance.isPlayerOn(Name.NodeColor.Green))
+                setCastingRangePreview();
-                {
-                    castRange++;
-                }
-                if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.tempCastRange))
-                {
-                    castRange+= Usermanager.playerAbnormalCondition[AbnormalCondition.tempCastRange].value;
-                }
-                setCastingRangePreview(castRange);
                 //预览影响范围
                 if (currentNode.influenced)
                 {
@@ -519,7 +513,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
                     //更新涂色预览材质
                    // SettlementManager.Instance.PreviewSwitchColor(cardEntity.cardOriginalData, currentNode);
                     //更新地块计数
-                    SettlementManager.Instance.PreviewColorMapUnity(cardEntity.cardOriginalData, currentNode);
+                    //SettlementManager.Instance.PreviewColorMapUnity(cardEntity.cardOriginalData, currentNode);
                 }
 
                 //更新效果作用范围内怪物虚血
@@ -530,14 +524,43 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
 
     }
 
-    private void setCastingRangePreview(int castRange)
+    private void setCastingRangePreview()
+    {
+        int castRange = GameManager.Instance.playerState.castRange;
+        if (MapUnityManager.Instance.isPlayerOn(Name.NodeColor.Green))
         {
+            castRange++;
+        }
+        if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.tempCastRange))
+        {
+            castRange += Usermanager.playerAbnormalCondition[AbnormalCondition.tempCastRange].value;
+        }
+        if (cardEntity.cardOriginalData.TrueFunctionVal.ContainsKey(CardFunction.castRangePlusOne))
+        {
+            castRange += 1;
+        }
+        if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.nextDyeingCardRangeAddTwo)&&cardEntity.cardOriginalData.CardType.Equals(Name.CardType.dyeing))
+        {
+            castRange += 2;
+        }
+        if (LegacyManager.Instance.isUseful(Name.Legacy.LegacyNode_Bipod))
+        {
+            castRange += 4;
+        }
         foreach (MapUnity mapUnity in MapUnityManager.Instance.castPool)
         {
             mapUnity.influenced = false;
         }
         MapUnityManager.Instance.castPool.Clear();
+        if (cardEntity.cardOriginalData.TrueFunctionVal.ContainsKey(CardFunction.infCastRange))
+        {
+            MapUnityManager.Instance.getCastPoolForInfRange();
+        }
+        else
+        {
             MapUnityManager.Instance.getCastPool(castRange);
+        }
+        
 
 
     }
@@ -571,7 +594,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
         //更新效果作用范围内怪物虚血
         EnemyManager.Instance.ShowExpHp_Observer(cardEntity.influencePreviewPool);
         //更新涂色材质和地块数量统计预览
-        SettlementManager.Instance.PreviewColorMapUnity(cardEntity.cardOriginalData, GameManager .Instance .playerOn );
+        //SettlementManager.Instance.PreviewColorMapUnity(cardEntity.cardOriginalData, GameManager .Instance .playerOn );
     }
 
     public void OnDrag(PointerEventData eventData)

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

@@ -97,10 +97,10 @@ public class CardEntity : MonoBehaviour
     public Animator animator;
     [Header("卡牌边框画器控件")]
     public Animator borderAnim;
-    public Dictionary<string, Tuple<string, string>>  cardFunToLose =  new Dictionary<string, Tuple<string, string>>();
     [Header("卡牌费用变化监测")]
     int lastCost;
     public int currentCost;
+    public string currentCostType;
     private void Start()
     {
         currentCost = cardOriginalData.Cost;
@@ -171,7 +171,7 @@ public class CardEntity : MonoBehaviour
         //Debug.Log(cardId + "-" + CardOriginalDataList.Instance.cardOriginalDataList[cardId]);
         cardOriginalData = CardOriginalDataList.Instance.existCardOriginalDataList[cardId];
         settleForStart(SettlementManager.settleTurn);
-        createCardUI(needTrueFun);
+        //createCardUI(needTrueFun);
         //createCardDescription();
         createCardName();
         //createCardCost();
@@ -362,7 +362,7 @@ public class CardEntity : MonoBehaviour
 
     public void createCardImageTest()
     {
-        MapUnity currentNode = CardPictureManager.Instance.ToolX[3].Y[3];
+        MapUnity currentNode = CardPictureManager.Instance.ToolX[4].Y[4];
         Debug.Log("card创建");
         CardManager.setCardImageTest(cardOriginalData, 90.0f, currentNode,this);
     }
@@ -380,18 +380,8 @@ public class CardEntity : MonoBehaviour
                 }
                 else
                 {*/
-        currentCost = cardOriginalData.Cost;       
+        (currentCost, currentCostType)=CardResourcesManager.Instance.getCardCost(cardOriginalData);
-        if (MapUnityManager.Instance.isPlayerOn(Name.NodeColor.Black))
-        {
-            currentCost += 1;
-            cost.text = currentCost.ToString();
-            
-        }
-        else
-        {
         cost.text = currentCost.ToString();
-        }
-        
         if (currentCost!=lastCost )
         {
             lastCost = currentCost;
@@ -589,11 +579,11 @@ public class CardEntity : MonoBehaviour
             //Debug.Log("cardId是" + cardOriginalData.CardId + "功能是" + cardOriginalData.TrueFunctionVal.ElementAt(i).Key + "数值是" + cardOriginalData.TrueFunctionVal.ElementAt(i).Value);
             //Debug.Log("originFunctionVal的key是"+ fun);
             //Debug.Log("originFunctionVal的value是" + cardOriginalData.originFunctionVal.ElementAt(i).Value);
-            if (cardOriginalData.testTrueFunctionVal.Keys.Contains(fun))
+            if (cardOriginalData.TrueFunctionVal.Keys.Contains(fun))
             {
                 keyChild.SetActive(true);
                 valueChild.SetActive(true);
-                description.text = cardOriginalData.testTrueFunctionVal[fun];
+                description.text = cardOriginalData.TrueFunctionVal[fun];
                 
             }
             else
@@ -785,7 +775,33 @@ public class CardEntity : MonoBehaviour
                 {
                     return;
                 }*/
-        cardOriginalData.testTrueFunctionVal.Clear();
+        if (cardOriginalData.TrueFunctionVal != null)
+        {
+            cardOriginalData.TrueFunctionVal.Clear();
+        }
+        foreach (KeyValuePair<string, string> kvp in cardOriginalData.commonFunctionVal)
+        {
+            if (int.TryParse(kvp.Value, out int newValue))
+            {
+                MathTool.AddOrUpdateDictionary(cardOriginalData.TrueFunctionVal, kvp.Key, kvp.Value);
+            }
+            else
+            {
+                if (Name.Color.AllColor.Contains(kvp.Value))
+                {
+                    MathTool.AddOrUpdateDictionary(cardOriginalData.TrueFunctionVal, kvp.Key, getNodeTools.getNodesCount(kvp.Value).ToString());
+                }
+                else
+                {
+                    MathTool.AddOrUpdateDictionary(cardOriginalData.TrueFunctionVal, kvp.Key, kvp.Value);
+                }
+                
+            }
+        }
+
+        List<bool> allMatchList = new List<bool>();
+        int exclusiveConditionIndex = 0;
+        bool canexclusiveCondition=false;
         for (int i = 0; i < cardOriginalData.conditionAndFunctionVal.Count; i++)
         {
             bool isAllMatch=true;
@@ -817,69 +833,44 @@ public class CardEntity : MonoBehaviour
                 }
             }
             Image condition = conditionList[i].GetComponent<Image>();
+            allMatchList.Add(isAllMatch);
             if (isAllMatch)
             {
-                string[] fun = kvp.Value.Item1.Split("_");
+                exclusiveConditionIndex = i;
-                string[] vals = kvp.Value.Item2.Split("_");
+                canexclusiveCondition=true;
-                for (int j = 0; j < fun.Length; j++)
-                {
-                    if (int.TryParse(vals[j], out int newValue))
-                    {
-                        MathTool.AddOrUpdateDictionary(cardOriginalData.testTrueFunctionVal, fun[j], vals[j]);
-                    }
-                    else
-                    {
-                        MathTool.AddOrUpdateDictionary(cardOriginalData.testTrueFunctionVal, fun[j], getNodeTools.getNodesCount(vals[j]).ToString());
-                    }
-                }
-                string value = kvp.Value.Item2;
-                
-                
                 condition.sprite = successCondition;
-                cardFunToLose.Remove( kvp.Key);
             }
             else
             {
                 condition.sprite = unsuccessCondition;
-                cardFunToLose.TryAdd(kvp.Key, kvp.Value);
             }
         }
-        
+        string[] fun = cardOriginalData.conditionAndFunctionVal.ElementAt(exclusiveConditionIndex).Value.Item1.Split("_");
-        /*cardOriginalData.TrueFunctionVal = cardOriginalData.originFunctionVal.ToDictionary(entry => entry.Key, entry => entry.Value);
+        string[] vals = cardOriginalData.conditionAndFunctionVal.ElementAt(exclusiveConditionIndex).Value.Item2.Split("_");
-        Dictionary<string,string> cardFunToLoseDict=new Dictionary<string,string>();
+        if (canexclusiveCondition)
-        foreach (var kvp in cardFunToLose)
         {
-            string[] fun=kvp.Value.Item1.Split("_");
-            string[] vals = kvp.Value.Item2.Split("_");
             for (int j = 0; j < fun.Length; j++)
             {
-                MathTool.AddOrUpdateDictionary(cardFunToLoseDict, fun[j], vals[j]);
+                if (int.TryParse(vals[j], out int newValue))
-            }
-            
-        }
-            foreach (var kvp in cardFunToLoseDict)
                 {
-            string tupleKey = kvp.Key;  // 从 A 中的 Tuple 获取 Item1 作为 B 的键
+                    MathTool.AddOrUpdateDictionary(cardOriginalData.TrueFunctionVal, fun[j], vals[j]);
-            string tupleValue = kvp.Value;  // 从 A 中的 Tuple 获取 Item2 作为减数
+                }
-            if (cardOriginalData.TrueFunctionVal.ContainsKey(tupleKey))
+                else
                 {
-                // 解析字典 B 的值和 A 中 Tuple 的 Item2
+                    if (Name.Color.AllColor.Contains(vals[j]))
-                if (int.TryParse(cardOriginalData.TrueFunctionVal[tupleKey], out int bValue) &&
-                    int.TryParse(tupleValue, out int aValue2))
                     {
-                    // 计算新的值，字典 B 中的值减去 A 中 Tuple 中的 Item2 值
+                        MathTool.AddOrUpdateDictionary(cardOriginalData.TrueFunctionVal, fun[j], getNodeTools.getNodesCount(vals[j]).ToString());
-                    int newValue = bValue - aValue2;
-
-                    // 更新字典 C 中的值
-                    cardOriginalData.TrueFunctionVal[tupleKey] = newValue.ToString();
                     }
                     else
                     {
-                    Console.WriteLine($"键 '{tupleKey}' 的值不是有效的整数，无法更新。");
+                        MathTool.AddOrUpdateDictionary(cardOriginalData.TrueFunctionVal, fun[j], vals[j]);
                     }
                 }
-        }*/
+            }
-        resultsScreenCal(cardDataSummary);
+        }
+        
+
+        //resultsScreenCal(cardDataSummary);
     }
     private void createCardRelease()
     {

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

@@ -20,12 +20,14 @@ public class CardOriginalData : System.Object
     private int castingRange;
 
     private string effectRange;
-
+    //一次性
     private int isDisposable;
 
     private Dictionary<string, string> trueFunctionVal;
 
-    public Dictionary<string, string> testTrueFunctionVal;
+    public Dictionary<string, string> showFunctionVal;
+
+    public Dictionary<string, string> commonFunctionVal;
 
     private string cardType;
 

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

@@ -28,7 +28,7 @@ public class CardOriginalDataList : Singleton<CardOriginalDataList>
 
     private void OnEnable()
     {
-        cardOriginalDataList = ReadExcelForDyeingCard("card_data_4.csv");
+        cardOriginalDataList = ReadExcelForDyeingCard("card_data_5.csv");
         effectCardOriginalDataList = ReadExcelForEffectCard("card_data_effect_4.csv");
         itemCardOriginalDataList = ReadExcelForItemCard("card_data_item_4.csv");
         //categorizeCardsByRarity();
@@ -210,7 +210,8 @@ public class CardOriginalDataList : Singleton<CardOriginalDataList>
         //cardOriginalData.ChineseName = values[1];
         cardOriginalData.costType = values[1];
         cardOriginalData.Cost = int.Parse(values[2]);
-        //cardOriginalData.Rarity = int.Parse(values[3]);
+        cardOriginalData.Rarity = int.Parse(values[12]);
+        cardOriginalData.ChineseName = values[11];
         cardOriginalData.CastingRange = int.Parse(values[3]);
         cardOriginalData.EffectRange = values[4];
         //cardOriginalData.IsDisposable = int.Parse(values[6]) == 1;
@@ -218,8 +219,8 @@ public class CardOriginalDataList : Singleton<CardOriginalDataList>
         cardOriginalData.nodesColor = values[9].Split(";");
         cardOriginalData.conditionAndFunctionVal = new Dictionary<string, Tuple<string, string>>();
         cardOriginalData.TrueFunctionVal = new Dictionary<string, string>();
-        cardOriginalData.testTrueFunctionVal = new Dictionary<string, string>();
         cardOriginalData.originFunctionVal = new HashSet<string>();
+        cardOriginalData.commonFunctionVal = new Dictionary<string, string>();
         cardOriginalData.CardType = Name.CardType.dyeing;
         cardOriginalData.ImgPath = values[10];
         for (int i = 0; i < cardOriginalData.nodesMark.Length; i++)
@@ -246,36 +247,37 @@ public class CardOriginalDataList : Singleton<CardOriginalDataList>
         cardOriginalData.cardImageMark = new HashSet<CoordinateColorPair>();
         //CardOriginalData cardOriginalData = CardOriginalData.Instance;
         cardOriginalData.CardId = values[0];
-        //cardOriginalData.ChineseName = values[1];
+        cardOriginalData.ChineseName = values[13];
         cardOriginalData.costType = values[1];
         cardOriginalData.Cost = int.Parse(values[2]);
-        //cardOriginalData.Rarity = int.Parse(values[3]);
+        cardOriginalData.Rarity = int.Parse(values[11]);
-        cardOriginalData.CastingRange = int.Parse(values[8]);
         //cardOriginalData.EffectRange = values[3];
-        //cardOriginalData.IsDisposable = int.Parse(values[6]) == 1;
+        cardOriginalData.IsDisposable = int.Parse(values[12]) == 1;
-        cardOriginalData.nodesMark = values[6].Split(";");
+        cardOriginalData.nodesMark = values[8].Split(";");
         //cardOriginalData.nodesColor = values[8].Split(";");
         cardOriginalData.conditionAndFunctionVal = new Dictionary<string, Tuple<string, string>>();
+        cardOriginalData.commonFunctionVal = new Dictionary<string, string>();
         cardOriginalData.TrueFunctionVal = new Dictionary<string, string>();
-        cardOriginalData.testTrueFunctionVal = new Dictionary<string, string>();
         cardOriginalData.originFunctionVal = new HashSet<string>();
         cardOriginalData.CardType = Name.CardType.effect;
-        cardOriginalData.ImgPath = values[7];
+        cardOriginalData.ImgPath = values[9];
-        cardOriginalData.CastingRange = int.Parse(values[8]);
+        cardOriginalData.CastingRange = int.Parse(values[10]);
-        cardOriginalData.TrueFunctionVal = new Dictionary<string, string>();
         cardOriginalData.originFunctionVal = new HashSet<string>();
         //cardOriginalData.testTrueFunctionVal = new Dictionary<string, string>();
-        string[] condition = values[3].Split(";");
+        string[] condition = values[5].Split(";");
-        string[] function = values[4].Split(";");
+        string[] function = values[6].Split(";");
-        string[] functionVal = values[5].Split(";");
+        string[] functionVal = values[7].Split(";");
-        /*string[] advantagefunction = values[9].Split(";");
+        string[] commonFunction = values[3].Split(";");
-        string[] advantagefunctionVal = values[10].Split(";");*/
+        string[] commonFunctionVal = values[4].Split(";");
-        //cardOriginalData.FunctionVal = new Dictionary<string, string>();
-        //cardOriginalData.AdvantageFunctionVal = new Dictionary<string, string>();
         for (int i = 0; i < function.Length; i++)
         {
             cardOriginalData.conditionAndFunctionVal.Add(condition[i], new Tuple<string, string>(function[i], functionVal[i]));
         }
+        for (int i = 0; i < commonFunction.Length; i++)
+        {
+            cardOriginalData.commonFunctionVal.Add(commonFunction[i],commonFunctionVal[i]);
+            //Debug.Log("TrueFunctionValÊÇ" + commonFunction[i] + "+" + commonFunctionVal[i]);
+        }
         //getDictionaryFromString(values, cardOriginalData);
         /* for (int i = 0; i < function.Length; i++)
          {
@@ -312,7 +314,7 @@ public class CardOriginalDataList : Singleton<CardOriginalDataList>
         string[] functionVal = values[4].Split(";");
         cardOriginalData.TrueFunctionVal = new Dictionary<string, string>();
         cardOriginalData.originFunctionVal = new HashSet<string>();
-        cardOriginalData.testTrueFunctionVal = new Dictionary<string, string>();
+        cardOriginalData.TrueFunctionVal = new Dictionary<string, string>();
         cardOriginalData.IsDisposable=true;
 
         //getDictionaryFromString(values, cardOriginalData);
@@ -320,7 +322,6 @@ public class CardOriginalDataList : Singleton<CardOriginalDataList>
         {
             cardOriginalData.originFunctionVal.Add(function[i]);
             cardOriginalData.TrueFunctionVal.Add(function[i], functionVal[i]);
-            cardOriginalData.testTrueFunctionVal.Add(function[i], functionVal[i]);
         }
         return cardOriginalData;
     }

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

@@ -30,7 +30,7 @@ public class CardPictureManager : Singleton<CardPictureManager>
         yield return StartCoroutine(SetUpMapUnityForTool());
         yield return StartCoroutine(SetUpMapUnityForCubeForTool());
         createCameraAboveObject(ToolX[3].Y[3].gameObject, 10.0f, 0);
-        CardManager.createCardImageMap();
+        //CardManager.createCardImageMap();
     }
     IEnumerator MapGenerateTest()
     {

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

@@ -82,6 +82,96 @@ public class CardResourcesManager : Singleton <CardResourcesManager>
         return System.Text.RegularExpressions.Regex.IsMatch(input, @"^[><=]|\d+$");
     }
 
+    public (int trueCost, string trueCostType) getCardCost(CardOriginalData cardOriginalData)
+    {
+        int cost = cardOriginalData.Cost;
+        string costType=cardOriginalData.costType.Substring(0);
+        if (MapUnityManager.Instance.isPlayerOn(Name.NodeColor.Black))
+        {
+            cost += 1;
+        }
+        if (cardOriginalData.TrueFunctionVal.ContainsKey(CardFunction.reduceCost))
+        {
+            cost -= int.Parse(cardOriginalData.TrueFunctionVal[CardFunction.reduceCost]);
+        }
+        if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.nextCardCostMinusOne))
+        {
+            cost -= 1;
+        }
+        if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.dyeingCardCostMinusOne)&&cardOriginalData.CardType.Equals(Name.CardType.dyeing))
+        {
+            cost -= 1;
+        }
+        if (LegacyManager.Instance.isUseful(Name.Legacy.LegacyNode_Prism) && cardOriginalData.CardType.Equals(Name.CardType.dyeing))
+        {
+            cost -= 1;
+        }
+        if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.nextCardCostHp))
+        {
+            costType=Name.CostType.health;
+        }
+        if (LegacyManager.Instance.isUseful(Name.Legacy.LegacyNode_FreeBullet) && cardOriginalData.CardType.Equals(Name.CardType.dyeing))
+        {
+            cost = 0;
+        }
+        if (LegacyManager.Instance.isUseful(Name.Legacy.LegacyNode_SpeedLoader) && cardOriginalData.CardType.Equals(Name.CardType.effect))
+        {
+            cost = 0;
+            LegacyManager.Instance.tryResetCount(Name.Legacy.LegacyNode_SpeedLoader);
+        }
+        MathTool.keepNature(ref cost);
+        return (cost, costType);
+    }
+
+    public (int trueCost, string trueCostType) getCardCostForSettle(CardOriginalData cardOriginalData)
+    {
+        int cost = cardOriginalData.Cost;
+        string costType = cardOriginalData.costType.Substring(0);
+        if (MapUnityManager.Instance.isPlayerOn(Name.NodeColor.Black))
+        {
+            cost += 1;
+        }
+        if (cardOriginalData.TrueFunctionVal.ContainsKey(CardFunction.reduceCost))
+        {
+            cost -= int.Parse(cardOriginalData.TrueFunctionVal[CardFunction.reduceCost]);
+        }
+        if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.nextCardCostMinusOne))
+        {
+            cost -= 1;
+            Usermanager.playerAbnormalCondition[AbnormalCondition.nextCardCostMinusOne].value -= 1;
+        }
+        if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.dyeingCardCostMinusOne) && cardOriginalData.CardType.Equals(Name.CardType.dyeing))
+        {
+            cost -= 1;
+        }
+        if (LegacyManager.Instance.isUseful(Name.Legacy.LegacyNode_Prism) && cardOriginalData.CardType.Equals(Name.CardType.dyeing))
+        {
+            cost -=1;
+        }
+        if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.nextCardCostHp))
+        {
+            costType = Name.CostType.health;
+            Usermanager.playerAbnormalCondition[AbnormalCondition.nextCardCostHp].value -= 1;
+        }
+        if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.nextDyeingCardCostZero) && cardOriginalData.CardType.Equals(Name.CardType.dyeing))
+        {
+            cost = 0;
+            Usermanager.playerAbnormalCondition[AbnormalCondition.nextDyeingCardCostZero].value -= 1;
+        }
+        if(LegacyManager.Instance.isUseful(Name.Legacy.LegacyNode_FreeBullet)&& cardOriginalData.CardType.Equals(Name.CardType.dyeing))
+        {
+            cost = 0;
+            LegacyManager.Instance.tryResetCount(Name.Legacy.LegacyNode_FreeBullet);
+        }
+        if (LegacyManager.Instance.isUseful(Name.Legacy.LegacyNode_SpeedLoader) && cardOriginalData.CardType.Equals(Name.CardType.effect))
+        {
+            cost = 0;
+            LegacyManager.Instance.tryResetCount(Name.Legacy.LegacyNode_SpeedLoader);
+        }
+        Usermanager.Instance.AbnormalConditionEndCheck();
+        MathTool.keepNature(ref cost);
+        return (cost, costType);
+    }
     public void getImage(GameObject input,string imageString)
     {
         Image image = input.GetComponent<Image>();

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

@@ -1,9 +1,13 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.Playables;
 using UnityEngine.UI;
+using UnityEngine.Windows;
+using static Name;
 
 public class TurnMaster : Singleton<TurnMaster>
 {
@@ -83,6 +87,8 @@ public class TurnMaster : Singleton<TurnMaster>
             Usermanager.Instance.PlayerTurnBeginSettle();
             //恢复cost
             restoreResource(settleTurn);
+            //重置遗物计数
+            ResetLegacy();
 
             //恢复体力
             GameManager.Instance.playerState.currentStepRange = Usermanager.Instance.StepRangeCalculation(GameManager.Instance.playerState.maxStepRange);
@@ -210,6 +216,11 @@ public class TurnMaster : Singleton<TurnMaster>
     {
         GameManager.Instance.servantState.currentStepRange = GameManager.Instance.servantState.maxStepRange;
     }
+
+    public void ResetLegacy()
+    {
+        LegacyManager.Instance.tryResetCount(Name.Legacy.LegacyNode_LightningBoots);
+    }
     public void CloseSkillUI()
     {
        GameManager.Instance.servant .SkillUI.SetActive(false);
@@ -248,10 +259,10 @@ public class TurnMaster : Singleton<TurnMaster>
     {
         /*        totalCost = Usermanager.Instance.totalCost;
                 Usermanager.Instance.currentCost = totalCost;*/
-        if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_AncientSilverCoin) &&
+        if (LegacyManager.Instance.isUseful(Name.Legacy.LegacyNode_PerpetualMotionPump))
-            settleTurn == 0)
         {
-            GameManager.Instance.playerState.currentCost = GameManager.Instance.playerState.maxCost+1;
+            int lastRoundCost = GameManager.Instance.playerState.currentCost;
+            GameManager.Instance.playerState.currentCost = GameManager.Instance.playerState.maxCost+ lastRoundCost;
         }
         else
         {
@@ -299,7 +310,7 @@ public class TurnMaster : Singleton<TurnMaster>
         {
             tureDrawCardsNum-=2;
         }*/
-        MathTool.keepNature(tureDrawCardsNum);
+        MathTool.keepNature(ref tureDrawCardsNum);
         Debug.Log("真正抽卡数:"+tureDrawCardsNum);
         // 等待直到当前帧结束
         yield return new WaitForEndOfFrame();
@@ -426,6 +437,188 @@ public class TurnMaster : Singleton<TurnMaster>
         yield break;
     }
 
+    public IEnumerator drawAndCopyOneCard()
+    {
+        int drawNum = 1;
+        GameManager.Instance.onDraw = true;
+
+        int handCardCount = handCard.cardEntityList.Count;
+        int actualCardsToDraw = Mathf.Min(handCard.maxHandCard - handCardCount, drawNum);
+
+        CardActiveSort.Instance.drawCardCount = actualCardsToDraw;
+        yield return CardActiveSort.Instance.StartCoroutine(CardActiveSort.Instance.SortOldCardPointWithDrawCards());
+        Debug.Log("抽卡点1");
+        for (int i = handCardCount; i < handCardCount + actualCardsToDraw; i++)
+        {
+
+            if (cardDeck.cardList.Count > 0)
+            {
+                createCard(i);
+            }
+            else if (usedCard.usedCardList.Count > 0)
+            {
+                //洗牌继续抽
+                for (int c = 0; c < usedCard.usedCardList.Count; c++)
+                {
+                    cardDeck.cardList.Add(usedCard.usedCardList[c]);
+                    cardDeck.cardList.Shuffle();
+                }
+                usedCard.usedCardList.Clear();
+
+                createCard(i);
+            }
+            yield return new WaitForSeconds(0.1f);
+        }
+
+        yield return CardActiveSort.Instance.StartCoroutine(CardActiveSort.Instance.ReflashCardPointWithDrawCards());
+        yield return StartCoroutine(copyNewestCard());
+        yield break;
+    }
+
+    public IEnumerator copyNewestCard()
+    {
+
+        int handCardCount = handCard.cardEntityList.Count;
+        if (handCardCount == handCard.maxHandCard)
+        {
+            yield return null;
+        }
+        string cardId= handCard.cardEntityList[handCardCount-1].cardOriginalData.CardId;
+        copyCard(handCardCount + 1,cardId);
+        yield return CardActiveSort.Instance.StartCoroutine(CardActiveSort.Instance.ReflashCardPointWithDrawCards());
+        yield break;
+    }
+
+    public IEnumerator drawDyeingCards(int drawNum)
+    {
+        int dyeingCardCount = 0;
+        List<int> dyeingCardIndexList= new List<int>();
+        List<string> dyeingCardList = new List<string>();
+        
+        for (int i = 0; i < cardDeck.cardList.Count; i++)
+        {
+            if (System.Text.RegularExpressions.Regex.IsMatch(cardDeck.cardList[i], Name.Regex.pattern1xxx))
+            {
+                dyeingCardCount++;
+                dyeingCardIndexList.Add(i);
+                //dyeingCardList.Add(cardDeck.cardList[i]);
+            }
+        }
+        GameManager.Instance.onDraw = true;
+        int handCardCount = handCard.cardEntityList.Count;
+        int drawNumA = Mathf.Min(dyeingCardIndexList.Count, drawNum);
+        int actualCardsToDraw = Mathf.Min(handCard.maxHandCard - handCardCount, drawNumA);
+        if (actualCardsToDraw == 0)
+        {
+            yield break;
+        }
+        //重新排序抽卡列表
+        dyeingCardIndexList.Sort((a, b) => b.CompareTo(a));
+        int count = Math.Min(actualCardsToDraw, dyeingCardIndexList.Count);
+        for (int i = 0; i < count; i++)
+        {
+            int index = dyeingCardIndexList[i];
+            if (index >= 0 && index < cardDeck.cardList.Count)
+            {
+                dyeingCardList.Add(cardDeck.cardList[index]);  // 保存移除的元素
+                cardDeck.cardList.RemoveAt(index);           // 移除元素
+            }
+        }
+        cardDeck.cardList.InsertRange(0, dyeingCardList);
+        CardActiveSort.Instance.drawCardCount = actualCardsToDraw;
+        yield return CardActiveSort.Instance.StartCoroutine(CardActiveSort.Instance.SortOldCardPointWithDrawCards());
+        Debug.Log("抽卡点1");
+        for (int i = handCardCount; i < handCardCount + actualCardsToDraw; i++)
+        {
+
+            if (cardDeck.cardList.Count > 0)
+            {
+                createCard(i);
+            }
+            else if (usedCard.usedCardList.Count > 0)
+            {
+                //洗牌继续抽
+                for (int c = 0; c < usedCard.usedCardList.Count; c++)
+                {
+                    cardDeck.cardList.Add(usedCard.usedCardList[c]);
+                    cardDeck.cardList.Shuffle();
+                }
+                usedCard.usedCardList.Clear();
+
+                createCard(i);
+            }
+            yield return new WaitForSeconds(0.1f);
+        }
+
+        yield return CardActiveSort.Instance.StartCoroutine(CardActiveSort.Instance.ReflashCardPointWithDrawCards());
+        yield break;
+    }
+
+    public IEnumerator drawEffectCards(int drawNum)
+    {
+        int effectCardCount = 0;
+        List<int> effectCardIndexList = new List<int>();
+        List<string> effectCardList = new List<string>();
+
+        for (int i = 0; i < cardDeck.cardList.Count; i++)
+        {
+            if (System.Text.RegularExpressions.Regex.IsMatch(cardDeck.cardList[i], Name.Regex.pattern2xxx))
+            {
+                effectCardCount++;
+                effectCardIndexList.Add(i);
+                //dyeingCardList.Add(cardDeck.cardList[i]);
+            }
+        }
+        GameManager.Instance.onDraw = true;
+        int handCardCount = handCard.cardEntityList.Count;
+        int drawNumA = Mathf.Min(effectCardIndexList.Count, drawNum);
+        int actualCardsToDraw = Mathf.Min(handCard.maxHandCard - handCardCount, drawNumA);
+        if (actualCardsToDraw == 0)
+        {
+            yield break;
+        }
+        //重新排序抽卡列表
+        effectCardIndexList.Sort((a, b) => b.CompareTo(a));
+        int count = Math.Min(actualCardsToDraw, effectCardIndexList.Count);
+        for (int i = 0; i < count; i++)
+        {
+            int index = effectCardIndexList[i];
+            if (index >= 0 && index < cardDeck.cardList.Count)
+            {
+                effectCardList.Add(cardDeck.cardList[index]);  // 保存移除的元素
+                cardDeck.cardList.RemoveAt(index);           // 移除元素
+            }
+        }
+        cardDeck.cardList.InsertRange(0, effectCardList);
+        CardActiveSort.Instance.drawCardCount = actualCardsToDraw;
+        yield return CardActiveSort.Instance.StartCoroutine(CardActiveSort.Instance.SortOldCardPointWithDrawCards());
+        Debug.Log("抽卡点1");
+        for (int i = handCardCount; i < handCardCount + actualCardsToDraw; i++)
+        {
+
+            if (cardDeck.cardList.Count > 0)
+            {
+                createCard(i);
+            }
+            else if (usedCard.usedCardList.Count > 0)
+            {
+                //洗牌继续抽
+                for (int c = 0; c < usedCard.usedCardList.Count; c++)
+                {
+                    cardDeck.cardList.Add(usedCard.usedCardList[c]);
+                    cardDeck.cardList.Shuffle();
+                }
+                usedCard.usedCardList.Clear();
+
+                createCard(i);
+            }
+            yield return new WaitForSeconds(0.1f);
+        }
+
+        yield return CardActiveSort.Instance.StartCoroutine(CardActiveSort.Instance.ReflashCardPointWithDrawCards());
+        yield break;
+    }
+
     public void createCard(int i)
     {
         GameObject cardPrefab;
@@ -463,6 +656,43 @@ public class TurnMaster : Singleton<TurnMaster>
         cardSmall.SetDestinationWithDrawCard(CardActiveSort.Instance.newPointList[i]);
     }
 
+    public void copyCard(int i,string cardId)
+    {
+        GameObject cardPrefab;
+        cardPrefab = Instantiate(cardDeck.rareCardPrefab, handCard.cardPanle.transform);
+        //int cardRarity = CardOriginalDataList.Instance.cardOriginalDataList[cardDeck.cardList[cardDeck.cardList.Count - 1]].Rarity;
+        //cardPrefab = new GameObject();
+        /*switch (cardRarity)
+        {
+            case Name.CardRarity.Legendary:
+                cardPrefab = Instantiate(cardDeck.legendaryCardPrefab, handCard.cardPanle.transform);
+                break;
+            case Name.CardRarity.Rare:
+                cardPrefab = Instantiate(cardDeck.rareCardPrefab, handCard.cardPanle.transform);
+                break;
+            case Name.CardRarity.Common:
+                cardPrefab = Instantiate(cardDeck.cardPrefabPuTong, handCard.cardPanle.transform);
+                break;
+        }*/
+        /* if (cardRarity==Name.CardRarity.Legendary)
+        {
+            cardPrefab = Instantiate(cardDeck.legendaryCardPrefab, handCard.cardPanle.transform);
+        }
+        else
+        {
+            cardPrefab = Instantiate(cardDeck.cardPrefabPuTong, handCard.cardPanle.transform);
+        }*/
+
+        cardPrefab.GetComponent<RectTransform>().localEulerAngles = new Vector3(0, 0, 0);
+        CardEntity cardEntity = cardPrefab.GetComponent<CardEntity>();
+        cardEntity.createCard(cardId, i, true);
+        cardDeck.cardList.RemoveAt(cardDeck.cardList.Count - 1);
+        handCard.cardEntityList.Add(cardEntity);
+        //添加卡牌移动脚本
+        CardSmall cardSmall = cardPrefab.AddComponent<CardSmall>();
+        cardSmall.SetDestinationWithDrawCard(CardActiveSort.Instance.newPointList[i]);
+    }
+
     public void createCardWithoutMove(int i)
     {
         GameObject cardPrefab;

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Enemy.cs

@@ -127,7 +127,7 @@ public class Enemy : MonoBehaviour
 
     public IEnumerator moveOneStep(MapUnity nexMapUnity)
     {
-        enemyNode.bleedCal();
+        //enemyNode.bleedCal();
         MapUnity currentNode = getNodeTools.LocationToGetNode(enemyNode.positionX, enemyNode.positionY);
         MapUnity disNode = nexMapUnity;
         currentNode.blocked = false;
@@ -180,7 +180,7 @@ public class Enemy : MonoBehaviour
         //Åжϸ¯Ê´
         enemyNode.CorrodeRealize(endMapUnity);
         //ÅжÏÁ÷Ѫ
-        enemyNode.bleedRealize(endMapUnity);
+        enemyNode.bleedRealize();
         yield break;
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs

@@ -337,6 +337,10 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
         {
             extraStep += EnemyState.abnormalCondition[AbnormalCondition.upSpeed].value;
         }
+        if (EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.disable))
+        {
+            extraStep -= 1;
+        }
         if (EnemyManager.Instance.isEnemyAlive(Name.EnemyName.SoulMaker) && MapUnityManager.Instance.enemyNodeCount > 12)
         {
             extraStep += 2;
@@ -346,7 +350,7 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
             stepMultiplie = 0f;
         }
         int trueStepRange=EnemyState.stepRange+extraStep;
-        MathTool.keepNature(trueStepRange);
+        MathTool.keepNature(ref trueStepRange);
         int result=(int)(trueStepRange * stepMultiplie);
         return result;
     }
@@ -730,14 +734,6 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
     //ËÀÍöʱ
     public virtual void OnDeath()
     {
-        if (EnemyState.abnormalCondition.TryGetValue(AbnormalCondition.posion,out Buff posionbuff)&&
-            LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_SnakeGall))
-        {
-            if (posionbuff.value > 10)
-            {
-                Usermanager.Instance.recoverHp(1);
-            }
-        }
         if (EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.boomAndPollute))
         {
             boomAndPolluteCal();
@@ -746,6 +742,27 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
         {
             boomCal();
         }
+        if (EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.deathMark)&& EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.bleed))
+        {
+            deathMarkCal();
+        }
+        if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_BloodTax))
+        {
+            Usermanager.Instance.SufferPlayerAbnormalCondition(AbnormalCondition.bleedDamage, 1);
+        }
+        if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_Sneakers))
+        {
+            if (LegacyManager.Instance.legacyNodesList[Name.Legacy.LegacyNode_Sneakers].isUsed.Equals(false))
+            {
+                LegacyManager.Instance.legacyNodesList[Name.Legacy.LegacyNode_Sneakers].isUsed = true;
+                GameManager.Instance.playerState.currentStepRange = GameManager.Instance.playerState.maxStepRange;
+            }
+        }
+        if (LegacyManager.Instance.isUseful(Name.Legacy.LegacyNode_ActivatedCarbon))
+        {
+            MapUnity currentNode = GameManager.Instance.X[positionX].Y[positionY];
+            currentNode.canChange = false;
+        }
         if (bone != null)
         {
             var currentenemy = Instantiate(bone, this.transform.position, this.transform.rotation);
@@ -820,6 +837,16 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
         }
     }
 
+    public void deathMarkCal()
+    {
+        MapUnity currentNode = GameManager.Instance.X[positionX].Y[positionY];
+        HashSet<MapUnity> targetSet = new HashSet<MapUnity>();
+        targetSet.Add(currentNode);
+        getNodeTools.getCircleNodeForBoom(targetSet, 3);
+        int bleedCount= EnemyState.abnormalCondition[AbnormalCondition.bleed].value;
+        SettlementManager.Instance.abnormalConditionWork(AbnormalCondition.bleed, bleedCount, new List<MapUnity>(targetSet));
+    }
+
     public void boomCal()
     {
         MapUnity currentNode = GameManager.Instance.X[positionX].Y[positionY];
@@ -1092,7 +1119,7 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
         {
             thornCal();
         }
-        bleedCal();
+        bleedRealize();
         int trueDamage = SufferDamageCalculation(damageVal);
         if (trueDamage > EnemyState.shieldValue)
         {
@@ -1180,6 +1207,89 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
         }
     }
 
+    public void bleedRealize()
+    {
+        if (EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.bleed))
+        {
+            int bleedDamage = 2;
+            if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.bleedDamage))
+            {
+                bleedDamage += Usermanager.playerAbnormalCondition[AbnormalCondition.bleedDamage].value;
+            }
+            if (EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.bleedHeal))
+            {
+                Usermanager.Instance.recoverHp(bleedDamage);
+            }
+            bleed4TurnCostCal();
+            bleed3TurnCostCal();
+            sufferTrueDamage(bleedDamage);
+            EnemyState.abnormalCondition[AbnormalCondition.bleed].value -= 1;
+            if (EnemyState.abnormalCondition[AbnormalCondition.bleed].value <= 0)
+            {
+                EnemyState.abnormalCondition.Remove(AbnormalCondition.bleed);
+            }
+
+            if (LegacyManager.Instance.isUseful(Name.Legacy.LegacyNode_MeatSaw))
+            {
+                bleedRealizeForMeatSaw();
+            }
+        }
+
+    }
+
+    public void bleedRealizeForMeatSaw()
+    {
+        if (EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.bleed))
+        {
+            int bleedDamage = 2;
+            if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.bleedDamage))
+            {
+                bleedDamage += Usermanager.playerAbnormalCondition[AbnormalCondition.bleedDamage].value;
+            }
+            if (EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.bleedHeal))
+            {
+                Usermanager.Instance.recoverHp(bleedDamage);
+            }
+            bleed4TurnCostCal();
+            bleed3TurnCostCal();
+            sufferTrueDamage(bleedDamage);
+            EnemyState.abnormalCondition[AbnormalCondition.bleed].value -= 1;
+            if (EnemyState.abnormalCondition[AbnormalCondition.bleed].value <= 0)
+            {
+                EnemyState.abnormalCondition.Remove(AbnormalCondition.bleed);
+            }
+        }
+
+    }
+
+    private void bleed4TurnCostCal()
+    {
+        if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.bleed4TurnCost))
+        {
+            Usermanager.playerAbnormalCondition[AbnormalCondition.bleed4TurnCost].count += 1;
+            if (Usermanager.playerAbnormalCondition[AbnormalCondition.bleed4TurnCost].count == 4)
+            {
+                GameManager.Instance.playerState.currentCost += 1;
+                Usermanager.playerAbnormalCondition[AbnormalCondition.bleed4TurnCost].count = 0;
+            }
+        }
+       
+    }
+
+    private void bleed3TurnCostCal()
+    {
+        if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.bleed3TurnCost))
+        {
+            Usermanager.playerAbnormalCondition[AbnormalCondition.bleed3TurnCost].count += 1;
+            if (Usermanager.playerAbnormalCondition[AbnormalCondition.bleed3TurnCost].count == 3)
+            {
+                GameManager.Instance.playerState.currentCost += 1;
+                Usermanager.playerAbnormalCondition[AbnormalCondition.bleed4TurnCost].count = 0;
+            }
+        }
+
+    }
+
     private void thornCal()
     {
         if (EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.thorn))
@@ -1515,19 +1625,7 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
         }
     }
 
-    public void bleedRealize(MapUnity node)
-    {
-        if (EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.bleed))
-        {
-            sufferDamage(2, false);
-            EnemyState.abnormalCondition[AbnormalCondition.bleed].value -= 1;
-            if (EnemyState.abnormalCondition[AbnormalCondition.bleed].value <= 0)
-            {
-              EnemyState.abnormalCondition.Remove(AbnormalCondition.bleed);
-            }
-        }
     
-    }
 
 
     #endregion

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/V0.1/AshBeetle.cs

@@ -180,7 +180,7 @@ public class AshBeetle : MonoBehaviour
         //Åжϸ¯Ê´
         enemyNode.CorrodeRealize(endMapUnity);
         //ÅжÏÁ÷Ѫ
-        enemyNode.bleedRealize(endMapUnity);
+        enemyNode.bleedRealize();
         yield break;
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/V0.1/BlastFistMushroom.cs

@@ -186,7 +186,7 @@ public class BlastFistMushroom : MonoBehaviour
         //Åжϸ¯Ê´
         enemyNode.CorrodeRealize(endMapUnity);
         //ÅжÏÁ÷Ѫ
-        enemyNode.bleedRealize(endMapUnity);
+        enemyNode.bleedRealize();
         yield break;
     }
 
@@ -207,7 +207,7 @@ public class BlastFistMushroom : MonoBehaviour
     public void AttackDamage()
     {
         int damage = GameManager.Instance.gerEnemytNodeCount();
-        MathTool.keepNature(damage);
+        MathTool.keepNature(ref damage);
         Usermanager.Instance.SufferDamage(enemyNode.DamageCalculation(damage), enemyNode);
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/V0.1/CorrosiveSludge.cs

@@ -208,7 +208,7 @@ public class CorrosiveSludge : MonoBehaviour
         //Åжϸ¯Ê´
         enemyNode.CorrodeRealize(endMapUnity);
         //ÅжÏÁ÷Ѫ
-        enemyNode.bleedRealize(endMapUnity);
+        enemyNode.bleedRealize();
         yield break;
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/V0.1/DarkCloud.cs

@@ -317,7 +317,7 @@ public class DarkCloud : MonoBehaviour
         //Åжϸ¯Ê´
         enemyNode.CorrodeRealize(endMapUnity);
         //ÅжÏÁ÷Ѫ
-        enemyNode.bleedRealize(endMapUnity);
+        enemyNode.bleedRealize();
         yield break;
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/V0.1/DrowsyShroom.cs

@@ -188,7 +188,7 @@ public class DrowsyShroom : MonoBehaviour
         //Åжϸ¯Ê´
         enemyNode.CorrodeRealize(endMapUnity);
         //ÅжÏÁ÷Ѫ
-        enemyNode.bleedRealize(endMapUnity);
+        enemyNode.bleedRealize();
         yield break;
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/V0.1/EmberWraith.cs

@@ -204,7 +204,7 @@ public class EmberWraith : MonoBehaviour
         //Åжϸ¯Ê´
         enemyNode.CorrodeRealize(endMapUnity);
         //ÅжÏÁ÷Ѫ
-        enemyNode.bleedRealize(endMapUnity);
+        enemyNode.bleedRealize();
         yield break;
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/V0.1/Grinfiend.cs

@@ -326,7 +326,7 @@ public class Grinfiend : MonoBehaviour
         //Åжϸ¯Ê´
         enemyNode.CorrodeRealize(endMapUnity);
         //ÅжÏÁ÷Ѫ
-        enemyNode.bleedRealize(endMapUnity);
+        enemyNode.bleedRealize();
         yield break;
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/V0.1/HoodWanderer.cs

@@ -235,7 +235,7 @@ public class HoodWanderer : MonoBehaviour
         //Åжϸ¯Ê´
         enemyNode.CorrodeRealize(endMapUnity);
         //ÅжÏÁ÷Ѫ
-        enemyNode.bleedRealize(endMapUnity);
+        enemyNode.bleedRealize();
         yield break;
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/V0.1/Mushroom.cs

@@ -393,7 +393,7 @@ public class Mushroom : MonoBehaviour
         //Åжϸ¯Ê´
         enemyNode.CorrodeRealize(endMapUnity);
         //ÅжÏÁ÷Ѫ
-        enemyNode.bleedRealize(endMapUnity);
+        enemyNode.bleedRealize();
         yield break;
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/V0.1/ParasiticMushroom.cs

@@ -239,7 +239,7 @@ public class ParasiticMushroom : MonoBehaviour
         //Åжϸ¯Ê´
         enemyNode.CorrodeRealize(endMapUnity);
         //ÅжÏÁ÷Ѫ
-        enemyNode.bleedRealize(endMapUnity);
+        enemyNode.bleedRealize();
         yield break;
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/V0.1/Polymaw.cs

@@ -331,7 +331,7 @@ public class Polymaw : MonoBehaviour
         //Åжϸ¯Ê´
         enemyNode.CorrodeRealize(endMapUnity);
         //ÅжÏÁ÷Ѫ
-        enemyNode.bleedRealize(endMapUnity);
+        enemyNode.bleedRealize();
         yield break;
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/V0.1/ShatteringFistMushroom.cs

@@ -243,7 +243,7 @@ public class ShatteringFistMushroom : MonoBehaviour
         //Åжϸ¯Ê´
         enemyNode.CorrodeRealize(endMapUnity);
         //ÅжÏÁ÷Ѫ
-        enemyNode.bleedRealize(endMapUnity);
+        enemyNode.bleedRealize();
         yield break;
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/V0.1/SkullGuardian.cs

@@ -202,7 +202,7 @@ public class SkullGuardian : MonoBehaviour
         //Åжϸ¯Ê´
         enemyNode.CorrodeRealize(endMapUnity);
         //ÅжÏÁ÷Ѫ
-        enemyNode.bleedRealize(endMapUnity);
+        enemyNode.bleedRealize();
         yield break;
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/V0.1/SkullMage.cs

@@ -216,7 +216,7 @@ public class SkullMage : MonoBehaviour
         //Åжϸ¯Ê´
         enemyNode.CorrodeRealize(endMapUnity);
         //ÅжÏÁ÷Ѫ
-        enemyNode.bleedRealize(endMapUnity);
+        enemyNode.bleedRealize();
         yield break;
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/V0.1/SkullWarlock.cs

@@ -206,7 +206,7 @@ public class SkullWarlock : MonoBehaviour
         //Åжϸ¯Ê´
         enemyNode.CorrodeRealize(endMapUnity);
         //ÅжÏÁ÷Ѫ
-        enemyNode.bleedRealize(endMapUnity);
+        enemyNode.bleedRealize();
         yield break;
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ae81639b55b115344ba483790eeab686
+guid: 281d6a379996cfb44962f57c0de81415
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_ActivatedCarbon.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_ActivatedCarbon : LegacyNode
+{
+    
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_ActivatedCarbon.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0cc37f34a087db04490ed46f6fc2f981
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_AegisOfTheImmortal.cs

@@ -0,0 +1,29 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_AegisOfTheImmortal : LegacyNode
+{
+    public override void Use()
+    {
+        if (isUsed == false)
+        {
+            int recoverHpVal = (int)GameManager.Instance.playerState.maxHP / 10 * 3;
+            GameManager.Instance.playerState.currentHP=recoverHpVal;
+            isUsed = true;
+        }
+        
+    }
+
+    public override bool IsUseful()
+    {
+        if (isUsed == false)
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_AegisOfTheImmortal.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7086a35f318e6bf448553227273a6943
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_BigBackpack.cs

@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_BigBackpack : LegacyNode
+{
+    public override void Use()
+    {
+        Usermanager.Instance.Shield += Usermanager.Instance.ShieldCalculation(3);
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_BigBackpack.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 450ef84430f74dd4bbac3bc20c7c1e5a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Bipod.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_Bipod : LegacyNode
+{
+    public bool lastRoundTrigger=true;
+    public bool thisRoundTrigger = false;
+
+    public override bool IsUseful()
+    {
+        bool result = false;
+        if (lastRoundTrigger)
+        {
+            result = true;
+        }
+        return result;
+    }
+
+    public override void EffectInPlayerTurnEnd()
+    {
+        lastRoundTrigger = thisRoundTrigger;
+        thisRoundTrigger=false;
+    }
+
+    public override void ResetCount()
+    {
+        thisRoundTrigger=true;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Bipod.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e985a48b718f0d047848b5ce0a87c743
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_BloodBorne.cs

@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_BloodBorne : LegacyNode
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_BloodBorne.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f9dfde8ffd59d6645982ec82f20b043f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_BloodTax.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_BloodTax : LegacyNode
+{
+    
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_BloodTax.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8d4cac3a6694a174ca2b722f6ec2a93f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_ChaosTrigger.cs

@@ -0,0 +1,27 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_ChaosTrigger : LegacyNode
+{
+    public bool yellowTrigger=false;
+    public bool redTrigger = false;
+    public bool blueTrigger = false;
+
+    public override bool IsUseful()
+    {
+        bool result=false;
+        if (yellowTrigger&& redTrigger&& blueTrigger)
+        {
+            result=true;
+        }
+        return result;
+    }
+
+    public override void EffectInPlayerTurnEnd()
+    {
+        yellowTrigger = false;
+        blueTrigger = false;
+        redTrigger = false;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_ChaosTrigger.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c82f0b01863a17f42b7f2129b2ed44eb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Cheese.cs

@@ -0,0 +1,12 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_Cheese : LegacyNode
+{
+    public override void OnGet()
+    {
+        int recoverHpVal = 30;
+        Usermanager.Instance.recoverHp(recoverHpVal);
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Cheese.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 44f70195fc587904baaae09745f23ddd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Filter.cs

@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_Filter : LegacyNode
+{
+
+
+    
+
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Filter.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5b63c67010446d24ab8cbcfc5f29f98d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_FreeBullet.cs

@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_FreeBullet : LegacyNode
+{
+
+    public override bool IsUseful()
+    {
+        bool result=false;
+        if (count == 4)
+        {
+            result=true;
+        }
+        return result;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_FreeBullet.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1d501d5fe5fd5fc45ab49b81e264b455
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_LightningBoots.cs

@@ -0,0 +1,24 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_LightningBoots : LegacyNode
+{
+
+    public override bool IsUseful()
+    {
+        bool result = false;
+        if (count == 3)
+        {
+            result = true;
+        }
+        return result;
+
+    }
+
+    public override void Use()
+    {
+        GameManager.Instance.playerState.currentStepRange += 2;
+        ResetCount();
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_LightningBoots.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cd26e3e64f3217644b98784901afe3fc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MeatSaw.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_MeatSaw : LegacyNode
+{
+    
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MeatSaw.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f650d7c780239c34c823efc783c917d0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_NurturingBloom.cs

@@ -0,0 +1,15 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_NurturingBloom: LegacyNode
+{
+    public override void EffectInPlayerTurnEnd()
+    {
+        if (GameManager.Instance.playerOn.whoColour == Name.NodeColor.Black)
+        {
+            Usermanager.Instance.SufferPlayerAbnormalCondition(AbnormalCondition.angerUpperDamage, 2);
+            Usermanager.Instance.lostHp(5);
+        }
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_NurturingBloom.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7b8e9769b94e28442a9bc5680300c9f6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_PainContract.cs

@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_PainContract : LegacyNode
+{
+    public override void EffectInPlayerTurnBegin()
+    {
+        Usermanager.Instance.lostHp(2);
+        List<int> colorList = MathTool.GenerateRandomPlayerColorList(6);
+        MapUnity playerNode = GameManager.Instance.playerOn;
+        HashSet<MapUnity> targetSet=new HashSet<MapUnity> { playerNode };
+        getNodeTools.getCircleNodeExceptSelf(targetSet,1);
+        List< MapUnity> targetList = new List<MapUnity>(targetSet);
+        for (int i=0; i<targetList.Count; i++)
+        {
+            MapUnity target = targetList[i];
+            target.switchColor(colorList[i]);
+        }
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_PainContract.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7f7d783f7fdc98b4d8209e87d52456f3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Parasol.cs

@@ -0,0 +1,15 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_Parasol : LegacyNode
+{
+    public override void EffectInPlayerTurnEnd()
+    {
+        if (MapUnityManager.Instance.playerNodeCount > 9)
+        {
+            Usermanager.Instance.Shield += Usermanager.Instance.ShieldCalculation(7);
+        }
+        
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Parasol.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d5b288d7194006c4c93a0199ea52068e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_PerpetualMotionPump.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_PerpetualMotionPump : LegacyNode
+{
+    
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_PerpetualMotionPump.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e3b8b5ca83486ff4b95bd3f19cf0d24e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_PlatedSteelcaps.cs

@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_PlatedSteelcaps : LegacyNode
+{
+    public override void Use()
+    {
+        Usermanager.Instance.Shield += Usermanager.Instance.ShieldCalculation(3);
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_PlatedSteelcaps.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 15720e4841ccf084aa2be96f1885ab52
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_PortableReactor.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_PortableReactor : LegacyNode
+{
+    
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_PortableReactor.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 47d9a0b02a09e7f47b7394b1efa3c3e5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Prism.cs

@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_Prism : LegacyNode
+{
+    public override  bool IsUseful()
+    {
+        bool result=false;
+        if(MapUnityManager.Instance.yellowNodeCount!=0&& MapUnityManager.Instance.redNodeCount != 0&& MapUnityManager.Instance.blueNodeCount != 0)
+        {
+            result=true;
+        }
+
+        return result;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Prism.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6b6bbcbf82f0ba14cb488396d88d77df
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_PurityBadge.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_PurityBadge : LegacyNode
+{
+    
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_PurityBadge.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b7086655735c4ab4b91bc077d65e2118
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Sneakers.cs

@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_Sneakers : LegacyNode
+{
+    public override void EffectInPlayerTurnBegin()
+    {
+        isUsed = false;
+    }
+}