Merge pull request '0516修正' (#118) from dev-0513-yjm into dev-1217

Reviewed-on: #118

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

@@ -14,17 +14,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   playerName: Julius
   maxStepRange: 5
-  currentStepRange: 0
+  currentStepRange: 5
   maxCost: 10
-  currentCost: 8
+  currentCost: 7
   maxShieldValue: 0
   currentShieldValue: 0
   maxHP: 1000
-  currentHP: 966
+  currentHP: 916
   cardRewardNumToChoose: 0
   cardRewardNumToGget: 0
   canColorCount: 20
   castRange: 2
-  money: 476
+  money: 10000
   forgingPoint: 50
   priceMultiplier: 1

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

@@ -13,8 +13,22 @@ MonoBehaviour:
   m_Name: cardDeckList
   m_EditorClassIdentifier: 
   cardDeckList:
-  - 1001
+  - 1010
-  - 1001
+  - 1005
+  - 1010
+  - 1010
+  - 2040
+  - 2041
+  - 2042
+  - 2043
+  - 2019
+  - 2045
+  - 2019
+  - 2047
+  - 2018
+  - 2019
+  - 2018
+  - 2018
   - 1001
   - 1002
   - 1002

ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 5b07afdbcf13e43438545d591cfd2e4b
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta

@@ -0,0 +1,27 @@
+fileFormatVersion: 2
+guid: a94cf6fef2879da4c91e5ef768aadf4e
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -206,7 +206,7 @@ public class CardEntity : MonoBehaviour
         //createCardUI(needTrueFun);
         createCardDescription();
         createCardName();
-        //createCardCost();
+        createCardCostInit();
         //createCardImage();
         createCardImageTest();
         this.cardIndex = cardIndex;
@@ -224,7 +224,7 @@ public class CardEntity : MonoBehaviour
         createEffectCardUI(needTrueFun);
         createCardDescription();
         createCardName();
-        //createCardCost();
+        createCardCostInit();
         createCardImage();
         //createCardImageTest();
         this.cardIndex = cardIndex;
@@ -245,8 +245,8 @@ public class CardEntity : MonoBehaviour
         //createCardDescription();
         createCardName();
         createCardImage();
-        
+
-        //createCardCost();
+        createCardCostInit();
         //createCardImage();
         //createCardImageTest();
         this.cardIndex = cardIndex;
@@ -434,6 +434,23 @@ public class CardEntity : MonoBehaviour
         }
     }
 
+    public void createCardCostInit()
+    {
+        /*        if (cardOriginalData.FunctionVal.ContainsKey(CardFunction.xCost))
+                {
+                    cost.text = "X";
+                }
+                else
+                {*/
+        (currentCost, currentCostType) = CardResourcesManager.Instance.getCardCostInit(this);
+        cost.text = currentCost.ToString();
+        if (currentCost != lastCost)
+        {
+            lastCost = currentCost;
+            CheckUse();
+        }
+    }
+
     public void createCardUI(bool needTrueFun)
     {
 

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

@@ -135,6 +135,14 @@ public class CardResourcesManager : Singleton <CardResourcesManager>
         return (cost, costType);
     }
 
+    public (int trueCost, string trueCostType) getCardCostInit(CardEntity cardEntity)
+    {
+        CardOriginalData cardOriginalData = cardEntity.cardOriginalData;
+        int cost = cardOriginalData.Cost;
+        string costType = cardOriginalData.costType.Substring(0);
+        MathTool.keepNature(ref cost);
+        return (cost, costType);
+    }
     public (int trueCost, string trueCostType) getCardCostForSettle(CardOriginalData cardOriginalData)
     {
         int cost = cardOriginalData.Cost;

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

@@ -77,7 +77,7 @@ public class Pharmacist : Enemy
     }
     public override void OnDeath()
     {
-        RewardManager.Instance.AddRewardTips(RewardManager.RewardType.potion, 1.ToString());
+        RewardManager.Instance.AddRewardTips(RewardManager.RewardType.potion, MathTool.GetRandomElements(PotionManager.Instance.potionSet,1).ElementAt(0));
     }
 
     public override IEnumerator JudgeActionCoroutine()//等移动到位置就判断是否还能走

ColorlessWorld-2024-4-2/Assets/Scripts/Potion/PotionManager.cs

@@ -14,6 +14,7 @@ public class PotionManager : Singleton<PotionManager>
     public string filePath;
     public Dictionary<string, string[]> potionDictionary = new Dictionary<string, string[]>();
     public Dictionary<int, string> potionEffect = new Dictionary<int, string>();
+    public HashSet<string> potionSet = new HashSet<string>();
 
     private void OnEnable()
     {
@@ -127,6 +128,7 @@ public class PotionManager : Singleton<PotionManager>
                 }
                 // 用逗号分隔每行数据
                 string[] values = line.Split(',');
+                potionSet.Add(values[0]);
                 potionDictionary.Add(values[0],values);
             }
         }

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

@@ -216,6 +216,8 @@ public static class CardFunction
     public const string infection = "119";
     //下回合能量上限-1
     public const string nextRoundCostMinusOne = "120";
+    //»÷ÍË·¶Î§
+    public const string repelRound = "121";
 
 
 

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

@@ -218,6 +218,7 @@ public static class Name
     
     public static void getSingleDescription(StringBuilder sb, KeyValuePair<string, string> kvp)
     {
+        Debug.Log("KeyValuePair是" + kvp.Key + "|" + kvp.Value);
         switch (kvp.Key)
         {
             case CardFunction.cardDamage:
@@ -363,6 +364,9 @@ public static class Name
             case CardFunction.teleportAround:
                 sb.Append("玩家出现在周围随机1格");
                 break;
+            case CardFunction.infCastRange:
+                sb.Append("无限施法距离");
+                break;
             case CardFunction.drawEffectCard:
                 sb.Append("抽" + kvp.Value + "张效果牌");
                 break;
@@ -435,8 +439,44 @@ public static class Name
             case CardFunction.bleedForRedNode:
                 sb.Append("对红色地块造成" + kvp.Value + "层流血");
                 break;
+            case CardFunction.shieldToDamage:
+                sb.Append("对目标造成护盾值的伤害");
+                break;
             case CardFunction.damageForRedNode:
-                sb.Append("对红色地块造成" + kvp.Value + "点伤害");
+                //sb.Append("对红色地块造成" + Usermanager.Instance.DamageCalculation(int.Parse(kvp.Value)) + "点伤害");
+                if (Usermanager.Instance != null)
+                {
+                    sb.Append("对红色地块造成" + Usermanager.Instance.DamageCalculation(int.Parse(kvp.Value)) + "点伤害");
+                }
+                else
+                {
+                    sb.Append("对红色地块造成" + kvp.Value + "点伤害");
+                }
+                break;
+            case CardFunction.damageForBlueNode:
+                if (Usermanager.Instance != null)
+                {
+                    sb.Append("对蓝色地块造成" + Usermanager.Instance.DamageCalculation(int.Parse(kvp.Value)) + "点伤害");
+                }
+                else
+                {
+                    sb.Append("对蓝色地块造成" + kvp.Value + "点伤害");
+                }
+                break;
+            case CardFunction.damagexyForBlueNode:
+                string[] valuesA = kvp.Value.Split("&");
+                if (Usermanager.Instance != null)
+                {
+                    sb.Append("对蓝色地块造成" + Usermanager.Instance.DamageCalculation(int.Parse(valuesA[0])) + "点伤害" + valuesA[1] + "次");
+                }
+                else
+                {
+                    sb.Append("对蓝色地块造成" + int.Parse(valuesA[0]) + "点伤害" + valuesA[1] + "次");
+                }
+                
+                break;
+            case CardFunction.nextRoundCostMinusOne:
+                sb.Append("下回合能量回复-1");
                 break;
             case CardFunction.damagexy:
                 string[] values = kvp.Value.Split("&");
@@ -450,6 +490,9 @@ public static class Name
             case CardFunction.repel:
                 sb.Append("击退" + kvp.Value + "格");
                 break;
+            case CardFunction.repelRound:
+                sb.Append("击退范围1的单位" + kvp.Value + "格");
+                break;
             case CardFunction.reduceCost:
                 sb.Append("<link=\"" + kvp.Key + "\">费用-" + kvp.Value + "</link>");
                 break;

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

@@ -204,6 +204,8 @@ public class BuffDataManager : Singleton<BuffDataManager>
                 return "本回合无法释放效果牌";
             case AbnormalCondition.nextDyeingCardRangeAddTwo:
                 return "下张涂色牌施法距离+2";
+            case AbnormalCondition.nextRoundCostMinusOne:
+                return "下回合能量回复-1";
 
         }
         return " ";

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

@@ -225,7 +225,7 @@ public class MapUnityManager : Singleton<MapUnityManager>
         castPool= getNodeTools.getAllCanUseNode();
         foreach (MapUnity mapUnity in castPool)
         {
-            mapUnity.EffectInfluenced(castPool);
+            mapUnity.PlayerCastRangeInf(castPool);
         }
     }
  }

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

@@ -548,7 +548,8 @@ public class SettlementManager : Singleton<SettlementManager>
     public void teleportAround(List<MapUnity> influencePreviewPool)
     {
         HashSet<MapUnity> targets = new HashSet<MapUnity> { influencePreviewPool[0] };
-        getNodeTools.getCircleNode(targets, 1);
+        getNodeTools.getCircleNodeExceptSelf(targets, 1);
+        getNodeTools.exceptWithEnemyNode(targets);
         HashSet<MapUnity> targetNode = MathTool.GetRandomElements(targets, 1);
 
         getNodeTools.playerTeleportToNode(targetNode.ElementAt(0));
@@ -1057,6 +1058,7 @@ public class SettlementManager : Singleton<SettlementManager>
                     //
                     break;
                 case CardFunction.repel:
+                case CardFunction.repelRound:
                     repelFromPlayer(influencePreviewPool, targetNode,int.Parse(kvp.Value));
                     break;
                 case CardFunction.repelToEnd:

ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_effect_4.csv

@@ -11,11 +11,11 @@
 2015,1,2,1,15,yellow>4,53,5&3,1,0_0,EffectCardIcon/左右开弓,1,3,0,左右开弓,none
 2017,1,1,83,3,yellow>4,93,1,none,0_0,EffectCardIcon/死亡印记,1,3,0,死亡印记,none
 2018,1,1,84;85,1;1,yellow>5,33,1,none,0_0,EffectCardIcon/暗影步,1,2,0,暗影步,none
-2019,1,3,94,10,red>12,95,5&2,94,0_0,EffectCardIcon/影舞步,1,2,0,影舞步,none
+2019,1,3,94,10,red>12,95,5&2,94,0_0,EffectCardIcon/影舞步,0,2,0,影舞步,none
 2021,1,1,90,1,blue>7,89,1,none,0_0,EffectCardIcon/血怒,0,3,1,血怒,none
 2022,1,3,68,1,red>5,69,1,68,0_0,EffectCardIcon/抽血,1,3,0,抽血,none
 2023,1,1,52,2,yellow>5,52,3,52,0_0,EffectCardIcon/踢击,1,1,0,踢击,none
-2024,1,1,52,1,red>10,52,2,52,0_1;1_0;0_-1;-1_0;-1_1;-1_-1,EffectCardIcon/展翅,0,1,0,展翅,击退2格
+2024,1,1,121,1,red>10,121,2,121,0_1;1_0;0_-1;-1_0;-1_1;-1_-1,EffectCardIcon/展翅,0,1,0,展翅,击退2格
 2026,1,1,40,2,blue>5,16,1,none,0_0,EffectCardIcon/疾跑,0,2,0,疾跑,none
 2027,1,2,5;58,2;2,blue>10,5;58,3;3,5;58,0_0,EffectCardIcon/穷追猛砍,1,2,0,穷追猛砍,none
 2028,1,1,53,6&2,aroundblue=4,53,6&4,53,0_1;1_0;0_-1;-1_0;-1_1;-1_-1,EffectCardIcon/剑刃风暴,1,3,0,剑刃风暴,none
@@ -35,4 +35,4 @@
 2044,1,1,12;102,1;10,none,none,none,none,0_0,EffectCardIcon/战吼,1,1,0,背刺,none
 2045,1,1,101,7,blue>5,12,1,none,0_0,EffectCardIcon/战吼,1,1,0,践踏,none
 2046,1,1,100,1,yellow>7,16,2,none,0_0,EffectCardIcon/战吼,0,2,0,狂战,none
-2047,1,1,1,22,blue>9,103,22&2,1,0_0,EffectCardIcon/战吼,1,2,0,斩杀,如果击杀，回复2点能量
+2047,1,2,1,22,blue>9,103,22&2,1,0_0,EffectCardIcon/战吼,1,2,0,斩杀,如果击杀，回复2点能量