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/Scripts/StartChoosePoint/GetWeaponNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/StartChoosePoint/GetWeaponNode.cs index 0083cbba..f21e0bb6 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/StartChoosePoint/GetWeaponNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/StartChoosePoint/GetWeaponNode.cs @@ -52,7 +52,15 @@ public class GetWeaponNode : MonoBehaviour StartChooseCardManager.Instance.getWeaponNodeAnimator.SetTrigger("end"); TipManager.Instance.SendGetItemTip("附魔次数已用尽"); } - StartChooseCardManager.Instance.RefreshWeaponNode(); + if (StartChooseCardManager.Instance.getWeaponNodeCount == 1 && StartChooseCardManager.Instance.CheckPlayerHaveAddScore()) + { + StartChooseCardManager.Instance.RefreshWeaponNodeWithAddScore(); + } + else + { + StartChooseCardManager.Instance.RefreshWeaponNode(); + } + //StartChooseCardManager.Instance.RefreshWeaponNode(); break; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/StartChoosePoint/StartChooseCardManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/StartChoosePoint/StartChooseCardManager.cs index de343304..574925ca 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/StartChoosePoint/StartChooseCardManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/StartChoosePoint/StartChooseCardManager.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using TMPro; using UnityEngine; +using static Name; public class StartChooseCardManager : Singleton { @@ -120,6 +121,25 @@ public class StartChooseCardManager : Singleton } } + + public void RefreshWeaponNodeWithAddScore() + { + for (int i = 0; i < getWeaponNodeList.Count; i++) + { + if (getWeaponNodeList[i].currentWeaponNode != null) + { + Destroy(getWeaponNodeList[i].currentWeaponNode); + } + //GameObject weaponNode = WeaponManager.Instance.getRandomWeaponNodeForPlayer(); + GameObject weaponNode = WeaponManager.Instance.getRandomAddScoreWeaponNodeForPlayerWithLevel(Name.WeaponNodeLevel.Basic); + weaponNode.transform.parent = getWeaponNodeList[i].weaponNodeFather; + weaponNode.transform.localPosition = Vector3.zero; + weaponNode.transform.localScale = Vector3.one; + weaponNode.transform.localEulerAngles = Vector3.zero; + getWeaponNodeList[i].currentWeaponNode = weaponNode; + + } + } public void LoadWeaponNodeToGame() { if (openCount > 0 || getWeaponNodeCount > 0) @@ -193,6 +213,27 @@ public class StartChooseCardManager : Singleton } } + public bool CheckPlayerHaveAddScore() + { + bool result=true; + for (int i = 0; i < playerWeaponNode.childCount; i++) + { + Transform weaponSlot = playerWeaponNode.GetChild(i); + if (weaponSlot.childCount != 0) + { + Transform weaponNode = weaponSlot.GetChild(0); + WeaponNode node = weaponNode.transform.GetComponent(); + if (Name.WeaponNodeFunction.PlayerBasicAddScoreResultSet.Contains(node.result)) + { + Debug.Log("成功进入3"); + result =false; + return result; + } + } + } + return result; + } + public void OpenBag() { PlayerStatusUIManager.Instance.OpenBag(); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs index 7839b083..62020d5f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs @@ -590,7 +590,7 @@ public static class Name return sb.ToString(); } - public static string getGemResultDescription(string result, string resultValue, string[] nodesMark, string[] nodesColor) + public static string getGemResultDescription(string result, string resultValue) { StringBuilder sb = new StringBuilder(); switch (result) @@ -1048,20 +1048,20 @@ public static class Name //鐐稿脊鐖嗙偢 public const string bombbomb = "bombbomb"; - public static readonly HashSet PlayerConditionSet= new HashSet { cardConditionPattern,position, positionUnused, positionUsed, diffSettle - ,usedCard,node,threeColorCountMoreThan,everyNumNodeConvert}; + public static readonly HashSet PlayerConditionSet= new HashSet { cardConditionPattern + ,node,everyNumNodeConvert}; public static readonly HashSet PlayerBasicConditionSet = new HashSet { cardConditionPattern, - node,position}; + node}; - public static readonly HashSet PlayerElementaryConditionSet = new HashSet { cardConditionPattern,position - ,usedCard,node,everyNumNodeConvert}; + public static readonly HashSet PlayerElementaryConditionSet = new HashSet { cardConditionPattern + ,node,everyNumNodeConvert}; - public static readonly HashSet PlayerIntermediateConditionSet = new HashSet { cardConditionPattern,position, positionUsed, diffSettle - ,usedCard,node,everyNumNodeConvert}; + public static readonly HashSet PlayerIntermediateConditionSet = new HashSet { cardConditionPattern + ,node,everyNumNodeConvert}; - public static readonly HashSet PlayerAdvancedConditionSet = new HashSet { cardConditionPattern, positionUnused - ,node,threeColorCountMoreThan}; + public static readonly HashSet PlayerAdvancedConditionSet = new HashSet { cardConditionPattern + ,node}; } @@ -1178,6 +1178,9 @@ public static class Name public static readonly HashSet PlayerBasicResultSet = new HashSet { addScore, redNodeCount, blueNodeCount ,yellowNodeCount,everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore}; + public static readonly HashSet PlayerBasicAddScoreResultSet = new HashSet { addScore + ,everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore}; + public static readonly HashSet PlayerElementaryResultSet = new HashSet { addScore, redNodeCount, blueNodeCount ,yellowNodeCount,mostNodeCount,leastNodeCount,drawCard,everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore}; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponManager.cs index 744d33b0..51d797ab 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponManager.cs @@ -3,7 +3,11 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using System.Text; +using System.Text.RegularExpressions; +using Unity.VisualScripting; using UnityEngine; +using static Cinemachine.DocumentationSortingAttribute; +using static Name; public class WeaponManager : Singleton { @@ -318,6 +322,116 @@ public class WeaponManager : Singleton return gem; } + public WeaponNodeDataPair getRandomConditionWithLevel(string level) + { + string condition = ""; + WeaponNodeDataPair result= new WeaponNodeDataPair(); + switch (level) + { + case Name.WeaponNodeLevel.Basic: + condition = MathTool.GetRandomElements(Name.WeaponNodeCondition.PlayerBasicConditionSet, 1).ElementAt(0); + break; + case Name.WeaponNodeLevel.Elementary: + condition = MathTool.GetRandomElements(Name.WeaponNodeCondition.PlayerElementaryConditionSet, 1).ElementAt(0); + break; + case Name.WeaponNodeLevel.Intermediate: + condition = MathTool.GetRandomElements(Name.WeaponNodeCondition.PlayerIntermediateConditionSet, 1).ElementAt(0); + break; + case Name.WeaponNodeLevel.Advanced: + condition = MathTool.GetRandomElements(Name.WeaponNodeCondition.PlayerAdvancedConditionSet, 1).ElementAt(0); + break; + } + + string conditionValue = ""; + List nodesMark = new List(); + List nodesColor = new List(); + conditionValue = getConditionValueWithLevel(level, ref condition, ref nodesMark, ref nodesColor); + result.conditionOrResult = condition; + result.value = conditionValue; + result.nodesMark = nodesMark.ToArray(); + result.nodesColor = nodesColor.ToArray(); + result.description = Name.getGemConditionDescription(condition, conditionValue, nodesMark.ToArray(), nodesColor.ToArray()); + return result; + } + + public WeaponNodeDataPair getRandomResultWithLevel(string level) + { + string condition = ""; + WeaponNodeDataPair resultData = new WeaponNodeDataPair(); + string result = ""; + switch (level) + { + case Name.WeaponNodeLevel.Basic: + result = MathTool.GetRandomElements(Name.WeaponNodeFunction.PlayerBasicResultSet, 1).ElementAt(0); + break; + case Name.WeaponNodeLevel.Elementary: + result = MathTool.GetRandomElements(Name.WeaponNodeFunction.PlayerElementaryResultSet, 1).ElementAt(0); + break; + case Name.WeaponNodeLevel.Intermediate: + result = MathTool.GetRandomElements(Name.WeaponNodeFunction.PlayerIntermediateResultSet, 1).ElementAt(0); + break; + case Name.WeaponNodeLevel.Advanced: + result = MathTool.GetRandomElements(Name.WeaponNodeFunction.PlayerAdvancedResultSet, 1).ElementAt(0); + break; + } + string resultValue = getResultValueWithLevel(level, ref result, Name.none, Name.none); + resultData.conditionOrResult = condition; + resultData.value = resultValue; + resultData.description = Name.getGemResultDescription(result, resultValue); + return resultData; + } + public GameObject getRandomAddScoreWeaponNodeForPlayerWithLevel(string level) + { + GameObject gem = Instantiate(Resources.Load(Name.WeaponNode.PrefabPath + Name.WeaponNode.PrefabName)); + string condition = ""; + switch (level) + { + case Name.WeaponNodeLevel.Basic: + condition = MathTool.GetRandomElements(Name.WeaponNodeCondition.PlayerBasicConditionSet, 1).ElementAt(0); + break; + case Name.WeaponNodeLevel.Elementary: + condition = MathTool.GetRandomElements(Name.WeaponNodeCondition.PlayerElementaryConditionSet, 1).ElementAt(0); + break; + case Name.WeaponNodeLevel.Intermediate: + condition = MathTool.GetRandomElements(Name.WeaponNodeCondition.PlayerIntermediateConditionSet, 1).ElementAt(0); + break; + case Name.WeaponNodeLevel.Advanced: + condition = MathTool.GetRandomElements(Name.WeaponNodeCondition.PlayerAdvancedConditionSet, 1).ElementAt(0); + break; + } + + string conditionValue = ""; + List nodesMark = new List(); + List nodesColor = new List(); + string result = ""; + switch (level) + { + case Name.WeaponNodeLevel.Basic: + result = MathTool.GetRandomElements(Name.WeaponNodeFunction.PlayerBasicAddScoreResultSet, 1).ElementAt(0); + break; + case Name.WeaponNodeLevel.Elementary: + result = MathTool.GetRandomElements(Name.WeaponNodeFunction.PlayerElementaryResultSet, 1).ElementAt(0); + break; + case Name.WeaponNodeLevel.Intermediate: + result = MathTool.GetRandomElements(Name.WeaponNodeFunction.PlayerIntermediateResultSet, 1).ElementAt(0); + break; + case Name.WeaponNodeLevel.Advanced: + result = MathTool.GetRandomElements(Name.WeaponNodeFunction.PlayerAdvancedResultSet, 1).ElementAt(0); + break; + } + + string resultValue = ""; + conditionValue = getConditionValueWithLevel(level, ref condition, ref nodesMark, ref nodesColor); + resultValue = getResultValueWithLevel(level, ref result, condition, conditionValue); + WeaponNode weaponNode = gem.GetComponent(); + weaponNode.result = result; + weaponNode.resultValue = resultValue; + weaponNode.condition = condition; + weaponNode.conditionValue = conditionValue; + weaponNode.nodesMark = nodesMark.ToArray(); + weaponNode.nodesColor = nodesColor.ToArray(); + return gem; + } public GameObject getRandomWeaponNodeForPlayerWithLevelDiff(int levelDiff) { GameObject gem = Instantiate(Resources.Load(Name.WeaponNode.PrefabPath + Name.WeaponNode.PrefabName)); @@ -626,16 +740,16 @@ public class WeaponManager : Singleton switch (level) { case Name.WeaponNodeLevel.Basic: - conditionValue = MathTool.GetRandomElements(new HashSet { "1", "2", }, 1).ElementAt(0); + conditionValue = MathTool.GetRandomElements(new HashSet { "1" }, 1).ElementAt(0); break; case Name.WeaponNodeLevel.Elementary: - conditionValue = MathTool.GetRandomElements(new HashSet { "2", "3", }, 1).ElementAt(0); + conditionValue = MathTool.GetRandomElements(new HashSet { "2", }, 1).ElementAt(0); break; case Name.WeaponNodeLevel.Intermediate: - conditionValue = MathTool.GetRandomElements(new HashSet { "3", "4", "5" }, 1).ElementAt(0); + conditionValue = MathTool.GetRandomElements(new HashSet { "3" }, 1).ElementAt(0); break; case Name.WeaponNodeLevel.Advanced: - conditionValue = MathTool.GetRandomElements(new HashSet { "4", "5" }, 1).ElementAt(0); + conditionValue = MathTool.GetRandomElements(new HashSet { "4"}, 1).ElementAt(0); break; } break; @@ -647,16 +761,16 @@ public class WeaponManager : Singleton switch (level) { case Name.WeaponNodeLevel.Basic: - conditionValue = MathTool.GetRandomElements(MathTool.GetIntegerRangeAsStrings(3, 5), 1).ElementAt(0); + conditionValue = MathTool.GetRandomElements(MathTool.GenerateIntegerSet(10, 11), 1).ElementAt(0); break; case Name.WeaponNodeLevel.Elementary: - conditionValue = MathTool.GetRandomElements(MathTool.GetIntegerRangeAsStrings(4, 6), 1).ElementAt(0); + conditionValue = MathTool.GetRandomElements(MathTool.GenerateIntegerSet(7, 9), 1).ElementAt(0); break; case Name.WeaponNodeLevel.Intermediate: - conditionValue = MathTool.GetRandomElements(MathTool.GetIntegerRangeAsStrings(5, 7), 1).ElementAt(0); + conditionValue = MathTool.GetRandomElements(MathTool.GenerateIntegerSet(5, 6), 1).ElementAt(0); break; case Name.WeaponNodeLevel.Advanced: - conditionValue = MathTool.GetRandomElements(MathTool.GetIntegerRangeAsStrings(6, 8), 1).ElementAt(0); + conditionValue = MathTool.GetRandomElements(MathTool.GenerateIntegerSet(3, 4), 1).ElementAt(0); break; } break; @@ -697,16 +811,16 @@ public class WeaponManager : Singleton switch (level) { case Name.WeaponNodeLevel.Basic: - part3 = MathTool.GetRandomElements(MathTool.GetIntegerRangeAsStrings(3, 5), 1).ElementAt(0); + part3 = MathTool.GetRandomElements(MathTool.GenerateIntegerSet(3, 5), 1).ElementAt(0); break; case Name.WeaponNodeLevel.Elementary: - part3 = MathTool.GetRandomElements(MathTool.GetIntegerRangeAsStrings(5, 8), 1).ElementAt(0); + part3 = MathTool.GetRandomElements(MathTool.GenerateIntegerSet(6, 8), 1).ElementAt(0); break; case Name.WeaponNodeLevel.Intermediate: - part3 = MathTool.GetRandomElements(MathTool.GetIntegerRangeAsStrings(9, 12), 1).ElementAt(0); + part3 = MathTool.GetRandomElements(MathTool.GenerateIntegerSet(9, 12), 1).ElementAt(0); break; case Name.WeaponNodeLevel.Advanced: - part3 = MathTool.GetRandomElements(MathTool.GetIntegerRangeAsStrings(14, 18), 1).ElementAt(0); + part3 = MathTool.GetRandomElements(MathTool.GenerateIntegerSet(14, 18), 1).ElementAt(0); break; } sb.Append(part3); @@ -760,7 +874,7 @@ public class WeaponManager : Singleton switch (level) { case Name.WeaponNodeLevel.Basic: - resultValue = MathTool.GetRandomElements(MathTool.GenerateIntegerSet(3, 7), 1).ElementAt(0); + resultValue = MathTool.GetRandomElements(MathTool.GenerateIntegerSet(3, 5), 1).ElementAt(0); break; case Name.WeaponNodeLevel.Elementary: resultValue = MathTool.GetRandomElements(MathTool.GenerateIntegerSet(6, 12), 1).ElementAt(0); @@ -797,7 +911,7 @@ public class WeaponManager : Singleton resultValue = MathTool.GetRandomElements(MathTool.GenerateIntegerSet(1, 2), 1).ElementAt(0); break; case Name.WeaponNodeLevel.Intermediate: - resultValue = MathTool.GetRandomElements(MathTool.GenerateIntegerSet(2, 3), 1).ElementAt(0); + resultValue = MathTool.GetRandomElements(MathTool.GenerateIntegerSet(3, 3), 1).ElementAt(0); break; case Name.WeaponNodeLevel.Advanced: resultValue = MathTool.GetRandomElements(MathTool.GenerateIntegerSet(4, 5), 1).ElementAt(0); @@ -872,6 +986,257 @@ public class WeaponManager : Singleton } + public string getWeaponNodeResultRarity(string result, string resultValue) + { + string rarity=Name.none; + Dictionary> addScoreDict = new Dictionary> + { { Name.WeaponNodeLevel.Basic, MathTool.GenerateIntegerSet(5, 7) }, + { Name.WeaponNodeLevel.Elementary, MathTool.GenerateIntegerSet(8, 12) }, + { Name.WeaponNodeLevel.Intermediate, MathTool.GenerateIntegerSet(13, 18) }, + { Name.WeaponNodeLevel.Advanced, MathTool.GenerateIntegerSet(23, 30) }}; + Dictionary> mulScoreDict = new Dictionary>{ + { Name.WeaponNodeLevel.Intermediate, MathTool.GenerateIntegerSet(1, 3) }, + { Name.WeaponNodeLevel.Advanced, MathTool.GenerateIntegerSet(4, 6) }}; + Dictionary> nodeCountDict = new Dictionary> + { { Name.WeaponNodeLevel.Basic, MathTool.GenerateIntegerSet(3, 5) }, + { Name.WeaponNodeLevel.Elementary, MathTool.GenerateIntegerSet(6, 12) }, + { Name.WeaponNodeLevel.Intermediate, MathTool.GenerateIntegerSet(14, 18) }, + { Name.WeaponNodeLevel.Advanced, MathTool.GenerateIntegerSet(20, 25) }}; + Dictionary> allNodeCountDict = new Dictionary>{ + { Name.WeaponNodeLevel.Basic, MathTool.GenerateIntegerSet(2, 3) }, + { Name.WeaponNodeLevel.Elementary, MathTool.GenerateIntegerSet(4, 6) }, + { Name.WeaponNodeLevel.Intermediate, MathTool.GenerateIntegerSet(7, 9) }, + { Name.WeaponNodeLevel.Advanced, MathTool.GenerateIntegerSet(10, 12) }}; + Dictionary> drawCardDict = new Dictionary>{ + { Name.WeaponNodeLevel.Basic, MathTool.GenerateIntegerSet(1, 2) }, + { Name.WeaponNodeLevel.Elementary, MathTool.GenerateIntegerSet(3, 3) }, + { Name.WeaponNodeLevel.Intermediate, MathTool.GenerateIntegerSet(4, 5) }}; + Dictionary> everyNodeAddScoreDict = new Dictionary>{ + { Name.WeaponNodeLevel.Basic, MathTool.GenerateIntegerSet(1, 1) }, + { Name.WeaponNodeLevel.Elementary, MathTool.GenerateIntegerSet(2, 3) }, + { Name.WeaponNodeLevel.Intermediate, MathTool.GenerateIntegerSet(4, 5) }, + { Name.WeaponNodeLevel.Advanced, MathTool.GenerateIntegerSet(6, 8) }}; + Dictionary> isIgnoreConditionDict = new Dictionary>(); + Dictionary> VolcanoDict = new Dictionary>{ + { Name.WeaponNodeLevel.Basic, MathTool.GenerateIntegerSet(1, 1) }, + { Name.WeaponNodeLevel.Elementary, MathTool.GenerateIntegerSet(2, 2) }, + { Name.WeaponNodeLevel.Intermediate, MathTool.GenerateIntegerSet(3, 3) }, + { Name.WeaponNodeLevel.Advanced, MathTool.GenerateIntegerSet(4, 4) }}; + + switch (result) + { + case Name.WeaponNodeFunction.addScore: + foreach(KeyValuePair> kvp in addScoreDict) + { + if (kvp.Value.Contains(resultValue)) + { + rarity= kvp.Key; + } + } + break; + case Name.WeaponNodeFunction.mulScore: + foreach (KeyValuePair> kvp in mulScoreDict) + { + if (kvp.Value.Contains(resultValue)) + { + rarity = kvp.Key; + } + } + break; + case Name.WeaponNodeFunction.repetWeaponNode: + rarity = Name.WeaponNodeLevel.Advanced; + break; + case Name.WeaponNodeFunction.redNodeCount: + case Name.WeaponNodeFunction.blueNodeCount: + case Name.WeaponNodeFunction.yellowNodeCount: + case Name.WeaponNodeFunction.mostNodeCount: + case Name.WeaponNodeFunction.leastNodeCount: + foreach (KeyValuePair> kvp in nodeCountDict) + { + if (kvp.Value.Contains(resultValue)) + { + rarity = kvp.Key; + } + } + break; + case Name.WeaponNodeFunction.allNodeCount: + foreach (KeyValuePair> kvp in allNodeCountDict) + { + if (kvp.Value.Contains(resultValue)) + { + rarity = kvp.Key; + } + } + break; + case Name.WeaponNodeFunction.drawCard: + foreach (KeyValuePair> kvp in drawCardDict) + { + if (kvp.Value.Contains(resultValue)) + { + rarity = kvp.Key; + } + } + break; + case Name.WeaponNodeFunction.everyRedNodeAddScore: + case Name.WeaponNodeFunction.everyYellowNodeAddScore: + case Name.WeaponNodeFunction.everyBlueNodeAddScore: + foreach (KeyValuePair> kvp in everyNodeAddScoreDict) + { + if (kvp.Value.Contains(resultValue)) + { + rarity = kvp.Key; + } + } + break; + case Name.NodeItem.Volcano: + foreach (KeyValuePair> kvp in VolcanoDict) + { + if (kvp.Value.Contains(resultValue)) + { + rarity = kvp.Key; + } + } + break; + case Name.WeaponNodeFunction.isIgnoreCondition: + rarity = Name.WeaponNodeLevel.Advanced; + break; + } + return rarity; + } + + public string getWeaponNodeConditionRarity(string condition, string conditionValue, string[] nodesColor) + { + string rarity = Name.none; + Dictionary> everyNumNodeConvertDict = new Dictionary> + { { Name.WeaponNodeLevel.Basic, MathTool.GenerateIntegerSet(10, 11) }, + { Name.WeaponNodeLevel.Elementary, MathTool.GenerateIntegerSet(7, 9) }, + { Name.WeaponNodeLevel.Intermediate, MathTool.GenerateIntegerSet(5, 6) }, + { Name.WeaponNodeLevel.Advanced, MathTool.GenerateIntegerSet(3, 4) }}; + Dictionary> cardConditionPatternDict = new Dictionary> + { { Name.WeaponNodeLevel.Basic, MathTool.GenerateIntegerSet(3, 5) }, + { Name.WeaponNodeLevel.Elementary, MathTool.GenerateIntegerSet(6, 8) }, + { Name.WeaponNodeLevel.Intermediate, MathTool.GenerateIntegerSet(9, 12) }, + { Name.WeaponNodeLevel.Advanced, MathTool.GenerateIntegerSet(14, 18) }}; + Dictionary> nodeCountDict = new Dictionary> + { { Name.WeaponNodeLevel.Basic, MathTool.GenerateIntegerSet(3, 5) }, + { Name.WeaponNodeLevel.Elementary, MathTool.GenerateIntegerSet(6, 12) }, + { Name.WeaponNodeLevel.Intermediate, MathTool.GenerateIntegerSet(14, 18) }, + { Name.WeaponNodeLevel.Advanced, MathTool.GenerateIntegerSet(20, 25) }}; + Dictionary> allNodeCountDict = new Dictionary>{ + { Name.WeaponNodeLevel.Basic, MathTool.GenerateIntegerSet(2, 3) }, + { Name.WeaponNodeLevel.Elementary, MathTool.GenerateIntegerSet(4, 6) }, + { Name.WeaponNodeLevel.Intermediate, MathTool.GenerateIntegerSet(7, 9) }, + { Name.WeaponNodeLevel.Advanced, MathTool.GenerateIntegerSet(10, 12) }}; + Dictionary> drawCardDict = new Dictionary>{ + { Name.WeaponNodeLevel.Basic, MathTool.GenerateIntegerSet(1, 2) }, + { Name.WeaponNodeLevel.Elementary, MathTool.GenerateIntegerSet(3, 3) }, + { Name.WeaponNodeLevel.Intermediate, MathTool.GenerateIntegerSet(4, 5) }}; + Dictionary> everyNodeAddScoreDict = new Dictionary>{ + { Name.WeaponNodeLevel.Basic, MathTool.GenerateIntegerSet(1, 1) }, + { Name.WeaponNodeLevel.Elementary, MathTool.GenerateIntegerSet(2, 3) }, + { Name.WeaponNodeLevel.Intermediate, MathTool.GenerateIntegerSet(4, 5) }, + { Name.WeaponNodeLevel.Advanced, MathTool.GenerateIntegerSet(6, 8) }}; + Dictionary> isIgnoreConditionDict = new Dictionary>(); + Dictionary> VolcanoDict = new Dictionary>{ + { Name.WeaponNodeLevel.Basic, MathTool.GenerateIntegerSet(1, 1) }, + { Name.WeaponNodeLevel.Elementary, MathTool.GenerateIntegerSet(2, 2) }, + { Name.WeaponNodeLevel.Intermediate, MathTool.GenerateIntegerSet(3, 3) }, + { Name.WeaponNodeLevel.Advanced, MathTool.GenerateIntegerSet(4, 4) }}; + Match match = System.Text.RegularExpressions.Regex.Match(condition, Name.Regex.cardConditionPattern); + if (match.Success) + { + string firstPart = match.Groups[1].Value; // 绗竴閮ㄥ垎 + string op = match.Groups[2].Value; // 杩愮畻绗﹂儴鍒 + string secondPart = match.Groups[3].Value; // 绗簩閮ㄥ垎 + int firstPartCount = CardManager.Instance.evaluateExpression(firstPart); + int secondPartCount = CardManager.Instance.evaluateExpression(secondPart); + foreach (KeyValuePair> kvp in cardConditionPatternDict) + { + if (kvp.Value.Contains(secondPart)) + { + rarity = kvp.Key; + return rarity; + } + } + } + else + { + switch (condition) + { + case Name.WeaponNodeCondition.everyNumNodeConvert: + foreach (KeyValuePair> kvp in everyNumNodeConvertDict) + { + if (kvp.Value.Contains(conditionValue)) + { + rarity = kvp.Key; + } + } + break; + case Name.WeaponNodeCondition.node: + if (nodesColor.Length == 3) + { + rarity = Name.WeaponNodeLevel.Basic; + } + else if (nodesColor.Length == 4) + { + rarity = Name.WeaponNodeLevel.Elementary; + } + else if (nodesColor.Length == 5) + { + rarity = Name.WeaponNodeLevel.Intermediate; + } + else if (nodesColor.Length == 6) + { + rarity = Name.WeaponNodeLevel.Advanced; + } + break; + } + } + + return rarity; + } + + public string getRarityWithLevelDiff(string rarity,int levelDiff) + { + string newRarity = ""; + switch (rarity) + { + case Name.WeaponNodeLevel.Basic: + if (levelDiff == 0) + { + newRarity = Name.WeaponNodeLevel.Basic; + }else if (levelDiff == 1) + { + newRarity = Name.WeaponNodeLevel.Elementary; + } + break; + case Name.WeaponNodeLevel.Elementary: + if (levelDiff == 0) + { + newRarity = Name.WeaponNodeLevel.Elementary; + } + else if (levelDiff == 1) + { + newRarity = Name.WeaponNodeLevel.Intermediate; + } + break; + case Name.WeaponNodeLevel.Intermediate: + if (levelDiff == 0) + { + newRarity = Name.WeaponNodeLevel.Intermediate; + } + else if (levelDiff == 1) + { + newRarity = Name.WeaponNodeLevel.Advanced; + } + break; + case Name.WeaponNodeLevel.Advanced: + newRarity = Name.WeaponNodeLevel.Advanced; + break; + } + return newRarity; + } + public void ClearAllChildren(Transform parent) { // 锟斤拷锟斤拷锟斤拷时锟叫憋拷锟芥储锟斤拷锟斤拷锟藉（锟斤拷锟斤拷锟斤拷循锟斤拷锟斤拷锟睫改硷拷锟较ｏ拷 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNode.cs index a83dbf29..91d81e3c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNode.cs @@ -94,7 +94,7 @@ public class WeaponNode : MonoBehaviour,IDragHandler, IBeginDragHandler, IEndDra private void Start() { currentTime = time; - resultDescription = Name.getGemResultDescription(result, resultValue, nodesMark, nodesColor); + resultDescription = Name.getGemResultDescription(result, resultValue); conditionDescription = Name.getGemConditionDescription(condition, conditionValue, nodesMark, nodesColor); SetUpInforText(); } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNodeDataPair.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNodeDataPair.cs new file mode 100644 index 00000000..69e39f7c --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNodeDataPair.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class WeaponNodeDataPair : MonoBehaviour +{ + public string conditionOrResult; + public string value; + public string description; + public string[] nodesMark; + public string[] nodesColor; +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNodeDataPair.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNodeDataPair.cs.meta new file mode 100644 index 00000000..4cf122f3 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNodeDataPair.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c315193d9990cfe4888cba8e35bf7014 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: