From 480f77a18f32c1d9ab215ce2c4e226cf299421df Mon Sep 17 00:00:00 2001 From: yjm484 <171359351@qq.com> Date: Tue, 21 Oct 2025 01:49:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=8B=E7=82=B8?= =?UTF-8?q?=E5=BC=B9=E7=9A=84=E6=95=B0=E5=80=BC2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Particle Eff/Eff_UI/mat_FloorsPanel/mat_Blue.mat | 2 +- .../Particle Eff/Eff_UI/mat_FloorsPanel/mat_Green.mat | 2 +- .../Particle Eff/Eff_UI/mat_FloorsPanel/mat_Matal.mat | 2 +- .../Particle Eff/Eff_UI/mat_FloorsPanel/mat_Red.mat | 2 +- .../Particle Eff/Eff_UI/mat_FloorsPanel/mat_White.mat | 2 +- .../Particle Eff/Eff_UI/mat_FloorsPanel/mat_Yellow.mat | 2 +- .../Assets/Scripts/Enemy/EnemyManager.cs | 10 +++++----- ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) 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 ab6fbc21..4f9423c6 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.5, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.3610894, 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 94d943df..9576652d 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.5, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.40275583, 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 5700c9c6..eca0f0e1 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.5, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.2361565, 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 3ca518c3..a61a64b4 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.5, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.40275583, 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 1cd913bd..b94253da 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.08453795, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.013911635, 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 a5aa7b98..6404f493 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.5, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.2361565, 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/Enemy/EnemyManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs index 4435f707..d32e24b4 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs @@ -130,12 +130,12 @@ public class EnemyManager : Singleton public void loadBlastJesterWeaponNode() { - /*GameObject gemA = Instantiate(Resources.Load(Name.WeaponNode.EnemyPrefabPath + Name.WeaponNode.PrefabName)); + GameObject gemA = Instantiate(Resources.Load(Name.WeaponNode.EnemyPrefabPath + Name.WeaponNode.PrefabName)); WeaponNode weaponNodeA = gemA.GetComponent(); - weaponNodeA.result = Name.WeaponNodeFunction.addScore; - weaponNodeA.resultValue = "10"; + weaponNodeA.result = Name.WeaponNodeFunction.addScoreThisTurn; + weaponNodeA.resultValue = "2"; weaponNodeA.condition = Name.WeaponNodeCondition.bombbomb; - weaponNodeA.conditionValue = Name.none;*/ + weaponNodeA.conditionValue = Name.none; GameObject gemB = Instantiate(Resources.Load(Name.WeaponNode.EnemyPrefabPath + Name.WeaponNode.PrefabName)); WeaponNode weaponNodeB = gemB.GetComponent(); @@ -150,7 +150,7 @@ public class EnemyManager : Singleton weaponNodeC.result = Name.WeaponNodeFunction.everyBombAddScore; weaponNodeC.resultValue = "5"; - //WeaponManager.Instance.loadEnemyWeaponNode(0, gemA); + WeaponManager.Instance.loadEnemyWeaponNode(2, gemA); WeaponManager.Instance.loadEnemyWeaponNode(0, gemB); WeaponManager.Instance.loadEnemyWeaponNode(1, gemC); } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs index a0d2826b..e7f1ab39 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs @@ -1167,7 +1167,7 @@ public static class Name public const string everyColorNodeConvert = "everyColorNodeConvert"; public static readonly HashSet PlayerConvertSet = new HashSet { everyNumNodeConvert - ,everyRedNodeConvert,everyBlueNodeConvert,everyYellowNodeConvert}; + ,everyRedNodeConvert,everyBlueNodeConvert,everyYellowNodeConvert,bombbomb}; public static readonly HashSet PlayerColorConvertSet = new HashSet { everyRedNodeConvert,everyBlueNodeConvert,everyYellowNodeConvert};