diff --git a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Blue.mat b/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Blue.mat index 5b717f4e..719451de 100644 --- a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Blue.mat +++ b/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.318182, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.3636367, 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} diff --git a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Green.mat b/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Green.mat index cd78ff63..fccc0a62 100644 --- a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Green.mat +++ b/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.42045435, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.37500033, 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} diff --git a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Matal.mat b/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Matal.mat index 4b488f33..a851043c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Matal.mat +++ b/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.21590966, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.2840911, 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} diff --git a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Red.mat b/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Red.mat index 433a9e27..db3c73a6 100644 --- a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Red.mat +++ b/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.42045435, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.37500033, 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} diff --git a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_White.mat b/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_White.mat index 1bbdf055..eaa1f2bb 100644 --- a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_White.mat +++ b/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, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.022726774, a: 0} - _Tex2offset: {r: 0.6, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!114 &558137770919511581 diff --git a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Yellow.mat b/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Yellow.mat index 9615b5f4..735df61d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Yellow.mat +++ b/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.21590966, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.2840911, 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} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs index 861ec1fb..82d5da3b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs @@ -85,8 +85,8 @@ public class ForgintPointManager : Singleton public TMP_Text weaponNodeForgingResaultText;//锻造附魔界面结果按钮 public List weaponNodeForgingEffectSlotList = new List ();//词条刷新区域 public WeaponNode selectWeaponNode;//被选中的附魔 - string selectWeaponNodeConditionLevel; - string selectWeaponNodeResultLevel; + public string selectWeaponNodeConditionLevel; + public string selectWeaponNodeResultLevel; public List conditionOrResultSelectedNodeList = new List();//刷新出来的附魔词条载体 public bool firstConditionRefresh;//第一次点击条件会刷新三个词条 public bool firstResultRefresh; @@ -689,7 +689,7 @@ public class ForgintPointManager : Singleton { selectWeaponNode = currentWeaponNode; selectWeaponNodeConditionLevel = WeaponManager.Instance.getWeaponNodeConditionRarity(selectWeaponNode.condition, selectWeaponNode.conditionValue, selectWeaponNode.nodesColor); - selectWeaponNodeResultLevel = WeaponManager.Instance.getWeaponNodeResultRarity(selectWeaponNode.condition, selectWeaponNode.conditionValue); + selectWeaponNodeResultLevel = WeaponManager.Instance.getWeaponNodeResultRarity(selectWeaponNode.result, selectWeaponNode.resultValue); weaponNodeForgingPanel.SetActive(true); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs index f5b7a645..02a9f571 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs @@ -1314,7 +1314,7 @@ public static class Name ,yellowNodeCount,mostNodeCount,leastNodeCount,allNodeCount,drawCard,everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore}; public static readonly HashSet PlayerAdvancedResultSet = new HashSet { addScore,mulScore, repetWeaponNode - ,mostNodeCount,allNodeCount,isIgnoreCondition,everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore}; + ,mostNodeCount,allNodeCount,everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore}; }