Browse Source

调整一下炸弹的数值2

pull/216/head
yjm484 2 months ago
parent
commit
480f77a18f
  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. 10
      ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.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.5, a: 0} - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.3610894, 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.5, a: 0} - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.40275583, 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.5, a: 0} - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.2361565, 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.5, a: 0} - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.40275583, 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.08453795, a: 0} - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.013911635, 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.5, a: 0} - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.2361565, 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}

10
ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs

@ -130,12 +130,12 @@ public class EnemyManager : Singleton<EnemyManager>
public void loadBlastJesterWeaponNode() public void loadBlastJesterWeaponNode()
{ {
/*GameObject gemA = Instantiate(Resources.Load<GameObject>(Name.WeaponNode.EnemyPrefabPath + Name.WeaponNode.PrefabName)); GameObject gemA = Instantiate(Resources.Load<GameObject>(Name.WeaponNode.EnemyPrefabPath + Name.WeaponNode.PrefabName));
WeaponNode weaponNodeA = gemA.GetComponent<WeaponNode>(); WeaponNode weaponNodeA = gemA.GetComponent<WeaponNode>();
weaponNodeA.result = Name.WeaponNodeFunction.addScore; weaponNodeA.result = Name.WeaponNodeFunction.addScoreThisTurn;
weaponNodeA.resultValue = "10"; weaponNodeA.resultValue = "2";
weaponNodeA.condition = Name.WeaponNodeCondition.bombbomb; weaponNodeA.condition = Name.WeaponNodeCondition.bombbomb;
weaponNodeA.conditionValue = Name.none;*/ weaponNodeA.conditionValue = Name.none;
GameObject gemB = Instantiate(Resources.Load<GameObject>(Name.WeaponNode.EnemyPrefabPath + Name.WeaponNode.PrefabName)); GameObject gemB = Instantiate(Resources.Load<GameObject>(Name.WeaponNode.EnemyPrefabPath + Name.WeaponNode.PrefabName));
WeaponNode weaponNodeB = gemB.GetComponent<WeaponNode>(); WeaponNode weaponNodeB = gemB.GetComponent<WeaponNode>();
@ -150,7 +150,7 @@ public class EnemyManager : Singleton<EnemyManager>
weaponNodeC.result = Name.WeaponNodeFunction.everyBombAddScore; weaponNodeC.result = Name.WeaponNodeFunction.everyBombAddScore;
weaponNodeC.resultValue = "5"; weaponNodeC.resultValue = "5";
//WeaponManager.Instance.loadEnemyWeaponNode(0, gemA); WeaponManager.Instance.loadEnemyWeaponNode(2, gemA);
WeaponManager.Instance.loadEnemyWeaponNode(0, gemB); WeaponManager.Instance.loadEnemyWeaponNode(0, gemB);
WeaponManager.Instance.loadEnemyWeaponNode(1, gemC); WeaponManager.Instance.loadEnemyWeaponNode(1, gemC);
} }

2
ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs

@ -1167,7 +1167,7 @@ public static class Name
public const string everyColorNodeConvert = "everyColorNodeConvert"; public const string everyColorNodeConvert = "everyColorNodeConvert";
public static readonly HashSet<string> PlayerConvertSet = new HashSet<string> { everyNumNodeConvert public static readonly HashSet<string> PlayerConvertSet = new HashSet<string> { everyNumNodeConvert
,everyRedNodeConvert,everyBlueNodeConvert,everyYellowNodeConvert}; ,everyRedNodeConvert,everyBlueNodeConvert,everyYellowNodeConvert,bombbomb};
public static readonly HashSet<string> PlayerColorConvertSet = new HashSet<string> { public static readonly HashSet<string> PlayerColorConvertSet = new HashSet<string> {
everyRedNodeConvert,everyBlueNodeConvert,everyYellowNodeConvert}; everyRedNodeConvert,everyBlueNodeConvert,everyYellowNodeConvert};

Loading…
Cancel
Save