新祝福

ColorlessWorld-2024-4-2/Assets/GameDate/RelicList.asset

@@ -13,4 +13,4 @@ MonoBehaviour:
   m_Name: RelicList
   m_EditorClassIdentifier: 
   relicClassNameList:
-  - LegacyNode_FireHeart
+  - LegacyNode_AgnisTorch

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

@@ -19710,6 +19710,7 @@ MonoBehaviour:
   deleteCardNumberText: {fileID: 263387098}
   currentCost: 0
   totalCost: 0
+  settleTurn: 0
   commDrawCardsNum: 5
   continueTurn: 0
   turn: 4

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

@@ -311,7 +311,7 @@ public class CardEntity : MonoBehaviour
     {
         
         //string pattern = @"(\w+)([><=])(\d+)";
-        cardOriginalData.originFunctionVal.Clear();
+        //cardOriginalData.originFunctionVal.Clear();
         Debug.Log("condition是"+condition);
         Debug.Log("CardManager" + CardManager.Instance);
         List <string> stringList= CardManager.Instance.splitStringIntoComponents(condition);
@@ -379,7 +379,12 @@ public class CardEntity : MonoBehaviour
             //蓝色地块优势
             if (MapUnityManager.Instance.getAdvNode().Equals(Name.Color.Blue))
             {
-                thresholdShift = 2;
+                thresholdShift += 2;
+            }
+            if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_SuspiciousMushroom)
+                && firstPart.Equals(Name.Color.Blue))
+            {
+                thresholdShift += 1;
             }
             if (performComparison(firstPartCount, op, secondPartCount, thresholdShift))
             {

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

@@ -20,6 +20,8 @@ public class TurnMaster : Singleton<TurnMaster>
     public int currentCost;
     public int totalCost;
 
+    public int settleTurn = 0;
+
     public int commDrawCardsNum = 6;
 
     [Header("销毁卡牌延迟结束回合")]
@@ -119,6 +121,7 @@ public class TurnMaster : Singleton<TurnMaster>
             GameManager.Instance.player.CloseStepPreviewInfluencedNode();
             //回合结束销毁卡牌
             TurnEndDisCard();
+            settleTurn++;
 
             //阶段流转
             StartCoroutine(WaitEndPlayerTurn());
@@ -241,9 +244,19 @@ public class TurnMaster : Singleton<TurnMaster>
     //老吊写的函数
     public void restoreResource(int settleTurn)
     {
-/*        totalCost = Usermanager.Instance.totalCost;
+        /*        totalCost = Usermanager.Instance.totalCost;
                 Usermanager.Instance.currentCost = totalCost;*/
+        if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_AncientSilverCoin) &&
+            settleTurn == 0)
+        {
+            GameManager.Instance.playerState.currentCost = GameManager.Instance.playerState.maxCost+1;
+        }
+        else
+        {
             GameManager.Instance.playerState.currentCost = GameManager.Instance.playerState.maxCost;
+        }
+
+        
         /*if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.nextTurnExtraOneCost))
         {
             Usermanager.playerAbnormalCondition[AbnormalCondition.nextTurnExtraOneCost].value--;

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs

@@ -682,6 +682,14 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
     //ËÀÍöʱ
     public void OnDeath()
     {
+        if (EnemyState.abnormalCondition.TryGetValue(AbnormalCondition.posion,out Buff posionbuff)&&
+            LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_SnakeGall))
+        {
+            if (posionbuff.value > 10)
+            {
+                Usermanager.Instance.recoverHp(1);
+            }
+        }
         if (EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.boomAndPollute))
         {
             boomAndPolluteCal();
@@ -938,12 +946,12 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
         //firseedµÄÌØÊâ´¦Àí
         int damage = 15;
         int checkVal = 10;
-        if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_CharcoalFire))
+        if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_VulcanHammer))
         {
             damage = 25;
             checkVal = 15;
         }
-        if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_FireSpark))
+        if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_AgnisTorch))
         {
             checkVal = 8;
         }
@@ -982,6 +990,10 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
         int trueValue = nowValue + value;
         if (trueValue >= 10)
         {
+            if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_EnchantedConch))
+            {
+                sufferAbnormalCondition(AbnormalCondition.vulnerable, 1);
+            }
             sufferAbnormalCondition(AbnormalCondition.coma, 1);
             EnemyState.abnormalCondition.Remove(condition);
 

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Polymaw.cs

@@ -167,12 +167,14 @@ public class Polymaw : MonoBehaviour
     IEnumerator MeleeAttackAndPolluteAction()
     {
         MapUnity currentNode = GameManager.Instance.playerOn;
+        MapUnity enemyOn = GameManager.Instance.X[enemyNode.positionX].Y[enemyNode.positionY];
         HashSet<MapUnity> targetNodes = new HashSet<MapUnity> { currentNode };
         getNodeTools.getCircleNode(targetNodes, 1);
 
-        if (getNodeTools.canRemoteAttack(currentNode, enemyNode.EnemyState.attackRange))
+        if (getNodeTools.canRemoteAttack(enemyOn, enemyNode.EnemyState.attackRange))
         {
             Debug.Log("if³É¹¦");
+            Debug.Log("attackRangeÊÇ"+ enemyNode.EnemyState.attackRange);
             if (!enemyNode.EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.disarm))
             {
                 AttackDamage();

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_CharcoalFire.cs → ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_AgnisTorch.cs

@@ -2,13 +2,13 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class LegacyNode_CharcoalFire : LegacyNode
+public class LegacyNode_AgnisTorch : LegacyNode
 {
     public override void OnGet()
     {
-        if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_FireSpark))
+        if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_VulcanHammer))
         {
-            LegacyManager.Instance.relicClassNameList.Remove(Name.Legacy.LegacyNode_FireSpark);
+            LegacyManager.Instance.relicClassNameList.Remove(Name.Legacy.LegacyNode_VulcanHammer);
         }
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_AncientSilverCoin.cs

@@ -0,0 +1,7 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_AncientSilverCoin : LegacyNode
+{
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_DamagedBag.cs

@@ -1,12 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class LegacyNode_DamagedBag : LegacyNode
-{
-    public override void OnGet()
-    {
-       PlayerStatsManager .Instance.playerState.cardRewardNumToChoose -= 2;
-       PlayerStatsManager .Instance.playerState.maxCost ++;
-    }
-}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_EnchantedConch.cs

@@ -0,0 +1,7 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LegacyNode_EnchantedConch : LegacyNode
+{
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_MagicGloves.cs

@@ -1,18 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class LegacyNode_MagicGloves : LegacyNode
-{
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_BoxLock.cs → ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_SnakeGall.cs

@@ -2,6 +2,6 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class LegacyNode_BoxLock : LegacyNode
+public class LegacyNode_SnakeGall : LegacyNode
 {
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_FireHeart.cs → ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Starfish.cs

@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class LegacyNode_FireHeart : LegacyNode
+public class LegacyNode_Starfish : LegacyNode
 {
 
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_Extractor.cs → ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_SuspiciousMushroom.cs

@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class LegacyNode_Extractor : LegacyNode
+public class LegacyNode_SuspiciousMushroom : LegacyNode
 {
     // Start is called before the first frame update
     void Start()

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_FireSpark.cs → ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_VulcanHammer.cs

@@ -2,13 +2,13 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class LegacyNode_FireSpark : LegacyNode
+public class LegacyNode_VulcanHammer : LegacyNode
 {
     public override void OnGet()
     {
-        if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_CharcoalFire))
+        if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_VulcanHammer))
         {
-            LegacyManager.Instance.relicClassNameList.Remove(Name.Legacy.LegacyNode_CharcoalFire);
+            LegacyManager.Instance.relicClassNameList.Remove(Name.Legacy.LegacyNode_VulcanHammer);
         }
     }
 }

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

@@ -33,10 +33,21 @@ public static class Name
         public const string LegacyNode_LavaHeart = "LegacyNode_LavaHeart";
         public const string LegacyNode_MagicGloves = "LegacyNode_MagicGloves";
         public const string LegacyNode_FireSpark = "LegacyNode_FireSpark";
-        public const string LegacyNode_GoldVines = "LegacyNode_GoldVines";
         public const string LegacyNode_CharcoalFire = "LegacyNode_CharcoalFire";
         public const string LegacyNode_Extractor = "LegacyNode_Extractor";
 
+        public const string LegacyNode_AgnisTorch = "LegacyNode_AgnisTorch";
+        public const string LegacyNode_VulcanHammer = "LegacyNode_VulcanHammer";
+        public const string LegacyNode_AncientSilverCoin = "LegacyNode_AncientSilverCoin";
+        public const string LegacyNode_EnchantedConch = "LegacyNode_EnchantedConch";
+        public const string LegacyNode_GoldVines = "LegacyNode_GoldVines";
+        public const string LegacyNode_Starfish = "LegacyNode_Starfish";
+        public const string LegacyNode_SuspiciousMushroom = "LegacyNode_SuspiciousMushroom";
+        public const string LegacyNode_SnakeGall = "LegacyNode_SnakeGall";
+
+
+
+
     }
 
     public static class CardRelease

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

@@ -530,6 +530,7 @@ public class getNodeTools
         HashSet<MapUnity> shootAbleSet = new HashSet<MapUnity>();
         shootAbleSet.Add(currentNode);
         getCircleNodeForRemoteAttack(shootAbleSet,attackRange);
+        Debug.Log("shootAbleSet大小是" + shootAbleSet.Count);
         if (shootAbleSet.Contains(GameManager.Instance.playerOn))
         {
             inShootRange = true;

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

@@ -62,6 +62,11 @@ public class SettlementManager : Singleton<SettlementManager>
                 if (endNode != null)
                 {
                     endNode.switchColor(Name.stringColorToint(cardOriginalData.nodesColor[i + 1]));
+                    if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_SuspiciousMushroom)
+                         && cardOriginalData.nodesColor[i + 1].Equals(Name.Color.Green))
+                    {
+                        abnormalConditionWork(AbnormalCondition.posion, 1, new List<MapUnity> { endNode });
+                    }
                 }
             }catch(Exception e)
             {