From 899213d47823f28456b3adb385578cfb65d64d14 Mon Sep 17 00:00:00 2001 From: yjm484 <171359351@qq.com> Date: Tue, 13 May 2025 16:42:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=8D=AF=E6=B0=B4=E6=8E=89=E8=90=BD?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Pharmacist.cs | 2 +- ColorlessWorld-2024-4-2/Assets/Scripts/Potion/PotionManager.cs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Pharmacist.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Pharmacist.cs index 1e5ff9f7..0bdbc01e 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Pharmacist.cs +++ b/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()//等移动到位置就判断是否还能走 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Potion/PotionManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Potion/PotionManager.cs index b073eb9b..fdd3247e 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Potion/PotionManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Potion/PotionManager.cs @@ -14,6 +14,7 @@ public class PotionManager : Singleton public string filePath; public Dictionary potionDictionary = new Dictionary(); public Dictionary potionEffect = new Dictionary(); + public HashSet potionSet = new HashSet(); private void OnEnable() { @@ -117,6 +118,7 @@ public class PotionManager : Singleton } // 用逗号分隔每行数据 string[] values = line.Split(','); + potionSet.Add(values[0]); potionDictionary.Add(values[0],values); } } From 5be08eaaa15deda69719491159bb9d582b74f00e Mon Sep 17 00:00:00 2001 From: yjm484 <171359351@qq.com> Date: Fri, 16 May 2025 01:30:37 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Upgrade for URP.unitypackage.meta | 7 ----- .../Assets/Plugins/Microsoft.CSharp.dll.meta | 27 +++++++++++++++++++ .../StreamingAssets/card_data_effect_4.csv | 4 +-- 3 files changed, 29 insertions(+), 9 deletions(-) delete mode 100644 ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta b/ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta deleted file mode 100644 index 1d182472..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5b07afdbcf13e43438545d591cfd2e4b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta b/ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta new file mode 100644 index 00000000..17bba4e5 --- /dev/null +++ b/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: diff --git a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_effect_4.csv b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_effect_4.csv index f51ca302..65887db4 100644 --- a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_effect_4.csv +++ b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_effect_4.csv @@ -11,7 +11,7 @@ 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 @@ -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鐐硅兘閲 From c907f74f98513fd3178c553e0ac62cb6250e0928 Mon Sep 17 00:00:00 2001 From: yjm484 <171359351@qq.com> Date: Fri, 16 May 2025 03:04:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?0516=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/GameDate/PlayerState.asset | 8 ++-- .../Assets/GameDate/cardDeckList.asset | 12 ++--- .../Assets/Scripts/Card/CardEntity.cs | 25 +++++++++-- .../Scripts/Card/CardResourcesManager.cs | 8 ++++ .../Assets/Scripts/Tool/CardFunction.cs | 2 + .../Assets/Scripts/Tool/Name.cs | 45 ++++++++++++++++++- .../Assets/Scripts/manager/BuffDataManager.cs | 2 + .../Assets/Scripts/manager/MapUnityManager.cs | 2 +- .../Scripts/manager/SettlementManager.cs | 4 +- .../StreamingAssets/card_data_effect_4.csv | 2 +- 10 files changed, 92 insertions(+), 18 deletions(-) diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset index 009b33dc..ee024c23 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset +++ b/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 diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset index 465b0875..acc41090 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset @@ -21,11 +21,11 @@ MonoBehaviour: - 2041 - 2042 - 2043 - - 2044 + - 2019 - 2045 - - 2046 + - 2019 - 2047 - - 1010 - - 1010 - - 1005 - - 1005 + - 2018 + - 2019 + - 2018 + - 2018 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs index 26ab38a4..74119296 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs +++ b/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) { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardResourcesManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardResourcesManager.cs index ba4a3d88..925abc89 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardResourcesManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardResourcesManager.cs @@ -135,6 +135,14 @@ public class CardResourcesManager : Singleton 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; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardFunction.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardFunction.cs index 383a0d9b..eb258bea 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardFunction.cs +++ b/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"; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs index c661ed5c..0726fac7 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs @@ -218,6 +218,7 @@ public static class Name public static void getSingleDescription(StringBuilder sb, KeyValuePair 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("费用-" + kvp.Value + ""); break; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs index 7b68c737..d7185d0e 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs @@ -204,6 +204,8 @@ public class BuffDataManager : Singleton return "本回合无法释放效果牌"; case AbnormalCondition.nextDyeingCardRangeAddTwo: return "下张涂色牌施法距离+2"; + case AbnormalCondition.nextRoundCostMinusOne: + return "下回合能量回复-1"; } return " "; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/MapUnityManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/MapUnityManager.cs index 6662579b..fddff944 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/MapUnityManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/MapUnityManager.cs @@ -225,7 +225,7 @@ public class MapUnityManager : Singleton castPool= getNodeTools.getAllCanUseNode(); foreach (MapUnity mapUnity in castPool) { - mapUnity.EffectInfluenced(castPool); + mapUnity.PlayerCastRangeInf(castPool); } } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs index 2dca97da..b539e48d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs @@ -548,7 +548,8 @@ public class SettlementManager : Singleton public void teleportAround(List influencePreviewPool) { HashSet targets = new HashSet { influencePreviewPool[0] }; - getNodeTools.getCircleNode(targets, 1); + getNodeTools.getCircleNodeExceptSelf(targets, 1); + getNodeTools.exceptWithEnemyNode(targets); HashSet targetNode = MathTool.GetRandomElements(targets, 1); getNodeTools.playerTeleportToNode(targetNode.ElementAt(0)); @@ -1057,6 +1058,7 @@ public class SettlementManager : Singleton // break; case CardFunction.repel: + case CardFunction.repelRound: repelFromPlayer(influencePreviewPool, targetNode,int.Parse(kvp.Value)); break; case CardFunction.repelToEnd: diff --git a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_effect_4.csv b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_effect_4.csv index 65887db4..4fd9d967 100644 --- a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_effect_4.csv +++ b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_effect_4.csv @@ -15,7 +15,7 @@ 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 From 8fd0c09fec25b75749b41dfc81b9ae44f3313dbc Mon Sep 17 00:00:00 2001 From: yjm484 <171359351@qq.com> Date: Fri, 16 May 2025 03:07:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=812?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset | 2 -- 1 file changed, 2 deletions(-) diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset index 0bd55054..b505e5d5 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset @@ -13,7 +13,6 @@ MonoBehaviour: m_Name: cardDeckList m_EditorClassIdentifier: cardDeckList: -<<<<<<< HEAD - 1010 - 1005 - 1010 @@ -39,4 +38,3 @@ MonoBehaviour: - 2032 - 2001 - 2019 ->>>>>>> origin/dev-1217