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 81f987b0..1c6cf4b9 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.3695656, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.36607146, 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 7a0fc241..7f710c80 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.4673913, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.4821429, 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 67f1b1ed..8d3a9307 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.29347885, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.34821436, 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 9804e8f2..9a83edb9 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.4673913, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.4821429, 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 26698eb5..95297428 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.07608679, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.0000014007092, 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 0bfb3e72..6a06158a 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.29347885, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.34821436, 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/Tool/Name.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs index 2d1f1c69..54ad720a 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs +++ b/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}; public static readonly HashSet EveryResultSet = new HashSet {everyBelieverAddScore,everyBelieverAddScore,everyBombAddScore,everyHolyNodeAddScore,everyWhiteNodeAddScore, - everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore}; + everyRedNodeAddScore,everyYellowNodeAddScore,everyBlueNodeAddScore,everyBlackNodeAddScore}; public static readonly Dictionary PlayerBasicResultSet = new Dictionary { {addScore,0.4f}, {redNodeCount, 0.1f }, {blueNodeCount,0.1f} ,{yellowNodeCount,0.1f},{ everyRedNodeAddScore,0.1f},{ everyYellowNodeAddScore,0.1f},{everyBlueNodeAddScore,0.1f}}; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs index ea2a90df..68b1c287 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs @@ -97,6 +97,7 @@ public class ScenceLoadManager : Singleton public void ClearLevelStep() { PlayerStatsManager.Instance.levelDevelopData.levelStep = 0; + PlayerStatsManager.Instance.levelDevelopData.currentPoint = new Vector2(0, 0); PlayerStatsManager.Instance.newMapData.step = 0; PlayerStatsManager.Instance.playerState.maxHP = 100; PlayerStatsManager.Instance.playerState.currentHP = 100; @@ -109,7 +110,7 @@ public class ScenceLoadManager : Singleton PlayerStatsManager.Instance.relicList.relicClassNameList.Clear(); BagManager.Instance.bagForgedMaterialDataeLsit.Clear(); BagManager.Instance.RefreshForgedMaterialBag(); - // PlayerStatsManager.Instance.relicList.relicClassNameList.Add("LegacyNode_AncientSilverCoin"); + //PlayerStatsManager.Instance.relicList.relicClassNameList.Add("LegacyNode_AncientSilverCoin"); int childCount = LegacyManager.Instance.legacyFather.transform.childCount; for (int i = childCount-1; i > 0;i--) {