0923提交

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/Scenes/SampleScene.unity

@@ -122085,8 +122085,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mapUnity: {fileID: 887005656701010215, guid: ecde4b12dc4538b4caff9ada56c9ab30, type: 3}
-  line: 9
-  column: 6
+  line: 7
+  column: 5
   generatePoint: {fileID: 514899946}
   lineOffSet: {x: 1.43, y: 0, z: 0}
   columnOffSet: {x: 0, y: 0, z: 0.86}

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("附魔次数已用尽");
                     }
+                    if (StartChooseCardManager.Instance.getWeaponNodeCount == 1 && StartChooseCardManager.Instance.CheckPlayerHaveAddScore())
+                    {
+                        StartChooseCardManager.Instance.RefreshWeaponNodeWithAddScore();
+                    }
+                    else
+                    {
                         StartChooseCardManager.Instance.RefreshWeaponNode();
+                    }
+                    //StartChooseCardManager.Instance.RefreshWeaponNode();
 
                     break;
                 }

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<StartChooseCardManager>
 {
@@ -120,6 +121,25 @@ public class StartChooseCardManager : Singleton<StartChooseCardManager>
 
         }
     }
+
+    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<StartChooseCardManager>
         }
     }
 
+    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<WeaponNode>();
+                if (Name.WeaponNodeFunction.PlayerBasicAddScoreResultSet.Contains(node.result))
+                {
+                    Debug.Log("³É¹¦½øÈë3");
+                    result =false;
+                    return result;
+                }
+            }
+        }
+        return result;
+    }
+
     public void OpenBag()
     {
         PlayerStatusUIManager.Instance.OpenBag();

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

@@ -1178,6 +1178,9 @@ public static class Name
         public static readonly HashSet<string> PlayerBasicResultSet = new HashSet<string> { addScore, redNodeCount, blueNodeCount
         ,yellowNodeCount,everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore};
 
+        public static readonly HashSet<string> PlayerBasicAddScoreResultSet = new HashSet<string> { addScore 
+        ,everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore};
+
         public static readonly HashSet<string> PlayerElementaryResultSet = new HashSet<string> { addScore, redNodeCount, blueNodeCount
         ,yellowNodeCount,mostNodeCount,leastNodeCount,drawCard,everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore};
 

ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponManager.cs

@@ -316,6 +316,59 @@ public class WeaponManager : Singleton<WeaponManager>
         return gem;
     }
 
+
+    public GameObject getRandomAddScoreWeaponNodeForPlayerWithLevel(string level)
+    {
+        GameObject gem = Instantiate(Resources.Load<GameObject>(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<string> nodesMark = new List<string>();
+        List<string> nodesColor = new List<string>();
+        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>();
+        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<GameObject>(Name.WeaponNode.PrefabPath + Name.WeaponNode.PrefabName));