合并冲突0708

ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta

@@ -0,0 +1,27 @@
+fileFormatVersion: 2
+guid: a94cf6fef2879da4c91e5ef768aadf4e
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -300,9 +300,9 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
             case Name.CostType.energy:
                 energyCostCheck();
                 break;
-            case Name.CostType.step:
+/*            case Name.CostType.step:
                 stepCostCheck();
-                break;
+                break;*/
             case Name.CostType.health:
                 healthCostCheck();
                 break;
@@ -458,10 +458,10 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
             //取消音效
             AudioManager.Instance.ChooseCardVoicePlayer(false);
             //遍历范围预览池消除影响色
-            foreach (MapUnity mapUnity in MapUnityManager.Instance.castPool)
+            /*foreach (MapUnity mapUnity in MapUnityManager.Instance.castPool)
             {
                 mapUnity.castRangeInf = false;
-            }
+            }*/
             MapUnityManager.Instance.castPool.Clear();
 
             //遍历影响池变色
@@ -534,14 +534,14 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
                 //重新调用范围预览
                 //GameManager.Instance.player.StepPreviewInfluencedNode(cardEntity.cardOriginalData.CastingRange);
                 
-                setCastingRangePreview();
+                //setCastingRangePreview();
                 //预览影响范围
-                if (currentNode.castRangeInf)
-                {
+                /*if (currentNode.castRangeInf)
+                {*/
                     //根据卡牌属性改变影响池  
-                    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;
-                    getNodeTools.setEffectRangePreviewTest(cardEntity.cardOriginalData, euler, currentNode,cardEntity);
+                    /*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;*/
+                    getNodeTools.setEffectRangePreviewTest(cardEntity.cardOriginalData, 90.0f, currentNode,cardEntity);
 
                     //显示范围
                     dyeing();
@@ -551,8 +551,8 @@ 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);
+                //}
 
                 //更新效果作用范围内怪物虚血
                 //EnemyManager.Instance.ShowExpHp_Observer(cardEntity.influencePreviewPool);
@@ -589,10 +589,10 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
         {
             castRange += 4;
         }
-        foreach (MapUnity mapUnity in MapUnityManager.Instance.castPool)
+        /*foreach (MapUnity mapUnity in MapUnityManager.Instance.castPool)
         {
             mapUnity.castRangeInf = false;
-        }
+        }*/
         MapUnityManager.Instance.castPool.Clear();
         if (cardEntity.cardOriginalData.TrueFunctionVal.ContainsKey(CardFunction.infCastRange))
         {
@@ -631,13 +631,13 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
             }
         }*/
         //getNodeTools.setEffectRangePreview(cardEntity.cardOriginalData.EffectRange, 30.0f, currentNode, cardEntity);
-        MapUnity mapUnity=GameManager.Instance.playerOn;
+        /*MapUnity mapUnity=GameManager.Instance.playerOn;
         getNodeTools.setEffectRangePreviewTest(cardEntity.cardOriginalData, 90.0f, mapUnity, cardEntity);
-        dyeing();
+        dyeing();*/
         //更新效果作用范围内怪物虚血
         //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)
@@ -680,9 +680,9 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
             }
 
             //先判断该卡牌的类型是否是需要范围
-            if (cardEntity.cardOriginalData.CastingRange != 0)
-            {
-                if(currentNode != null&& currentNode.castRangeInf)
+            /*if (cardEntity.cardOriginalData.CastingRange != 0)
+            {*/
+                if(currentNode != null)
                 {
                     //卡牌释放效果
                     yield return StartCoroutine(cardEntity.settle(0,currentNode));
@@ -691,13 +691,13 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
                 {
                     resetComponentPosition();
                 } 
-            }
-            else
+            //}
+            /*else
             {
                 //卡牌释放效果
                 yield return StartCoroutine(cardEntity.settle(0, GameManager.Instance.playerOn));
 
-            } 
+            } */
             yield break;
         }
         else

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

@@ -276,10 +276,10 @@ public class CardEntity : MonoBehaviour
         {       
             //遍历范围预览池消除影响色
            
-            foreach (MapUnity mapUnity in MapUnityManager.Instance.castPool)
+            /*foreach (MapUnity mapUnity in MapUnityManager.Instance.castPool)
             {
                 mapUnity.castRangeInf = false;
-            }
+            }*/
             MapUnityManager.Instance.castPool.Clear();
 
         }
@@ -751,7 +751,7 @@ public class CardEntity : MonoBehaviour
 
     private void createCastRange()
     {
-        if (GameManager.Instance.playerOn.whoColour.Equals(Name.NodeColor.Green))
+        /*if (GameManager.Instance.playerOn.whoColour.Equals(Name.NodeColor.Green))
         {
             int range = cardOriginalData.CastingRange + 1;
             //Debug.Log("range是" + range);
@@ -760,7 +760,7 @@ public class CardEntity : MonoBehaviour
         else
         {
             castRange.text = cardOriginalData.CastingRange.ToString();
-        }
+        }*/
         
     }
 

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

@@ -19,8 +19,8 @@ public class GameManager : Singleton<GameManager>
     }
 
     [Header("角色当前位置参数")]
-    public MapUnity playerOn;//当前在哪个格子上
-    public MapUnity lastPlayerOn;//之前在哪个格子上
+    //public MapUnity playerOn;//当前在哪个格子上
+    //public MapUnity lastPlayerOn;//之前在哪个格子上
     public int lastWhoColor;//之前玩家格子颜色
 
     [Header("角色状态数据参数")]
@@ -325,7 +325,7 @@ public class GameManager : Singleton<GameManager>
         {
             if(currentCardEntity.cardOriginalData.CastingRange != 0)
             {
-                if( currentMapNode != null && currentMapNode.castRangeInf == true)
+                if( currentMapNode != null )
                 {
 
                 }
@@ -336,7 +336,7 @@ public class GameManager : Singleton<GameManager>
             }
             else
             {
-                currentMapNode = playerOn;
+                //currentMapNode = playerOn;
             }
             List<int> ints = SettlementManager.Instance.GetNodeCountStats();
             for (int i = 0; i < ints.Count; i++)

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

@@ -25,7 +25,7 @@ public class MapUnity : MonoBehaviour
     [Header("UI效果范围控件")]
     public bool effectInfluenced;//卡牌效果作用范围
     bool lastEffectInfluenced;
-    public bool castRangeInf;//鯤소尻�렀鍋
+    //public bool castRangeInf;//鯤소尻�렀鍋
     bool lastCastRangeInf;
     public bool stepInfluenced;//移动范围预览
     bool lastStepInfluenced;
@@ -196,14 +196,14 @@ public class MapUnity : MonoBehaviour
                 ClearStepRangeInfluenced();
             }
         }
-        if (castRangeInf != lastCastRangeInf)
+        /*if (castRangeInf != lastCastRangeInf)
         {
             lastCastRangeInf = castRangeInf;
             if (castRangeInf == false)
             {
                 ClearCastRangeInfluenced();
             }
-        }
+        }*/
         if (markInfluenced != lastMarkInfluenced)
         {
             lastMarkInfluenced = markInfluenced;
@@ -594,7 +594,7 @@ public class MapUnity : MonoBehaviour
     }
     public void PlayerCastRangeInf(HashSet<MapUnity> rangePool)
     {
-        castRangeInf = true;
+        //castRangeInf = true;
         castRangeMark.gameObject.SetActive(true);
         ShowMark(rangePool);
     }

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

@@ -4,12 +4,4 @@ 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/Relic/LegacyChild/LegacyNode_PainContract.cs

@@ -4,18 +4,4 @@ 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/Tool/getNodeTools.cs

@@ -44,7 +44,7 @@ public class getNodeTools
     public static void playerMoveToNextNode(MapUnity mapNode)
     {
         //角色移动
-        if ( mapNode.blocked == false)
+        /*if ( mapNode.blocked == false)
         {
             if (GameManager.Instance.playerOn != null)
             {
@@ -61,24 +61,12 @@ public class getNodeTools
             GameManager.Instance.playerOn = mapNode;
             GameObject playerObject = GameObject.Find("player");
             playerObject.transform.position = new Vector3(mapNode.transform.position.x, 0.5f, mapNode.transform.position.z);
-        }
+        }*/
     }
 
     public static void playerTeleportToNode(MapUnity mapNode)
     {
         //角色移动
-        if (mapNode.blocked == false )
-        {
-            if (GameManager.Instance.playerOn != null)
-            {
-                GameManager.Instance.playerOn.playerOn = false;
-                GameManager.Instance.playerOn.effectInfluenced = false;
-            }
-            mapNode.playerOn = true;
-            GameManager.Instance.playerOn = mapNode;
-            GameObject playerObject = GameObject.Find("player");
-            playerObject.transform.position = new Vector3(mapNode.transform.position.x, 0.5f, mapNode.transform.position.z);
-        }
     }
 
     public static void RandomPollute(HashSet<MapUnity> set, int num)
@@ -247,17 +235,6 @@ public class getNodeTools
     public static HashSet<MapUnity> getAllNodesExceptEnemyAndPlayer()
     {
         HashSet<MapUnity> set = new HashSet<MapUnity>();
-        for (int i = 0; i < GameManager.Instance.X.Count; i++)
-        {
-            for (int j = 0; j < GameManager.Instance.X[i].Y.Count; j++)
-            {
-                if ( !GameManager.Instance.X[i].Y[j].Equals(GameManager.Instance.playerOn))
-                {
-                    set.Add(GameManager.Instance.X[i].Y[j]);
-                }
-                
-            }
-        }
         return set;
     }
 
@@ -335,17 +312,17 @@ public class getNodeTools
 
     public static int getPlayerAroundNodesCount(string color)
     {
-        MapUnity playerNode = GameManager.Instance.playerOn;
-        HashSet<MapUnity> set = new HashSet<MapUnity> { playerNode };
-        getCircleNode(set, 1);
+        //MapUnity playerNode = GameManager.Instance.playerOn;
+        //HashSet<MapUnity> set = new HashSet<MapUnity> { playerNode };
+        //getCircleNode(set, 1);
         int colorCount = 0;
-        foreach(MapUnity mapUnity in set)
+        /*foreach(MapUnity mapUnity in set)
         {
             if (mapUnity.whoColour.Equals(Name.stringAroundColorToint(color)))
             {
                 colorCount++;
             }
-        }
+        }*/
         return colorCount;
     }
 
@@ -391,10 +368,6 @@ public class getNodeTools
             return canPass;
         }
         /*if (currentNode.TryGetComponent<EnemyNode>(out EnemyNode enemyNode))*/
-        if (currentNode.Equals(GameManager.Instance.playerOn))
-        {
-            canPass = false;
-        }
 
         if (canPass)
         {
@@ -411,10 +384,6 @@ public class getNodeTools
             canPass = false;
             return canPass;
         }
-        if (currentNode.Equals(GameManager.Instance.playerOn))
-        {
-            canPass = false;
-        }
 
         if (canPass)
         {
@@ -710,9 +679,10 @@ public class getNodeTools
         bool canPass = false;
         HashSet<MapUnity> shootAbleSet = new HashSet<MapUnity>();
         shootAbleSet.Add(currentNode);
+        canAttack = true;
         getCircleNodeForRemoteAttack(shootAbleSet,attackRange);
         Debug.Log("shootAbleSet大小是" + shootAbleSet.Count);
-        if (shootAbleSet.Contains(GameManager.Instance.playerOn))
+        /*if (shootAbleSet.Contains(GameManager.Instance.playerOn))
         {
             inShootRange = true;
         }
@@ -724,7 +694,7 @@ public class getNodeTools
         if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.Invisible))
         {
             canAttack = false;
-        }
+        }*/
         return canAttack;
     }
 
@@ -735,7 +705,7 @@ public class getNodeTools
         bool canPass = false;
         HashSet<MapUnity> shootAbleSet = new HashSet<MapUnity>();
         shootAbleSet.Add(currentNode);
-        getCircleNodeForRemoteAttack(shootAbleSet, attackRange);
+        /*getCircleNodeForRemoteAttack(shootAbleSet, attackRange);
         Debug.Log("shootAbleSet大小是" + shootAbleSet.Count);
         if (shootAbleSet.Contains(GameManager.Instance.playerOn))
         {
@@ -745,7 +715,7 @@ public class getNodeTools
         if (canPass && inShootRange)
         {
             canAttack = true;
-        }
+        }*/
         return canAttack;
     }
 
@@ -762,8 +732,8 @@ public class getNodeTools
 
     public static void setEffectRangePreview(string effectRange, float euler, MapUnity currentNode,CardEntity cardEntity)
     {
-        MapUnity playerOnNode = GameManager.Instance.playerOn.transform.GetComponent<MapUnity>();
-        Debug.Log("½Ç¶ÈÊÇ"+euler);
+        //MapUnity playerOnNode = GameManager.Instance.playerOn.transform.GetComponent<MapUnity>();
+        /*Debug.Log("½Ç¶ÈÊÇ"+euler);
         var handlers = new Dictionary<string, EffectRangeHandler>
         {
             {EffectRange.range1,new EffectRangeHandler1(currentNode,euler) },
@@ -812,7 +782,7 @@ public class getNodeTools
         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))
         {
@@ -909,7 +879,7 @@ public class getNodeTools
 
     public static HashSet<MapUnity> setEffectRangePreviewNoCard(string effectRange, float euler, MapUnity currentNode)
     {
-        MapUnity playerOnNode = GameManager.Instance.playerOn.transform.GetComponent<MapUnity>();
+        /*MapUnity playerOnNode = GameManager.Instance.playerOn.transform.GetComponent<MapUnity>();
         var handlers = new Dictionary<string, EffectRangeHandler>
         {
             {EffectRange.range1,new EffectRangeHandler1(currentNode,euler) },
@@ -930,14 +900,14 @@ public class getNodeTools
             {EffectRange.range7_2,new EffectRangeHandler7_2(currentNode,euler) },
             {EffectRange.range8_1,new EffectRangeHandler8_1(currentNode,euler) },
             {EffectRange.range8_2,new EffectRangeHandler8_2(playerOnNode,euler) },
-        };
+        };*/
 
         HashSet<MapUnity> influencePreviewPool = new HashSet<MapUnity>();
 
-        if (handlers.TryGetValue(effectRange, out var handler))
+        /*if (handlers.TryGetValue(effectRange, out var handler))
         {
             influencePreviewPool = handler.HandleAngleWithResult(euler);
-        }
+        }*/
 
         return influencePreviewPool;
     }

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

@@ -223,10 +223,10 @@ public class CardManager : Singleton<CardManager>
             {
                 currentNumber = getNodeTools.getNodesCount(component);
             }
-            else
+            /*else
             {
                 currentNumber = getNodeTools.getPlayerAroundNodesCount(component);
-            }
+            }*/
 
             // 如果没有操作符，设置初始值为 currentNumber
             if (result == 0 && string.IsNullOrEmpty(currentOperation))

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

@@ -118,11 +118,6 @@ public class MapUnityManager : Singleton<MapUnityManager>
     public bool isPlayerOn(int color)
     {
         bool isMatch = false;
-        if (GameManager.Instance.playerOn.whoColour == color)
-        {
-            //Debug.Log("whoColourÊÇÊÇ" + GameManager.Instance.playerOn.whoColour);
-            isMatch = true;
-        }
         return isMatch;
     }
 
@@ -207,17 +202,6 @@ public class MapUnityManager : Singleton<MapUnityManager>
 
     public void getCastPool(int castRange)
     {
-        MapUnity playerOn = GameManager.Instance.playerOn;
-        for (int i = 0; i < 6; i++)
-        {
-            getNodeTools.getLongNodes(playerOn, i, castRange, castPool);
-        }
-        MapUnity playerOnNode = GameManager.Instance.playerOn.transform.GetComponent<MapUnity>();
-        getNodeTools.checkListPass(castPool,playerOnNode);    
-        foreach (MapUnity mapUnity in castPool)
-        {
-            mapUnity.PlayerCastRangeInf(castPool); 
-        }
     }
 
     public void getCastPoolForInfRange()

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

@@ -28,15 +28,6 @@ public class MapUnitySettleManager : Singleton<MapUnitySettleManager>
 
     public void PlayerMudGridEndSettle(int value)
     {
-        if (GameManager.Instance.playerOn.whoColour == Name.NodeColor.Black)
-        {
-            Usermanager.Instance.SufferPlayerAbnormalCondition(AbnormalCondition.downSpeed, 1);
-        }
-        else if (Name.NodeColor.PlayerColor.Contains(GameManager.Instance.playerOn.whoColour))
-        {
-            Usermanager.Instance.SufferPlayerAbnormalCondition(AbnormalCondition.upSpeed, 1);
-
-        }
 
     }
 

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

@@ -62,8 +62,8 @@ public class SettlementManager : Singleton<SettlementManager>
 
     private void dyeingWork(CardOriginalData cardOriginalData,MapUnity targetNode)
     {
-        Vector3 face = targetNode.transform.position - GameManager.Instance.playerOn.transform.position;
-        float euler = Vector3.SignedAngle(-GameManager.Instance.playerOn.transform.forward, face, GameManager.Instance.playerOn.transform.up) + 180;
+        //Vector3 face = targetNode.transform.position - GameManager.Instance.playerOn.transform.position;
+        float euler = 90.0f;
         //Debug.Log("currentNode的X是" + targetNode.locationX + "currentNode的Y是" + targetNode.locationY);
         //Debug.Log("currentNode的Q是" + currentNode.cubeQ + "currentNode的S是" + currentNode.cubeS + "currentNode的R是" + currentNode.cubeR);
         List<(int, int, int)> cubeList = new List<(int, int, int)>();
@@ -113,8 +113,8 @@ public class SettlementManager : Singleton<SettlementManager>
         //List<EnemyNode> blockNodes = new List<EnemyNode>();//顺序结算被打爆地块的效果
         mapUnityColorPreviewCountPool.Clear();
 
-        Vector3 face = targetNode.transform.position - GameManager.Instance.playerOn.transform.position;
-        float euler = Vector3.SignedAngle(-GameManager.Instance.playerOn.transform.forward, face, GameManager.Instance.playerOn.transform.up) + 180;
+        //Vector3 face = targetNode.transform.position - GameManager.Instance.playerOn.transform.position;
+        float euler = 90.0f;
         List<(int, int, int)> cubeList = new List<(int, int, int)>();
         int intEuler = (int)euler;
         Debug.Log("euler是" + intEuler);
@@ -216,8 +216,8 @@ public class SettlementManager : Singleton<SettlementManager>
         {
             return;
         }
-        Vector3 face = targetNode.transform.position - GameManager.Instance.playerOn.transform.position;
-        float euler = Vector3.SignedAngle(-GameManager.Instance.playerOn.transform.forward, face, GameManager.Instance.playerOn.transform.up) + 180;
+        //Vector3 face = targetNode.transform.position - GameManager.Instance.playerOn.transform.position;
+        float euler = 90.0f;
         List<(int, int, int)> cubeList = new List<(int, int, int)>();
         int intEuler = (int)euler;
         for (int i = 0; i < cardOriginalData.nodesMark.Length; i++)
@@ -421,7 +421,7 @@ public class SettlementManager : Singleton<SettlementManager>
         getNodeTools.exceptWithEnemyNode(targets);
         HashSet<MapUnity> targetNode = MathTool.GetRandomElements(targets, 1);
 
-        getNodeTools.playerTeleportToNode(targetNode.ElementAt(0));
+        //getNodeTools.playerTeleportToNode(targetNode.ElementAt(0));
     }
 
 
@@ -746,7 +746,7 @@ public class SettlementManager : Singleton<SettlementManager>
                     break;
                 
                 case CardFunction.turn3RedNodesToEmber:
-                    HashSet<MapUnity> nearby2Nodes= new HashSet<MapUnity>();
+                    /*HashSet<MapUnity> nearby2Nodes= new HashSet<MapUnity>();
                     HashSet<MapUnity> nearby2RedNodes = new HashSet<MapUnity>();
                     nearby2Nodes.Add(GameManager.Instance.playerOn);
                     getNodeTools.getCircleNode(nearby2Nodes, 2);
@@ -756,10 +756,10 @@ public class SettlementManager : Singleton<SettlementManager>
                         mapUnity.switchColor(Name.NodeColor.White);
                     }
                     int emberCount=nearby2RedNodes.Count/3;
-                    Usermanager.Instance.SufferPlayerAbnormalCondition(AbnormalCondition.angerUpperDamage, emberCount);
+                    Usermanager.Instance.SufferPlayerAbnormalCondition(AbnormalCondition.angerUpperDamage, emberCount);*/
                     break;
                 case CardFunction.turn2RedNodesToEmber:
-                    HashSet<MapUnity> nearby2NodesA = new HashSet<MapUnity>();
+                    /*HashSet<MapUnity> nearby2NodesA = new HashSet<MapUnity>();
                     HashSet<MapUnity> nearby2RedNodesA = new HashSet<MapUnity>();
                     nearby2NodesA.Add(GameManager.Instance.playerOn);
                     getNodeTools.getCircleNode(nearby2NodesA, 2);
@@ -769,7 +769,7 @@ public class SettlementManager : Singleton<SettlementManager>
                         mapUnity.switchColor(Name.NodeColor.White);
                     }
                     int emberCountA = nearby2RedNodes.Count / 2;
-                    Usermanager.Instance.SufferPlayerAbnormalCondition(AbnormalCondition.angerUpperDamage, emberCountA);
+                    Usermanager.Instance.SufferPlayerAbnormalCondition(AbnormalCondition.angerUpperDamage, emberCountA);*/
                     break;
                 case CardFunction.posion:
                 case CardFunction.weak:
@@ -848,7 +848,7 @@ public class SettlementManager : Singleton<SettlementManager>
                 case CardFunction.teleport:
                     break;
                 case CardFunction.teleportAround:
-                    teleportAround(new List<MapUnity> { targetNode });
+                    //teleportAround(new List<MapUnity> { targetNode });
                     break;
                 case CardFunction.teleportAndDamageAround:
                     break;
@@ -925,37 +925,8 @@ public class SettlementManager : Singleton<SettlementManager>
                     abnormalConditionWork(kvp.Value, int.Parse(kvp.Value), influencePreviewPool);
                     break;
                 case CardFunction.turnRedNodesToBleed:
-                    HashSet<MapUnity> targetRedNodes = new HashSet<MapUnity> { GameManager.Instance.playerOn };
-                    HashSet<MapUnity> targetNodes = new HashSet<MapUnity> { GameManager.Instance.playerOn };
-                    getNodeTools.getCircleNode(targetRedNodes, 2);
-                    getNodeTools.getCircleNode(targetNodes, 1);
-                    int bleedCount = 0;
-                    foreach (MapUnity mapUnity in targetRedNodes)
-                    {
-                        if (Name.NodeColor.PlayerColor.Contains(mapUnity.whoColour))
-                        {
-                            bleedCount++;
-                            mapUnity.switchColor(Name.NodeColor.White);
-                        }
-                        
-                    }
-                    abnormalConditionWork(AbnormalCondition.bleed, bleedCount, new List<MapUnity>(targetNodes));
                     break;
                 case CardFunction.turnRedNodesToBleedInTwoCirCle:
-                    HashSet<MapUnity> targetRedNodesA = new HashSet<MapUnity> { GameManager.Instance.playerOn };
-                    HashSet<MapUnity> targetNodesA = new HashSet<MapUnity> { GameManager.Instance.playerOn };
-                    getNodeTools.getCircleNode(targetRedNodesA, 2);
-                    getNodeTools.getCircleNode(targetNodesA, 2);
-                    int bleedCountA = 0;
-                    foreach (MapUnity mapUnity in targetRedNodesA)
-                    {
-                        if (Name.NodeColor.PlayerColor.Contains(mapUnity.whoColour))
-                        {
-                            bleedCountA++;
-                            mapUnity.switchColor(Name.NodeColor.White);
-                        }
-                    }
-                    abnormalConditionWork(AbnormalCondition.bleed, bleedCountA, new List<MapUnity>(targetNodesA));
                     break;
 
             }