bug修复

ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Blue.mat

@@ -349,7 +349,7 @@ Material:
     - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
     - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
     - _MaskRefine: {r: 0, g: 1, b: 1, a: 0}
-    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.28829575, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.318182, a: 0}
     - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Green.mat

@@ -349,7 +349,7 @@ Material:
     - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
     - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
     - _MaskRefine: {r: 0, g: 1, b: 1, a: 0}
-    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.355857, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.42045435, a: 0}
     - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Matal.mat

@@ -349,7 +349,7 @@ Material:
     - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
     - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
     - _MaskRefine: {r: 0, g: 1, b: 1, a: 0}
-    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.2289713, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.21590966, a: 0}
     - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Red.mat

@@ -349,7 +349,7 @@ Material:
     - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
     - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
     - _MaskRefine: {r: 0, g: 1, b: 1, a: 0}
-    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.355857, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.42045435, a: 0}
     - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_White.mat

@@ -30,7 +30,7 @@ Material:
     m_Ints: []
     m_Floats: []
     m_Colors:
-    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.008552253, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0, a: 0}
     - _Tex2offset: {r: 0.6, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []
 --- !u!114 &558137770919511581

ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Yellow.mat

@@ -349,7 +349,7 @@ Material:
     - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
     - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
     - _MaskRefine: {r: 0, g: 1, b: 1, a: 0}
-    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.2289713, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.21590966, a: 0}
     - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs

@@ -737,7 +737,7 @@ public class ForgintPointManager : Singleton<ForgintPointManager>
     {
         for(int i=0;i< conditionOrResultSelectedNodeList .Count;i++)
         {
-            string newlevel = WeaponManager.Instance.getRarityWithLevelDiff(selectWeaponNodeConditionLevel, 1);
+            string newlevel = WeaponManager.Instance.getRarityWithLevelDiff(selectWeaponNodeConditionLevel, -1);
             conditionOrResultSelectedNodeList[i].weaponNodeDataPair = WeaponManager.Instance.getRandomConditionWithLevel(newlevel,Name.none);
             conditionOrResultSelectedNodeList[i].isResult = false;
             conditionOrResultSelectedNodeList[i].SetUpNode();

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

@@ -48,7 +48,7 @@ public static class Name
         public const string CompulsiveArcanist = "CompulsiveArcanist";
         public const string CultHierophant = "CultHierophant";
 
-        public static readonly HashSet<string> EnemySet = new HashSet<string> { CompulsiveArcanist };
+        public static readonly HashSet<string> EnemySet = new HashSet<string> { CultHierophant, CompulsiveArcanist, BlastJester, Pontiff };
     }
 
     public const string value = "value";

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

@@ -451,21 +451,7 @@ public class WeaponManager : Singleton<WeaponManager>
         List<string> nodesMark = new List<string>();
         List<string> nodesColor = new List<string>();
         string result = "";
-        switch (level)
+        resultSet = Name.WeaponNodeFunction.PlayerBasicAddScoreResultSet;
-        {
-            case Name.WeaponNodeLevel.Basic:
-                resultSet = Name.WeaponNodeFunction.PlayerBasicResultSet;
-                break;
-            case Name.WeaponNodeLevel.Elementary:
-                resultSet = Name.WeaponNodeFunction.PlayerElementaryResultSet;
-                break;
-            case Name.WeaponNodeLevel.Intermediate:
-                resultSet = Name.WeaponNodeFunction.PlayerIntermediateResultSet;
-                break;
-            case Name.WeaponNodeLevel.Advanced:
-                resultSet = Name.WeaponNodeFunction.PlayerAdvancedResultSet;
-                break;
-        }
         string resultValue = "";
         conditionValue = getConditionValueWithLevel(level, ref condition, ref nodesMark, ref nodesColor);
         checkResultSetRationality(ref resultSet, condition);
@@ -1399,7 +1385,7 @@ public class WeaponManager : Singleton<WeaponManager>
         switch (rarity)
         {
             case Name.WeaponNodeLevel.Basic:
-                if (levelDiff == 0)
+                if (levelDiff == 0|| levelDiff ==-1)
                 {
                     newRarity = Name.WeaponNodeLevel.Basic;
                 }else if (levelDiff == 1)
@@ -1416,6 +1402,10 @@ public class WeaponManager : Singleton<WeaponManager>
                 {
                     newRarity = Name.WeaponNodeLevel.Intermediate;
                 }
+                else if (levelDiff == -1)
+                {
+                    newRarity = Name.WeaponNodeLevel.Basic;
+                }
                 break;
             case Name.WeaponNodeLevel.Intermediate:
                 if (levelDiff == 0)
@@ -1426,9 +1416,17 @@ public class WeaponManager : Singleton<WeaponManager>
                 {
                     newRarity = Name.WeaponNodeLevel.Advanced;
                 }
+                else if (levelDiff == -1)
+                {
+                    newRarity = Name.WeaponNodeLevel.Elementary;
+                }
                 break;
             case Name.WeaponNodeLevel.Advanced:
-                    newRarity = Name.WeaponNodeLevel.Advanced;
+                 newRarity = Name.WeaponNodeLevel.Advanced;
+                if (levelDiff == -1)
+                {
+                    newRarity = Name.WeaponNodeLevel.Intermediate;
+                }
                 break;
         }
         return newRarity;