拖拽方法重构

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01.prefab

@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 1565126094104225739}
   m_Layer: 5
   m_Name: CardInforPanel
-  m_TagString: Untagged
+  m_TagString: Card
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -62,9 +62,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.392}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
+  m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -91,7 +91,7 @@ GameObject:
   - component: {fileID: 2236789563960399494}
   m_Layer: 5
   m_Name: CostText
-  m_TagString: Untagged
+  m_TagString: Card
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -137,9 +137,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
+  m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -264,7 +264,7 @@ GameObject:
   - component: {fileID: 1180069698942511928}
   m_Layer: 5
   m_Name: CostPanel
-  m_TagString: Untagged
+  m_TagString: Card
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -311,9 +311,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.27735847, g: 0.62061316, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
+  m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -340,7 +340,7 @@ GameObject:
   - component: {fileID: 2257759688655818602}
   m_Layer: 5
   m_Name: CardDescription
-  m_TagString: Untagged
+  m_TagString: Card
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -386,9 +386,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0, g: 0, b: 0, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
+  m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -419,7 +419,7 @@ GameObject:
   - component: {fileID: 5399218162963011116}
   m_Layer: 5
   m_Name: CardIcon
-  m_TagString: Untagged
+  m_TagString: Card
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -465,9 +465,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
+  m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -494,7 +494,7 @@ GameObject:
   - component: {fileID: 3365837530254898956}
   m_Layer: 5
   m_Name: SendRangPanel
-  m_TagString: Untagged
+  m_TagString: Card
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -541,9 +541,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.27735847, g: 0.62061316, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
+  m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -570,7 +570,7 @@ GameObject:
   - component: {fileID: 5281579542142419986}
   m_Layer: 5
   m_Name: CardName
-  m_TagString: Untagged
+  m_TagString: Card
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -616,9 +616,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0, g: 0, b: 0, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
+  m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -649,7 +649,7 @@ GameObject:
   - component: {fileID: 4490349531895466009}
   m_Layer: 5
   m_Name: ColourPanel
-  m_TagString: Untagged
+  m_TagString: Card
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -695,9 +695,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.38170218, g: 0.8867924, b: 0.33296537, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
+  m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -724,7 +724,7 @@ GameObject:
   - component: {fileID: 4647445150556690847}
   m_Layer: 5
   m_Name: CardLevel
-  m_TagString: Untagged
+  m_TagString: Card
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -771,9 +771,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.26553154, g: 0, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
+  m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -804,7 +804,7 @@ GameObject:
   - component: {fileID: 1131717685372222914}
   m_Layer: 5
   m_Name: Card_v01
-  m_TagString: Untagged
+  m_TagString: Card
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -934,14 +934,14 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9878eb734a9bb9e448c1a125b1e863e6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  text: {fileID: 2257759688655818602}
   cardId: 0
   originalParent: {fileID: 0}
   originalpoint: {x: 0, y: 0, z: 0}
-  eventSystem: {fileID: 0}
   ainPanle: {fileID: 1075869202937435496}
   currentNode: {fileID: 0}
   influencePreviewPool: []
+  dragState: 3
+  eventSystem: {fileID: 0}
 --- !u!1 &4245510081586536158
 GameObject:
   m_ObjectHideFlags: 0
@@ -955,7 +955,7 @@ GameObject:
   - component: {fileID: 5213765599758791271}
   m_Layer: 5
   m_Name: SendRangText
-  m_TagString: Untagged
+  m_TagString: Card
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1001,9 +1001,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
+  m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -1034,7 +1034,7 @@ GameObject:
   - component: {fileID: 4836343695955167576}
   m_Layer: 5
   m_Name: cardPanel
-  m_TagString: Untagged
+  m_TagString: Card
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1082,9 +1082,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.392}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
+  m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -1111,7 +1111,7 @@ GameObject:
   - component: {fileID: 2659509785439315043}
   m_Layer: 5
   m_Name: EffectRangText
-  m_TagString: Untagged
+  m_TagString: Card
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1157,9 +1157,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
+  m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -1190,7 +1190,7 @@ GameObject:
   - component: {fileID: 8869970537182491076}
   m_Layer: 5
   m_Name: EffectRangPanel
-  m_TagString: Untagged
+  m_TagString: Card
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1237,9 +1237,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.27735847, g: 0.62061316, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
+  m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -1266,7 +1266,7 @@ GameObject:
   - component: {fileID: 8175548824584654300}
   m_Layer: 5
   m_Name: CardLevel (1)
-  m_TagString: Untagged
+  m_TagString: Card
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1312,9 +1312,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.5475473, g: 0.3830188, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
+  m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []

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

@@ -24,7 +24,7 @@ public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDr
     [Header("拖拽参数")]
     public Transform originalParent;
     public Vector3 originalpoint;
-    public EventSystem eventSystem;
+    
     bool canUse=true;//决定卡牌是否可以释放
     bool choosed;//标识卡牌是否被选中
 
@@ -35,10 +35,24 @@ public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDr
     public MapUnity currentNode;//瞄准的格子
     public List<MapUnity> influencePreviewPool;//卡牌的影响范围
 
+    [Header("卡牌拖拽状态")]
+    public CardDragState dragState; 
+    public enum CardDragState
+    {
+        onBeginDrag,
+        onDrag,
+        onEndDrag,
+        noDrag
+    }
+    public EventSystem eventSystem;
+    PointerEventData eventData ;
+    List<RaycastResult> result = new List<RaycastResult>();
+
     public void Start()
     {
         //cardData = GetComponent<CardOriginalData>();
         eventSystem = GameObject.FindObjectOfType<EventSystem>();
+        eventData = new PointerEventData(eventSystem);
     }
     private void Update()
     {
@@ -46,6 +60,7 @@ public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDr
         if (choosed && Mouse.current.rightButton.wasPressedThisFrame)
         {
             Debug.Log("1");
+            dragState = CardDragState.noDrag;
             canUse = false;//取消释放
             ainPanle.SetActive(false);
             //遍历范围预览池消除影响色
@@ -68,6 +83,59 @@ public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDr
             GetComponent<CanvasGroup>().blocksRaycasts = true;
             return;
         }
+
+        if(dragState !=  CardDragState.noDrag && dragState != CardDragState.onDrag )
+        {
+            //UI射线检测
+            
+            eventData.position = Mouse.current.position.value;
+
+            eventSystem.RaycastAll(eventData, result);
+            if (result .Count >0)
+            {
+                Debug.Log(result[0].gameObject.name);
+            }
+        }
+
+
+        switch (dragState )
+        {
+            case CardDragState.onBeginDrag:
+                TurnMaster.Instance.playerAction = TurnMaster.PlayerAction.useCard;
+                CardChoose(eventData);
+                dragState = CardDragState.onDrag;
+                break;
+            case CardDragState.onDrag:
+                CardFollow();
+                if (Mouse.current.leftButton.wasReleasedThisFrame)
+                {
+                   dragState = CardDragState.onEndDrag;
+                }
+                break;
+            case CardDragState.onEndDrag:
+                TurnMaster.Instance.playerAction = TurnMaster.PlayerAction.none;
+                CardUse();           
+                break;
+            case CardDragState.noDrag:
+                if (Mouse.current.leftButton.wasReleasedThisFrame)
+                {
+                    eventData.position = Mouse.current.position.value;
+
+                    eventSystem.RaycastAll(eventData, result);
+                    if (result.Count > 0)
+                    {
+                        Debug.Log(result[0].gameObject.name);
+                        if(result[0].gameObject ==this .gameObject)
+                        {
+                            dragState = CardDragState.onBeginDrag;
+                        }
+                    }
+                    
+                    
+                }
+                break;
+        }
+
     }
 
     public void createCard(int cardId)
@@ -175,63 +243,22 @@ public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDr
 
     public void OnBeginDrag(PointerEventData eventData)
     {
-        // if (GameObject.Find("CardPanel") != null)
+        dragState = CardDragState.onBeginDrag;
-        //     graphicRaycaster = GameObject.Find("CardPanel").GetComponent<GraphicRaycaster>();
-        choosed = true;
-
-        GetComponent<CanvasGroup>().blocksRaycasts = false;
-
-        originalParent = this.gameObject.transform.parent;
-        originalpoint = this.transform.localPosition;
-
-        transform.SetParent(transform.parent.parent);
-        transform.position = eventData.position;
-
-        //根据卡牌数据决定是否调用曲线
-        if (cardOriginalData.CastingRange != 0)
-        {
-            //释放范围为0则不需要调用曲线
-            ainPanle.SetActive(true);
-        }
-        else
-        {
-            ainPanle.SetActive(false);
-        }
-
-
-
-
-        //todo-统一确定锚点位置
-
-        //重新调用范围预览--以后要写到卡牌效果里，现在默认影响1格
-        //GameManager.Instance.player.StepPreviewInfluencedNode(1);
     }
 
     public void OnDrag(PointerEventData eventData)
     {
        
-        if (cardOriginalData.CastingRange != 0)
-        {
-            ainPanleWork(eventData);
-        }
-        else
-        {
-            //没有范围不需要射线吧，因为不需要指定目标点？
-           // noAinPanleWork(eventData);
-        }
-        dyeing();
-
     }
 
-    private void ainPanleWork(PointerEventData eventData)
+    private void ainPanleWork()
     {
         //射线检测瞄准的地图节点，判断是否可放置和改变放置影响区
         Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value);
-        if (eventData.pointerCurrentRaycast.gameObject != null)
+       
-        {
             if (Physics.Raycast(ray, out RaycastHit raycastHit))
             {
-                // Debug.Log(raycastHit.collider.gameObject.name);
+                 Debug.Log(raycastHit.collider.gameObject.name);
                 //检测到跟上次瞄准地方不同，更新
                 if (currentNode == null || raycastHit.collider.transform.gameObject != currentNode.gameObject)
                 {
@@ -303,7 +330,7 @@ public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDr
 
                 }
             }
-        }
+        
         Debug.Log("结束影响数值" + influencePreviewPool.Count);
     }
 
@@ -323,20 +350,76 @@ public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDr
 
 
     public void OnEndDrag(PointerEventData eventData)
+    {
+       
+    }
+
+    //卡片动作
+    //开始选中
+   public void CardChoose(PointerEventData eventData)
+   {
+        // if (GameObject.Find("CardPanel") != null)
+        //     graphicRaycaster = GameObject.Find("CardPanel").GetComponent<GraphicRaycaster>();
+        choosed = true;
+
+        GetComponent<CanvasGroup>().blocksRaycasts = false;
+
+        originalParent = this.gameObject.transform.parent;
+        originalpoint = this.transform.localPosition;
+
+        transform.SetParent(transform.parent.parent);
+        transform.position = eventData.position;
+
+        //根据卡牌数据决定是否调用曲线
+        if (cardOriginalData.CastingRange != 0)
+        {
+            //释放范围为0则不需要调用曲线
+            ainPanle.SetActive(true);
+        }
+        else
+        {
+            ainPanle.SetActive(false);
+        }
+
+
+
+
+        //todo-统一确定锚点位置
+
+        //重新调用范围预览--以后要写到卡牌效果里，现在默认影响1格
+        //GameManager.Instance.player.StepPreviewInfluencedNode(1);
+    }
+
+    //拖拽中
+    public void CardFollow()
+    {
+        if (cardOriginalData.CastingRange != 0)
+        {
+            ainPanleWork();
+        }
+        else
+        {
+            //没有范围不需要射线吧，因为不需要指定目标点？
+            // noAinPanleWork(eventData);
+        }
+        dyeing();
+    }
+
+    //卡牌释放
+    public void CardUse()
     {
         choosed = false;
-        if(canUse )
+        if (canUse)
         {
             Debug.Log("进入影响数值" + influencePreviewPool.Count);
-            if (eventData.pointerCurrentRaycast.gameObject != null)
+            if (result .Count >0)
             {
-                if (eventData.pointerCurrentRaycast.gameObject.name == "Card")
+                if (result[0].gameObject.tag == "Card")
                 {
-                    transform.SetParent(eventData.pointerCurrentRaycast.gameObject.transform.parent);
+                    choosed = true;
-                    transform.position = eventData.pointerCurrentRaycast.gameObject.transform.position;
+                    dragState = CardDragState.onDrag;
-                    eventData.pointerCurrentRaycast.gameObject.transform.position = originalParent.position;
+                    TurnMaster.Instance.playerAction = TurnMaster.PlayerAction.useCard;
-                    eventData.pointerCurrentRaycast.gameObject.transform.SetParent(originalParent);
+                    /*
-
                     GetComponent<CanvasGroup>().blocksRaycasts = true;
 
                     ainPanle.SetActive(false);//关闭贝塞尔曲线
@@ -346,13 +429,17 @@ public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDr
                         GameManager.Instance.player.influencePreviewPool[i].influenced = false;
                     }
                     //GameManager.Instance.player.influencePreviewPool.Clear();
-
+                    */
                     return;
                 }
-                else if (eventData.pointerCurrentRaycast.gameObject.name == "cardSlot")
+                else if (result[0].gameObject.name == "cardSlot")
                 {
-                    transform.SetParent(eventData.pointerCurrentRaycast.gameObject.transform);
+                    choosed = true;
-                    transform.position = eventData.pointerCurrentRaycast.gameObject.transform.position;
+                    dragState = CardDragState.onDrag;
+                    TurnMaster.Instance.playerAction = TurnMaster.PlayerAction.useCard;
+                    /*
+                    transform.SetParent(result[0].gameObject.transform);
+                    transform.position = result [0].gameObject.transform.position;
                     GetComponent<CanvasGroup>().blocksRaycasts = true;
 
                     ainPanle.SetActive(false);//关闭贝塞尔曲线
@@ -362,7 +449,7 @@ public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDr
                         GameManager.Instance.player.influencePreviewPool[i].influenced = false;
                     }
                     //GameManager.Instance.player.influencePreviewPool.Clear();
-
+                    */
                     return;
                 }
             }
@@ -434,4 +521,5 @@ public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDr
             canUse = true;
         }
     }
+
 }

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

@@ -22,6 +22,15 @@ public class TurnMaster : Singleton<TurnMaster>
         enemyTurn
     };
     public Turn turn = Turn.playerTurnBegin;
+    [Header("角色动作")]
+    public PlayerAction playerAction;
+    public enum PlayerAction
+    {
+        none,
+        useCard,
+        move
+        
+    }
 
     private void Update()
     {

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

@@ -26,7 +26,7 @@ public class Player : MonoBehaviour
     }
     public void Update()
     {
-        if(Mouse .current .leftButton .wasPressedThisFrame )
+        if(Mouse .current .leftButton .wasPressedThisFrame && TurnMaster .Instance .playerAction !=TurnMaster.PlayerAction.useCard)
         {
             if(GameManager.Instance.playerState.currentStepRange>0)
             {

ColorlessWorld-2024-4-2/Library/StateCache/PrefabStageHierarchy/a7/a75fe03092d64491ac9a6b1ccc9d7e62.json

@@ -1 +1 @@
-{"m_ScrollY":0.0,"m_ExpandedPrefabGameObjectFileIDs":[3410471369990512392,55742390230665598],"m_LastClickedFileID":1321165852577465730}
+{"m_ScrollY":0.0,"m_ExpandedPrefabGameObjectFileIDs":[3410471369990512392,55742390230665598,5461942460596251060,2649362224241662458,1267054625817446498,1959932590596737920,6592263620250946689],"m_LastClickedFileID":55742390230665598}

ColorlessWorld-2024-4-2/Library/StateCache/SceneView/0c/0c613fc99160ece9fd5877ef0deee8b4.json

@@ -1 +1 @@
-{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":false,"pivot":{"x":979.000244140625,"y":531.0423583984375,"z":3.101348876953125},"rotation":{"x":0.1835920661687851,"y":0.08833619207143784,"z":-0.016603335738182069,"w":0.9789247512817383},"size":148.25701904296876,"orthographic":false}
+{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":false,"pivot":{"x":905.0,"y":447.5,"z":0.0},"rotation":{"x":0.1835920661687851,"y":0.08833619207143784,"z":-0.016603335738182069,"w":0.9789247512817383},"size":31.819805145263673,"orthographic":false}

ColorlessWorld-2024-4-2/Library/StateCache/SceneView/8c/8cd7c613bf844de3b80696e27a479d5e.json

@@ -1 +1 @@
-{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":false,"pivot":{"x":21.34392738342285,"y":1.3062845468521119,"z":5.773749351501465},"rotation":{"x":0.44551941752433779,"y":0.05358051136136055,"z":-0.026990743353962899,"w":0.8934251070022583},"size":1.4953428506851197,"orthographic":false}
+{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":false,"pivot":{"x":924.423095703125,"y":460.50701904296877,"z":276.7962951660156},"rotation":{"x":0.20789718627929688,"y":-0.000028618271244340576,"z":-0.00023815271561034024,"w":0.9783020615577698},"size":1101.45361328125,"orthographic":false}

ColorlessWorld-2024-4-2/Library/UIElements/EditorWindows/UnityEditor.InspectorWindow.pref

@@ -213,6 +213,7 @@ MonoBehaviour:
   - '{}'
   - '{}'
   - '{}'
+  - '{"m_ShowAlternatingRowBackgrounds":0,"serializedVirtualizationData":{"scrollOffset":{"x":0.0,"y":0.0},"firstVisibleIndex":0,"contentPadding":0.0,"contentHeight":0.0,"anchoredItemIndex":0,"anchorOffset":0.0}}'
   - '{}'
   - '{}'
   - '{}'
@@ -228,7 +229,6 @@ MonoBehaviour:
   - '{}'
   - '{}'
   - '{}'
-  - '{"m_ShowAlternatingRowBackgrounds":0,"serializedVirtualizationData":{"scrollOffset":{"x":0.0,"y":0.0},"firstVisibleIndex":0,"contentPadding":0.0,"contentHeight":0.0,"anchoredItemIndex":-1,"anchorOffset":0.0}}'
   - '{}'
   - '{}'
   - '{}'

ColorlessWorld-2024-4-2/Library/ilpp.pid

@@ -1 +1 @@
-1244
+10048

ColorlessWorld-2024-4-2/ProjectSettings/TagManager.asset

@@ -5,6 +5,7 @@ TagManager:
   serializedVersion: 2
   tags:
   - Enemy
+  - Card
   layers:
   - Default
   - TransparentFX

ColorlessWorld-2024-4-2/UserSettings/Layouts/default-2022.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 1459.2001
     height: 806.4
   m_ShowMode: 4
-  m_Title: "\u9879\u76EE"
+  m_Title: "\u5C42\u7EA7"
   m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 321}
   m_MaxSize: {x: 10000, y: 10000}
@@ -119,7 +119,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 10271
+  controlID: 118
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -144,7 +144,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 10309
+  controlID: 50
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -169,7 +169,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 10310
+  controlID: 51
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -206,7 +206,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_Name: SceneView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -217,12 +217,12 @@ MonoBehaviour:
     height: 476.8
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 12}
+  m_ActualView: {fileID: 14}
   m_Panes:
   - {fileID: 14}
   - {fileID: 12}
-  m_Selected: 1
+  m_Selected: 0
-  m_LastSelected: 0
+  m_LastSelected: 1
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -233,7 +233,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: ConsoleWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -242,14 +242,14 @@ MonoBehaviour:
     y: 476.8
     width: 1110.4
     height: 279.60004
-  m_MinSize: {x: 231, y: 271}
+  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 10001, y: 10021}
+  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 15}
   - {fileID: 16}
-  m_Selected: 0
+  m_Selected: 1
-  m_LastSelected: 1
+  m_LastSelected: 0
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -269,8 +269,8 @@ MonoBehaviour:
     y: 0
     width: 348.79993
     height: 756.4
-  m_MinSize: {x: 276, y: 71}
+  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 17}
@@ -344,7 +344,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
+    m_EnableMouseInput: 0
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -413,23 +413,23 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
+      m_SelectedIDs: d26d0000
-      m_LastClickedID: 0
+      m_LastClickedID: 28114
-      m_ExpandedIDs: ec9bfcff2afbffff6c6c00000a6f0000266f0000
+      m_ExpandedIDs: 2afbffffd66b0000de6b0000a06c0000a06d0000d86d00005c6e00002e6f0000506f0000846f0000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: 
+        m_Name: ColourPanel
-        m_OriginalName: 
+        m_OriginalName: ColourPanel
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 0
+        m_UserData: 58424
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 0
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 8}
       m_SearchString: 
@@ -783,9 +783,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 21.343927, y: 1.3062845, z: 5.7737494}
+    m_Target: {x: 924.4231, y: 460.50702, z: 276.7963}
     speed: 2
-    m_Value: {x: 21.343927, y: 1.3062845, z: 5.7737494}
+    m_Value: {x: 924.4231, y: 460.50702, z: 276.7963}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -831,13 +831,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.44551942, y: 0.05358051, z: -0.026990743, w: 0.8934251}
+    m_Target: {x: 0.20789719, y: -0.000028618271, z: -0.00023815272, w: 0.97830206}
     speed: 2
-    m_Value: {x: -0.44551942, y: -0.05358051, z: 0.026990743, w: -0.8934251}
+    m_Value: {x: 0.20786642, y: -0.000028614035, z: -0.00023811746, w: 0.9781572}
   m_Size:
-    m_Target: 1.4953429
+    m_Target: 1101.4536
     speed: 2
-    m_Value: 1.4953429
+    m_Value: 1101.4536
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -908,7 +908,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/UI
+    - Assets/Scripts
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -916,16 +916,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 64
   m_LastFolders:
-  - Assets/Scripts/UI
+  - Assets/Scripts
   m_LastFoldersGridSize: -1
   m_LastProjectPath: D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 161.39996}
+    scrollPos: {x: 0, y: 79}
-    m_SelectedIDs: b2720000
+    m_SelectedIDs: 00710000
-    m_LastClickedID: 29362
+    m_LastClickedID: 28928
-    m_ExpandedIDs: 00000000dc700000de70000000ca9a3bffffff7f
+    m_ExpandedIDs: 000000000071000002710000be72000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -953,7 +953,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000dc700000de70000000ca9a3bffffff7f
+    m_ExpandedIDs: 000000000071000002710000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -978,9 +978,9 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 
+    m_SelectedInstanceIDs: d26d0000
-    m_LastClickedInstanceID: 0
+    m_LastClickedInstanceID: 28114
-    m_HadKeyboardFocusLastEvent: 0
+    m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: c6230000f06f00003a7b000058cc00005ecc00006ed400004e6e000000000000e0720000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -1086,7 +1086,7 @@ MonoBehaviour:
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 54
+  m_LastVerticalScrollValue: 0
   m_GlobalObjectId: 
   m_InspectorMode: 0
   m_LockTracker: