Merge pull request '1024提交' (#218) from dev-1024-yjm into dev45-0703NewVer

Reviewed-on: #218

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.5, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.3695656, 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.5, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.4673913, 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.5, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.29347885, 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.5, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.4673913, 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.09347254, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.07608679, 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.5, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.29347885, 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/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/MapUnity/MapInforManager.cs

@@ -17,11 +17,26 @@ public class MapInforManager : Singleton<MapInforManager>
         bool isShow = true;
         switch (mapUnity.whoColour)
         {
-            case Name.NodeColor.Red:
+           /* case Name.NodeColor.Red:
                 infotText.text = "普通的红色地块。";
-                break;
+                break;*/
             case Name.NodeColor.Holy:
-                infotText.text = "特殊的黑色地块，不能被其他颜色更改。";
+                infotText.text = "圣光地块：白色计数+2，只能被诅咒地块转化。";
+                break;
+            case Name.NodeColor.Curse:
+                infotText.text = "诅咒地块：黑色计数+3，只能被圣光地块转化。";
+                break;
+            case Name.NodeColor.Lava:
+                infotText.text = "岩浆地块：特殊的红色地块，转化时会销毁上面的物品。";
+                break;
+            case Name.NodeColor.Glacier:
+                infotText.text = "冰川地块：+3蓝色计数，被岩浆地块转化时地块消失。";
+                break;
+            case Name.NodeColor.Void:
+                infotText.text = "虚无地块：+2黑色计数，不可选中。";
+                break;
+            case Name.NodeColor.Quicksand:
+                infotText.text = "流沙地块：+3黄色计数，被转化时地块消失。";
                 break;
             default:
                 isShow = false;

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

@@ -1291,7 +1291,7 @@ public static class Name
         //每有黑色+n
         public const string everyBlackNodeAddScore = "everyBlackNodeAddScore";
         //每有白色+n
-        public const string everyWhiteNodeAddScore = "everyBlackNodeAddScore";
+        public const string everyWhiteNodeAddScore = "everyWhiteNodeAddScore";
         //每有圣光+n
         public const string everyHolyNodeAddScore = "everyHolyNodeAddScore";
         //每有炸弹+n
@@ -1306,6 +1306,9 @@ public static class Name
         public static readonly HashSet<string> PlayerResultSet = new HashSet<string> { addScore,mulScore, repetWeaponNode, redNodeCount, blueNodeCount
         ,yellowNodeCount,mostNodeCount,leastNodeCount,allNodeCount,drawCard,isIgnoreCondition,everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore};
 
+        public static readonly HashSet<string> EveryResultSet = new HashSet<string> {everyBelieverAddScore,everyBelieverAddScore,everyBombAddScore,everyHolyNodeAddScore,everyWhiteNodeAddScore,
+        everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore};
+
         public static readonly Dictionary<string, float> PlayerBasicResultSet = new Dictionary<string, float> { {addScore,0.4f}, {redNodeCount, 0.1f }, {blueNodeCount,0.1f}
         ,{yellowNodeCount,0.1f},{ everyRedNodeAddScore,0.1f},{ everyYellowNodeAddScore,0.1f},{everyBlueNodeAddScore,0.1f}};
 
@@ -1343,12 +1346,12 @@ public static class Name
 
     public static class EveryNodeAddScoreResultSet
     {
-        public static readonly HashSet<string> BasiclSet = new HashSet<string> { "4_1" };
-        public static readonly HashSet<string> BasiclWithoutConditionSet = new HashSet<string> { "5_1" };
-        public static readonly HashSet<string> SimpleSet = new HashSet<string> { "3_1" };
-        public static readonly HashSet<string> ElementarySet = new HashSet<string> { "2_1" };
-        public static readonly HashSet<string> IntermediateSet = new HashSet<string> { "1_1" };
-        public static readonly HashSet<string> AdvancedSet = new HashSet<string> { "1_2" };
+        public static readonly HashSet<string> BasiclSet = new HashSet<string> { "3_1" };
+        public static readonly HashSet<string> BasiclWithoutConditionSet = new HashSet<string> { "4_1" };
+        public static readonly HashSet<string> SimpleSet = new HashSet<string> { "2_1" };
+        public static readonly HashSet<string> ElementarySet = new HashSet<string> { "1_1" };
+        public static readonly HashSet<string> IntermediateSet = new HashSet<string> { "1_2" };
+        public static readonly HashSet<string> AdvancedSet = new HashSet<string> { "1_3" };
     }
 
     public static class DomainFunction

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

@@ -3,11 +3,13 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Drawing.Imaging;
 using System.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
 using TMPro;
 using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using UnityEngine.SocialPlatforms.Impl;
 using UnityEngine.UI;
 using UnityEngine.UIElements;
 using static TMPro.SpriteAssetUtilities.TexturePacker_JsonArray;
@@ -403,6 +405,7 @@ public class WeaponNode : MonoBehaviour,IDragHandler, IBeginDragHandler, IEndDra
 
     public void SingleFunctionSettleForAwake()
     {
+        settleCount++;
         switch (result)
         {
             case Name.WeaponNodeFunction.addScoreThisTurn:
@@ -917,6 +920,11 @@ public class WeaponNode : MonoBehaviour,IDragHandler, IBeginDragHandler, IEndDra
 
     public void OnPointerEnter(PointerEventData eventData)
     {
+        resultDescription = Name.getGemResultDescription(result, resultValue);
+        conditionDescription = Name.getGemConditionDescription(condition, conditionValue, nodesMark, nodesColor);
+        resetConditionDes();
+        resetResultDes();
+        SetUpInforText();
         isOn = true;
     }
 
@@ -1018,4 +1026,110 @@ public class WeaponNode : MonoBehaviour,IDragHandler, IBeginDragHandler, IEndDra
             bagWeaponNode.isGemImage = condition.Equals(Name.WeaponNodeCondition.node);
         }
     }
+
+
+    public void resetConditionDes()
+    {
+        if (!Name.WeaponNodeCondition.PlayerConvertSet.Contains(condition))
+        {
+            return;
+        }
+        StringBuilder sb = new StringBuilder();
+        sb.Append(conditionDescription);
+        string num = "";
+        switch (condition)
+        {
+            case Name.WeaponNodeCondition.everyNumNodeConvert:
+                num = MapUnityManager.Instance.switchNodeNum.ToString();
+                break;
+            case Name.WeaponNodeCondition.everyRedNodeConvert:
+                num = MapUnityManager.Instance.switchRedNodeNum.ToString();
+                break;
+            case Name.WeaponNodeCondition.everyBlueNodeConvert:
+                num = MapUnityManager.Instance.switchBlueNodeNum.ToString();
+                break;
+            case Name.WeaponNodeCondition.everyYellowNodeConvert:
+                num = MapUnityManager.Instance.switchYellowNodeNum.ToString();
+                break;
+            case Name.WeaponNodeCondition.bombbomb:
+                num = settleCount.ToString();
+                break;
+        }
+        sb.Append("(");
+        sb.Append(num);
+        sb.Append(')');
+        conditionDescription=sb.ToString();
+    }
+
+    public void resetResultDes()
+    {
+        if (!(Name.WeaponNodeCondition.PlayerConvertSet.Contains(condition)||Name.WeaponNodeFunction.EveryResultSet.Contains(result)))
+        {
+            return;
+        }
+        StringBuilder sb = new StringBuilder();
+        sb.Append(resultDescription);
+        string num = "";
+        int settleCoefficient = 1;
+        if (settleCount != 0)
+        {
+            settleCoefficient=settleCount;
+        }
+        switch (result)
+        {
+
+            case Name.WeaponNodeFunction.everyRedNodeAddScore:
+                int redNodeCount = getNodeTools.getNodesCount(Name.Color.Red);
+                num = (settleCoefficient*redNodeCount / int.Parse(resultValue.Split("_")[0]) * int.Parse(resultValue.Split("_")[1])).ToString();
+                break;
+            case Name.WeaponNodeFunction.everyYellowNodeAddScore:
+                int yellowNodeCount = getNodeTools.getNodesCount(Name.Color.Yellow);
+                num = (settleCoefficient * yellowNodeCount / int.Parse(resultValue.Split("_")[0]) * int.Parse(resultValue.Split("_")[1])).ToString();
+                break;
+            case Name.WeaponNodeFunction.everyBlueNodeAddScore:
+                int blueNodeCount = getNodeTools.getNodesCount(Name.Color.Blue);
+                num = (settleCoefficient * blueNodeCount / int.Parse(resultValue.Split("_")[0]) * int.Parse(resultValue.Split("_")[1])).ToString();
+                break;
+            case Name.WeaponNodeFunction.everyBlackNodeAddScore:
+                int blackNodeCount = getNodeTools.getNodesCount(Name.Color.Black);
+                num = (settleCoefficient * blackNodeCount / int.Parse(resultValue.Split("_")[0]) * int.Parse(resultValue.Split("_")[1])).ToString();
+                break;
+            case Name.WeaponNodeFunction.everyHolyNodeAddScore:
+                int holyNodeCount = getNodeTools.getNodesCount(Name.Color.Holy);
+                num = (settleCoefficient * holyNodeCount / int.Parse(resultValue.Split("_")[0]) * int.Parse(resultValue.Split("_")[1])).ToString();
+                break;
+            case Name.WeaponNodeFunction.everyBombAddScore:
+                int bombCount = 0;
+                foreach (MapUnity nodeB in getNodeTools.getAllNodes())
+                {
+                    if (nodeB.blockNode != null && nodeB.blockNode is Bomb)
+                    {
+                        bombCount++;
+                    }
+                }
+                num = (bombCount * int.Parse(resultValue)).ToString();
+                break;
+            case Name.WeaponNodeFunction.everyBelieverAddScore:
+                int believerCount = 0;
+                foreach (MapUnity nodeC in getNodeTools.getAllNodes())
+                {
+                    if (nodeC.blockNode != null && nodeC.blockNode is Believer)
+                    {
+                        believerCount++;
+                    }
+                }
+                num = (believerCount / int.Parse(resultValue.Split("_")[0]) * int.Parse(resultValue.Split("_")[1])).ToString();
+                break;
+            case Name.WeaponNodeFunction.addScoreThisTurn:
+                num=turnScore.ToString();
+                break;
+            default:
+                num = (settleCount * int.Parse(resultValue)).ToString();
+                break;
+        }
+        sb.Append("(");
+        sb.Append(num);
+        sb.Append(')');
+        resultDescription = sb.ToString();
+    }
 }