卡牌范围和优势

.gitignore

@@ -147,5 +147,5 @@ Plugins/*/Intermediate/*
 # Cache files for the editor to use
 DerivedDataCache/*
 
-Library/*
-Logs/*
+ColorlessWorld-2024-4-2/Library/*
+ColorlessWorld-2024-4-2/Logs/*

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

@@ -11221,124 +11221,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2096369103}
   m_CullTransparentMesh: 1
---- !u!1001 &2099011614
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_Name
-      value: Card_v01
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 125
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 200
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7032930392706796801, guid: d255d4b8a06372542bcbeef98cf4761c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d255d4b8a06372542bcbeef98cf4761c, type: 3}
 --- !u!1 &2132810046
 GameObject:
   m_ObjectHideFlags: 0
@@ -11435,4 +11317,3 @@ SceneRoots:
   - {fileID: 130569072}
   - {fileID: 2019229959}
   - {fileID: 61166330}
-  - {fileID: 2099011614}

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

@@ -4,6 +4,9 @@ using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.EventSystems;
 using UnityEngine.InputSystem;
+using static EnemyNode;
+using static UnityEngine.Rendering.DebugUI;
+using System;
 
 public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler
 {
@@ -26,6 +29,8 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
     //[Header("卡牌属性")]
     private CardEntity cardEntity;
 
+    public List<MapUnity> castingPool;//卡牌打出范围
+
     void Start()
     {
         eventSystem = GameObject.FindObjectOfType<EventSystem>();
@@ -161,58 +166,18 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
                     currentNode = raycastHit.collider.transform.GetComponent<MapUnity>();
 
                     //重新调用范围预览
-                    GameManager.Instance.player.StepPreviewInfluencedNode(cardEntity.cardOriginalData.CastingRange);
+                    //GameManager.Instance.player.StepPreviewInfluencedNode(cardEntity.cardOriginalData.CastingRange);
+                    setCastingRangePreview(cardEntity.cardOriginalData.EffectRange);
                     Debug.Log(cardEntity.cardOriginalData.CastingRange);
                     //预览影响范围
                     if (currentNode.influenced)
                     {
                         //根据卡牌属性改变影响池  
-                        cardEntity.influencePreviewPool.Add(currentNode);
+                        
                         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;
-                        Debug.Log(euler);
-                        if (euler > 0 && euler < 45)
-                        {
-                            if (currentNode.unitPool[0] != null)
-                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[0]);
-                            if (currentNode.unitPool[4] != null)
-                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[4]);
-                        }
-                        else if (euler > 45 && euler < 135)
-                        {
-                            if (currentNode.unitPool[1] != null)
-                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[1]);
-                            if (currentNode.unitPool[5] != null)
-                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[5]);
-                        }
-                        else if (euler > 135 && euler < 180)
-                        {
-                            if (currentNode.unitPool[2] != null)
-                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[2]);
-                            if (currentNode.unitPool[0] != null)
-                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[0]);
-                        }
-                        else if (euler > 180 && euler < 225)
-                        {
-                            if (currentNode.unitPool[1] != null)
-                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[1]);
-                            if (currentNode.unitPool[3] != null)
-                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[3]);
-                        }
-                        else if (euler > 225 && euler < 315)
-                        {
-                            if (currentNode.unitPool[2] != null)
-                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[2]);
-                            if (currentNode.unitPool[4] != null)
-                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[4]);
-                        }
-                        else if (euler > 315 && euler < 360)
-                        {
-                            if (currentNode.unitPool[3] != null)
-                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[3]);
-                            if (currentNode.unitPool[5] != null)
-                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[5]);
-                        }
+                        Debug.Log("角度是:"+euler);
+                        setEffectRangePreview(cardEntity.cardOriginalData.EffectRange,euler,currentNode);
                         //influencePreviewPool.Add(currentNode);
 
 
@@ -222,7 +187,150 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
                 }
             }
         }
-        Debug.Log("结束影响数值" + cardEntity.influencePreviewPool.Count);
+    }
+
+    private void setCastingRangePreview(string effectRange)
+    {
+        if (effectRange == EffectRange.range1)
+        {
+            GameManager.Instance.player.StepPreviewInfluencedNode(cardEntity.cardOriginalData.CastingRange);
+        }
+        else
+        {
+            GameManager.Instance.player.StepPreviewInfluencedNode(1);
+            /*            MapUnity playerNode = GameManager.Instance.playerOn;
+                        MapUnity currentNode = GameManager.Instance.playerOn;
+                        castingPool.Clear();
+                        for (int i = 0; i < 6; i++)
+                        {
+                            currentNode = GameManager.Instance.playerOn;
+                            if (currentNode.unitPool[0] != null && currentNode.unitPool[0].TryGetComponent<EnemyNode>(out _))
+                            {
+
+                            }
+                        }*/
+        }
+        
+    }
+    private void setEffectRangePreview(string effectRange, float euler,MapUnity currentNode)
+    {
+        Debug.Log("作用范围:" + effectRange);
+        MapUnity playerOnNode = GameManager.Instance.playerOn.transform.GetComponent<MapUnity>();
+        var handlers = new Dictionary<string,EffectRangeHandler>
+        {
+            {EffectRange.range2,new EffectRangeHandler2(currentNode,euler) },
+            {EffectRange.range3_1,new EffectRangeHandler3_1(currentNode,euler) },
+            {EffectRange.range3_2,new EffectRangeHandler3_2(currentNode,euler) },
+            {EffectRange.range3_3,new EffectRangeHandler3_3(currentNode,euler) },
+            {EffectRange.range4_1,new EffectRangeHandler4_1(currentNode,euler) },
+            {EffectRange.range4_2,new EffectRangeHandler4_2(currentNode,euler) },
+            {EffectRange.range4_3,new EffectRangeHandler4_3(currentNode,euler) },
+            {EffectRange.range5_1,new EffectRangeHandler5_1(currentNode,euler) },
+            {EffectRange.range5_2,new EffectRangeHandler5_2(currentNode,euler) },
+            {EffectRange.range5_3,new EffectRangeHandler5_3(currentNode,euler) },
+            {EffectRange.range6_1,new EffectRangeHandler6_1(currentNode,euler) },
+            {EffectRange.range6_2,new EffectRangeHandler6_2(currentNode,euler) },
+            {EffectRange.range6_3,new EffectRangeHandler6_3(playerOnNode,euler) },
+            {EffectRange.range7_1,new EffectRangeHandler7_1(currentNode,euler) },
+            {EffectRange.range7_2,new EffectRangeHandler7_2(currentNode,euler) },
+            {EffectRange.range8_1,new EffectRangeHandler8_1(currentNode,euler) },
+            {EffectRange.range8_2,new EffectRangeHandler8_2(playerOnNode,euler) },
+        };
+
+        if (handlers.TryGetValue(effectRange, out var handler))
+        {
+            cardEntity.influencePreviewPool = handler.HandleAngleWithResult(euler);
+        }
+
+    }
+/*    private void showEffectRange3_2(float euler)
+    {
+        if (euler > 0 && euler < 45)
+        {
+            if (checkNodeInfluencedable(currentNode.unitPool[0]))
+                cardEntity.influencePreviewPool.Add(currentNode.unitPool[0]);
+            if (checkNodeInfluencedable(currentNode.unitPool[4]))
+                cardEntity.influencePreviewPool.Add(currentNode.unitPool[4]);
+        }
+        else if (euler > 45 && euler < 135)
+        {
+            if (checkNodeInfluencedable(currentNode.unitPool[1]))
+                cardEntity.influencePreviewPool.Add(currentNode.unitPool[1]);
+            if (checkNodeInfluencedable(currentNode.unitPool[5]))
+                cardEntity.influencePreviewPool.Add(currentNode.unitPool[5]);
+        }
+        else if (euler > 135 && euler < 180)
+        {
+            if (checkNodeInfluencedable(currentNode.unitPool[2]))
+                cardEntity.influencePreviewPool.Add(currentNode.unitPool[2]);
+            if (checkNodeInfluencedable(currentNode.unitPool[0]))
+                cardEntity.influencePreviewPool.Add(currentNode.unitPool[0]);
+        }
+        else if (euler > 180 && euler < 225)
+        {
+            if (checkNodeInfluencedable(currentNode.unitPool[1]))
+                cardEntity.influencePreviewPool.Add(currentNode.unitPool[1]);
+            if (checkNodeInfluencedable(currentNode.unitPool[3]))
+                cardEntity.influencePreviewPool.Add(currentNode.unitPool[3]);
+        }
+        else if (euler > 225 && euler < 315)
+        {
+            if (checkNodeInfluencedable(currentNode.unitPool[2]))
+                cardEntity.influencePreviewPool.Add(currentNode.unitPool[2]);
+            if (checkNodeInfluencedable(currentNode.unitPool[4]))
+                cardEntity.influencePreviewPool.Add(currentNode.unitPool[4]);
+        }
+        else if (euler > 315 && euler < 360)
+        {
+            if (checkNodeInfluencedable(currentNode.unitPool[3]))
+                cardEntity.influencePreviewPool.Add(currentNode.unitPool[3]);
+            if (checkNodeInfluencedable(currentNode.unitPool[5]))
+                cardEntity.influencePreviewPool.Add(currentNode.unitPool[5]);
+        }
+    }*/
+/*    private void showEffectRange2(float euler)
+    {
+        if (euler > 0 && euler <= 45)
+        {
+            if (checkNodeInfluencedable(currentNode.unitPool[2]))
+                cardEntity.influencePreviewPool.Add(currentNode.unitPool[2]);
+        }
+        else if (euler > 45 && euler <= 135)
+        {
+            if (checkNodeInfluencedable(currentNode.unitPool[3]))
+                cardEntity.influencePreviewPool.Add(currentNode.unitPool[3]);
+        }
+        else if (euler > 135 && euler <= 180)
+        {
+            if (checkNodeInfluencedable(currentNode.unitPool[4]))
+                cardEntity.influencePreviewPool.Add(currentNode.unitPool[4]);
+        }
+        else if (euler > 180 && euler <= 225)
+        {
+            if (checkNodeInfluencedable(currentNode.unitPool[5]))
+                cardEntity.influencePreviewPool.Add(currentNode.unitPool[5]);
+        }
+        else if (euler > 225 && euler <= 315)
+        {
+            if (checkNodeInfluencedable(currentNode.unitPool[0]))
+                cardEntity.influencePreviewPool.Add(currentNode.unitPool[0]);
+        }
+        else if (euler > 315 && euler <= 360)
+        {
+            if (checkNodeInfluencedable(currentNode.unitPool[1]))
+                cardEntity.influencePreviewPool.Add(currentNode.unitPool[1]);
+        }
+    }*/
+    
+
+    private void getInfluencePreviePoll(MapUnity currentNode,string effecctRange)
+    {
+        switch (effecctRange) 
+        {
+            case EffectRange.range1:
+                break;
+
+        }
     }
 
     private void noAinPanleWork(PointerEventData eventData)
@@ -272,14 +380,14 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
 
     public void OnEndDrag(PointerEventData eventData)
     {
-        if (!cardEntity.costEnough)
+        StartCoroutine(OnDragIEnumerator(eventData));
+/*        if (!cardEntity.costEnough)
         {
             return;
         }
         choosed = false;
         if (canUse)
         {
-            Debug.Log("进入影响数值" + cardEntity.influencePreviewPool.Count);
             if (eventData.pointerCurrentRaycast.gameObject != null)
             {
                 if (eventData.pointerCurrentRaycast.gameObject.name == "Card")
@@ -340,6 +448,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
                 {
 
                     //卡牌释放效果
+                    Debug.Log("卡牌释放前影响格数:" + cardEntity.influencePreviewPool.Count);
                     cardEntity.use();
                     Debug.Log("玩家盾量：" + Usermanager.Instance.Shield);
 
@@ -374,6 +483,99 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
 
             }//无范围类，直接释放
 
+        }
+        else
+        {
+            canUse = true;
+        }*/
+    }
+
+    private IEnumerator OnDragIEnumerator(PointerEventData eventData)
+    {
+        if (!cardEntity.costEnough)
+        {
+            yield break;
+        }
+        choosed = false;
+        if (canUse)
+        {
+            if (eventData.pointerCurrentRaycast.gameObject != null)
+            {
+                if (eventData.pointerCurrentRaycast.gameObject.name == "Card")
+                {
+                    transform.SetParent(eventData.pointerCurrentRaycast.gameObject.transform.parent);
+                    transform.position = eventData.pointerCurrentRaycast.gameObject.transform.position;
+                    eventData.pointerCurrentRaycast.gameObject.transform.position = originalParent.position;
+                    eventData.pointerCurrentRaycast.gameObject.transform.SetParent(originalParent);
+
+                    GetComponent<CanvasGroup>().blocksRaycasts = true;
+
+                    ainPanle.SetActive(false);//关闭贝塞尔曲线
+                                              //遍历范围预览池消除影响色
+                    for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++)
+                    {
+                        GameManager.Instance.player.influencePreviewPool[i].influenced = false;
+                    }
+                    //GameManager.Instance.player.influencePreviewPool.Clear();
+
+                    yield break;
+                }
+                else if (eventData.pointerCurrentRaycast.gameObject.name == "cardSlot")
+                {
+                    transform.SetParent(eventData.pointerCurrentRaycast.gameObject.transform);
+                    transform.position = eventData.pointerCurrentRaycast.gameObject.transform.position;
+                    GetComponent<CanvasGroup>().blocksRaycasts = true;
+
+                    ainPanle.SetActive(false);//关闭贝塞尔曲线
+                                              //遍历范围预览池消除影响色
+                    for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++)
+                    {
+                        GameManager.Instance.player.influencePreviewPool[i].influenced = false;
+                    }
+                    //GameManager.Instance.player.influencePreviewPool.Clear();
+
+                    yield break;
+                }
+            }
+            if (ainPanle.activeSelf)
+            {
+                ainPanle.SetActive(false);//关闭贝塞尔曲线
+            }
+
+            //先判断该卡牌的类型是否是需要范围
+            if (cardEntity.cardOriginalData.CastingRange != 0)
+            {
+                //检测碰撞的地图节点是否被影响（可释放）
+                if (currentNode == null || currentNode.influenced == false)
+                {
+                    //遍历范围预览池消除影响色（红色，卡牌的释放范围）
+                    for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++)
+                    {
+                        GameManager.Instance.player.influencePreviewPool[i].influenced = false;
+                    }
+                    //GameManager.Instance.player.influencePreviewPool.Clear();
+                }
+                else if (currentNode.influenced)
+                {
+
+                    //卡牌释放效果
+                    yield return StartCoroutine(cardEntity.settle(0));
+                    Debug.Log("玩家盾量：" + Usermanager.Instance.Shield);
+
+
+                }
+               
+                yield break;
+            }//范围类，需要指定被影响的节点才能释放
+            else
+            {
+                //卡牌释放效果
+                yield return StartCoroutine(cardEntity.settle(0));
+
+                yield break;
+
+            }//无范围类，直接释放
+
         }
         else
         {

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

@@ -67,9 +67,9 @@ public class CardEntity : MonoBehaviour
 
     }
     //卡牌效果的结算
-    public void settle(int settleTurn)
+    public IEnumerator settle(int settleTurn)
     {
-        DestructionManager.Instance.startDestoryAndUseCard(this.gameObject, cardOriginalData, influencePreviewPool, cardIndex);
+        yield return StartCoroutine(DestructionManager.Instance.startDestoryAndUseCard(this.gameObject, cardOriginalData, influencePreviewPool, cardIndex));
 
     }
 

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

@@ -19,7 +19,7 @@ public class CardOriginalData : System.Object
 
     private int castingRange;
 
-    private int effectRange;
+    private string effectRange;
 
     private int isDisposable;
 
@@ -76,7 +76,7 @@ public class CardOriginalData : System.Object
         set { castingRange = value; }
     }
 
-    public int EffectRange
+    public string EffectRange
     {
         get { return effectRange; }
         set { effectRange = value; }

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

@@ -53,7 +53,7 @@ public class CardOriginalDataList : Singleton<CardOriginalDataList>
         cardOriginalData.Function = values[4].Split(";");
         cardOriginalData.FunctionVal = values[5].Split(";");
         cardOriginalData.CastingRange = int.Parse(values[6]);
-        cardOriginalData.EffectRange = int.Parse(values[7]);
+        cardOriginalData.EffectRange = values[7];
         cardOriginalData.IsDisposable = int.Parse(values[8]) == 1;
         cardOriginalData.AdvantageFunction = values[9].Split(";");
         cardOriginalData.AdvantageFunctionVal = values[10].Split(";");

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

@@ -142,20 +142,15 @@ public class TurnMaster : Singleton<TurnMaster>
             a.transform.SetParent(handCard.cardSlotList[i].transform);
             a.GetComponent<CardEntity>().createCard(cardList[i], i);
         }
-        Debug.Log("结束moveCards");
     }
 
     public IEnumerator randomDiscard(int count)
     {
-        Debug.Log("开始弃牌");
         List<int> disCardList = MathTool.GetRandomNumbers(handCard.getHandCardList().Count, count);
-        Debug.Log("开始弃牌b");
         foreach (int number in disCardList)
         {
-            Debug.Log("弃牌：" + number);
             disCard(number);
         }
-        Debug.Log("结束弃牌");
         yield return null;
     }
 
@@ -186,7 +181,6 @@ public class TurnMaster : Singleton<TurnMaster>
 
             if (cardDeck.cardList.Count > 0)
             {
-                Debug.Log("bbb");
                 var a = Instantiate(cardDeck.cardPrefab, handCard.cardSlotList[i].transform.position, Quaternion.identity);
                 a.transform.SetParent(handCard.cardSlotList[i].transform);
 
@@ -195,7 +189,6 @@ public class TurnMaster : Singleton<TurnMaster>
             }
             else if (usedCard.usedCardList.Count > 0)
             {
-                Debug.Log("aaa");
                 //Ï´ÅƼÌÐø³é
                 for (int c = 0; c < usedCard.usedCardList.Count; c++)
                 {
@@ -211,7 +204,6 @@ public class TurnMaster : Singleton<TurnMaster>
                 cardDeck.cardList.RemoveAt(cardDeck.cardList.Count - 1);
             }
         }
-        Debug.Log("ddd");
     }
 }
    /* public void ShuffleWithoutLosingCards()

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

@@ -71,8 +71,9 @@ public class GameManager : Singleton<GameManager>
     }
 
     //苀數部華晇伎
-    public void SyncColourCountUI()
+    public bool SyncColourCountUI()
     {
+        bool result = false;
         Debug.Log("Sync");
         float playerCount = 0;
         float enemyCount = 0;
@@ -99,6 +100,11 @@ public class GameManager : Singleton<GameManager>
         enemyColourCountText.text = enemyCount.ToString();
         playerColourCountBar.fillAmount = playerCount / totalCount;
         enemyColourCountBar.fillAmount = enemyCount / totalCount;
+        if (playerCount> enemyCount)
+        {
+            result = true;
+        }
+        return result;
     }
 
     //羲擁部華芨伎

ColorlessWorld-2024-4-2/Assets/Scripts/Handler.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8a23b57531c711044a3673e71ad539bb
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+interface EffectRangeHandler 
+{
+    public List<MapUnity> HandleAngleWithResult(float angle) {  return new List<MapUnity>(); }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler2.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EffectRangeHandler2 : EffectRangeHandlerBase
+{
+    public EffectRangeHandler2(MapUnity currentNode, float euler)
+    {
+        influencePreviewPool.Clear();
+        influencePreviewPool.Add(currentNode);
+        angleActions = new Dictionary<float, Func<List<MapUnity>>>
+        {
+            { 30.0f, () =>
+               {
+                tryGetNodeInfluencedable(currentNode.unitPool[2]);
+                return influencePreviewPool;
+               }
+            },
+            { 90.0f, () =>
+               {
+                 tryGetNodeInfluencedable(currentNode.unitPool[3]);
+                 return influencePreviewPool;
+                }
+            },
+            { 150.0f, () =>
+               {
+                 tryGetNodeInfluencedable(currentNode.unitPool[4]);
+                 return influencePreviewPool;
+                }
+            },
+            { 210.0f, () =>
+               {
+                 tryGetNodeInfluencedable(currentNode.unitPool[5]);
+                 return influencePreviewPool;
+                }
+            },
+            { 270.0f, () =>
+               {
+                 tryGetNodeInfluencedable(currentNode.unitPool[0]);
+                 return influencePreviewPool;
+                }
+            },
+            { 330.0f, () =>
+               {
+                 tryGetNodeInfluencedable(currentNode.unitPool[1]);
+                 return influencePreviewPool;
+                }
+            }
+        };
+
+    }
+
+
+
+
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler2.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler3_1.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EffectRangeHandler3_1 : EffectRangeHandlerBase
+{
+    public EffectRangeHandler3_1(MapUnity currentNode, float euler)
+    {
+        influencePreviewPool.Clear();
+        influencePreviewPool.Add(currentNode);
+        angleActions = new Dictionary<float, Func<List<MapUnity>>>
+        {
+            { 30.0f, () =>
+               {
+                if(tryGetNodeInfluencedable(currentNode.unitPool[2]))
+                 {
+                       tryGetNodeInfluencedable(currentNode.unitPool[2].unitPool[2]);
+                 };
+                return influencePreviewPool;
+               }
+            },
+            { 90.0f, () =>
+               {
+                if(tryGetNodeInfluencedable(currentNode.unitPool[3]))
+                 {
+                       tryGetNodeInfluencedable(currentNode.unitPool[3].unitPool[3]);
+                 };
+                 return influencePreviewPool;
+                }
+            },
+            { 150.0f, () =>
+               {
+                if(tryGetNodeInfluencedable(currentNode.unitPool[4]))
+                 {
+                       tryGetNodeInfluencedable(currentNode.unitPool[4].unitPool[4]);
+                 };
+                 return influencePreviewPool;
+                }
+            },
+            { 210.0f, () =>
+               {
+                if(tryGetNodeInfluencedable(currentNode.unitPool[5]))
+                 {
+                       tryGetNodeInfluencedable(currentNode.unitPool[5].unitPool[5]);
+                 };
+                 return influencePreviewPool;
+                }
+            },
+            { 270.0f, () =>
+               {
+                if(tryGetNodeInfluencedable(currentNode.unitPool[0]))
+                 {
+                       tryGetNodeInfluencedable(currentNode.unitPool[0].unitPool[0]);
+                 };
+                 return influencePreviewPool;
+                }
+            },
+            { 330.0f, () =>
+               {
+                if(tryGetNodeInfluencedable(currentNode.unitPool[1]))
+                 {
+                       tryGetNodeInfluencedable(currentNode.unitPool[1].unitPool[1]);
+                 };
+                 return influencePreviewPool;
+                }
+            }
+        };
+
+    }
+
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler3_1.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler3_2.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EffectRangeHandler3_2 : EffectRangeHandlerBase
+{
+    public EffectRangeHandler3_2(MapUnity currentNode, float euler)
+    {
+        influencePreviewPool.Clear();
+        influencePreviewPool.Add(currentNode);
+        angleActions = new Dictionary<float, Func<List<MapUnity>>>
+        {
+            { 30.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[0]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[4]);
+                   return influencePreviewPool;
+               }
+            },
+            { 90.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[1]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[5]);
+                   return influencePreviewPool;
+                }
+            },
+            { 150.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[2]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[0]);
+                   return influencePreviewPool;
+                }
+            },
+            { 210.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[3]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[1]);
+                   return influencePreviewPool;
+                }
+            },
+            { 270.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[4]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[2]);
+                   return influencePreviewPool;
+                }
+            },
+            { 330.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[5]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[3]);
+                   return influencePreviewPool;
+                }
+            }
+        };
+
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler3_2.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler3_3.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EffectRangeHandler3_3 : EffectRangeHandlerBase
+{
+    public EffectRangeHandler3_3(MapUnity currentNode, float euler)
+    {
+        influencePreviewPool.Clear();
+        influencePreviewPool.Add(currentNode);
+        angleActions = new Dictionary<float, Func<List<MapUnity>>>
+        {
+            { 30.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[1]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[3]);
+                   return influencePreviewPool;
+               }
+            },
+            { 90.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[2]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[4]);
+                   return influencePreviewPool;
+                }
+            },
+            { 150.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[3]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[5]);
+                   return influencePreviewPool;
+                }
+            },
+            { 210.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[4]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[0]);
+                   return influencePreviewPool;
+                }
+            },
+            { 270.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[5]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[1]);
+                   return influencePreviewPool;
+                }
+            },
+            { 330.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[0]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[2]);
+                   return influencePreviewPool;
+                }
+            }
+        };
+
+    }
+
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler3_3.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler4_1.cs

@@ -0,0 +1,89 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EffectRangeHandler4_1 : EffectRangeHandlerBase
+{
+    public EffectRangeHandler4_1(MapUnity currentNode, float euler)
+    {
+        influencePreviewPool.Clear();
+        influencePreviewPool.Add(currentNode);
+        angleActions = new Dictionary<float, Func<List<MapUnity>>>
+        {
+            { 30.0f, () =>
+               {
+                if(tryGetNodeInfluencedable(currentNode.unitPool[2]))
+                 {
+                       if (tryGetNodeInfluencedable(currentNode.unitPool[2].unitPool[2]))
+                       {
+                           tryGetNodeInfluencedable(currentNode.unitPool[2].unitPool[2].unitPool[2]);
+                       }
+                 };
+                return influencePreviewPool;
+               }
+            },
+            { 90.0f, () =>
+               {
+                if(tryGetNodeInfluencedable(currentNode.unitPool[3]))
+                 {
+                       if (tryGetNodeInfluencedable(currentNode.unitPool[3].unitPool[3]))
+                       {
+                           tryGetNodeInfluencedable(currentNode.unitPool[3].unitPool[3].unitPool[3]);
+                       }
+                 };
+                 return influencePreviewPool;
+                }
+            },
+            { 150.0f, () =>
+               {
+                if(tryGetNodeInfluencedable(currentNode.unitPool[4]))
+                 {
+                       if (tryGetNodeInfluencedable(currentNode.unitPool[4].unitPool[4]))
+                       {
+                           tryGetNodeInfluencedable(currentNode.unitPool[4].unitPool[4].unitPool[4]);
+                       }
+                 };
+                 return influencePreviewPool;
+                }
+            },
+            { 210.0f, () =>
+               {
+                if(tryGetNodeInfluencedable(currentNode.unitPool[5]))
+                 {
+                       if (tryGetNodeInfluencedable(currentNode.unitPool[5].unitPool[5]))
+                       {
+                           tryGetNodeInfluencedable(currentNode.unitPool[5].unitPool[5].unitPool[5]);
+                       }
+                 };
+                 return influencePreviewPool;
+                }
+            },
+            { 270.0f, () =>
+               {
+                if(tryGetNodeInfluencedable(currentNode.unitPool[0]))
+                 {
+                       if (tryGetNodeInfluencedable(currentNode.unitPool[0].unitPool[0]))
+                       {
+                           tryGetNodeInfluencedable(currentNode.unitPool[0].unitPool[0].unitPool[0]);
+                       }
+                 };
+                 return influencePreviewPool;
+                }
+            },
+            { 330.0f, () =>
+               {
+                if(tryGetNodeInfluencedable(currentNode.unitPool[1]))
+                 {
+                       if (tryGetNodeInfluencedable(currentNode.unitPool[1].unitPool[1]))
+                       {
+                           tryGetNodeInfluencedable(currentNode.unitPool[1].unitPool[1].unitPool[1]);
+                       }
+                 };
+                 return influencePreviewPool;
+                }
+            }
+        };
+
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler4_1.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler4_2.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EffectRangeHandler4_2 : EffectRangeHandlerBase
+{
+    // Start is called before the first frame update
+    public EffectRangeHandler4_2(MapUnity currentNode, float euler)
+    {
+        influencePreviewPool.Clear();
+        influencePreviewPool.Add(currentNode);
+        angleActions = new Dictionary<float, Func<List<MapUnity>>>
+        {
+            { 30.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[1]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[3]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[2]);
+                   return influencePreviewPool;
+               }
+            },
+            { 90.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[2]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[4]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[3]);
+                   return influencePreviewPool;
+                }
+            },
+            { 150.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[3]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[5]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[4]);
+                   return influencePreviewPool;
+                }
+            },
+            { 210.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[4]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[0]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[5]);
+                   return influencePreviewPool;
+                }
+            },
+            { 270.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[5]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[1]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[0]);
+                   return influencePreviewPool;
+                }
+            },
+            { 330.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[0]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[2]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[1]);
+                   return influencePreviewPool;
+                }
+            }
+        };
+
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler4_2.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler4_3.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EffectRangeHandler4_3 : EffectRangeHandlerBase
+{
+    public EffectRangeHandler4_3(MapUnity currentNode, float euler)
+    {
+        influencePreviewPool.Clear();
+        influencePreviewPool.Add(currentNode);
+        angleActions = new Dictionary<float, Func<List<MapUnity>>>
+        {
+            { 30.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[0]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[4]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[2]);
+                   return influencePreviewPool;
+               }
+            },
+            { 90.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[1]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[5]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[3]);
+                   return influencePreviewPool;
+                }
+            },
+            { 150.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[2]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[0]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[4]);
+                   return influencePreviewPool;
+                }
+            },
+            { 210.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[3]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[1]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[5]);
+                   return influencePreviewPool;
+                }
+            },
+            { 270.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[4]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[2]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[0]);
+                   return influencePreviewPool;
+                }
+            },
+            { 330.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[5]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[3]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[1]);
+                   return influencePreviewPool;
+                }
+            }
+        };
+
+    }
+
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler4_3.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler5_1.cs

@@ -0,0 +1,71 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EffectRangeHandler5_1 : EffectRangeHandlerBase
+{
+    public EffectRangeHandler5_1(MapUnity currentNode, float euler)
+    {
+        influencePreviewPool.Clear();
+        influencePreviewPool.Add(currentNode);
+        angleActions = new Dictionary<float, Func<List<MapUnity>>>
+        {
+            { 30.0f, () =>
+               {
+                get5_1Node(currentNode,2);
+                return influencePreviewPool;
+               }
+            },
+            { 90.0f, () =>
+               {
+                get5_1Node(currentNode,3);
+                return influencePreviewPool;
+                }
+            },
+            { 150.0f, () =>
+               {
+                get5_1Node(currentNode,4);
+                return influencePreviewPool;
+                }
+            },
+            { 210.0f, () =>
+               {
+                get5_1Node(currentNode,5);
+                return influencePreviewPool;
+                }
+            },
+            { 270.0f, () =>
+               {
+                get5_1Node(currentNode,0);
+                return influencePreviewPool;
+               }
+            },
+            { 330.0f, () =>
+               {
+                get5_1Node(currentNode,1);
+                return influencePreviewPool;
+                }
+            }
+        };
+
+    }
+
+
+
+    private void get5_1Node(MapUnity currentNode,int angle)
+    {
+        MapUnity currentCheckNode= currentNode;
+        for (int i=0; i < 4; i++)
+        {
+            if (tryGetNodeInfluencedable(currentCheckNode.unitPool[angle]))
+            {
+                currentCheckNode= currentCheckNode.unitPool[angle];
+            }
+            else
+            {
+                return;
+            }
+        }
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler5_1.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler5_2.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EffectRangeHandler5_2 : EffectRangeHandlerBase
+{
+
+    public EffectRangeHandler5_2(MapUnity currentNode, float euler)
+    {
+        influencePreviewPool.Clear();
+        influencePreviewPool.Add(currentNode);
+        angleActions = new Dictionary<float, Func<List<MapUnity>>>
+        {
+            { 30.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[1]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[3]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[0]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[4]);
+                   return influencePreviewPool;
+               }
+            },
+            { 90.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[2]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[4]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[1]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[5]);
+                   return influencePreviewPool;
+                }
+            },
+            { 150.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[3]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[5]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[2]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[0]);
+                   return influencePreviewPool;
+                }
+            },
+            { 210.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[4]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[0]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[3]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[1]);
+                   return influencePreviewPool;
+                }
+            },
+            { 270.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[5]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[1]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[4]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[2]);
+                   return influencePreviewPool;
+                }
+            },
+            { 330.0f, () =>
+               {
+                   tryGetNodeInfluencedable(currentNode.unitPool[0]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[2]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[5]);
+                   tryGetNodeInfluencedable(currentNode.unitPool[3]);
+                   return influencePreviewPool;
+                }
+            }
+        };
+
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler5_2.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler5_3.cs

@@ -0,0 +1,95 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EffectRangeHandler5_3 : EffectRangeHandlerBase
+{
+    public EffectRangeHandler5_3(MapUnity currentNode, float euler)
+    {
+        influencePreviewPool.Clear();
+        influencePreviewPool.Add(currentNode);
+        angleActions = new Dictionary<float, Func<List<MapUnity>>>
+        {
+            { 30.0f, () =>
+               {
+                   if (tryGetNodeInfluencedable(currentNode.unitPool[0]))
+                   {
+                       tryGetNodeInfluencedable(currentNode.unitPool[0].unitPool[0]);
+                   }
+                   if (tryGetNodeInfluencedable(currentNode.unitPool[4]))
+                   {
+                       tryGetNodeInfluencedable(currentNode.unitPool[4].unitPool[4]);
+                   }
+                   return influencePreviewPool;
+               }
+            },
+            { 90.0f, () =>
+               {
+                   if (tryGetNodeInfluencedable(currentNode.unitPool[1]))
+                   {
+                       tryGetNodeInfluencedable(currentNode.unitPool[1].unitPool[1]);
+                   }
+                   if (tryGetNodeInfluencedable(currentNode.unitPool[5]))
+                   {
+                       tryGetNodeInfluencedable(currentNode.unitPool[5].unitPool[5]);
+                   }
+                   return influencePreviewPool;
+                }
+            },
+            { 150.0f, () =>
+               {
+                   if (tryGetNodeInfluencedable(currentNode.unitPool[2]))
+                   {
+                       tryGetNodeInfluencedable(currentNode.unitPool[2].unitPool[2]);
+                   }
+                   if (tryGetNodeInfluencedable(currentNode.unitPool[0]))
+                   {
+                       tryGetNodeInfluencedable(currentNode.unitPool[0].unitPool[0]);
+                   }
+                   return influencePreviewPool;
+                }
+            },
+            { 210.0f, () =>
+               {
+                   if (tryGetNodeInfluencedable(currentNode.unitPool[3]))
+                   {
+                       tryGetNodeInfluencedable(currentNode.unitPool[3].unitPool[3]);
+                   }
+                   if (tryGetNodeInfluencedable(currentNode.unitPool[1]))
+                   {
+                       tryGetNodeInfluencedable(currentNode.unitPool[1].unitPool[1]);
+                   }
+                   return influencePreviewPool;
+                }
+            },
+            { 270.0f, () =>
+               {
+                   if (tryGetNodeInfluencedable(currentNode.unitPool[4]))
+                   {
+                       tryGetNodeInfluencedable(currentNode.unitPool[4].unitPool[4]);
+                   }
+                   if (tryGetNodeInfluencedable(currentNode.unitPool[2]))
+                   {
+                       tryGetNodeInfluencedable(currentNode.unitPool[2].unitPool[2]);
+                   }
+                   return influencePreviewPool;
+                }
+            },
+            { 330.0f, () =>
+               {
+                   if (tryGetNodeInfluencedable(currentNode.unitPool[5]))
+                   {
+                       tryGetNodeInfluencedable(currentNode.unitPool[5].unitPool[5]);
+                   }
+                   if (tryGetNodeInfluencedable(currentNode.unitPool[3]))
+                   {
+                       tryGetNodeInfluencedable(currentNode.unitPool[3].unitPool[3]);
+                   }
+                   return influencePreviewPool;
+                }
+            }
+        };
+
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler5_3.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler6_1.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EffectRangeHandler6_1 : EffectRangeHandlerBase
+{
+
+    public EffectRangeHandler6_1(MapUnity currentNode, float euler)
+    {
+        influencePreviewPool.Clear();
+        influencePreviewPool.Add(currentNode);
+        angleActions = new Dictionary<float, Func<List<MapUnity>>>
+        {
+            { 30.0f, () =>
+               {
+                get6_1Node(currentNode,2);
+                return influencePreviewPool;
+               }
+            },
+            { 90.0f, () =>
+               {
+                get6_1Node(currentNode,3);
+                return influencePreviewPool;
+                }
+            },
+            { 150.0f, () =>
+               {
+                get6_1Node(currentNode,4);
+                return influencePreviewPool;
+                }
+            },
+            { 210.0f, () =>
+               {
+                get6_1Node(currentNode,5);
+                return influencePreviewPool;
+                }
+            },
+            { 270.0f, () =>
+               {
+                get6_1Node(currentNode,0);
+                return influencePreviewPool;
+               }
+            },
+            { 330.0f, () =>
+               {
+                get6_1Node(currentNode,1);
+                return influencePreviewPool;
+                }
+            }
+        };
+
+    }
+
+
+
+    private void get6_1Node(MapUnity currentNode, int angle)
+    {
+        MapUnity currentCheckNode = currentNode;
+        for (int i = 0; i < 5; i++)
+        {
+            if (tryGetNodeInfluencedable(currentCheckNode.unitPool[angle]))
+            {
+                currentCheckNode = currentCheckNode.unitPool[angle];
+            }
+            else
+            {
+                return;
+            }
+        }
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler6_1.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler6_2.cs

@@ -0,0 +1,70 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EffectRangeHandler6_2 : EffectRangeHandlerBase
+{
+
+    private ZeroToFiveCircularCounter counter=new ZeroToFiveCircularCounter();
+    public EffectRangeHandler6_2(MapUnity currentNode, float euler)
+    {
+        influencePreviewPool.Clear();
+        influencePreviewPool.Add(currentNode);
+        angleActions = new Dictionary<float, Func<List<MapUnity>>>
+        {
+            { 30.0f, () =>
+               {
+                   get6_2Node(currentNode,2);
+                   return influencePreviewPool;
+               }
+            },
+            { 90.0f, () =>
+               {
+                   get6_2Node(currentNode,3);
+                   return influencePreviewPool;
+                }
+            },
+            { 150.0f, () =>
+               {
+                   get6_2Node(currentNode,4);
+                   return influencePreviewPool;
+                }
+            },
+            { 210.0f, () =>
+               {
+                   get6_2Node(currentNode,5);
+                   return influencePreviewPool;
+                }
+            },
+            { 270.0f, () =>
+               {
+                   get6_2Node(currentNode,0);
+                   return influencePreviewPool;
+                }
+            },
+            { 330.0f, () =>
+               {
+                   get6_2Node(currentNode,1);
+                   return influencePreviewPool;
+                }
+            }
+        };
+
+    }
+
+
+    private void get6_2Node(MapUnity currentNode,int value)
+    {
+        if (tryGetNodeInfluencedable(currentNode.unitPool[counter.Subtract(value,2)]))
+        {
+            tryGetNodeInfluencedable(currentNode.unitPool[counter.Subtract(value, 2)].unitPool[value]);
+        }
+        if (tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(value,2)]))
+        {
+            tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(value, 2)].unitPool[value]);
+        }
+        tryGetNodeInfluencedable(currentNode.unitPool[value]);
+
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler6_2.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler6_3.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EffectRangeHandler6_3 : EffectRangeHandlerBase
+{
+    public EffectRangeHandler6_3(MapUnity currentNode, float euler)
+    {
+        influencePreviewPool.Clear();
+        angleActions = new Dictionary<float, Func<List<MapUnity>>>
+        {
+            { 30.0f, () =>
+               {
+                   get6_3Node(currentNode);
+                   return influencePreviewPool;
+               }
+            },
+            { 90.0f, () =>
+               {
+                   get6_3Node(currentNode);
+                   return influencePreviewPool;
+                }
+            },
+            { 150.0f, () =>
+               {
+                   get6_3Node(currentNode);
+                   return influencePreviewPool;
+                }
+            },
+            { 210.0f, () =>
+               {
+                   get6_3Node(currentNode);
+                   return influencePreviewPool;
+                }
+            },
+            { 270.0f, () =>
+               {
+                   get6_3Node(currentNode);
+                   return influencePreviewPool;
+                }
+            },
+            { 330.0f, () =>
+               {
+                   get6_3Node(currentNode);
+                   return influencePreviewPool;
+                }
+            }
+        };
+
+    }
+
+
+    private void get6_3Node(MapUnity currentNode)
+    {
+        for (int i = 0; i < 6; i++)
+        {
+            tryGetNodeInfluencedable(currentNode.unitPool[i]);
+        }
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler6_3.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler7_1.cs

@@ -0,0 +1,70 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EffectRangeHandler7_1 : EffectRangeHandlerBase
+{
+    public EffectRangeHandler7_1(MapUnity currentNode, float euler)
+    {
+        influencePreviewPool.Clear();
+        influencePreviewPool.Add(currentNode);
+        angleActions = new Dictionary<float, Func<List<MapUnity>>>
+        {
+            { 30.0f, () =>
+               {
+                get5_1Node(currentNode,2);
+                return influencePreviewPool;
+               }
+            },
+            { 90.0f, () =>
+               {
+                get5_1Node(currentNode,3);
+                return influencePreviewPool;
+                }
+            },
+            { 150.0f, () =>
+               {
+                get5_1Node(currentNode,4);
+                return influencePreviewPool;
+                }
+            },
+            { 210.0f, () =>
+               {
+                get5_1Node(currentNode,5);
+                return influencePreviewPool;
+                }
+            },
+            { 270.0f, () =>
+               {
+                get5_1Node(currentNode,0);
+                return influencePreviewPool;
+               }
+            },
+            { 330.0f, () =>
+               {
+                get5_1Node(currentNode,1);
+                return influencePreviewPool;
+                }
+            }
+        };
+
+    }
+
+
+    private void get5_1Node(MapUnity currentNode, int angle)
+    {
+        MapUnity currentCheckNode = currentNode;
+        for (int i = 0; i < 6; i++)
+        {
+            if (tryGetNodeInfluencedable(currentCheckNode.unitPool[angle]))
+            {
+                currentCheckNode = currentCheckNode.unitPool[angle];
+            }
+            else
+            {
+                return;
+            }
+        }
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler7_1.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler7_2.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EffectRangeHandler7_2 : EffectRangeHandlerBase
+{
+
+    private ZeroToFiveCircularCounter counter = new ZeroToFiveCircularCounter();
+    public EffectRangeHandler7_2(MapUnity currentNode, float euler)
+    {
+        influencePreviewPool.Clear();
+        influencePreviewPool.Add(currentNode);
+        angleActions = new Dictionary<float, Func<List<MapUnity>>>
+        {
+            { 30.0f, () =>
+               {
+                   get7_2Node(currentNode,2);
+                   return influencePreviewPool;
+               }
+            },
+            { 90.0f, () =>
+               {
+                   get7_2Node(currentNode,3);
+                   return influencePreviewPool;
+                }
+            },
+            { 150.0f, () =>
+               {
+                   get7_2Node(currentNode,4);
+                   return influencePreviewPool;
+                }
+            },
+            { 210.0f, () =>
+               {
+                   get7_2Node(currentNode,5);
+                   return influencePreviewPool;
+                }
+            },
+            { 270.0f, () =>
+               {
+                   get7_2Node(currentNode,0);
+                   return influencePreviewPool;
+                }
+            },
+            { 330.0f, () =>
+               {
+                   get7_2Node(currentNode,1);
+                   return influencePreviewPool;
+                }
+            }
+        };
+
+    }
+
+
+    private void get7_2Node(MapUnity currentNode, int value)
+    {
+        if (tryGetNodeInfluencedable(currentNode.unitPool[counter.Subtract(value, 1)]))
+        {
+            tryGetNodeInfluencedable(currentNode.unitPool[counter.Subtract(value, 1)].unitPool[value]);
+        }
+        if (tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(value, 1)]))
+        {
+            tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(value, 1)].unitPool[value]);
+        }
+        getongNode(currentNode, value);
+
+    }
+
+
+    private void getongNode(MapUnity currentNode, int angle)
+    {
+        MapUnity currentCheckNode = currentNode;
+        for (int i = 0; i < 2; i++)
+        {
+            if (tryGetNodeInfluencedable(currentCheckNode.unitPool[angle]))
+            {
+                currentCheckNode = currentCheckNode.unitPool[angle];
+            }
+            else
+            {
+                return;
+            }
+        }
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler7_2.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler8_1.cs

@@ -0,0 +1,132 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EffectRangeHandler8_1 : EffectRangeHandler
+{
+    // Start is called before the first frame update
+    public float Epsilon { get; } = 1.00f;
+
+    private float euler;
+
+    private MapUnity currentNode;
+
+    public List<MapUnity> influencePreviewPool = new List<MapUnity>();//卡牌的影响范围
+
+    private readonly Dictionary<float, Func<List<MapUnity>>> angleActions;
+
+    private ZeroToFiveCircularCounter counter = new ZeroToFiveCircularCounter();
+    public EffectRangeHandler8_1(MapUnity currentNode, float euler)
+    {
+        influencePreviewPool.Clear();
+        this.currentNode = currentNode;
+        this.euler = euler;
+        influencePreviewPool.Add(currentNode);
+        angleActions = new Dictionary<float, Func<List<MapUnity>>>
+        {
+            { 30.0f, () =>
+               {
+                   ge8_1Node(currentNode,2);
+                   return influencePreviewPool;
+               }
+            },
+            { 90.0f, () =>
+               {
+                   ge8_1Node(currentNode,3);
+                   return influencePreviewPool;
+                }
+            },
+            { 150.0f, () =>
+               {
+                   ge8_1Node(currentNode,4);
+                   return influencePreviewPool;
+                }
+            },
+            { 210.0f, () =>
+               {
+                   ge8_1Node(currentNode,5);
+                   return influencePreviewPool;
+                }
+            },
+            { 270.0f, () =>
+               {
+                   ge8_1Node(currentNode,0);
+                   return influencePreviewPool;
+                }
+            },
+            { 330.0f, () =>
+               {
+                   ge8_1Node(currentNode,1);
+                   return influencePreviewPool;
+                }
+            }
+        };
+
+    }
+
+
+    public List<MapUnity> HandleAngleWithResult(float angle)
+    {
+        foreach (var kvp in angleActions)
+        {
+            if (Math.Abs(angle - kvp.Key) < Epsilon)
+            {
+                return kvp.Value();
+            }
+        }
+        return influencePreviewPool;
+    }
+
+    public bool tryGetNodeInfluencedable(MapUnity currentNode)
+    {
+        bool canPass = true;
+        if (currentNode == null)
+        {
+            canPass = false;
+            return canPass;
+        }
+        //Debug.Log("坐标X"+currentNode.locationX+ "坐标Y" + currentNode.locationY);
+        if (currentNode.TryGetComponent<EnemyNode>(out EnemyNode enemyNode))
+        {
+            Debug.Log("JJKK");
+            if (enemyNode.enemyType == EnemyNode.EnemyType.block)
+            {
+                Debug.Log("AABB");
+                canPass = false;
+                influencePreviewPool.Add(currentNode);
+            }
+            Debug.Log("DDFF");
+        }
+        
+        if (canPass)
+        {
+            influencePreviewPool.Add(currentNode);
+        }
+        return canPass;
+    }
+
+    private void ge8_1Node(MapUnity currentNode, int value)
+    {
+        try
+        {
+         
+            tryGetNodeInfluencedable(currentNode.unitPool[counter.Subtract(value, 2)]);
+            tryGetNodeInfluencedable(currentNode.unitPool[counter.Subtract(value, 2)].unitPool[counter.Subtract(value, 2)]);
+            tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(value, 2)]);
+            tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(value, 2)].unitPool[counter.Add(value, 2)]);
+            tryGetNodeInfluencedable(currentNode.unitPool[value]);
+            tryGetNodeInfluencedable(currentNode.unitPool[counter.Subtract(value, 1)]);
+            tryGetNodeInfluencedable(currentNode.unitPool[value].unitPool[counter.Subtract(value, 2)].unitPool[counter.Subtract(value, 2)]);
+            tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(value, 1)]);
+            tryGetNodeInfluencedable(currentNode.unitPool[value].unitPool[counter.Add(value, 2)].unitPool[counter.Add(value, 2)]);
+        }
+        catch (Exception ex)
+        {
+            //nothing to do
+        }
+
+
+    }
+
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler8_1.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler8_2.cs

@@ -0,0 +1,118 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using TreeEditor;
+using UnityEditor.Experimental.GraphView;
+using UnityEngine;
+
+public class EffectRangeHandler8_2 : EffectRangeHandlerBase
+{
+
+    public EffectRangeHandler8_2(MapUnity currentNode, float euler)
+    {
+        influencePreviewPool.Clear();
+        angleActions = new Dictionary<float, Func<List<MapUnity>>>
+        {
+            { 30.0f, () =>
+               {
+                   get8_2Node(currentNode,influencePreviewPool);
+                   return influencePreviewPool;
+               }
+            },
+            { 90.0f, () =>
+               {
+                   get8_2Node(currentNode,influencePreviewPool);
+                   return influencePreviewPool;
+                }
+            },
+            { 150.0f, () =>
+               {
+                   get8_2Node(currentNode,influencePreviewPool);
+                   return influencePreviewPool;
+                }
+            },
+            { 210.0f, () =>
+               {
+                   get8_2Node(currentNode,influencePreviewPool);
+                   return influencePreviewPool;
+                }
+            },
+            { 270.0f, () =>
+               {
+                   get8_2Node(currentNode,influencePreviewPool);
+                   return influencePreviewPool;
+                }
+            },
+            { 330.0f, () =>
+               {
+                   get8_2Node(currentNode,influencePreviewPool);
+                   return influencePreviewPool;
+                }
+            }
+        };
+
+    }
+
+
+    public  bool tryGetNodeInfluencedableList(MapUnity node,List<MapUnity> nodeList)
+    {
+        bool canPass = true; 
+        if (node == null)
+        {
+            canPass = false;
+            return canPass;
+        }
+        Debug.Log("坐标X" + node.locationX + "坐标Y" + node.locationY);
+        if (node.TryGetComponent<EnemyNode>(out EnemyNode enemyNode))
+        {
+            Debug.Log("JJKK");
+            if (enemyNode.enemyType == EnemyNode.EnemyType.block)
+            {
+                Debug.Log("AABB");
+                canPass = false;
+                nodeList.Add(node);
+            }
+            Debug.Log("DDFF");
+        }
+
+        if (canPass)
+        {
+            nodeList.Add(node);
+        }
+        return canPass;
+    }
+
+
+    private void get8_2Node(MapUnity node, List<MapUnity> influencePreviewPool)
+    {
+        influencePreviewPool.Add(node);
+        getNearbyNode(influencePreviewPool);
+        getNearbyNode(influencePreviewPool);
+        getNearbyNode(influencePreviewPool);
+        while (influencePreviewPool.Contains(node))
+        {
+            influencePreviewPool.Remove(node);
+        }
+    }
+
+    public void getNearbyNode(List<MapUnity> nodeList)
+    {
+        // 创建一个副本以避免遍历时修改原集合
+        List<MapUnity> nodesCopy = new List<MapUnity>(nodeList);
+        List<MapUnity> nodesToAdd = new List<MapUnity>(); // 临时列表存储要添加的节点
+
+        foreach (var node in nodesCopy)
+        {
+            for (int i = 0; i < 6; i++)
+            {
+                tryGetNodeInfluencedableList(node.unitPool[i], nodesToAdd);
+            }
+        }
+
+        // 遍历完成后统一修改原集合
+        nodeList.AddRange(nodesToAdd);
+
+    }
+
+
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler8_2.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandlerBase.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public  class EffectRangeHandlerBase : EffectRangeHandler
+{
+    public List<MapUnity> influencePreviewPool = new List<MapUnity>();//卡牌的影响范围
+
+    public Dictionary<float, Func<List<MapUnity>>> angleActions;
+
+    public float Epsilon { get; } = 1.00f;
+    public bool tryGetNodeInfluencedable(MapUnity currentNode) 
+    {
+        bool canPass = true;
+        if (currentNode == null)
+        {
+            canPass = false;
+            return canPass;
+        }
+        if (currentNode.TryGetComponent<EnemyNode>(out EnemyNode enemyNode))
+        {
+            Debug.Log("JJKK");
+            if (enemyNode.enemyType == EnemyNode.EnemyType.block)
+            {
+                Debug.Log("AABB");
+                canPass = false;
+                influencePreviewPool.Add(currentNode);
+            }
+            Debug.Log("DDFF");
+        }
+
+        if (canPass)
+        {
+            influencePreviewPool.Add(currentNode);
+        }
+        return canPass;
+    }
+
+    public List<MapUnity> HandleAngleWithResult(float angle)
+    {
+        Debug.Log("角度大小" + angle);
+        foreach (var kvp in angleActions)
+        {
+            if (Math.Abs(angle - kvp.Key) < Epsilon)
+            {
+                return kvp.Value();
+            }
+        }
+        Debug.Log("数组大小" + influencePreviewPool.Count);
+        return influencePreviewPool;
+    }
+
+
+
+
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandlerBase.cs.meta

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

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

@@ -0,0 +1,43 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EffectRange 
+{
+
+    public const string range1 = "1";
+
+    public const string range2 = "2";
+
+    public const string range3_1 = "3_1";
+
+    public const string range3_2 = "3_2";
+
+    public const string range3_3 = "3_3";
+
+    public const string range4_1 = "4_1";
+
+    public const string range4_2 = "4_2";
+
+    public const string range4_3 = "4_3";
+
+    public const string range5_1 = "5_1";
+
+    public const string range5_2 = "5_2";
+
+    public const string range5_3 = "5_3";
+
+    public const string range6_1 = "6_1";
+
+    public const string range6_2 = "6_2";
+
+    public const string range6_3 = "6_3";
+
+    public const string range7_1 = "7_1";
+
+    public const string range7_2 = "7_2";
+
+    public const string range8_1 = "8_1";
+
+    public const string range8_2 = "8_2";
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/EffectRange.cs.meta

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

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

@@ -0,0 +1,29 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ZeroToFiveCircularCounter 
+{
+    private const int MinValue = 0;
+    private const int MaxValue = 5;
+
+    public int Add(int currentValue, int increment)
+    {
+        int newValue = (currentValue + increment) % (MaxValue + 1);
+        if (newValue < MinValue)
+        {
+            newValue += (MaxValue + 1);
+        }
+        return newValue;
+    }
+
+    public int Subtract(int currentValue, int decrement)
+    {
+        int newValue = (currentValue - decrement) % (MaxValue + 1);
+        if (newValue < MinValue)
+        {
+            newValue += (MaxValue + 1);
+        }
+        return newValue;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/ZeroToFiveCircularCounter.cs.meta

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

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

@@ -0,0 +1,27 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class getNodeTools 
+{
+    public bool tryGetNodeInfluencedable(MapUnity currentNode,List<MapUnity> nodeList)
+    {
+        bool canPass = true;
+        if (currentNode == null)
+        {
+            canPass = false;
+        }
+        else if (currentNode.blocked)
+        {
+            canPass = false;
+        }
+        if (canPass)
+        {
+            nodeList.Add(currentNode);
+        }
+
+        return canPass;
+    }
+
+
+}

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

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

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

@@ -12,18 +12,36 @@ public class DestructionManager : Singleton<DestructionManager>
             TurnMaster.Instance.usedCard.usedCardList.Add(target.GetComponent<CardEntity>().CardId);
         }
         Destroy(target);
-        Debug.Log("˝řČëĹĹĐň");
-        StartCoroutine(TurnMaster.Instance.MoveCards());
-        yield return new WaitForEndOfFrame();
-        Debug.Log("˝řČ뿨ĹĆ˝áËă");
-        StartCoroutine(SettlementManager.Instance.settle(cardOriginalData, influencePreviewPool, cardIndex));
-        Debug.Log("˝áĘř");
+        yield return null;
+        yield return StartCoroutine(TurnMaster.Instance.MoveCards());
+        //遍历影响池变色
+        for (int i = 0; i < influencePreviewPool.Count; i++)
+        {
+            influencePreviewPool[i].influenced = false;
+        }
+        GameManager.Instance.SyncColourCountUI();
+        //遍历范围预览池消除影响色
+        Debug.Log("清除前红色格数:" + GameManager.Instance.player.influencePreviewPool.Count);
+        for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++)
+        {
+            GameManager.Instance.player.influencePreviewPool[i].influenced = false;
+        }
+        GameManager.Instance.player.influencePreviewPool.Clear();
+
+        //GetComponent<CanvasGroup>().blocksRaycasts = true;
+
+        //其他位置都归位
+        /*transform.SetParent(originalParent);
+        transform.localPosition = originalpoint;*/
+        yield return StartCoroutine(SettlementManager.Instance.settle(cardOriginalData, influencePreviewPool, cardIndex));
+        Debug.Log("执行结束1");
 
     }
 
-    public void startDestoryAndUseCard(GameObject target, CardOriginalData cardOriginalData, List<MapUnity> influencePreviewPool, int cardIndex)
+    public IEnumerator startDestoryAndUseCard(GameObject target, CardOriginalData cardOriginalData, List<MapUnity> influencePreviewPool, int cardIndex)
     {
-        StartCoroutine(destoryAndUseCard(target, cardOriginalData, influencePreviewPool, cardIndex));
+        yield return StartCoroutine(destoryAndUseCard(target, cardOriginalData, influencePreviewPool, cardIndex));
+        Debug.Log("执行结束2");
     }
 
 

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

@@ -10,7 +10,7 @@ public class SettlementManager : Singleton<SettlementManager>
 
     public IEnumerator settle(CardOriginalData cardOriginalData, List<MapUnity> influencePreviewPool, int cardIndex)
     {
-
+        bool canAdv = GameManager.Instance.SyncColourCountUI();
         for (int i = 0; i < cardOriginalData.Function.Length; i++)
         {
             switch (cardOriginalData.Function[i])
@@ -51,8 +51,50 @@ public class SettlementManager : Singleton<SettlementManager>
             //yield return  StartCoroutine(TurnMaster.Instance.MoveCards());
 
         }
-        TurnMaster.Instance.currentCost -= cardOriginalData.Cost;
-        Debug.Log("½áÊø½áËã");
+        //ÓÅÊÆ
+        if (canAdv)
+        {
+            for (int i = 0; i < cardOriginalData.AdvantageFunction.Length; i++)
+            {
+                switch (cardOriginalData.AdvantageFunction[i])
+                {
+                    case CardFunction.cardDamage:
+                        damageWork(int.Parse(cardOriginalData.AdvantageFunctionVal[i]), influencePreviewPool);
+                        break;
+                    case CardFunction.cardShield:
+                        Usermanager.Instance.Shield = Usermanager.Instance.Shield + int.Parse(cardOriginalData.AdvantageFunctionVal[i]);
+                        break;
+                    case CardFunction.posion:
+                    case CardFunction.weak:
+                    case CardFunction.coma:
+                    case CardFunction.disarm:
+                    case CardFunction.sleep:
+                    case CardFunction.bleed:
+                    case CardFunction.thorn:
+                        abnormalConditionWork(cardOriginalData.AdvantageFunction[i], int.Parse(cardOriginalData.AdvantageFunctionVal[i]), influencePreviewPool);
+                        break;
+                    case CardFunction.costRestore:
+                        TurnMaster.Instance.currentCost += int.Parse(cardOriginalData.AdvantageFunctionVal[i]);
+                        break;
+                    case CardFunction.dyeing:
+                        dyeingWork(influencePreviewPool);
+                        break;
+                    case CardFunction.discard:
+                        yield return StartCoroutine(TurnMaster.Instance.randomDiscard(int.Parse(cardOriginalData.AdvantageFunctionVal[i])));
+                        yield return StartCoroutine(TurnMaster.Instance.MoveCards());
+                        break;
+                    case CardFunction.drawCard:
+                        TurnMaster.Instance.drawCards(int.Parse(cardOriginalData.AdvantageFunctionVal[i]));
+                        yield return StartCoroutine(TurnMaster.Instance.MoveCards());
+                        break;
+
+                }
+
+            }
+            TurnMaster.Instance.currentCost -= cardOriginalData.Cost;
+            
+        }
+        Debug.Log("»¤¶ÜÁ¿:" + Usermanager.Instance.Shield);
 
 
     }
@@ -73,7 +115,6 @@ public class SettlementManager : Singleton<SettlementManager>
     //Ⱦɫ
     private void dyeingWork(List<MapUnity> influencePreviewPool)
     {
-        Debug.Log(influencePreviewPool.Count);
         for (int i = 0; i < influencePreviewPool.Count; i++)
         {
             influencePreviewPool[i].whoColour = MapUnity.WhoColour.playerColour;

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

@@ -1,3 +1,3 @@
 ID,名称,费用,稀有度,功能,数值,施法范围,作用范围,消耗,优势功能,数值,卡牌类型,文本描述,图片路径
-10001,打击,0,1,12;13,3;3,0,0,1,0,0,1,,PlayerIcon
-10002,治疗,2,2,2,2,0,0,0,0,0,1,,
+10001,打击,0,1,1;14,1;0,2,6_1,0,2,100,1,,PlayerIcon
+10002,治疗,2,2,1,2,0,0,0,0,0,1,,