Browse Source

bugfix

pull/212/head
yjm484 2 months ago
parent
commit
0fbf11b75b
  1. 2
      ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Blue.mat
  2. 2
      ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Green.mat
  3. 2
      ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Matal.mat
  4. 2
      ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Red.mat
  5. 2
      ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_White.mat
  6. 2
      ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Yellow.mat
  7. 6
      ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs
  8. 2
      ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs

2
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} - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
- _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0} - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
- _MaskRefine: {r: 0, g: 1, b: 1, 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} - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0} - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

2
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} - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
- _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0} - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
- _MaskRefine: {r: 0, g: 1, b: 1, 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} - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0} - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

2
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} - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
- _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0} - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
- _MaskRefine: {r: 0, g: 1, b: 1, 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} - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0} - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

2
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} - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
- _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0} - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
- _MaskRefine: {r: 0, g: 1, b: 1, 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} - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0} - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

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

@ -30,7 +30,7 @@ Material:
m_Ints: [] m_Ints: []
m_Floats: [] m_Floats: []
m_Colors: 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} - _Tex2offset: {r: 0.6, g: 0, b: 0, a: 0}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &558137770919511581 --- !u!114 &558137770919511581

2
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} - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
- _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0} - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
- _MaskRefine: {r: 0, g: 1, b: 1, 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} - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0} - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

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

@ -85,8 +85,8 @@ public class ForgintPointManager : Singleton<ForgintPointManager>
public TMP_Text weaponNodeForgingResaultText;//锻造附魔界面结果按钮 public TMP_Text weaponNodeForgingResaultText;//锻造附魔界面结果按钮
public List <GameObject > weaponNodeForgingEffectSlotList = new List<GameObject > ();//词条刷新区域 public List <GameObject > weaponNodeForgingEffectSlotList = new List<GameObject > ();//词条刷新区域
public WeaponNode selectWeaponNode;//被选中的附魔 public WeaponNode selectWeaponNode;//被选中的附魔
string selectWeaponNodeConditionLevel; public string selectWeaponNodeConditionLevel;
string selectWeaponNodeResultLevel; public string selectWeaponNodeResultLevel;
public List<ConditionOrResultSelectedNode> conditionOrResultSelectedNodeList = new List<ConditionOrResultSelectedNode>();//刷新出来的附魔词条载体 public List<ConditionOrResultSelectedNode> conditionOrResultSelectedNodeList = new List<ConditionOrResultSelectedNode>();//刷新出来的附魔词条载体
public bool firstConditionRefresh;//第一次点击条件会刷新三个词条 public bool firstConditionRefresh;//第一次点击条件会刷新三个词条
public bool firstResultRefresh; public bool firstResultRefresh;
@ -689,7 +689,7 @@ public class ForgintPointManager : Singleton<ForgintPointManager>
{ {
selectWeaponNode = currentWeaponNode; selectWeaponNode = currentWeaponNode;
selectWeaponNodeConditionLevel = WeaponManager.Instance.getWeaponNodeConditionRarity(selectWeaponNode.condition, selectWeaponNode.conditionValue, selectWeaponNode.nodesColor); 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); weaponNodeForgingPanel.SetActive(true);

2
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}; ,yellowNodeCount,mostNodeCount,leastNodeCount,allNodeCount,drawCard,everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore};
public static readonly HashSet<string> PlayerAdvancedResultSet = new HashSet<string> { addScore,mulScore, repetWeaponNode public static readonly HashSet<string> PlayerAdvancedResultSet = new HashSet<string> { addScore,mulScore, repetWeaponNode
,mostNodeCount,allNodeCount,isIgnoreCondition,everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore}; ,mostNodeCount,allNodeCount,everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore};
} }

Loading…
Cancel
Save