Skip to content

Commit

Permalink
fix: light movement particle
Browse files Browse the repository at this point in the history
  • Loading branch information
angelocavallet committed Feb 7, 2024
1 parent a98116a commit fdf5142
Show file tree
Hide file tree
Showing 23 changed files with 951 additions and 2,896 deletions.
18 changes: 11 additions & 7 deletions Assets/Prefabs/Effects/BloodParticle.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2590109654476040501}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2561955471287000917}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &1418678648030343503
ParticleSystem:
Expand Down Expand Up @@ -4812,13 +4812,15 @@ ParticleSystemRenderer:
m_RenderAlignment: 0
m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 0
m_EnableGPUInstancing: 1
m_ApplyActiveColorSpace: 1
m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
m_UseCustomVertexStreams: 0
m_VertexStreams: 00010304
m_UseCustomTrailVertexStreams: 0
m_TrailVertexStreams: 00010304
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
Expand Down Expand Up @@ -4854,14 +4856,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8719900064538854672}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: -0.3, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3120873398482430733}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &3321157396918252614
ParticleSystem:
Expand Down Expand Up @@ -9665,8 +9667,8 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: fa36c46ddccbd344997ea8c2ceb33f60, type: 2}
- {fileID: 2100000, guid: fa36c46ddccbd344997ea8c2ceb33f60, type: 2}
- {fileID: 2100000, guid: 3438a7673ecaa5b459840c6aff4383d4, type: 2}
- {fileID: 2100000, guid: 3438a7673ecaa5b459840c6aff4383d4, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand All @@ -9689,7 +9691,7 @@ ParticleSystemRenderer:
m_SortingOrder: 0
m_RenderMode: 4
m_MeshDistribution: 0
m_SortMode: 3
m_SortMode: 2
m_MinParticleSize: 0
m_MaxParticleSize: 0.5
m_CameraVelocityScale: 0
Expand All @@ -9701,13 +9703,15 @@ ParticleSystemRenderer:
m_RenderAlignment: 0
m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 0
m_EnableGPUInstancing: 1
m_ApplyActiveColorSpace: 1
m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
m_UseCustomVertexStreams: 0
m_VertexStreams: 00010304
m_UseCustomTrailVertexStreams: 0
m_TrailVertexStreams: 00010304
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
Expand Down
4 changes: 2 additions & 2 deletions Assets/Prefabs/Effects/BloodPoint.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4481857523578877274}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4840027735024532909
MonoBehaviour:
Expand Down Expand Up @@ -67,7 +67,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down
30 changes: 16 additions & 14 deletions Assets/Prefabs/Effects/ThrowParticle.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4135206969941052617}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.021038, y: -0.24167836, z: -0.01449481}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &1090151331659466684
ParticleSystem:
Expand All @@ -41,14 +41,14 @@ ParticleSystem:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4135206969941052617}
serializedVersion: 8
lengthInSec: 1
lengthInSec: 3
simulationSpeed: 1
stopAction: 0
cullingMode: 0
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
emitterVelocityMode: 1
looping: 0
looping: 1
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
Expand Down Expand Up @@ -116,7 +116,7 @@ ParticleSystem:
startLifetime:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0.5
minScalar: 5
maxCurve:
serializedVersion: 2
Expand Down Expand Up @@ -870,7 +870,7 @@ ParticleSystem:
rateOverTime:
serializedVersion: 2
minMaxState: 0
scalar: 30
scalar: 0
minScalar: 10
maxCurve:
serializedVersion: 2
Expand Down Expand Up @@ -923,7 +923,7 @@ ParticleSystem:
rateOverDistance:
serializedVersion: 2
minMaxState: 0
scalar: 0
scalar: 2.5
minScalar: 0
maxCurve:
serializedVersion: 2
Expand Down Expand Up @@ -979,9 +979,9 @@ ParticleSystem:
enabled: 0
curve:
serializedVersion: 2
minMaxState: 1
minMaxState: 3
scalar: 1
minScalar: 1
minScalar: 0.5
maxCurve:
serializedVersion: 2
m_Curve:
Expand Down Expand Up @@ -1032,7 +1032,7 @@ ParticleSystem:
m_RotationOrder: 4
y:
serializedVersion: 2
minMaxState: 1
minMaxState: 3
scalar: 1
minScalar: 1
maxCurve:
Expand Down Expand Up @@ -1085,7 +1085,7 @@ ParticleSystem:
m_RotationOrder: 4
z:
serializedVersion: 2
minMaxState: 1
minMaxState: 3
scalar: 1
minScalar: 1
maxCurve:
Expand Down Expand Up @@ -1308,8 +1308,8 @@ ParticleSystem:
maxColor: {r: 1, g: 1, b: 1, a: 1}
maxGradient:
serializedVersion: 2
key0: {r: 0.8207547, g: 0.8207547, b: 0.8207547, a: 1}
key1: {r: 0.8207547, g: 0.8207547, b: 0.8207547, a: 0}
key0: {r: 1, g: 1, b: 1, a: 1}
key1: {r: 0.9372549, g: 0.9372549, b: 0.9372549, a: 0}
key2: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
Expand All @@ -1326,7 +1326,7 @@ ParticleSystem:
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime2: 65535
atime3: 0
atime4: 0
atime5: 0
Expand Down Expand Up @@ -4812,13 +4812,15 @@ ParticleSystemRenderer:
m_RenderAlignment: 0
m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 0
m_EnableGPUInstancing: 1
m_ApplyActiveColorSpace: 1
m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
m_UseCustomVertexStreams: 0
m_VertexStreams: 00010304
m_UseCustomTrailVertexStreams: 0
m_TrailVertexStreams: 00010304
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
Expand Down
138 changes: 138 additions & 0 deletions Assets/Prefabs/Effects/TrailEffect.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7197107790443365913
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2881190523127190913}
- component: {fileID: 8590981386943457669}
m_Layer: 0
m_Name: TrailEffect
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2881190523127190913
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7197107790443365913}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!96 &8590981386943457669
TrailRenderer:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7197107790443365913}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10301, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 984986535
m_SortingLayer: -4
m_SortingOrder: -1
m_Time: 0.4
m_PreviewTimeScale: 1
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
colorGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 0.5019608}
key1: {r: 1, g: 1, b: 1, a: 0}
key2: {r: 1, g: 1, b: 1, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 21974
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 42983
atime2: 37586
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
numCornerVertices: 0
numCapVertices: 0
alignment: 0
textureMode: 0
textureScale: {x: 1, y: 1}
shadowBias: 0.5
generateLightingData: 0
m_MinVertexDistance: 0.1
m_MaskInteraction: 0
m_Autodestruct: 0
m_Emitting: 1
m_ApplyActiveColorSpace: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Prefabs/Lights.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit fdf5142

Please sign in to comment.