diff --git a/Assets/1-Packs/Effects/Hovl Studio/Magic effects pack/Prefabs/Hits and explosions/Snow hit.prefab b/Assets/1-Packs/Effects/Hovl Studio/Magic effects pack/Prefabs/Hits and explosions/Snow hit.prefab index 771e2ce3..fbf9d7f9 100644 --- a/Assets/1-Packs/Effects/Hovl Studio/Magic effects pack/Prefabs/Hits and explosions/Snow hit.prefab +++ b/Assets/1-Packs/Effects/Hovl Studio/Magic effects pack/Prefabs/Hits and explosions/Snow hit.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1607713453557310720} + 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: 9094896269969779576} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!198 &3278525338544329849 ParticleSystem: @@ -251,6 +251,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -280,6 +281,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -601,6 +603,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 1000 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -1397,6 +1400,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -1426,6 +1430,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -3646,6 +3651,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -3675,6 +3681,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -4052,6 +4059,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -4094,6 +4102,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4123,6 +4132,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -4210,6 +4220,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4239,6 +4250,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -4277,6 +4289,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4306,6 +4319,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -4559,6 +4573,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4588,6 +4603,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -4863,13 +4879,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: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -4904,9 +4922,10 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4924508274929071776} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_LocalScale: {x: 0.45, y: 0.45, z: 0.45} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 6724152929448912873} @@ -4914,7 +4933,6 @@ Transform: - {fileID: 9001665431472907474} - {fileID: 2971019438578344905} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!198 &6523699520211762466 ParticleSystem: @@ -5134,6 +5152,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -5163,6 +5182,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -5484,6 +5504,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 15 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -6280,6 +6301,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -6309,6 +6331,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -8529,6 +8552,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8558,6 +8582,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -8935,6 +8960,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -8977,6 +9003,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9006,6 +9033,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -9093,6 +9121,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9122,6 +9151,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -9160,6 +9190,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9189,6 +9220,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -9442,6 +9474,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9471,6 +9504,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -9746,13 +9780,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: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -9787,13 +9823,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5249445469998048360} + 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: 9094896269969779576} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!198 &2121764580729701989 ParticleSystem: @@ -10013,6 +10049,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -10042,6 +10079,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -10363,6 +10401,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 1000 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -11159,6 +11198,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 3 minGradient: @@ -11188,6 +11228,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -13408,6 +13449,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -13437,6 +13479,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -13814,6 +13857,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -13856,6 +13900,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -13885,6 +13930,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -13972,6 +14018,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14001,6 +14048,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -14039,6 +14087,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14068,6 +14117,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -14321,6 +14371,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14350,6 +14401,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -14625,13 +14677,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: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -14666,13 +14720,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6778245140291535280} + 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: 9094896269969779576} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!198 &7274769404230388204 ParticleSystem: @@ -14892,6 +14946,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14921,6 +14976,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -15242,6 +15298,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 1000 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -16038,6 +16095,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 minGradient: @@ -16067,6 +16125,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -18287,6 +18346,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -18316,6 +18376,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -18693,6 +18754,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -18735,6 +18797,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -18764,6 +18827,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -18851,6 +18915,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -18880,6 +18945,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -18918,6 +18984,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -18947,6 +19014,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -19200,6 +19268,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19229,6 +19298,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -19504,13 +19574,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: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -19545,13 +19617,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8099841235637464375} + 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: 9094896269969779576} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!198 &2835648722743101163 ParticleSystem: @@ -19771,6 +19843,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19800,6 +19873,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -20121,6 +20195,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 1000 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 1 @@ -20908,6 +20983,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -20937,6 +21013,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -23157,6 +23234,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23186,6 +23264,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -23563,6 +23642,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -23605,6 +23685,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23634,6 +23715,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -23721,6 +23803,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23750,6 +23833,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -23788,6 +23872,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23817,6 +23902,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -24070,6 +24156,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -24099,6 +24186,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -24374,13 +24462,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: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} diff --git a/Assets/Audio.meta b/Assets/Audio.meta new file mode 100644 index 00000000..c7a86cba --- /dev/null +++ b/Assets/Audio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d4936130a5c3c4b409b2c4244b64de37 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/arrow-swish_03-306040.mp3 b/Assets/Audio/arrow-swish_03-306040.mp3 new file mode 100644 index 00000000..57583654 --- /dev/null +++ b/Assets/Audio/arrow-swish_03-306040.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b3fd4fd824031ed33b27df338777a3637327e59d48bb4ae1cc0ed6ed5d26e27 +size 33436 diff --git a/Assets/Audio/arrow-swish_03-306040.mp3.meta b/Assets/Audio/arrow-swish_03-306040.mp3.meta new file mode 100644 index 00000000..1ee66dc4 --- /dev/null +++ b/Assets/Audio/arrow-swish_03-306040.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 918147921f5150648b1f62ca00d044ab +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 1 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/crossbow-firing-bolt-gamemaster-audio-3-3-00-00.mp3 b/Assets/Audio/crossbow-firing-bolt-gamemaster-audio-3-3-00-00.mp3 new file mode 100644 index 00000000..6e47ba81 --- /dev/null +++ b/Assets/Audio/crossbow-firing-bolt-gamemaster-audio-3-3-00-00.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c43a02d6f1a30ad4a6ea9c210b36deb1108129a065f5473ba1929c937ee06076 +size 23311 diff --git a/Assets/Audio/crossbow-firing-bolt-gamemaster-audio-3-3-00-00.mp3.meta b/Assets/Audio/crossbow-firing-bolt-gamemaster-audio-3-3-00-00.mp3.meta new file mode 100644 index 00000000..c0c46e85 --- /dev/null +++ b/Assets/Audio/crossbow-firing-bolt-gamemaster-audio-3-3-00-00.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: f0e9347d5f965e54e85d0a6bcc84d0cb +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 1 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/crossbow-firing-heavy-bolt-gamemaster-audio-2-2-00-00.mp3 b/Assets/Audio/crossbow-firing-heavy-bolt-gamemaster-audio-2-2-00-00.mp3 new file mode 100644 index 00000000..3833f48a --- /dev/null +++ b/Assets/Audio/crossbow-firing-heavy-bolt-gamemaster-audio-2-2-00-00.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:548bf15f690fcb1b864b46ac12e4f418ca4a25c8ce95c0be947f21dd3184e2ae +size 14964 diff --git a/Assets/Audio/crossbow-firing-heavy-bolt-gamemaster-audio-2-2-00-00.mp3.meta b/Assets/Audio/crossbow-firing-heavy-bolt-gamemaster-audio-2-2-00-00.mp3.meta new file mode 100644 index 00000000..6558cee7 --- /dev/null +++ b/Assets/Audio/crossbow-firing-heavy-bolt-gamemaster-audio-2-2-00-00.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: c988ab92e63bd8945b16dc81acfee9da +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 1 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Developer/Prefabs/Persistent Objects.prefab b/Assets/Developer/Prefabs/Persistent Objects.prefab index 92062ae3..a88d7371 100644 --- a/Assets/Developer/Prefabs/Persistent Objects.prefab +++ b/Assets/Developer/Prefabs/Persistent Objects.prefab @@ -7473,6 +7473,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 12447dd4c759d5e40a085a6062af22a4, type: 2} - {fileID: 11400000, guid: d58ac5a6fef83a24e93311b30cc34b0d, type: 2} - {fileID: 11400000, guid: b9a421f28b69be7499e354879b040b1f, type: 2} + - {fileID: 11400000, guid: 6ab43ebffefa8b743a72236468d755a5, type: 2} - characterClass: {fileID: 11400000, guid: 0751a225be067c646b9bc92f245d4292, type: 2} possibleClassAbilities: - {fileID: 11400000, guid: 2aedba226d5809043bcd0f660b35f74f, type: 2} @@ -11900,6 +11901,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 67c07fd55113f25478bc5a7954290614, type: 2} - {fileID: 11400000, guid: c602778d057001d4b929c6685f50bb59, type: 2} - {fileID: 11400000, guid: f9fac722d620a31458c32b962378ad7c, type: 2} + - {fileID: 11400000, guid: 6ab43ebffefa8b743a72236468d755a5, type: 2} --- !u!1 &7475116341184709871 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat b/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat index 435cfab6..6e32316c 100644 --- a/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat +++ b/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat @@ -78,7 +78,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 14.226553 + - _Rotation: 17.83034 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Resources/Abilities/ArrowProjectilePrefab.prefab b/Assets/Resources/Abilities/ArrowProjectilePrefab.prefab index cc9443f5..aff262c9 100644 --- a/Assets/Resources/Abilities/ArrowProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/ArrowProjectilePrefab.prefab @@ -216,6 +216,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5408610653861158196} + - {fileID: 6186933404459732400} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &8607891234483246275 @@ -265,9 +266,119 @@ MonoBehaviour: lifeSpan: 0 canPierce: 0 canHitSelf: 0 + speedOverLifetime: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + useSpeedCurve: 0 + enableCurving: 0 + curveAxis: {x: 0, y: 1, z: 0} + curveStrength: 1 + curveAmplitude: 45 + enableRicochet: 0 + maxRicochets: 1 + ricochetSpread: 10 onTargetHit: m_PersistentCalls: m_Calls: [] +--- !u!1001 &2331645724559597255 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8607891234483246272} + m_Modifications: + - target: {fileID: 548295500233825645, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} + propertyPath: m_Volume + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 548295500233825645, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} + propertyPath: m_audioClip + value: + objectReference: {fileID: 8300000, guid: f0e9347d5f965e54e85d0a6bcc84d0cb, type: 3} + - target: {fileID: 548295500233825645, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} + propertyPath: m_PlayOnAwake + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1082793402966804016, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} + propertyPath: m_Name + value: AudioPlayer_SFX + objectReference: {fileID: 0} + - target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} +--- !u!4 &6186933404459732400 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} + m_PrefabInstance: {fileID: 2331645724559597255} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7649113661387922054 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/FanOfArrows_Shoot_AreaOfEffectWithImpactEventPrefab.prefab b/Assets/Resources/Abilities/FanOfArrows_Shoot_AreaOfEffectWithImpactEventPrefab.prefab index 1d1703b2..ee406ed2 100644 --- a/Assets/Resources/Abilities/FanOfArrows_Shoot_AreaOfEffectWithImpactEventPrefab.prefab +++ b/Assets/Resources/Abilities/FanOfArrows_Shoot_AreaOfEffectWithImpactEventPrefab.prefab @@ -56,6 +56,10 @@ MonoBehaviour: - {fileID: 7361961845613573154} - {fileID: 7361961845736109002} - {fileID: 7361961847312288263} + delayedRelease: 0 + delay: 0 + oneByOne: 1 + releaseInterval: 0.075 --- !u!1 &2569138106013936178 GameObject: m_ObjectHideFlags: 0 @@ -332,6 +336,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2569138106013936177} m_Modifications: + - target: {fileID: 2864364906802512810, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} + propertyPath: m_audioClip + value: + objectReference: {fileID: 8300000, guid: c988ab92e63bd8945b16dc81acfee9da, type: 3} - target: {fileID: 8607891234483246272, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} propertyPath: m_RootOrder value: 5 @@ -414,6 +422,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2569138106013936177} m_Modifications: + - target: {fileID: 2864364906802512810, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} + propertyPath: m_audioClip + value: + objectReference: {fileID: 8300000, guid: c988ab92e63bd8945b16dc81acfee9da, type: 3} - target: {fileID: 8607891234483246272, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} propertyPath: m_RootOrder value: 2 @@ -660,6 +672,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2569138106013936177} m_Modifications: + - target: {fileID: 2864364906802512810, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} + propertyPath: m_audioClip + value: + objectReference: {fileID: 8300000, guid: c988ab92e63bd8945b16dc81acfee9da, type: 3} - target: {fileID: 8607891234483246272, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} propertyPath: m_RootOrder value: 4 diff --git a/Assets/Resources/Abilities/FanOfKnives_Throw_AreaOfEffectWithImpactEventPrefab.prefab b/Assets/Resources/Abilities/FanOfKnives_Throw_AreaOfEffectWithImpactEventPrefab.prefab index 43f7e2fb..65eb3082 100644 --- a/Assets/Resources/Abilities/FanOfKnives_Throw_AreaOfEffectWithImpactEventPrefab.prefab +++ b/Assets/Resources/Abilities/FanOfKnives_Throw_AreaOfEffectWithImpactEventPrefab.prefab @@ -203,6 +203,10 @@ MonoBehaviour: - {fileID: 8387270999060975240} - {fileID: 7407069868122460264} - {fileID: 1771966622067895815} + delayedRelease: 0 + delay: 0 + oneByOne: 1 + releaseInterval: 0.075 --- !u!1 &7615306565481972756 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/IceShards_V_AreaOfEffectWithImpactEventPrefab.prefab b/Assets/Resources/Abilities/IceShards_V_AreaOfEffectWithImpactEventPrefab.prefab new file mode 100644 index 00000000..40d42e5c --- /dev/null +++ b/Assets/Resources/Abilities/IceShards_V_AreaOfEffectWithImpactEventPrefab.prefab @@ -0,0 +1,667 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2047364057251002422 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5133864828540381382} + - component: {fileID: 2822406144658782004} + m_Layer: 30 + m_Name: effectVisual + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5133864828540381382 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2047364057251002422} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 2488398379200581119} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2822406144658782004 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2047364057251002422} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &4940949788476054311 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2906308981400678374} + m_Layer: 30 + m_Name: Epicenter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2906308981400678374 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4940949788476054311} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9208624900469718939} + - {fileID: 1463400303954302920} + - {fileID: 1477174148183520518} + - {fileID: 6847133327618995902} + - {fileID: 4007579093907109113} + m_Father: {fileID: 5594342921507666472} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7897311209507034419 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2488398379200581119} + - component: {fileID: 7047934907440010099} + - component: {fileID: 643520134109384112} + m_Layer: 30 + m_Name: IceShards_V_AreaOfEffectWithImpactEventPrefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2488398379200581119 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7897311209507034419} + 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: + - {fileID: 5133864828540381382} + - {fileID: 5594342921507666472} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &7047934907440010099 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7897311209507034419} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &643520134109384112 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7897311209507034419} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6bf14323f3109464580b6790c9171be9, type: 3} + m_Name: + m_EditorClassIdentifier: + telegraph: {fileID: 0} + effectVisual: {fileID: 2047364057251002422} + abilityHitLayer: + serializedVersion: 2 + m_Bits: 2147483648 + impactHitVFX: {fileID: 0} + shouldDisableVisualsOnDelayedDestroyEntered: 1 + ownerTag: {fileID: 0} + ability: {fileID: 0} + radius: 0 + shouldResizeVisuals: 0 + telegraphDelay: 0 + lifeSpan: 0 + canHitSelf: 0 + onTargetHit: + m_PersistentCalls: + m_Calls: [] + impactDelay: 0 + onImpactHappened: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 5565566547569565260} + m_TargetAssemblyTypeName: NetworkMultipleProjectileChainReaction, Assembly-CSharp + m_MethodName: ExecuteAbilityChainReaction + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &7995000011554157670 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5594342921507666472} + - component: {fileID: 5565566547569565260} + m_Layer: 30 + m_Name: AbilityChainReaction + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5594342921507666472 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7995000011554157670} + 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: 1 + m_Children: + - {fileID: 2906308981400678374} + m_Father: {fileID: 2488398379200581119} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5565566547569565260 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7995000011554157670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 82544ba8826f0ea418d1d5af39acb641, type: 3} + m_Name: + m_EditorClassIdentifier: + ability: {fileID: 11400000, guid: 6e6816a87356ed54aa546aefca31e06b, type: 2} + abilityPrefabName: {fileID: 0} + projectiles: + - {fileID: 9208624900469718938} + - {fileID: 1463400303954302921} + - {fileID: 1477174148183520519} + - {fileID: 6847133327618995903} + - {fileID: 4007579093907109112} + delayedRelease: 1 + delay: 0.01 + oneByOne: 1 + releaseInterval: 0.1 +--- !u!1001 &881301578887824579 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2906308981400678374} + m_Modifications: + - target: {fileID: 4298339421658607672, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_Name + value: Iceshard_ProjectilePrefab (4) + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607672, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalPosition.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalPosition.z + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607677, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: sceneViewId + value: 25 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} +--- !u!114 &4007579093907109112 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4298339421658607675, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + m_PrefabInstance: {fileID: 881301578887824579} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cce7597ff76d7054badb29dbc478106e, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &4007579093907109113 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + m_PrefabInstance: {fileID: 881301578887824579} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &3447856128063079740 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2906308981400678374} + m_Modifications: + - target: {fileID: 4298339421658607672, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_Name + value: Iceshard_ProjectilePrefab (3) + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607672, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalPosition.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalPosition.z + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607677, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: sceneViewId + value: 25 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} +--- !u!4 &1477174148183520518 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + m_PrefabInstance: {fileID: 3447856128063079740} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1477174148183520519 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4298339421658607675, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + m_PrefabInstance: {fileID: 3447856128063079740} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cce7597ff76d7054badb29dbc478106e, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &3452517348620232690 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2906308981400678374} + m_Modifications: + - target: {fileID: 4298339421658607672, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_Name + value: Iceshard_ProjectilePrefab (1) + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607672, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalPosition.x + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalPosition.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607677, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: sceneViewId + value: 25 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} +--- !u!4 &1463400303954302920 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + m_PrefabInstance: {fileID: 3452517348620232690} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1463400303954302921 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4298339421658607675, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + m_PrefabInstance: {fileID: 3452517348620232690} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cce7597ff76d7054badb29dbc478106e, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &4930702035349966753 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2906308981400678374} + m_Modifications: + - target: {fileID: 4298339421658607672, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_Name + value: Iceshard_ProjectilePrefab + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607672, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalPosition.z + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607677, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: sceneViewId + value: 25 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} +--- !u!114 &9208624900469718938 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4298339421658607675, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + m_PrefabInstance: {fileID: 4930702035349966753} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cce7597ff76d7054badb29dbc478106e, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &9208624900469718939 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + m_PrefabInstance: {fileID: 4930702035349966753} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7251678951787136644 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2906308981400678374} + m_Modifications: + - target: {fileID: 4298339421658607672, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_Name + value: Iceshard_ProjectilePrefab (2) + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607672, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalPosition.x + value: -0.25 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalPosition.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298339421658607677, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + propertyPath: sceneViewId + value: 25 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} +--- !u!4 &6847133327618995902 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + m_PrefabInstance: {fileID: 7251678951787136644} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6847133327618995903 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4298339421658607675, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + m_PrefabInstance: {fileID: 7251678951787136644} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cce7597ff76d7054badb29dbc478106e, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Resources/Abilities/IceShards_V_AreaOfEffectWithImpactEventPrefab.prefab.meta b/Assets/Resources/Abilities/IceShards_V_AreaOfEffectWithImpactEventPrefab.prefab.meta new file mode 100644 index 00000000..42c13ad9 --- /dev/null +++ b/Assets/Resources/Abilities/IceShards_V_AreaOfEffectWithImpactEventPrefab.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8086edeaf6a4a974db8a4636fe1cef86 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Abilities/Iceshard_ProjectilePrefab.prefab b/Assets/Resources/Abilities/Iceshard_ProjectilePrefab.prefab index e6bf4cb2..e77a2058 100644 --- a/Assets/Resources/Abilities/Iceshard_ProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/Iceshard_ProjectilePrefab.prefab @@ -459,6 +459,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4298339421658607674} m_Modifications: + - target: {fileID: 548295500233825645, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} + propertyPath: m_Volume + value: 0.6 + objectReference: {fileID: 0} - target: {fileID: 548295500233825645, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3} propertyPath: m_audioClip value: diff --git a/Assets/Resources/Abilities/ShootArrow_III_AreaOfEffectWithImpactEventPrefab.prefab b/Assets/Resources/Abilities/ShootArrow_III_AreaOfEffectWithImpactEventPrefab.prefab index 37bfdab9..ce9b81aa 100644 --- a/Assets/Resources/Abilities/ShootArrow_III_AreaOfEffectWithImpactEventPrefab.prefab +++ b/Assets/Resources/Abilities/ShootArrow_III_AreaOfEffectWithImpactEventPrefab.prefab @@ -48,9 +48,13 @@ MonoBehaviour: ability: {fileID: 11400000, guid: 4a43c80e0cffd1447b4bf2e849ce0c59, type: 2} abilityPrefabName: {fileID: 0} projectiles: + - {fileID: 2243483365408012197} - {fileID: 2243483364851591459} - {fileID: 2243483364195524044} - - {fileID: 2243483365408012197} + delayedRelease: 0 + delay: 0 + oneByOne: 1 + releaseInterval: 0.075 --- !u!1 &8605368231226215619 GameObject: m_ObjectHideFlags: 0 @@ -240,6 +244,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8605368231226215616} m_Modifications: + - target: {fileID: 2864364906802512810, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} + propertyPath: m_audioClip + value: + objectReference: {fileID: 8300000, guid: c988ab92e63bd8945b16dc81acfee9da, type: 3} - target: {fileID: 8607891234483246272, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} propertyPath: m_RootOrder value: 1 diff --git a/Assets/Scenes/Dev/Abilities.unity b/Assets/Scenes/Dev/Abilities.unity index 435cb8d2..89a8ad6e 100644 --- a/Assets/Scenes/Dev/Abilities.unity +++ b/Assets/Scenes/Dev/Abilities.unity @@ -506,7 +506,6 @@ Transform: - {fileID: 186318874114278864} - {fileID: 4839708417611160024} - {fileID: 7116996884322360767} - - {fileID: 2275885020835014822} - {fileID: 9043445715939327476} - {fileID: 3305348038826615218} - {fileID: 6660974608414628976} @@ -5191,80 +5190,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 8654493186987980829, guid: 7b00a5e4fcb04994190ef797dfb61e95, type: 3} m_PrefabInstance: {fileID: 2150745757727967513} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2275885020835014821 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 177303970} - m_Modifications: - - target: {fileID: 4298339421658607672, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} - propertyPath: m_Name - value: Iceshard_ProjectilePrefab - objectReference: {fileID: 0} - - target: {fileID: 4298339421658607672, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4298339421658607677, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} - propertyPath: sceneViewId - value: 25 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} ---- !u!4 &2275885020835014822 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4298339421658607674, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} - m_PrefabInstance: {fileID: 2275885020835014821} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2322773292303647677 PrefabInstance: m_ObjectHideFlags: 0 @@ -5709,6 +5634,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 4547055273174472751, guid: 4979f41a1f79dc94682524b11303b49f, type: 3} m_PrefabInstance: {fileID: 3119086481078164034} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3215777116591347979 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2488398379200581119, guid: 8086edeaf6a4a974db8a4636fe1cef86, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2488398379200581119, guid: 8086edeaf6a4a974db8a4636fe1cef86, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2488398379200581119, guid: 8086edeaf6a4a974db8a4636fe1cef86, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2488398379200581119, guid: 8086edeaf6a4a974db8a4636fe1cef86, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2488398379200581119, guid: 8086edeaf6a4a974db8a4636fe1cef86, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2488398379200581119, guid: 8086edeaf6a4a974db8a4636fe1cef86, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2488398379200581119, guid: 8086edeaf6a4a974db8a4636fe1cef86, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2488398379200581119, guid: 8086edeaf6a4a974db8a4636fe1cef86, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2488398379200581119, guid: 8086edeaf6a4a974db8a4636fe1cef86, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2488398379200581119, guid: 8086edeaf6a4a974db8a4636fe1cef86, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7897311209507034419, guid: 8086edeaf6a4a974db8a4636fe1cef86, type: 3} + propertyPath: m_Name + value: IceShards_V_AreaOfEffectWithImpactEventPrefab + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8086edeaf6a4a974db8a4636fe1cef86, type: 3} --- !u!1001 &3305348038826615217 PrefabInstance: m_ObjectHideFlags: 0 @@ -11423,6 +11405,10 @@ PrefabInstance: propertyPath: m_Name value: EquinoxCore_ProjectilePrefab objectReference: {fileID: 0} + - target: {fileID: 3565839997967106406, guid: 0c26679edf0546f428e5abf177386b6f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6298629893283075091, guid: 0c26679edf0546f428e5abf177386b6f, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -17584,6 +17570,14 @@ PrefabInstance: propertyPath: sceneViewId value: 65 objectReference: {fileID: 0} + - target: {fileID: 2243483364195524047, guid: 110303f5465936d498288246496a184b, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2243483364851591456, guid: 110303f5465936d498288246496a184b, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2243483364851591461, guid: 110303f5465936d498288246496a184b, type: 3} propertyPath: sceneViewId value: 66 @@ -17592,6 +17586,10 @@ PrefabInstance: propertyPath: sceneViewId value: 64 objectReference: {fileID: 0} + - target: {fileID: 2243483365408012198, guid: 110303f5465936d498288246496a184b, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9023701964577279872, guid: 110303f5465936d498288246496a184b, type: 3} propertyPath: m_RootOrder value: 18 @@ -23326,6 +23324,7 @@ SceneRoots: - {fileID: 1544510706581098781} - {fileID: 6545462103452042218} - {fileID: 7518525670175012109} + - {fileID: 3215777116591347979} - {fileID: 1483268165} - {fileID: 1569104425} - {fileID: 942386134} diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-TornadoProjectileStats.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-TornadoProjectileStats.asset index ec460f6f..18aa2508 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-TornadoProjectileStats.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-TornadoProjectileStats.asset @@ -27,6 +27,9 @@ MonoBehaviour: manaCost: 0 healthCost: 0 classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0 + percentMaxHealthCost: 0 cooldown: 0 castableWhileMoving: 0 animationType: 1 @@ -35,3 +38,35 @@ MonoBehaviour: lifeSpan: 0 canPierce: 1 canHitSelf: 0 + speedOverLifetime: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 2 + outSlope: 2 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + useSpeedCurve: 1 + enableCurving: 0 + curveAxis: {x: 0, y: 1, z: 0} + curveStrength: 5 + curveAmplitude: 30 + enableRicochet: 0 + maxRicochets: 1 + ricochetSpread: 10 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/1-AxeThrow_ProjectileAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/1-AxeThrow_ProjectileAbility.asset index d559f380..6c99aa65 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/1-AxeThrow_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/1-AxeThrow_ProjectileAbility.asset @@ -31,6 +31,9 @@ MonoBehaviour: manaCost: 6 healthCost: 0 classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0 + percentMaxHealthCost: 0 cooldown: 0 castableWhileMoving: 0 animationType: 0 @@ -39,3 +42,35 @@ MonoBehaviour: lifeSpan: 2 canPierce: 0 canHitSelf: 0 + speedOverLifetime: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + useSpeedCurve: 0 + enableCurving: 0 + curveAxis: {x: 0, y: 1, z: 0} + curveStrength: 1 + curveAmplitude: 45 + enableRicochet: 0 + maxRicochets: 1 + ricochetSpread: 12 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Knight/1-ShieldThrow_ProjectileAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Knight/1-ShieldThrow_ProjectileAbility.asset index 588bab28..fb8428fe 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Knight/1-ShieldThrow_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Knight/1-ShieldThrow_ProjectileAbility.asset @@ -28,6 +28,9 @@ MonoBehaviour: manaCost: 6 healthCost: 0 classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0 + percentMaxHealthCost: 0 cooldown: 0 castableWhileMoving: 0 animationType: 0 @@ -36,3 +39,35 @@ MonoBehaviour: lifeSpan: 2 canPierce: 0 canHitSelf: 0 + speedOverLifetime: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + useSpeedCurve: 0 + enableCurving: 0 + curveAxis: {x: 0, y: 1, z: 0} + curveStrength: 1 + curveAmplitude: 45 + enableRicochet: 1 + maxRicochets: 1 + ricochetSpread: 12 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/0-IceShard_ProjectileAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/0-IceShard_ProjectileAbility.asset index 77bc4906..bdb14336 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/0-IceShard_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/0-IceShard_ProjectileAbility.asset @@ -39,7 +39,48 @@ MonoBehaviour: castableWhileMoving: 0 animationType: 1 projectilePrefab: {fileID: 4298339421658607672, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} - projectileSpeed: 10 - lifeSpan: 1.5 - canPierce: 1 + projectileSpeed: 50 + lifeSpan: 1 + canPierce: 0 canHitSelf: 0 + speedOverLifetime: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: -0.06359792 + outSlope: -0.06359792 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0.0741688 + - serializedVersion: 3 + time: 0.60086226 + value: 1.0058026 + inSlope: 3.168166 + outSlope: 3.168166 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.06327993 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9846547 + value: 1.3325472 + inSlope: 0.31616712 + outSlope: 0.31616712 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.27712005 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + useSpeedCurve: 1 + enableCurving: 0 + curveAxis: {x: 0, y: 1, z: 0} + curveStrength: 15 + curveAmplitude: 85.3 + enableRicochet: 0 + maxRicochets: 1 + ricochetSpread: 10 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/0-Iceshards_V_ImpactEventIntoProjectilesAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/0-Iceshards_V_ImpactEventIntoProjectilesAbility.asset new file mode 100644 index 00000000..5e2e0e9c --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/0-Iceshards_V_ImpactEventIntoProjectilesAbility.asset @@ -0,0 +1,41 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 341727b42bbd81a4491fc0b16dc445de, type: 3} + m_Name: 0-Iceshards_V_ImpactEventIntoProjectilesAbility + m_EditorClassIdentifier: + displayName: Ice Shards V + Icon: {fileID: 21300000, guid: 0d1dc8ade7e63d14da6ea8a209621906, type: 3} + targettingTags: [] + tags: [] + abilityEffects: [] + castTime: 0.5 + manaCost: 8 + healthCost: 0 + classResourceCost: 0 + spiritPowerReserveCost: 0 + percentMaxManaCost: 0.02 + percentMaxHealthCost: 0 + cooldown: 0 + castableWhileMoving: 0 + animationType: 1 + aoePrefab: {fileID: 7897311209507034419, guid: 8086edeaf6a4a974db8a4636fe1cef86, type: 3} + movementMask: + serializedVersion: 2 + m_Bits: 8 + lifeSpan: 1 + radius: 0 + shouldResizeVisuals: 0 + telegraphDelay: 0 + canHitSelf: 0 + spawnUnderUser: 1 + rotateOnSpawn: 1 + impactDelay: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/0-Iceshards_V_ImpactEventIntoProjectilesAbility.asset.meta b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/0-Iceshards_V_ImpactEventIntoProjectilesAbility.asset.meta new file mode 100644 index 00000000..2248a685 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Mage/0-Iceshards_V_ImpactEventIntoProjectilesAbility.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6ab43ebffefa8b743a72236468d755a5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Arrows/1-Arrow_ProjectileAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Arrows/1-Arrow_ProjectileAbility.asset index 485c1432..a9be622a 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Arrows/1-Arrow_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Arrows/1-Arrow_ProjectileAbility.asset @@ -31,6 +31,7 @@ MonoBehaviour: manaCost: 0 healthCost: 0 classResourceCost: 0 + spiritPowerReserveCost: 0 percentMaxManaCost: 0 percentMaxHealthCost: 0 cooldown: 0 @@ -39,5 +40,37 @@ MonoBehaviour: projectilePrefab: {fileID: 8607891234483246274, guid: a8562c2c02cd5f84c890099e7d06e36b, type: 3} projectileSpeed: 12 lifeSpan: 2 - canPierce: 1 + canPierce: 0 canHitSelf: 0 + speedOverLifetime: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + useSpeedCurve: 0 + enableCurving: 0 + curveAxis: {x: 0, y: 1, z: 0} + curveStrength: 1 + curveAmplitude: 45 + enableRicochet: 1 + maxRicochets: 1 + ricochetSpread: 15 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Knives/1-KnifeThrow_ProjectileAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Knives/1-KnifeThrow_ProjectileAbility.asset index 605ea624..a86afb31 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Knives/1-KnifeThrow_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Rogue/2-Knives/1-KnifeThrow_ProjectileAbility.asset @@ -31,6 +31,7 @@ MonoBehaviour: manaCost: 0 healthCost: 0 classResourceCost: 0 + spiritPowerReserveCost: 0 percentMaxManaCost: 0 percentMaxHealthCost: 0 cooldown: 0 @@ -39,5 +40,37 @@ MonoBehaviour: projectilePrefab: {fileID: 3193727938999914987, guid: 76c807989cc347a43992d6f1829976f5, type: 3} projectileSpeed: 8 lifeSpan: 2 - canPierce: 1 + canPierce: 0 canHitSelf: 0 + speedOverLifetime: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + useSpeedCurve: 0 + enableCurving: 0 + curveAxis: {x: 0, y: 1, z: 0} + curveStrength: 1 + curveAmplitude: 45 + enableRicochet: 0 + maxRicochets: 1 + ricochetSpread: 10 diff --git a/Assets/Scripts/AbilitySystem/ProjectileAbility.cs b/Assets/Scripts/AbilitySystem/ProjectileAbility.cs index fba620c2..13ae29f7 100644 --- a/Assets/Scripts/AbilitySystem/ProjectileAbility.cs +++ b/Assets/Scripts/AbilitySystem/ProjectileAbility.cs @@ -12,6 +12,18 @@ public class ProjectileAbility : BaseAbility public bool canPierce; public bool canHitSelf; + [Header("Movement Behaviour")] + public AnimationCurve speedOverLifetime = AnimationCurve.Linear(0, 1, 1, 1); + public bool useSpeedCurve = false; + public bool enableCurving = false; + public Vector3 curveAxis = Vector3.up; + public float curveStrength = 1f; + public float curveAmplitude = 45f; + + public bool enableRicochet = false; + public int maxRicochets = 1; + public float ricochetSpread = 10f; + private GameObject instantiatedProjectile; private NetworkedProjectile networkedProjectile; @@ -26,12 +38,7 @@ public class ProjectileAbility : BaseAbility networkedProjectile = instantiatedProjectile.GetComponent(); - networkedProjectile.speed = projectileSpeed; - networkedProjectile.ownerTag = user; - networkedProjectile.ability = this; - networkedProjectile.lifeSpan = lifeSpan; - networkedProjectile.canPierce = canPierce; - networkedProjectile.canHitSelf = canHitSelf; + SetupProjectileInstance(user); networkedProjectile.Init(); } @@ -46,12 +53,7 @@ public class ProjectileAbility : BaseAbility networkedProjectile = instantiatedProjectile.GetComponent(); - networkedProjectile.speed = projectileSpeed; - networkedProjectile.ownerTag = user; - networkedProjectile.ability = this; - networkedProjectile.lifeSpan = lifeSpan; - networkedProjectile.canPierce = canPierce; - networkedProjectile.canHitSelf = canHitSelf; + SetupProjectileInstance(user); networkedProjectile.Init(); } @@ -66,13 +68,27 @@ public class ProjectileAbility : BaseAbility networkedProjectile = instantiatedProjectile.GetComponent(); + SetupProjectileInstance(user); + + networkedProjectile.Init(); + } + + protected virtual void SetupProjectileInstance(Taggable user) + { networkedProjectile.speed = projectileSpeed; networkedProjectile.ownerTag = user; networkedProjectile.ability = this; networkedProjectile.lifeSpan = lifeSpan; networkedProjectile.canPierce = canPierce; networkedProjectile.canHitSelf = canHitSelf; - - networkedProjectile.Init(); + networkedProjectile.speedOverLifetime = speedOverLifetime; + networkedProjectile.useSpeedCurve = useSpeedCurve; + networkedProjectile.enableCurving = enableCurving; + networkedProjectile.curveAxis = curveAxis; + networkedProjectile.curveStrength = curveStrength; + networkedProjectile.curveAmplitude = curveAmplitude; + networkedProjectile.enableRicochet = enableRicochet; + networkedProjectile.maxRicochets = maxRicochets; + networkedProjectile.ricochetSpread = ricochetSpread; } } diff --git a/Assets/Scripts/AbilitySystem/ProjectileAreaOfEffectOverTimeAbility.cs b/Assets/Scripts/AbilitySystem/ProjectileAreaOfEffectOverTimeAbility.cs index 65111404..671c6c10 100644 --- a/Assets/Scripts/AbilitySystem/ProjectileAreaOfEffectOverTimeAbility.cs +++ b/Assets/Scripts/AbilitySystem/ProjectileAreaOfEffectOverTimeAbility.cs @@ -82,5 +82,17 @@ public class ProjectileAreaOfEffectOverTimeAbility : AreaOfEffectAbility networkedAreaOfEffectOverTime.damageFollowingTarget = damageFollowingTarget; networkedAreaOfEffectOverTime.canHitSelf = canHitSelf; networkedAreaOfEffectOverTime.projectileAbility = projectileAbility; + + + networkedAreaOfEffectOverTime.projectileSpeed = projectileAbility.projectileSpeed; + networkedAreaOfEffectOverTime.canPierce = projectileAbility.canPierce; + networkedAreaOfEffectOverTime.useSpeedCurve = projectileAbility.useSpeedCurve; + networkedAreaOfEffectOverTime.enableCurving = projectileAbility.enableCurving; + networkedAreaOfEffectOverTime.curveAxis = projectileAbility.curveAxis; + networkedAreaOfEffectOverTime.curveStrength = projectileAbility.curveStrength; + networkedAreaOfEffectOverTime.curveAmplitude = projectileAbility.curveAmplitude; + networkedAreaOfEffectOverTime.enableRicochet = projectileAbility.enableRicochet; + networkedAreaOfEffectOverTime.maxRicochets = projectileAbility.maxRicochets; + networkedAreaOfEffectOverTime.ricochetSpread = projectileAbility.ricochetSpread; } } diff --git a/Assets/Scripts/Networking/NetworkMultipleProjectileChainReaction.cs b/Assets/Scripts/Networking/NetworkMultipleProjectileChainReaction.cs index 575a894b..e0466d6a 100644 --- a/Assets/Scripts/Networking/NetworkMultipleProjectileChainReaction.cs +++ b/Assets/Scripts/Networking/NetworkMultipleProjectileChainReaction.cs @@ -6,12 +6,18 @@ public class NetworkMultipleProjectileChainReaction : NetworkAbilityChainReactio { public List projectiles = new List(); + public bool delayedRelease = false; + public float delay = 0f; + public bool oneByOne = false; + public float releaseInterval = 0f; + ProjectileAbility projectileAbility; public override void ExecuteAbilityChainReaction(Taggable owner, List targets) { + StartCoroutine(ReleaseProjectiles(owner, delayedRelease, delay, oneByOne, releaseInterval)); - projectileAbility = (ProjectileAbility)ability; + /* projectileAbility = (ProjectileAbility)ability; foreach (NetworkedProjectile projectile in projectiles) { @@ -25,6 +31,37 @@ public class NetworkMultipleProjectileChainReaction : NetworkAbilityChainReactio projectile.gameObject.SetActive(true); projectile.Init(); + }*/ + } + + IEnumerator ReleaseProjectiles(Taggable owner,bool delayedRelease = false, float delay = 0f, bool oneByOne = true, float releaseInterval = 0f) + { + if (delayedRelease) yield return new WaitForSeconds(delay); + + projectileAbility = (ProjectileAbility)ability; + foreach (NetworkedProjectile projectile in projectiles) + { + projectile.speed = projectileAbility.projectileSpeed; + projectile.ownerTag = owner; + projectile.ability = projectileAbility; + projectile.lifeSpan = projectileAbility.lifeSpan; + projectile.canPierce = projectileAbility.canPierce; + projectile.canHitSelf = projectileAbility.canHitSelf; + projectile.speedOverLifetime = projectileAbility.speedOverLifetime; + projectile.useSpeedCurve = projectileAbility.useSpeedCurve; + projectile.enableCurving = projectileAbility.enableCurving; + projectile.curveAxis = projectileAbility.curveAxis; + projectile.curveStrength = projectileAbility.curveStrength; + projectile.curveAmplitude = projectileAbility.curveAmplitude; + projectile.enableRicochet = projectileAbility.enableRicochet; + projectile.maxRicochets = projectileAbility.maxRicochets; + projectile.ricochetSpread = projectileAbility.ricochetSpread; + + projectile.gameObject.SetActive(true); + + projectile.Init(); + + if (oneByOne) yield return new WaitForSeconds(releaseInterval); } } } diff --git a/Assets/Scripts/Networking/NetworkedProjectile.cs b/Assets/Scripts/Networking/NetworkedProjectile.cs index 6c887902..e898f8dc 100644 --- a/Assets/Scripts/Networking/NetworkedProjectile.cs +++ b/Assets/Scripts/Networking/NetworkedProjectile.cs @@ -16,6 +16,16 @@ public class NetworkedProjectile : MonoBehaviour public float lifeSpan; public bool canPierce; public bool canHitSelf; + public AnimationCurve speedOverLifetime = AnimationCurve.Linear(0, 1, 1, 1); + public bool useSpeedCurve = false; + public bool enableCurving = false; + public Vector3 curveAxis = Vector3.up; + public float curveStrength = 1f; + public float curveAmplitude = 45f; + + public bool enableRicochet = false; + public int maxRicochets = 1; + public float ricochetSpread = 10f; private Taggable target; @@ -31,6 +41,12 @@ public class NetworkedProjectile : MonoBehaviour NetworkedAntiProjectile possibleBlock; + private float timeAlive = 0f; + private int ricochetCount = 0; + Vector3 incomingDir = new Vector3(); + Vector3 hitNormal = new Vector3(); + Vector3 reflected = new Vector3(); + private void Awake() { onTargetHit.AddListener(SpawnHitParticleVFX); @@ -39,9 +55,9 @@ public class NetworkedProjectile : MonoBehaviour { waitingForDestroy = false; - - StartCoroutine(SelfDestruct()); - + + StartCoroutine(SelfDestruct()); + } @@ -54,19 +70,30 @@ public class NetworkedProjectile : MonoBehaviour hitSpawnedVFXs.Add(hitSpawnedVFX); } - private void Update() { if (waitingForDestroy) return; - this.transform.position += this.transform.forward * speed * Time.deltaTime; + timeAlive += Time.deltaTime; + + float lifetimeFraction = Mathf.Clamp01(timeAlive / lifeSpan); + float currentSpeed = useSpeedCurve ? speed * speedOverLifetime.Evaluate(lifetimeFraction) : speed; + + // Curving logic + if (enableCurving) + { + float curveOffset = Mathf.Sin(timeAlive * curveStrength) * curveAmplitude * Time.deltaTime; + transform.Rotate(curveAxis.normalized * curveOffset, Space.World); + } + + transform.position += transform.forward * currentSpeed * Time.deltaTime; } private void OnTriggerEnter(Collider other) { if (waitingForDestroy) return; - if(other.GetComponent() != null) + if (other.GetComponent() != null) { other.GetComponent().Hit(); @@ -110,6 +137,24 @@ public class NetworkedProjectile : MonoBehaviour if (!canPierce) { + if (enableRicochet && ricochetCount < maxRicochets) + { + incomingDir = transform.forward; + hitNormal = other.ClosestPoint(transform.position) - transform.position; + hitNormal = hitNormal.normalized; + + reflected = Vector3.Reflect(incomingDir, hitNormal); + + // Add spread + reflected = Quaternion.Euler(Random.Range(-ricochetSpread, ricochetSpread), + Random.Range(-ricochetSpread, ricochetSpread), + 0) * reflected; + + transform.forward = reflected; + ricochetCount++; + return; + } + waitingForDestroy = true; StartCoroutine(DelayedDestroy()); } diff --git a/Assets/Scripts/Networking/NetworkedProjectileAreaOfEffectOverTimeWithTickEvent.cs b/Assets/Scripts/Networking/NetworkedProjectileAreaOfEffectOverTimeWithTickEvent.cs index be2717e7..be97448d 100644 --- a/Assets/Scripts/Networking/NetworkedProjectileAreaOfEffectOverTimeWithTickEvent.cs +++ b/Assets/Scripts/Networking/NetworkedProjectileAreaOfEffectOverTimeWithTickEvent.cs @@ -15,6 +15,24 @@ public class NetworkedProjectileAreaOfEffectOverTimeWithTickEvent : NetworkedAre public UnityEvent> onTargetHitByProjectile = new UnityEvent>(); NetworkedAntiProjectile possibleBlock; + public bool canPierce; + public float projectileSpeed; + public AnimationCurve speedOverLifetime = AnimationCurve.Linear(0, 1, 1, 1); + public bool useSpeedCurve = false; + public bool enableCurving = false; + public Vector3 curveAxis = Vector3.up; + public float curveStrength = 1f; + public float curveAmplitude = 45f; + + public bool enableRicochet = false; + public int maxRicochets = 1; + public float ricochetSpread = 10f; + + private float timeAlive = 0f; + private int ricochetCount = 0; + Vector3 incomingDir = new Vector3(); + Vector3 hitNormal = new Vector3(); + Vector3 reflected = new Vector3(); protected List processedTargets = new List(); protected List projectileTargets = new List(); @@ -28,7 +46,19 @@ public class NetworkedProjectileAreaOfEffectOverTimeWithTickEvent : NetworkedAre { if (waitingForDestroy) return; - this.transform.position += this.transform.forward * projectileAbility.projectileSpeed * Time.deltaTime; + timeAlive += Time.deltaTime; + + float lifetimeFraction = Mathf.Clamp01(timeAlive / lifeSpan); + float currentSpeed = useSpeedCurve ? projectileSpeed * speedOverLifetime.Evaluate(lifetimeFraction) : projectileSpeed; + + // Curving logic + if (enableCurving) + { + float curveOffset = Mathf.Sin(timeAlive * curveStrength) * curveAmplitude * Time.deltaTime; + transform.Rotate(curveAxis.normalized * curveOffset, Space.World); + } + + transform.position += transform.forward * currentSpeed * Time.deltaTime; } protected override void OnTickPerformed() @@ -91,8 +121,26 @@ public class NetworkedProjectileAreaOfEffectOverTimeWithTickEvent : NetworkedAre onTargetHitByProjectile.Invoke(ownerTag, projectileTargets); } - if (!projectileAbility.canPierce) + if (!canPierce) { + if (enableRicochet && ricochetCount < maxRicochets) + { + incomingDir = transform.forward; + hitNormal = other.ClosestPoint(transform.position) - transform.position; + hitNormal = hitNormal.normalized; + + reflected = Vector3.Reflect(incomingDir, hitNormal); + + // Add spread + reflected = Quaternion.Euler(Random.Range(-ricochetSpread, ricochetSpread), + Random.Range(-ricochetSpread, ricochetSpread), + 0) * reflected; + + transform.forward = reflected; + ricochetCount++; + return; + } + waitingForDestroy = true; StartCoroutine(DelayedDestroy()); }