diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs index a8718efe..9b23f0e5 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs +++ b/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("费用不足"); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs index 8caefce1..943eba1b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs +++ b/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)); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs index 0adc8755..7bab0c9f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs @@ -119,22 +119,28 @@ public class DestructionManager : Singleton } else {*/ -/* if (canAdv) - { - int trueCost = cardOriginalData.Cost; - string reduceCost; - if (cardOriginalData.AdvantageFunctionVal.TryGetValue(CardFunction.reduceCost, out reduceCost)) - { + /* if (canAdv) + { + int trueCost = cardOriginalData.Cost; + string reduceCost; + if (cardOriginalData.AdvantageFunctionVal.TryGetValue(CardFunction.reduceCost, out reduceCost)) + { - trueCost -= int.Parse(reduceCost); - MathTool.keepNature(trueCost); - } - GameManager.Instance.playerState.currentCost -= trueCost; + trueCost -= int.Parse(reduceCost); + MathTool.keepNature(trueCost); + } + GameManager.Instance.playerState.currentCost -= trueCost; - } - else - {*/ - GameManager.Instance.playerState.currentCost -= cardOriginalData.Cost; + } + else + {*/ + 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));