0611更新

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

@@ -798,10 +798,10 @@ GameObject:
   - component: {fileID: 7032930392706796801}
   - component: {fileID: 1721283816090231721}
   - component: {fileID: 7025343009472937813}
-  - component: {fileID: 5066967261904071208}
   - component: {fileID: 8067268704048347736}
   - component: {fileID: 2967471168845626985}
   - component: {fileID: 1131717685372222914}
+  - component: {fileID: 770420557596943942}
   m_Layer: 5
   m_Name: Card_v01
   m_TagString: Untagged
@@ -872,24 +872,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &5066967261904071208
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3410471369990512392}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 80971e1d1b78104439c3472d4276e502, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  originalParent: {fileID: 0}
-  originalpoint: {x: 0, y: 0, z: 0}
-  eventSystem: {fileID: 0}
-  ainPanle: {fileID: 1075869202937435496}
-  currentNode: {fileID: 0}
-  influencePreviewPool: []
 --- !u!114 &8067268704048347736
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -934,13 +916,29 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9878eb734a9bb9e448c1a125b1e863e6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  influencePreviewPool: []
   cardId: 0
+  cost: {fileID: 2236789563960399494}
+  cardDescription: {fileID: 2257759688655818602}
+  cardName: {fileID: 5281579542142419986}
+  costEnough: 1
+--- !u!114 &770420557596943942
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3410471369990512392}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 80971e1d1b78104439c3472d4276e502, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
   originalParent: {fileID: 0}
   originalpoint: {x: 0, y: 0, z: 0}
   eventSystem: {fileID: 0}
   ainPanle: {fileID: 1075869202937435496}
   currentNode: {fileID: 0}
-  influencePreviewPool: []
 --- !u!1 &4245510081586536158
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -2456,6 +2456,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0ddfb517f3ae49c42b2c7ff57e12f8d8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  totalCost: 0
 --- !u!1 &514899946
 GameObject:
   m_ObjectHideFlags: 0
@@ -4660,6 +4661,8 @@ MonoBehaviour:
   usedCard: {fileID: 1964831963}
   cardDeckNumberText: {fileID: 1278694494}
   usedCardNumberText: {fileID: 591146068}
+  currentCost: 0
+  totalCost: 0
   turn: 0
 --- !u!4 &1108322117
 Transform:
@@ -5034,8 +5037,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   cardPrefab: {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c,
     type: 3}
-  cardList: 11270000112700001127000011270000112700001127000011270000112700001227000012270000122700001227000012270000122700001227000012270000
+  cardList: 
-  cardDeck: 00000000
+  cardDeck: 112700001127000011270000112700001127000011270000122700001227000012270000122700001227000012270000
 --- !u!4 &1190351098
 Transform:
   m_ObjectHideFlags: 0

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

@@ -8,4 +8,10 @@ public class CardDeck : MonoBehaviour
     public List<int> cardList;//局内使用卡组 
 
     public List<int> cardDeck;//标准卡组
+
+    public void Start()
+    {
+        cardList = cardDeck;
+        cardList.Shuffle();
+    }
 }

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

@@ -13,30 +13,90 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
     public Transform originalParent;
     public Vector3 originalpoint;
     public EventSystem eventSystem;
+    bool canUse = true;//决定卡牌是否可以释放
+    bool choosed;//标识卡牌是否被选中
 
     [Header("贝塞尔曲线瞄准")]
     public GameObject ainPanle;
 
     [Header("影响格参数")]
     public MapUnity currentNode;//瞄准的格子
-    public List<MapUnity> influencePreviewPool;
+    
 
     //[Header("卡牌属性")]
+    private CardEntity cardEntity;
 
     void Start()
     {
         eventSystem = GameObject.FindObjectOfType<EventSystem>();
+        cardEntity=GetComponent<CardEntity>();
     }
 
 
     private void Update()
+    {
+        handleRightClickCancel();
+
+    }
+    //检查卡牌的费用是否可以释放
+    private void costCheck()
+    {
+        Debug.Log("当前费用：" + TurnMaster.Instance.currentCost);
+        Debug.Log("总费用：" + Usermanager.Instance.totalCost);
+        if (TurnMaster.Instance.currentCost - cardEntity.cardOriginalData.Cost < 0)
+        {
+            Debug.Log("费用不足");
+            cardEntity.costEnough = false;
+        }
+    }
+
+    private void resetComponentPosition()
+    {
+        //遍历范围预览池消除影响色
+        for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++)
+        {
+            GameManager.Instance.player.influencePreviewPool[i].influenced = false;
+        }
+        GameManager.Instance.player.influencePreviewPool.Clear();
+        //遍历影响池变色
+        for (int i = 0; i < cardEntity.influencePreviewPool.Count; i++)
+        {
+            cardEntity.influencePreviewPool[i].influenced = false;
+        }
+        cardEntity.influencePreviewPool.Clear();
+
+
+        //其他位置都归位
+        transform.SetParent(originalParent);
+        transform.localPosition = originalpoint;
+        GetComponent<CanvasGroup>().blocksRaycasts = true;
+        return;
+    }
+
+    //右键取消释放
+    private void handleRightClickCancel()
     {
 
+        if (choosed && Mouse.current.rightButton.wasPressedThisFrame)
+        {
+            Debug.Log("取消释放");
+            canUse = false;//取消释放
+            ainPanle.SetActive(false);
+            resetComponentPosition();
+
+
+        }
     }
     public void OnBeginDrag(PointerEventData eventData)
     {
         // if (GameObject.Find("CardPanel") != null)
         //     graphicRaycaster = GameObject.Find("CardPanel").GetComponent<GraphicRaycaster>();
+        costCheck();
+        if (!cardEntity.costEnough)
+        {
+            return;
+        }
+        choosed = true;
 
         GetComponent<CanvasGroup>().blocksRaycasts = false;
 
@@ -47,32 +107,19 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
         transform.position = eventData.position;
 
         //根据卡牌数据决定是否调用曲线
-
+        if (cardEntity.cardOriginalData.CastingRange != 0)
-
+        {
+            //释放范围为0则不需要调用曲线
             ainPanle.SetActive(true);
-
-        //todo-统一确定锚点位置
-
-        //重新调用范围预览--以后要写到卡牌效果里，现在默认影响1格
-        GameManager.Instance.player.StepPreviewInfluencedNode(1);
         }
-
+        else
-    public void OnDrag(PointerEventData eventData)
         {
-        /*  Vector3 pos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
+            ainPanle.SetActive(false);
-          pos.z = 0;
+        }
-          transform.position = pos;*/
+    }
-        // transform.position = eventData.position;
-
-
-        //selecton = eventData.pointerCurrentRaycast.gameObject;
-
-        //返回射线碰到的物品名称
-        // if (eventData.pointerCurrentRaycast.gameObject != null)
-        //  Debug.Log(eventData.pointerCurrentRaycast.gameObject.name);
-
-
 
+    private void ainPanleWork(PointerEventData eventData)
+    {
         //射线检测瞄准的地图节点，判断是否可放置和改变放置影响区
         Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value);
         if (eventData.pointerCurrentRaycast.gameObject != null)
@@ -83,85 +130,133 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
                 //检测到跟上次瞄准地方不同，更新
                 if (currentNode == null || raycastHit.collider.transform.gameObject != currentNode.gameObject)
                 {
-                    for (int i = 0; i < influencePreviewPool.Count; i++)
+                    for (int i = 0; i < cardEntity.influencePreviewPool.Count; i++)
                     {
-                        influencePreviewPool[i].influenced = false;
+                        cardEntity.influencePreviewPool[i].influenced = false;
                     }
-                    influencePreviewPool.Clear();
+                    cardEntity.influencePreviewPool.Clear();
                     currentNode = raycastHit.collider.transform.GetComponent<MapUnity>();
 
                     //重新调用范围预览
-                    GameManager.Instance.player.StepPreviewInfluencedNode(1);
+                    GameManager.Instance.player.StepPreviewInfluencedNode(cardEntity.cardOriginalData.CastingRange);
+                    Debug.Log(cardEntity.cardOriginalData.CastingRange);
                     //预览影响范围
                     if (currentNode.influenced)
                     {
                         //根据卡牌属性改变影响池  
-                        influencePreviewPool.Add(currentNode);
+                        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)
-                                influencePreviewPool.Add(currentNode.unitPool[0]);
+                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[0]);
                             if (currentNode.unitPool[4] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[4]);
+                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[4]);
                         }
                         else if (euler > 45 && euler < 135)
                         {
                             if (currentNode.unitPool[1] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[1]);
+                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[1]);
                             if (currentNode.unitPool[5] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[5]);
+                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[5]);
                         }
                         else if (euler > 135 && euler < 180)
                         {
                             if (currentNode.unitPool[2] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[2]);
+                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[2]);
                             if (currentNode.unitPool[0] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[0]);
+                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[0]);
                         }
                         else if (euler > 180 && euler < 225)
                         {
                             if (currentNode.unitPool[1] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[1]);
+                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[1]);
                             if (currentNode.unitPool[3] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[3]);
+                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[3]);
                         }
                         else if (euler > 225 && euler < 315)
                         {
                             if (currentNode.unitPool[2] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[2]);
+                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[2]);
                             if (currentNode.unitPool[4] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[4]);
+                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[4]);
                         }
                         else if (euler > 315 && euler < 360)
                         {
                             if (currentNode.unitPool[3] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[3]);
+                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[3]);
                             if (currentNode.unitPool[5] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[5]);
+                                cardEntity.influencePreviewPool.Add(currentNode.unitPool[5]);
                         }
                         //influencePreviewPool.Add(currentNode);
-                        //遍历影响池变色
+
-                        for (int i = 0; i < influencePreviewPool.Count; i++)
+
-                        {
+                    }
-                            influencePreviewPool[i].influenced = true;
+
-                            influencePreviewPool[i].choossedMark.GetComponent<Renderer>().material = influencePreviewPool[i].yellow;
+
+                }
+            }
+        }
+        Debug.Log("结束影响数值" + cardEntity.influencePreviewPool.Count);
     }
 
+    private void noAinPanleWork(PointerEventData eventData)
+    {
+
+        Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value);
+        if (eventData.pointerCurrentRaycast.gameObject != null)
+        {
+            if (Physics.Raycast(ray, out RaycastHit raycastHit))
+            {
+                currentNode = raycastHit.collider.transform.GetComponent<MapUnity>();
+                cardEntity.influencePreviewPool.Add(currentNode);
+            }
+        }
     }
 
+    public void OnDrag(PointerEventData eventData)
+    {
+        if (!cardEntity.costEnough)
+        {
+            return;
+        }
 
+        if (cardEntity.cardOriginalData.CastingRange != 0)
+        {
+            ainPanleWork(eventData);
         }
+        else
+        {
+            //没有范围不需要射线吧，因为不需要指定目标点？
+            // noAinPanleWork(eventData);
         }
+        dyeing();
+
     }
 
+    private void dyeing()
+    {
+        //遍历影响池变色
+        for (int i = 0; i < cardEntity.influencePreviewPool.Count; i++)
+        {
+            cardEntity.influencePreviewPool[i].influenced = true;
+            cardEntity.influencePreviewPool[i].choossedMark.GetComponent<Renderer>().material = cardEntity.influencePreviewPool[i].yellow;
+        }
     }
 
 
     public void OnEndDrag(PointerEventData 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")
@@ -179,7 +274,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
                     {
                         GameManager.Instance.player.influencePreviewPool[i].influenced = false;
                     }
-                GameManager.Instance.player.influencePreviewPool.Clear();
+                    //GameManager.Instance.player.influencePreviewPool.Clear();
 
                     return;
                 }
@@ -195,74 +290,78 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
                     {
                         GameManager.Instance.player.influencePreviewPool[i].influenced = false;
                     }
-                GameManager.Instance.player.influencePreviewPool.Clear();
+                    //GameManager.Instance.player.influencePreviewPool.Clear();
 
                     return;
                 }
             }
-
+            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();
+                    //GameManager.Instance.player.influencePreviewPool.Clear();
                 }
                 else if (currentNode.influenced)
                 {
 
                     //卡牌释放效果
-            CardEntity cardEntity = this.GetComponent<CardEntity>();
                     cardEntity.use();
-            Debug.Log(Usermanager.Instance.Health);
+                    Debug.Log("玩家盾量：" + Usermanager.Instance.Shield);
-            //临时效果--将颜色变成玩家颜色
-            for (int i = 0; i < influencePreviewPool.Count; i++)
-            {
-                influencePreviewPool[i].whoColour = MapUnity.WhoColour.playerColour;
-                //造成伤害
-                if (influencePreviewPool[i].enemyNode != null)
-                {
-                    influencePreviewPool[i].enemyNode.EnemyState.currentHP -= 50;
-                    Debug.Log(influencePreviewPool[i].enemyNode.EnemyState.currentHP);
-                    if (influencePreviewPool[i].enemyNode.EnemyState.currentHP <= 0)
-                    {
-                        influencePreviewPool[i].enemyNode.OnDeath();
-                    }
-                }
-            }
-            //临时效果结束
 
-            //遍历影响池变色
+                    //临时效果--将其加入墓地并销毁实体
-            for (int i = 0; i < influencePreviewPool.Count; i++)
+                    TurnMaster.Instance.usedCard.usedCardList.Add(this.gameObject.GetComponent<CardEntity>().CardId);
-            {
+                    Destroy(this.gameObject);
-                influencePreviewPool[i].influenced = false;
                 }
-            influencePreviewPool.Clear();
-
                 //遍历范围预览池消除影响色
                 for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++)
                 {
                     GameManager.Instance.player.influencePreviewPool[i].influenced = false;
                 }
                 GameManager.Instance.player.influencePreviewPool.Clear();
-
+                //遍历影响池变色
-            //临时效果--将其加入墓地并销毁实体
+                for (int i = 0; i < cardEntity.influencePreviewPool.Count; i++)
-            TurnMaster.Instance.usedCard.usedCardList.Add(this.gameObject.GetComponent<CardEntity>().CardId);
+                {
-            Destroy(this.gameObject);
+                    cardEntity.influencePreviewPool[i].influenced = false;
                 }
-
+                cardEntity.influencePreviewPool.Clear();
-
                 GetComponent<CanvasGroup>().blocksRaycasts = true;
 
                 //其他位置都归位
                 transform.SetParent(originalParent);
                 transform.localPosition = originalpoint;
                 return;
+            }//范围类，需要指定被影响的节点才能释放
+            else
+            {
+                //卡牌释放效果
+                cardEntity.use();
+                Debug.Log("玩家盾量：" + Usermanager.Instance.Shield);
+
+                //临时效果--将其加入墓地并销毁实体
+                TurnMaster.Instance.usedCard.usedCardList.Add(this.gameObject.GetComponent<CardEntity>().CardId);
+                Destroy(this.gameObject);
+
+                return;
+
+            }//无范围类，直接释放
+
+        }
+        else
+        {
+            canUse = true;
+        }
     }
 
 }

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

@@ -1,17 +1,22 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Text;
 using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.InputSystem;
+using UnityEngine.UI;
 
-public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler
+public class CardEntity : MonoBehaviour
 {
     public CardOriginalData cardOriginalData;
     //public CardOriginalData cardData;
+    public List<MapUnity> influencePreviewPool;//卡牌的影响范围
 
     public int cardId;
+
+    public Text cost;
     public int CardId
     {
         get { return cardId; }
@@ -20,54 +25,22 @@ public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDr
 
     // public Vector3 OriginTransform;
     //private Vector3 EndTransform;
-    [Header("拖拽参数")]
+
-    public Transform originalParent;
+
-    public Vector3 originalpoint;
+    public Text cardDescription;
-    public EventSystem eventSystem;
+    public Text cardName;
-    bool canUse=true;//决定卡牌是否可以释放
+
-    bool choosed;//标识卡牌是否被选中
+    public bool costEnough=true;
-
+
-    [Header("贝塞尔曲线瞄准")]
-    public GameObject ainPanle;
-
-    [Header("影响格参数")]
-    public MapUnity currentNode;//瞄准的格子
-    public List<MapUnity> influencePreviewPool;//卡牌的影响范围
 
     public void Start()
     {
         //cardData = GetComponent<CardOriginalData>();
-        eventSystem = GameObject.FindObjectOfType<EventSystem>(); 
+        //eventSystem = GameObject.FindObjectOfType<EventSystem>();
-    }
-    private void Update()
-    {
-        //右键取消释放
-        if (choosed && Mouse.current.rightButton.wasPressedThisFrame)
-        {
-            Debug.Log("1");
-            canUse = false;//取消释放
-            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();
-            //遍历影响池变色
-            for (int i = 0; i < influencePreviewPool.Count; i++)
-            {
-                influencePreviewPool[i].influenced = false;
-            }
-            influencePreviewPool.Clear();
 
 
-            //其他位置都归位
+
-            transform.SetParent(originalParent);
-            transform.localPosition = originalpoint;
-            GetComponent<CanvasGroup>().blocksRaycasts = true;
-            return;
-        }
-    }
 
     public void createCard(int cardId)
     {
@@ -75,6 +48,9 @@ public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDr
         Debug.Log(cardId + "-" + CardOriginalDataList.Instance.cardOriginalDataList[cardId]);
         cardOriginalData = CardOriginalDataList.Instance.cardOriginalDataList[cardId];
         settleForStart(SettlementManager.settleTurn);
+        createCardDescription();
+        createCardName();
+        createCardCost();
     }
 
     //不应该为void，返回值为作用的地块
@@ -114,9 +90,65 @@ public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDr
                     break;
             }
         }
+        TurnMaster.Instance.currentCost-=cardOriginalData.Cost;
 
     }
+    //获取卡牌名字
+    public void createCardName()
+    {
+        cardName.text = cardOriginalData.ChineseName;
+    }
 
+    public void createCardCost()
+    {
+        cost.text = cardOriginalData.Cost.ToString();
+    }
+    //获取卡牌描述
+    public void createCardDescription()
+    {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < cardOriginalData.Function.Length; i++)
+        {
+            switch (cardOriginalData.Function[i])
+            {
+                case CardFunction.cardDamage:
+                    sb.Append("造成" + cardOriginalData.FunctionVal[i]+"点伤害;");
+                    break;
+                case CardFunction.cardShield:
+                    sb.Append("获得" + cardOriginalData.FunctionVal[i] + "点护盾;");
+                    break;
+                case CardFunction.posion:
+                    sb.Append("造成" + cardOriginalData.FunctionVal[i] + "层流血;");
+                    break;
+                case CardFunction.weak:
+                    sb.Append("造成" + cardOriginalData.FunctionVal[i] + "层虚弱;");
+                    break;
+                case CardFunction.coma:
+                    sb.Append("造成" + cardOriginalData.FunctionVal[i] + "层昏迷;");
+                    break;
+                case CardFunction.disarm:
+                    sb.Append("造成" + cardOriginalData.FunctionVal[i] + "层缴械;");
+                    break;
+                case CardFunction.sleep:
+                    sb.Append("造成" + cardOriginalData.FunctionVal[i] + "层睡眠;");
+                    break;
+                case CardFunction.bleed:
+                    sb.Append("造成" + cardOriginalData.FunctionVal[i] + "层流血;");
+                    break;
+                case CardFunction.thorn:
+                    sb.Append("获得" + cardOriginalData.FunctionVal[i] + "层荆棘;");
+                    break;
+                case CardFunction.costRestore:
+                    sb.Append("获得" + cardOriginalData.FunctionVal[i] + "点费用;");
+                    break;
+                case CardFunction.dyeing:
+                    sb.Append("染色;");
+                    break;
+            }
+        }
+        cardDescription.text = sb.ToString();
+    }
+    //造成异常状态
     public void abnormalConditionWork(string condition, int stackVak)
     {
         for (int i = 0; i < influencePreviewPool.Count; i++)
@@ -128,7 +160,7 @@ public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDr
             }
         }
     }
-
+    //造成伤害
     private void damageWork(int damageVal)
     {
         for (int i = 0; i < influencePreviewPool.Count; i++)
@@ -140,7 +172,7 @@ public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDr
             }
         }
     }
-
+    //染色
     private void dyeingWork()
     {
         Debug.Log(influencePreviewPool.Count);
@@ -150,15 +182,7 @@ public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDr
         }
     }
 
-    private void dyeing()
+
-    {
-        //遍历影响池变色
-        for (int i = 0; i < influencePreviewPool.Count; i++)
-        {
-            influencePreviewPool[i].influenced = true;
-            influencePreviewPool[i].choossedMark.GetComponent<Renderer>().material = influencePreviewPool[i].yellow;
-        }
-    }
 
 
     //生成卡牌时候遗物的结算
@@ -172,265 +196,12 @@ public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDr
 
     }
 
-    public void OnBeginDrag(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 OnDrag(PointerEventData eventData)
-    {
 
-        if (cardOriginalData.CastingRange != 0)
-        {
-            ainPanleWork(eventData);
-        }
-        else
-        {
-            //没有范围不需要射线吧，因为不需要指定目标点？
-           // noAinPanleWork(eventData);
-        }
-        dyeing();
 
-    }
 
-    private void ainPanleWork(PointerEventData eventData)
-    {
-        //射线检测瞄准的地图节点，判断是否可放置和改变放置影响区
-        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);
-                //检测到跟上次瞄准地方不同，更新
-                if (currentNode == null || raycastHit.collider.transform.gameObject != currentNode.gameObject)
-                {
-                    for (int i = 0; i < influencePreviewPool.Count; i++)
-                    {
-                        influencePreviewPool[i].influenced = false;
-                    }
-                    influencePreviewPool.Clear();
-                    currentNode = raycastHit.collider.transform.GetComponent<MapUnity>();
-
-                    //重新调用范围预览
-                    GameManager.Instance.player.StepPreviewInfluencedNode(cardOriginalData.CastingRange);
-                    Debug.Log(cardOriginalData.CastingRange);
-                    //预览影响范围
-                    if (currentNode.influenced)
-                    {
-                        //根据卡牌属性改变影响池  
-                        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)
-                                influencePreviewPool.Add(currentNode.unitPool[0]);
-                            if (currentNode.unitPool[4] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[4]);
-                        }
-                        else if (euler > 45 && euler < 135)
-                        {
-                            if (currentNode.unitPool[1] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[1]);
-                            if (currentNode.unitPool[5] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[5]);
-                        }
-                        else if (euler > 135 && euler < 180)
-                        {
-                            if (currentNode.unitPool[2] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[2]);
-                            if (currentNode.unitPool[0] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[0]);
-                        }
-                        else if (euler > 180 && euler < 225)
-                        {
-                            if (currentNode.unitPool[1] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[1]);
-                            if (currentNode.unitPool[3] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[3]);
-                        }
-                        else if (euler > 225 && euler < 315)
-                        {
-                            if (currentNode.unitPool[2] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[2]);
-                            if (currentNode.unitPool[4] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[4]);
-                        }
-                        else if (euler > 315 && euler < 360)
-                        {
-                            if (currentNode.unitPool[3] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[3]);
-                            if (currentNode.unitPool[5] != null)
-                                influencePreviewPool.Add(currentNode.unitPool[5]);
-                        }
-                        //influencePreviewPool.Add(currentNode);
-
-
-                    }
-
-
-                }
-            }
-        }
-        Debug.Log("结束影响数值" + influencePreviewPool.Count);
-    }
-
-    private void noAinPanleWork(PointerEventData eventData)
-    {
-
-        Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value);
-        if (eventData.pointerCurrentRaycast.gameObject != null)
-        {
-            if (Physics.Raycast(ray, out RaycastHit raycastHit))
-            {
-                currentNode = raycastHit.collider.transform.GetComponent<MapUnity>();
-                influencePreviewPool.Add(currentNode);
-            }
-        }
-    }
-
-
-    public void OnEndDrag(PointerEventData eventData)
-    {
-        choosed = false;
-        if(canUse )
-        {
-            Debug.Log("进入影响数值" + influencePreviewPool.Count);
-            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();
-
-                    return;
-                }
-                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();
-
-                    return;
-                }
-            }
-            if (ainPanle.activeSelf)
-            {
-                ainPanle.SetActive(false);//关闭贝塞尔曲线
-            }
-
-            //先判断该卡牌的类型是否是需要范围
-            if (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)
-                {
-
-                    //卡牌释放效果
-                    use();
-                    Debug.Log("玩家盾量：" + Usermanager.Instance.Shield);
-
-                    //临时效果--将其加入墓地并销毁实体
-                    TurnMaster.Instance.usedCard.usedCardList.Add(this.gameObject.GetComponent<CardEntity>().CardId);
-                    Destroy(this.gameObject);
-                }
-                //遍历范围预览池消除影响色
-                for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++)
-                {
-                    GameManager.Instance.player.influencePreviewPool[i].influenced = false;
-                }
-                GameManager.Instance.player.influencePreviewPool.Clear();
-                //遍历影响池变色
-                for (int i = 0; i < influencePreviewPool.Count; i++)
-                {
-                    influencePreviewPool[i].influenced = false;
-                }
-                influencePreviewPool.Clear();
-                GetComponent<CanvasGroup>().blocksRaycasts = true;
-
-                //其他位置都归位
-                transform.SetParent(originalParent);
-                transform.localPosition = originalpoint;
-                return;
-            }//范围类，需要指定被影响的节点才能释放
-            else
-            {
-                //卡牌释放效果
-                use();
-                Debug.Log("玩家盾量：" + Usermanager.Instance.Shield);
-
-                //临时效果--将其加入墓地并销毁实体
-                TurnMaster.Instance.usedCard.usedCardList.Add(this.gameObject.GetComponent<CardEntity>().CardId);
-                Destroy(this.gameObject);
-
-                return;
-
-            }//无范围类，直接释放
-
-        }
-        else
-        {
-            canUse = true;
-        }
-    }
 }

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

@@ -14,6 +14,10 @@ public class TurnMaster : Singleton<TurnMaster>
     public Text cardDeckNumberText;
     public Text usedCardNumberText;
 
+    public int currentCost;
+    public int totalCost;
+
+
     public enum Turn
     {
         playerTurnBegin,
@@ -23,12 +27,18 @@ public class TurnMaster : Singleton<TurnMaster>
     };
     public Turn turn = Turn.playerTurnBegin;
 
+    public void Start()
+    {
+        totalCost = Usermanager.Instance.totalCost;
+        currentCost=totalCost;
+    }
     private void Update()
     {
         if (turn == Turn.playerTurnBegin)
         {
             //»Ö¸´ÌåÁ¦
             GameManager.Instance.playerState.currentStepRange = GameManager.Instance.playerState.maxStepRange;
+            restoreCost(0);
             //Ï´ÅÆ--³é¿¨
             ShuffleWithLosingCards();
 
@@ -61,6 +71,12 @@ public class TurnMaster : Singleton<TurnMaster>
         usedCardNumberText.text = usedCard.usedCardList.Count.ToString();
     }
 
+    public void restoreCost(int settleTurn)
+    {
+        totalCost=Usermanager.Instance.totalCost;
+        currentCost = totalCost;
+    }
+
     public void EndPlayerTurn()
     {
         turn = Turn.enemyTurnBegin;
@@ -101,6 +117,7 @@ public class TurnMaster : Singleton<TurnMaster>
                 for (int c = 0; c < usedCard.usedCardList.Count; c++)
                 {
                     cardDeck.cardList.Add (usedCard.usedCardList[c]);
+                    cardDeck.cardList.Shuffle();
                 }
                
                 usedCard.usedCardList.Clear();

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

@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System;
+
+public static class randomTool
+{
+    public static void Shuffle<T>(this List<T> list)
+    {
+        System.Random rng = new System.Random();
+        int n = list.Count;
+        while (n > 1)
+        {
+            n--;
+            int k = rng.Next(n + 1);
+            T value = list[k];
+            list[k] = list[n];
+            list[n] = value;
+        }
+    }
+}

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

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

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

@@ -6,6 +6,8 @@ public class Usermanager : Singleton<Usermanager>
 {
     private int health;
     private int shield;
+
+    public int totalCost;
     public int Health { get => health; set => health = value; }
     public int Shield { get => shield; set => shield = value; }
 
@@ -13,11 +15,13 @@ public class Usermanager : Singleton<Usermanager>
     {
         Health = health;
         Shield = 0;
+        totalCost = 1;
     }
 
     public void Start()
     {
         health = 100;
         Shield = 0;
+        totalCost = 1;
     }
 }