Finished adding Particle Effects, and some of the sprites were changed
This commit is contained in:
Obelisk 2024-03-02 16:28:58 -03:00
parent 08ce8f24e8
commit b70070cb39
10 changed files with 105 additions and 816 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -6679,7 +6679,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1277567380038478988} m_GameObject: {fileID: 1277567380038478988}
m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
m_LocalPosition: {x: 18.823528, y: -0.29411763, z: 0} m_LocalPosition: {x: 50, y: 0, z: 0}
m_LocalScale: {x: 1.1764704, y: 1.1764705, z: 1.1764704} m_LocalScale: {x: 1.1764704, y: 1.1764705, z: 1.1764704}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -6698,7 +6698,7 @@ WindZone:
m_Radius: 20 m_Radius: 20
m_WindMain: 0 m_WindMain: 0
m_WindTurbulence: 1 m_WindTurbulence: 1
m_WindPulseMagnitude: 0.5 m_WindPulseMagnitude: 0.3
m_WindPulseFrequency: 0.033333335 m_WindPulseFrequency: 0.033333335
--- !u!1 &1404833178906827570 --- !u!1 &1404833178906827570
GameObject: GameObject:
@ -12919,6 +12919,7 @@ GameObject:
- component: {fileID: 1026391380559014938} - component: {fileID: 1026391380559014938}
- component: {fileID: 8846257164105112889} - component: {fileID: 8846257164105112889}
- component: {fileID: 1095202275440968618} - component: {fileID: 1095202275440968618}
- component: {fileID: 2409540009449314099}
m_Layer: 0 m_Layer: 0
m_Name: leafBroken m_Name: leafBroken
m_TagString: Untagged m_TagString: Untagged
@ -12934,8 +12935,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3355844190426264431} m_GameObject: {fileID: 3355844190426264431}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -40, y: 11.470588, z: 0} m_LocalPosition: {x: -4, y: 4, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 2, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 6803714669671852684} m_Father: {fileID: 6803714669671852684}
@ -14390,7 +14391,7 @@ ParticleSystem:
uvChannelMask: -1 uvChannelMask: -1
rowMode: 1 rowMode: 1
sprites: sprites:
- sprite: {fileID: -8310146119116771886, guid: 3b1b81136589fd64bbfd3e586db0d9b1, type: 3} - sprite: {fileID: 511124380, guid: 76432e2902ee41440bb4dcde61fac224, type: 3}
flipU: 0 flipU: 0
flipV: 0 flipV: 0
VelocityModule: VelocityModule:
@ -17720,6 +17721,17 @@ ParticleSystemRenderer:
m_MeshWeighting2: 1 m_MeshWeighting2: 1
m_MeshWeighting3: 1 m_MeshWeighting3: 1
m_MaskInteraction: 0 m_MaskInteraction: 0
--- !u!210 &2409540009449314099
SortingGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3355844190426264431}
m_Enabled: 1
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 6
--- !u!1 &3413925648392711463 --- !u!1 &3413925648392711463
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -17792,11 +17804,11 @@ MonoBehaviour:
DebrisLeftCurve: {fileID: 681199269563884239} DebrisLeftCurve: {fileID: 681199269563884239}
DebrisRightCurve: {fileID: 6134167994079843062} DebrisRightCurve: {fileID: 6134167994079843062}
NgDebrisCurve: {fileID: 8755454903872010978} NgDebrisCurve: {fileID: 8755454903872010978}
Wind: {fileID: 0} Wind: {fileID: 1332804018436716926}
Effects: [] Effects:
Snow: {fileID: 0} - {fileID: 5104316731581633128}
Leaf: {fileID: 0} - {fileID: 4281379767841092066}
leafBroken: {fileID: 0} - {fileID: 8846257164105112889}
--- !u!1 &3493038887264649151 --- !u!1 &3493038887264649151
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -17808,6 +17820,7 @@ GameObject:
- component: {fileID: 123453862514258918} - component: {fileID: 123453862514258918}
- component: {fileID: 4281379767841092066} - component: {fileID: 4281379767841092066}
- component: {fileID: 2841921579701145429} - component: {fileID: 2841921579701145429}
- component: {fileID: 1271856565047390390}
m_Layer: 0 m_Layer: 0
m_Name: Leaf m_Name: Leaf
m_TagString: Untagged m_TagString: Untagged
@ -17823,8 +17836,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3493038887264649151} m_GameObject: {fileID: 3493038887264649151}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -40, y: 11.470588, z: 0} m_LocalPosition: {x: -4, y: 4, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 2, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 6803714669671852684} m_Father: {fileID: 6803714669671852684}
@ -19279,7 +19292,7 @@ ParticleSystem:
uvChannelMask: -1 uvChannelMask: -1
rowMode: 1 rowMode: 1
sprites: sprites:
- sprite: {fileID: -5825381291038537540, guid: 3b1b81136589fd64bbfd3e586db0d9b1, type: 3} - sprite: {fileID: -1086421176, guid: 76432e2902ee41440bb4dcde61fac224, type: 3}
flipU: 0 flipU: 0
flipV: 0 flipV: 0
VelocityModule: VelocityModule:
@ -22609,6 +22622,17 @@ ParticleSystemRenderer:
m_MeshWeighting2: 1 m_MeshWeighting2: 1
m_MeshWeighting3: 1 m_MeshWeighting3: 1
m_MaskInteraction: 0 m_MaskInteraction: 0
--- !u!210 &1271856565047390390
SortingGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3493038887264649151}
m_Enabled: 1
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 6
--- !u!1 &3520672688215352957 --- !u!1 &3520672688215352957
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -23372,6 +23396,7 @@ GameObject:
- component: {fileID: 9101955400970613891} - component: {fileID: 9101955400970613891}
- component: {fileID: 5104316731581633128} - component: {fileID: 5104316731581633128}
- component: {fileID: 8938510197397077380} - component: {fileID: 8938510197397077380}
- component: {fileID: 3593059234765228438}
m_Layer: 0 m_Layer: 0
m_Name: Snow m_Name: Snow
m_TagString: Untagged m_TagString: Untagged
@ -23387,8 +23412,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4278191893379979525} m_GameObject: {fileID: 4278191893379979525}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -40, y: 11.470588, z: 0} m_LocalPosition: {x: -4, y: 4, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 2, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 6803714669671852684} m_Father: {fileID: 6803714669671852684}
@ -24839,13 +24864,14 @@ ParticleSystem:
tilesY: 1 tilesY: 1
animationType: 0 animationType: 0
rowIndex: 0 rowIndex: 0
cycles: 1 cycles: 4
uvChannelMask: -1 uvChannelMask: -1
rowMode: 1 rowMode: 1
sprites: sprites:
- sprite: {fileID: -2320701839235687885, guid: 3b1b81136589fd64bbfd3e586db0d9b1, type: 3} - sprite: {fileID: -485762012, guid: 76432e2902ee41440bb4dcde61fac224, type: 3}
- sprite: {fileID: 2190835001878337691, guid: 3b1b81136589fd64bbfd3e586db0d9b1, type: 3} - sprite: {fileID: -1136952213, guid: 76432e2902ee41440bb4dcde61fac224, type: 3}
- sprite: {fileID: -5088141013119983375, guid: 3b1b81136589fd64bbfd3e586db0d9b1, type: 3} - sprite: {fileID: 1919391621, guid: 76432e2902ee41440bb4dcde61fac224, type: 3}
- sprite: {fileID: -1136952213, guid: 76432e2902ee41440bb4dcde61fac224, type: 3}
flipU: 0 flipU: 0
flipV: 0 flipV: 0
VelocityModule: VelocityModule:
@ -28176,6 +28202,17 @@ ParticleSystemRenderer:
m_MeshWeighting2: 1 m_MeshWeighting2: 1
m_MeshWeighting3: 1 m_MeshWeighting3: 1
m_MaskInteraction: 0 m_MaskInteraction: 0
--- !u!210 &3593059234765228438
SortingGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4278191893379979525}
m_Enabled: 1
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 6
--- !u!1 &4302608539052114858 --- !u!1 &4302608539052114858
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View file

@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0 m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0 m_IsAlphaChannelOptional: 0
serializedVersion: 5 serializedVersion: 5
m_Width: 862 m_Width: 1043
m_Height: 485 m_Height: 587
m_AntiAliasing: 2 m_AntiAliasing: 2
m_MipCount: -1 m_MipCount: -1
m_DepthStencilFormat: 92 m_DepthStencilFormat: 92

View file

@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0 m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0 m_IsAlphaChannelOptional: 0
serializedVersion: 5 serializedVersion: 5
m_Width: 1293 m_Width: 1564
m_Height: 727 m_Height: 880
m_AntiAliasing: 1 m_AntiAliasing: 1
m_MipCount: -1 m_MipCount: -1
m_DepthStencilFormat: 92 m_DepthStencilFormat: 92

Binary file not shown.

Before

Width:  |  Height:  |  Size: 538 KiB

After

Width:  |  Height:  |  Size: 500 KiB

View file

@ -8906,7 +8906,7 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 5.7 m_fontSize: 3.3
m_fontSizeBase: 14.3 m_fontSizeBase: 14.3
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 1 m_enableAutoSizing: 1
@ -14029,7 +14029,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 171581557} m_TargetGraphic: {fileID: 171581557}
m_HandleRect: {fileID: 171581556} m_HandleRect: {fileID: 171581556}
m_Direction: 2 m_Direction: 2
m_Value: 0 m_Value: 1
m_Size: 1 m_Size: 1
m_NumberOfSteps: 0 m_NumberOfSteps: 0
m_OnValueChanged: m_OnValueChanged:
@ -16661,7 +16661,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -50.000015} m_AnchoredPosition: {x: 0, y: -50}
m_SizeDelta: {x: -48, y: -148} m_SizeDelta: {x: -48, y: -148}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &572765323 --- !u!114 &572765323
@ -32707,7 +32707,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 37.428574} m_AnchoredPosition: {x: 0, y: 55.387753}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1154875945 --- !u!222 &1154875945
@ -43455,8 +43455,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1220118245} m_TargetGraphic: {fileID: 1220118245}
m_HandleRect: {fileID: 1220118244} m_HandleRect: {fileID: 1220118244}
m_Direction: 2 m_Direction: 2
m_Value: 1.0000001 m_Value: 1.0000002
m_Size: 0 m_Size: 0.060641393
m_NumberOfSteps: 0 m_NumberOfSteps: 0
m_OnValueChanged: m_OnValueChanged:
m_PersistentCalls: m_PersistentCalls:

View file

@ -71,12 +71,11 @@ namespace HeavenStudio.Games.Loaders
SamuraiSliceNtr.instance.SetParticleEffect(e.beat, e["type"], e["instant"], e["valA"], e["valB"]); SamuraiSliceNtr.instance.SetParticleEffect(e.beat, e["type"], e["instant"], e["valA"], e["valB"]);
}, },
defaultLength = 0.5f, defaultLength = 0.5f,
resizable = true,
parameters = new List<Param>() parameters = new List<Param>()
{ {
new Param("type", SamuraiSliceNtr.ParticleType.None, "Particle", "Set the type of particle effect to spawn. Using \"None\" will stop all effects."), new Param("type", SamuraiSliceNtr.ParticleType.None, "Particle", "Set the type of particle effect to spawn. Using \"None\" will stop all effects."),
new Param("instant", false, "Instant", "Toggle if the particles should start or stop instantly."), new Param("instant", false, "Instant", "Toggle if the particles should start or stop instantly."),
new Param("valA", new EntityTypes.Float(0f, 64f, 1f), "Wind Strength", "Set the strength of the particle wind."), new Param("valA", new EntityTypes.Float(0f, 16f, 1f), "Wind Strength", "Set the strength of the particle wind."),
new Param("valB", new EntityTypes.Float(1f, 16f, 1f), "Particle Intensity", "Set the intensity of the particle effect.") new Param("valB", new EntityTypes.Float(1f, 16f, 1f), "Particle Intensity", "Set the intensity of the particle effect.")
}, },
}, },
@ -155,9 +154,6 @@ namespace HeavenStudio.Games
// wind // wind
public WindZone Wind; public WindZone Wind;
public ParticleSystem[] Effects; public ParticleSystem[] Effects;
public ParticleSystem Snow;
public ParticleSystem Leaf;
public ParticleSystem leafBroken;
//game scene //game scene
public static SamuraiSliceNtr instance; public static SamuraiSliceNtr instance;
@ -301,7 +297,7 @@ namespace HeavenStudio.Games
return; return;
} }
ParticleSystem particleSystem = Effects[type - 1]; ParticleSystem particleSystem = Effects[Mathf.Clamp(type - 1, 0, Effects.Length - 1)];
particleSystem.gameObject.SetActive(true); particleSystem.gameObject.SetActive(true);
particleSystem.Play(); particleSystem.Play();