Merge pull request 'bug修复' (#55) from dev-0524-1023 into dev-0524

Reviewed-on: #55

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

@@ -254,6 +254,10 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
         Debug.Log("当前费用：" + TurnMaster.Instance.currentCost);
         Debug.Log("总费用：" + Usermanager.Instance.totalCost);
         int trueCost = cardEntity.cardOriginalData.Cost;
+        if (MapUnityManager.Instance.isPlayerOn(Name.NodeColor.Black))
+        {
+            trueCost++;
+        }
         if (GameManager.Instance.playerState.currentCost - trueCost < 0)
         {
             Debug.Log("费用不足");

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

@@ -151,11 +151,6 @@ public class CardEntity : MonoBehaviour
         player.FlipLocalScale(pos);
         //debug卡名
         Debug.Log("打出"+cardOriginalData.ChineseName);
-        //閡伎華輸虴彆
-        if (MapUnityManager.Instance.isPlayerOn(Name.NodeColor.Black))
-        {
-            cardOriginalData.Cost++;
-        }
         Debug.Log("结算时候influencePreviewPool大小" + influencePreviewPool.Count);
         //结算效果
         yield return StartCoroutine(DestructionManager.Instance.startDestoryAndUseCard(this.gameObject, cardOriginalData, influencePreviewPool, cardIndex, targetNode));

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

@@ -119,22 +119,28 @@ public class DestructionManager : Singleton<DestructionManager>
         }
         else
         {*/
-/*            if (canAdv)
+        /*            if (canAdv)
-            {
+                    {
-                int trueCost = cardOriginalData.Cost;
+                        int trueCost = cardOriginalData.Cost;
-                string reduceCost;
+                        string reduceCost;
-                if (cardOriginalData.AdvantageFunctionVal.TryGetValue(CardFunction.reduceCost, out reduceCost))
+                        if (cardOriginalData.AdvantageFunctionVal.TryGetValue(CardFunction.reduceCost, out reduceCost))
-                {
+                        {
 
-                    trueCost -= int.Parse(reduceCost);
+                            trueCost -= int.Parse(reduceCost);
-                    MathTool.keepNature(trueCost);
+                            MathTool.keepNature(trueCost);
-                }
+                        }
-                GameManager.Instance.playerState.currentCost -= trueCost;
+                        GameManager.Instance.playerState.currentCost -= trueCost;
 
-            }
+                    }
-            else
+                    else
-            {*/
+                    {*/
-            GameManager.Instance.playerState.currentCost -= cardOriginalData.Cost;
+        int trueCost = cardOriginalData.Cost;
+        //»ÒÉ«µØ¿éЧ¹û
+        if (MapUnityManager.Instance.isPlayerOn(Name.NodeColor.Black))
+        {
+            trueCost++;
+        }
+        GameManager.Instance.playerState.currentCost -= trueCost;
         //}
         
         yield return StartCoroutine(settleStage2(cardOriginalData, influencePreviewPool, cardIndex, leftCost, targetNode));