Browse Source

bug修正

dev45-0703NewVer
yjm484 2 months ago
parent
commit
aa8414a1a7
  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. 2
      ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs
  8. 1
      ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.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.3695656, a: 0} - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.36607146, 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.4673913, a: 0} - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.4821429, 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.29347885, a: 0} - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.34821436, 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.4673913, a: 0} - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.4821429, 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.07608679, a: 0} - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.0000014007092, 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.29347885, a: 0} - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.34821436, 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/Scripts/Tool/Name.cs

@ -1307,7 +1307,7 @@ public static class Name
,yellowNodeCount,mostNodeCount,leastNodeCount,allNodeCount,drawCard,isIgnoreCondition,everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore}; ,yellowNodeCount,mostNodeCount,leastNodeCount,allNodeCount,drawCard,isIgnoreCondition,everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore};
public static readonly HashSet<string> EveryResultSet = new HashSet<string> {everyBelieverAddScore,everyBelieverAddScore,everyBombAddScore,everyHolyNodeAddScore,everyWhiteNodeAddScore, public static readonly HashSet<string> EveryResultSet = new HashSet<string> {everyBelieverAddScore,everyBelieverAddScore,everyBombAddScore,everyHolyNodeAddScore,everyWhiteNodeAddScore,
everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore}; everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore,everyBlackNodeAddScore};
public static readonly Dictionary<string, float> PlayerBasicResultSet = new Dictionary<string, float> { {addScore,0.4f}, {redNodeCount, 0.1f }, {blueNodeCount,0.1f} 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}}; ,{yellowNodeCount,0.1f},{ everyRedNodeAddScore,0.1f},{ everyYellowNodeAddScore,0.1f},{everyBlueNodeAddScore,0.1f}};

1
ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs

@ -97,6 +97,7 @@ public class ScenceLoadManager : Singleton <ScenceLoadManager>
public void ClearLevelStep() public void ClearLevelStep()
{ {
PlayerStatsManager.Instance.levelDevelopData.levelStep = 0; PlayerStatsManager.Instance.levelDevelopData.levelStep = 0;
PlayerStatsManager.Instance.levelDevelopData.currentPoint = new Vector2(0, 0);
PlayerStatsManager.Instance.newMapData.step = 0; PlayerStatsManager.Instance.newMapData.step = 0;
PlayerStatsManager.Instance.playerState.maxHP = 100; PlayerStatsManager.Instance.playerState.maxHP = 100;
PlayerStatsManager.Instance.playerState.currentHP = 100; PlayerStatsManager.Instance.playerState.currentHP = 100;

Loading…
Cancel
Save