diff --git a/Assets/-ShaderVariants.meta b/Assets/-ShaderVariants.meta new file mode 100644 index 00000000..2caeac14 --- /dev/null +++ b/Assets/-ShaderVariants.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 573cd92bf03b20d44a78784ffbf5ced5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/-ShaderVariants/NewShaderVariants.shadervariants b/Assets/-ShaderVariants/NewShaderVariants.shadervariants new file mode 100644 index 00000000..bf6c8f2a --- /dev/null +++ b/Assets/-ShaderVariants/NewShaderVariants.shadervariants @@ -0,0 +1,258 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!200 &20000000 +ShaderVariantCollection: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NewShaderVariants + m_Shaders: + - first: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - keywords: + passType: 12 + - first: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - keywords: UNITY_UI_ALPHACLIP + passType: 0 + - keywords: UNITY_UI_CLIP_RECT + passType: 0 + - first: {fileID: 66, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: DIRECTIONAL INSTANCING_ON LIGHTPROBE_SH + passType: 4 + - keywords: DIRECTIONAL INSTANCING_ON LIGHTPROBE_SH _NORMALMAP + passType: 4 + - keywords: DIRECTIONAL INSTANCING_ON LIGHTPROBE_SH _NORMALMAP _SPECULARHIGHLIGHTS_OFF + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH VERTEXLIGHT_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _EMISSION + passType: 4 + - keywords: LIGHTPROBE_SH _EMISSION + passType: 4 + - keywords: DIRECTIONAL + passType: 5 + - keywords: DIRECTIONAL _NORMALMAP + passType: 5 + - keywords: DIRECTIONAL _NORMALMAP _SPECULARHIGHLIGHTS_OFF + passType: 5 + - keywords: POINT + passType: 5 + - keywords: POINT SHADOWS_CUBE SHADOWS_SOFT + passType: 5 + - keywords: INSTANCING_ON SHADOWS_CUBE + passType: 8 + - keywords: INSTANCING_ON SHADOWS_DEPTH + passType: 8 + - keywords: SHADOWS_CUBE + passType: 8 + - keywords: SHADOWS_DEPTH + passType: 8 + - first: {fileID: 104, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 106, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: _SUNDISK_SIMPLE + passType: 0 + - first: {fileID: 210, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: DIRECTIONAL LIGHTPROBE_SH SOFTPARTICLES_ON _ALPHABLEND_ON _FADING_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SOFTPARTICLES_ON _FADING_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ALPHABLEND_ON _FADING_ON + passType: 4 + - keywords: LIGHTPROBE_SH SOFTPARTICLES_ON VERTEXLIGHT_ON _ALPHABLEND_ON _FADING_ON + _NORMALMAP + passType: 4 + - keywords: PROCEDURAL_INSTANCING_ON _ALPHABLEND_ON + passType: 8 + - keywords: SHADOWS_CUBE _ALPHABLEND_ON + passType: 8 + - keywords: + passType: 13 + - first: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: EFFECT_BUMP _ALPHABLEND_ON _NORMALMAP + passType: 0 + - keywords: PROCEDURAL_INSTANCING_ON SOFTPARTICLES_ON _ALPHABLEND_ON + passType: 0 + - keywords: PROCEDURAL_INSTANCING_ON _ALPHABLEND_ON + passType: 0 + - keywords: SOFTPARTICLES_ON _ALPHABLEND_ON + passType: 0 + - keywords: SOFTPARTICLES_ON _ALPHABLEND_ON _EMISSION + passType: 0 + - keywords: SOFTPARTICLES_ON _ALPHABLEND_ON _EMISSION _FADING_ON + passType: 0 + - keywords: SOFTPARTICLES_ON _ALPHABLEND_ON _FADING_ON + passType: 0 + - keywords: SOFTPARTICLES_ON _FADING_ON + passType: 0 + - keywords: _ALPHABLEND_ON + passType: 0 + - keywords: _ALPHABLEND_ON _EMISSION + passType: 0 + - keywords: _ALPHABLEND_ON _EMISSION _FADING_ON + passType: 0 + - keywords: _ALPHABLEND_ON _FADING_ON + passType: 0 + - keywords: PROCEDURAL_INSTANCING_ON _ALPHABLEND_ON + passType: 8 + - keywords: SHADOWS_CUBE _ALPHABLEND_ON + passType: 8 + - keywords: + passType: 13 + - keywords: PROCEDURAL_INSTANCING_ON + passType: 13 + - first: {fileID: 9000, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9001, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9002, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9003, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9004, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9007, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9103, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3} + second: + variants: + - keywords: + passType: 0 + - keywords: UNITY_UI_CLIP_RECT + passType: 0 + - first: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + second: + variants: + - keywords: + passType: 0 + - keywords: UNITY_UI_CLIP_RECT + passType: 0 + - first: {fileID: -6465566751694194690, guid: 1a29b4d27eb8b04479ef89c00dea533d, type: 3} + second: + variants: + - keywords: SOFTPARTICLES_ON _ALPHABLEND_ON + passType: 4 + - keywords: SOFTPARTICLES_ON _ALPHABLEND_ON _CFXR_DISSOLVE + passType: 4 + - keywords: SOFTPARTICLES_ON _ALPHABLEND_ON _FADING_ON + passType: 4 + - keywords: _ALPHABLEND_ON + passType: 4 + - keywords: _ALPHABLEND_ON _CFXR_DISSOLVE + passType: 4 + - keywords: _ALPHABLEND_ON _FADING_ON + passType: 4 + - keywords: SHADOWS_DEPTH + passType: 8 + - keywords: SHADOWS_DEPTH _ALPHABLEND_ON + passType: 8 + - keywords: _ALPHABLEND_ON _CFXR_DISSOLVE + passType: 8 + - keywords: _ALPHABLEND_ON _CFXR_DITHERED_SHADOWS_ON + passType: 8 + - first: {fileID: 4800000, guid: c1e1d3119c6fd4646aea0b4b74cacc1a, type: 3} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 4800000, guid: cdbdb71de5f9c454b980f6d0e87f0afb, type: 3} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 4800000, guid: 4bf4cff0d0bac3d43894e2e8839feb40, type: 3} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 4800000, guid: 51bcf79c50dc92e47ba87821b61100c3, type: 3} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 4800000, guid: 382151503e2a43a4ebb7366d1632731d, type: 3} + second: + variants: + - keywords: BLOOM COLOR_GRADING_HDR_3D FINALPASS + passType: 0 + - keywords: FINALPASS + passType: 0 + - first: {fileID: 4800000, guid: d7640629310e79646af0f46eb55ae466, type: 3} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 4800000, guid: de7f3ac52268a194383c7d62c2a343c1, type: 3} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 4800000, guid: 5bb6ef6f3e1b20348b4fdb01e4c404e2, type: 3} + second: + variants: + - keywords: + passType: 0 diff --git a/Assets/-ShaderVariants/NewShaderVariants.shadervariants.meta b/Assets/-ShaderVariants/NewShaderVariants.shadervariants.meta new file mode 100644 index 00000000..ecd32471 --- /dev/null +++ b/Assets/-ShaderVariants/NewShaderVariants.shadervariants.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c94e871e978500b4288ff488ab69479a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 20000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ARPG Effects/Prefabs/Loot/Orbs/DarkOrb.prefab b/Assets/ARPG Effects/Prefabs/Loot/Orbs/DarkOrb.prefab index 43ef9f0e..f692ff21 100644 --- a/Assets/ARPG Effects/Prefabs/Loot/Orbs/DarkOrb.prefab +++ b/Assets/ARPG Effects/Prefabs/Loot/Orbs/DarkOrb.prefab @@ -28,6 +28,7 @@ Transform: 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: 7519633399310632822} m_RootOrder: 0 @@ -39,19 +40,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3673030724976233562} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 0.5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -582,7 +583,8 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 20 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -2138,6 +2140,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -3568,19 +3626,20 @@ ParticleSystem: range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -3754,17 +3813,20 @@ ParticleSystem: interiorCollisions: 1 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -4715,15 +4777,16 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 2d8b91518ccbaa545b00ba8e58594a33, type: 2} - - {fileID: 2100000, guid: 2d8b91518ccbaa545b00ba8e58594a33, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4745,6 +4808,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 3 m_MinParticleSize: 0 m_MaxParticleSize: 1 @@ -4761,11 +4825,17 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 m_VertexStreams: 000304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &4040920906233037255 GameObject: @@ -4795,6 +4865,7 @@ Transform: m_LocalRotation: {x: -0.000000059604645, y: 0.000000044703484, z: 0.3826837, w: 0.9238795} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7519633399310632822} m_RootOrder: 2 @@ -4811,15 +4882,16 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: bb53538a58209614794a88113c6a4a4b, type: 2} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4841,6 +4913,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 2 @@ -4857,11 +4930,17 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 m_VertexStreams: 000304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &6926766532282129702 ParticleSystem: @@ -4870,19 +4949,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4040920906233037255} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 2 simulationSpeed: 1 stopAction: 0 cullingMode: 1 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 1 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -5377,7 +5456,8 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 20 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -6951,6 +7031,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -8381,19 +8517,20 @@ ParticleSystem: range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -8567,17 +8704,20 @@ ParticleSystem: interiorCollisions: 1 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -9544,6 +9684,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8148826903249565636} - {fileID: 3309667932748477722} @@ -9558,19 +9699,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5862968557325787822} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 1 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -10119,7 +10260,8 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 20 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -11756,6 +11898,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -13186,19 +13384,20 @@ ParticleSystem: range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -13372,17 +13571,20 @@ ParticleSystem: interiorCollisions: 0 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -14333,15 +14535,16 @@ ParticleSystemRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: e0ff1e73f69825e4c99e7268260029e3, type: 2} - - {fileID: 2100000, guid: e0ff1e73f69825e4c99e7268260029e3, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -14363,6 +14566,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 4 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -14379,11 +14583,17 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 m_VertexStreams: 00010304 m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &8199462810779155303 GameObject: @@ -14413,6 +14623,7 @@ Transform: 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: 7519633399310632822} m_RootOrder: 1 @@ -14424,19 +14635,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8199462810779155303} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 1 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -14931,7 +15142,8 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 20 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -16483,6 +16695,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -17913,19 +18181,20 @@ ParticleSystem: range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -18099,17 +18368,20 @@ ParticleSystem: interiorCollisions: 1 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -19060,15 +19332,16 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: bb53538a58209614794a88113c6a4a4b, type: 2} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -19090,6 +19363,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -19106,9 +19380,15 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 m_VertexStreams: 000304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 diff --git a/Assets/ARPG Effects/Prefabs/Loot/Orbs/GoldOrb.prefab b/Assets/ARPG Effects/Prefabs/Loot/Orbs/GoldOrb.prefab index 99144bc4..6809d006 100644 --- a/Assets/ARPG Effects/Prefabs/Loot/Orbs/GoldOrb.prefab +++ b/Assets/ARPG Effects/Prefabs/Loot/Orbs/GoldOrb.prefab @@ -28,6 +28,7 @@ Transform: 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: 1514976257877233467} m_RootOrder: 2 @@ -39,19 +40,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1514976257475031243} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 1 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -546,7 +547,8 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 20 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -2116,6 +2118,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -3546,19 +3604,20 @@ ParticleSystem: range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -3732,17 +3791,20 @@ ParticleSystem: interiorCollisions: 1 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -4693,15 +4755,16 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: bb53538a58209614794a88113c6a4a4b, type: 2} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4723,6 +4786,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -4739,11 +4803,17 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 m_VertexStreams: 000304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &1514976257877233470 GameObject: @@ -4773,6 +4843,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2712820394284300208} - {fileID: 1514976258061593139} @@ -4788,19 +4859,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1514976257877233470} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 1 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -4971,7 +5042,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 0 minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 0.83137256, g: 0.51815873, b: 0.1607843, a: 1} + maxColor: {r: 0.83137256, g: 0.70843136, b: 0.1607843, a: 1} maxGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} @@ -5349,7 +5420,8 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 20 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -6986,6 +7058,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -8416,19 +8544,20 @@ ParticleSystem: range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -8602,17 +8731,20 @@ ParticleSystem: interiorCollisions: 0 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -9563,15 +9695,16 @@ ParticleSystemRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: d8117fa691558a44da9fbaad6a082083, type: 2} - - {fileID: 2100000, guid: d8117fa691558a44da9fbaad6a082083, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9593,6 +9726,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 4 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -9609,11 +9743,17 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 m_VertexStreams: 00010304 m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &1514976258061593136 GameObject: @@ -9643,6 +9783,7 @@ Transform: 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: 1514976257877233467} m_RootOrder: 1 @@ -9654,19 +9795,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1514976258061593136} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -10197,7 +10338,8 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 20 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -11762,6 +11904,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -13192,19 +13390,20 @@ ParticleSystem: range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -13378,17 +13577,20 @@ ParticleSystem: interiorCollisions: 1 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -14339,15 +14541,16 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 0d2de48b53a03f64bb9cec3879f59fbc, type: 2} - - {fileID: 2100000, guid: 0d2de48b53a03f64bb9cec3879f59fbc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -14369,6 +14572,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 3 m_MinParticleSize: 0 m_MaxParticleSize: 1 @@ -14385,11 +14589,17 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 m_VertexStreams: 000304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &2712820394284743380 GameObject: @@ -14419,6 +14629,7 @@ Transform: 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: 1514976257877233467} m_RootOrder: 0 @@ -14430,19 +14641,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2712820394284743380} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 1 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -14937,7 +15148,8 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 0 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 20 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 1 rotation3D: 0 gravityModifier: @@ -16502,6 +16714,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -17932,19 +18200,20 @@ ParticleSystem: range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -18118,17 +18387,20 @@ ParticleSystem: interiorCollisions: 1 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -19079,15 +19351,16 @@ ParticleSystemRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: d2a3d8c55cf59d14f802db9880d38095, type: 2} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -19109,6 +19382,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 4 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -19125,11 +19399,17 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 m_VertexStreams: 000304 m_Mesh: {fileID: 4300004, guid: 51388ad3b3b2ad24781da48a6cba52a8, type: 3} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &5503110803632588792 GameObject: @@ -19159,6 +19439,7 @@ Transform: m_LocalRotation: {x: -0, y: 0.000000041723737, z: 4.2311038e-10, 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: 1514976257877233467} m_RootOrder: 3 @@ -19175,15 +19456,16 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: bb53538a58209614794a88113c6a4a4b, type: 2} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -19205,6 +19487,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 2 @@ -19221,11 +19504,17 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 m_VertexStreams: 000304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &4004343457531006689 ParticleSystem: @@ -19234,19 +19523,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5503110803632588792} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 2 simulationSpeed: 1 stopAction: 0 cullingMode: 1 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 1 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -19741,7 +20030,8 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 20 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -21315,6 +21605,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -22745,19 +23091,20 @@ ParticleSystem: range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -22931,17 +23278,20 @@ ParticleSystem: interiorCollisions: 1 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 diff --git a/Assets/Hovl Studio/Magic effects pack/Prefabs/AoE effects/IceShard explosion.prefab b/Assets/Hovl Studio/Magic effects pack/Prefabs/AoE effects/IceShard explosion.prefab index 9aa99be6..68be389d 100644 --- a/Assets/Hovl Studio/Magic effects pack/Prefabs/AoE effects/IceShard explosion.prefab +++ b/Assets/Hovl Studio/Magic effects pack/Prefabs/AoE effects/IceShard explosion.prefab @@ -601,7 +601,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 30 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 @@ -5471,7 +5471,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 30 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 1 rotation3D: 0 @@ -10341,7 +10341,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 30 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 1 rotation3D: 0 @@ -15220,7 +15220,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 30 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 @@ -20162,7 +20162,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 30 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 @@ -25041,7 +25041,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 30 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 @@ -29911,7 +29911,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 30 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 1 @@ -34781,7 +34781,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 30 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 @@ -39085,7 +39085,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8378648546881499446} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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 @@ -39102,7 +39102,7 @@ Transform: - {fileID: 6004309576442641856} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &5726018809045565519 ParticleSystem: m_ObjectHideFlags: 0 @@ -39671,7 +39671,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 30 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 @@ -44550,7 +44550,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 30 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 1 @@ -49420,7 +49420,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 30 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 diff --git a/Assets/Hovl Studio/Magic effects pack/Prefabs/AoE effects/Snow AOE.prefab b/Assets/Hovl Studio/Magic effects pack/Prefabs/AoE effects/Snow AOE.prefab index ab3efc83..f9c24a5c 100644 --- a/Assets/Hovl Studio/Magic effects pack/Prefabs/AoE effects/Snow AOE.prefab +++ b/Assets/Hovl Studio/Magic effects pack/Prefabs/AoE effects/Snow AOE.prefab @@ -5478,7 +5478,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 20 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 diff --git a/Assets/Resources/Abilities/Blizzard_AreaOfEffectOverTimePrefab Variant.prefab b/Assets/Resources/Abilities/Blizzard_AreaOfEffectOverTimePrefab Variant.prefab index 1e7c3242..069a8536 100644 --- a/Assets/Resources/Abilities/Blizzard_AreaOfEffectOverTimePrefab Variant.prefab +++ b/Assets/Resources/Abilities/Blizzard_AreaOfEffectOverTimePrefab Variant.prefab @@ -7,10 +7,34 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3516499258260747617} m_Modifications: + - target: {fileID: 140423252894775985, guid: 05ce920d629922a4eb4795ef7494ce5c, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 20 + objectReference: {fileID: 0} - target: {fileID: 161766660727748596, guid: 05ce920d629922a4eb4795ef7494ce5c, type: 3} propertyPath: m_Name value: Snow AOE objectReference: {fileID: 0} + - target: {fileID: 1495062412500337703, guid: 05ce920d629922a4eb4795ef7494ce5c, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 3081162857619714281, guid: 05ce920d629922a4eb4795ef7494ce5c, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 4285771878599676360, guid: 05ce920d629922a4eb4795ef7494ce5c, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6273677078826306336, guid: 05ce920d629922a4eb4795ef7494ce5c, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6716276626152888754, guid: 05ce920d629922a4eb4795ef7494ce5c, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 20 + objectReference: {fileID: 0} - target: {fileID: 6744621815756589314, guid: 05ce920d629922a4eb4795ef7494ce5c, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -59,6 +83,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7870232523374136238, guid: 05ce920d629922a4eb4795ef7494ce5c, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 20 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 05ce920d629922a4eb4795ef7494ce5c, type: 3} --- !u!1001 &8049193564484122062 diff --git a/Assets/Resources/Abilities/BurstOfHope_AreaOfEffectPrefab Variant.prefab b/Assets/Resources/Abilities/BurstOfHope_AreaOfEffectPrefab Variant.prefab index b73b0dac..6d4a615d 100644 --- a/Assets/Resources/Abilities/BurstOfHope_AreaOfEffectPrefab Variant.prefab +++ b/Assets/Resources/Abilities/BurstOfHope_AreaOfEffectPrefab Variant.prefab @@ -128,6 +128,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2060993994} m_Modifications: + - target: {fileID: 1408815150312407145, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 20 + objectReference: {fileID: 0} - target: {fileID: 1408815150312407145, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} propertyPath: ColorModule.gradient.maxGradient.atime0 value: 13107 @@ -148,6 +152,10 @@ PrefabInstance: propertyPath: ColorModule.gradient.maxGradient.key1.a value: 0 objectReference: {fileID: 0} + - target: {fileID: 4875338611574649576, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 20 + objectReference: {fileID: 0} - target: {fileID: 4931987311882313766, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} propertyPath: m_RootOrder value: 0 @@ -212,6 +220,10 @@ PrefabInstance: propertyPath: m_Name value: Magic shield White Holyish objectReference: {fileID: 0} + - target: {fileID: 7133315941402050091, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 20 + objectReference: {fileID: 0} - target: {fileID: 7133315941402050091, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} propertyPath: ColorModule.gradient.maxGradient.atime0 value: 13107 @@ -232,6 +244,10 @@ PrefabInstance: propertyPath: ColorModule.gradient.maxGradient.key1.a value: 0 objectReference: {fileID: 0} + - target: {fileID: 9064075378098246578, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 20 + objectReference: {fileID: 0} - target: {fileID: 9064075378098246578, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} propertyPath: ColorModule.gradient.maxGradient.atime0 value: 13107 diff --git a/Assets/Resources/Abilities/Consecration_AreaOfEffectOverTimePrefab Variant.prefab b/Assets/Resources/Abilities/Consecration_AreaOfEffectOverTimePrefab Variant.prefab index 1fbdac7e..c03038bf 100644 --- a/Assets/Resources/Abilities/Consecration_AreaOfEffectOverTimePrefab Variant.prefab +++ b/Assets/Resources/Abilities/Consecration_AreaOfEffectOverTimePrefab Variant.prefab @@ -81,6 +81,10 @@ PrefabInstance: propertyPath: m_Materials.Array.size value: 1 objectReference: {fileID: 0} + - target: {fileID: 3280519133223516628, guid: a71be3e7990efb040a07565c43cbb198, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 20 + objectReference: {fileID: 0} - target: {fileID: 3280519133223516628, guid: a71be3e7990efb040a07565c43cbb198, type: 3} propertyPath: EmissionModule.rateOverTime.scalar value: 5 @@ -163,7 +167,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3280519133430969737, guid: a71be3e7990efb040a07565c43cbb198, type: 3} propertyPath: m_Intensity - value: 2.766842 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7893921968227561089, guid: a71be3e7990efb040a07565c43cbb198, type: 3} propertyPath: m_Materials.Array.size diff --git a/Assets/Resources/Abilities/DarkMatter_ProjectilePrefab.prefab b/Assets/Resources/Abilities/DarkMatter_ProjectilePrefab.prefab index ae8bf07e..946a59bd 100644 --- a/Assets/Resources/Abilities/DarkMatter_ProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/DarkMatter_ProjectilePrefab.prefab @@ -253,22 +253,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7862011006772686317} m_Modifications: - - target: {fileID: 42023901102674576, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 671279644942870738, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5862968557325787822, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} propertyPath: m_Name value: DarkOrb objectReference: {fileID: 0} - - target: {fileID: 7260378295621118172, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7519633399310632822, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} propertyPath: m_RootOrder value: 0 @@ -313,10 +301,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8082026002744614511, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fbeb4d755ac5acb4ba5f3cfe5ea79b6a, type: 3} --- !u!4 &378412214250309677 stripped diff --git a/Assets/Resources/Abilities/GlacialBomb_AreaOfEffectWithImpactEventPrefab.prefab b/Assets/Resources/Abilities/GlacialBomb_AreaOfEffectWithImpactEventPrefab.prefab index 8d3338aa..6c502ceb 100644 --- a/Assets/Resources/Abilities/GlacialBomb_AreaOfEffectWithImpactEventPrefab.prefab +++ b/Assets/Resources/Abilities/GlacialBomb_AreaOfEffectWithImpactEventPrefab.prefab @@ -822,10 +822,6 @@ PrefabInstance: propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 5182820693866792781, guid: 867c572a5be680d42a042d2349f10143, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5182820693866792781, guid: 867c572a5be680d42a042d2349f10143, type: 3} propertyPath: m_LocalPosition.x value: 0 diff --git a/Assets/Resources/Abilities/HolyBall_ProjectilePrefab.prefab b/Assets/Resources/Abilities/HolyBall_ProjectilePrefab.prefab index 2500a748..856107e1 100644 --- a/Assets/Resources/Abilities/HolyBall_ProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/HolyBall_ProjectilePrefab.prefab @@ -253,18 +253,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6744685882344048821} m_Modifications: - - target: {fileID: 1514976257475031237, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1514976257877233464, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} - propertyPath: InitialModule.startColor.maxColor.g - value: 0.70843136 - objectReference: {fileID: 0} - - target: {fileID: 1514976257877233465, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 1514976257877233467, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} propertyPath: m_RootOrder value: 0 @@ -313,26 +301,6 @@ PrefabInstance: propertyPath: m_Name value: GoldOrb objectReference: {fileID: 0} - - target: {fileID: 1514976257877233470, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1514976258061593138, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2712820394304701366, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3532558125713155705, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5503110803632588792, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 566249b39add7fd4e82bf2b3272c7453, type: 3} --- !u!4 &6528784925013361343 stripped diff --git a/Assets/Resources/Abilities/HolyCircle_AreaOfEffectOverTimePrefab Variant.prefab b/Assets/Resources/Abilities/HolyCircle_AreaOfEffectOverTimePrefab Variant.prefab index d2e2484a..b90995ba 100644 --- a/Assets/Resources/Abilities/HolyCircle_AreaOfEffectOverTimePrefab Variant.prefab +++ b/Assets/Resources/Abilities/HolyCircle_AreaOfEffectOverTimePrefab Variant.prefab @@ -73,6 +73,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3637001385577036596} m_Modifications: + - target: {fileID: 524572398670386221, guid: 12a56ee4630040c4eb17ae9707ed4cef, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 40 + objectReference: {fileID: 0} - target: {fileID: 524572398670386221, guid: 12a56ee4630040c4eb17ae9707ed4cef, type: 3} propertyPath: InitialModule.startColor.maxColor.b value: 0.33333334 @@ -81,6 +85,10 @@ PrefabInstance: propertyPath: InitialModule.startColor.maxColor.r value: 0.99607843 objectReference: {fileID: 0} + - target: {fileID: 1649048597955103039, guid: 12a56ee4630040c4eb17ae9707ed4cef, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 40 + objectReference: {fileID: 0} - target: {fileID: 1649048597955103039, guid: 12a56ee4630040c4eb17ae9707ed4cef, type: 3} propertyPath: InitialModule.startColor.maxColor.b value: 0.33333334 @@ -97,6 +105,10 @@ PrefabInstance: propertyPath: lengthInSec value: 5 objectReference: {fileID: 0} + - target: {fileID: 5510952348061193321, guid: 12a56ee4630040c4eb17ae9707ed4cef, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 40 + objectReference: {fileID: 0} - target: {fileID: 5510952348061193321, guid: 12a56ee4630040c4eb17ae9707ed4cef, type: 3} propertyPath: InitialModule.startLifetime.scalar value: 5 @@ -117,6 +129,10 @@ PrefabInstance: propertyPath: lengthInSec value: 5 objectReference: {fileID: 0} + - target: {fileID: 6211125795773073634, guid: 12a56ee4630040c4eb17ae9707ed4cef, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 40 + objectReference: {fileID: 0} - target: {fileID: 6211125795773073634, guid: 12a56ee4630040c4eb17ae9707ed4cef, type: 3} propertyPath: InitialModule.startLifetime.scalar value: 5 @@ -137,6 +153,10 @@ PrefabInstance: propertyPath: lengthInSec value: 5 objectReference: {fileID: 0} + - target: {fileID: 7834758006639453083, guid: 12a56ee4630040c4eb17ae9707ed4cef, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 40 + objectReference: {fileID: 0} - target: {fileID: 7834758006639453083, guid: 12a56ee4630040c4eb17ae9707ed4cef, type: 3} propertyPath: InitialModule.startLifetime.scalar value: 5 diff --git a/Assets/Resources/Abilities/Iceshard_ProjectilePrefab.prefab b/Assets/Resources/Abilities/Iceshard_ProjectilePrefab.prefab index 978180a5..4ba24767 100644 --- a/Assets/Resources/Abilities/Iceshard_ProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/Iceshard_ProjectilePrefab.prefab @@ -433,14 +433,30 @@ PrefabInstance: propertyPath: m_Materials.Array.size value: 1 objectReference: {fileID: 0} + - target: {fileID: 1952394862276623533, guid: 100d85319f3af73458980fbe0578f1ff, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 2612978979095249183, guid: 100d85319f3af73458980fbe0578f1ff, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 25 + objectReference: {fileID: 0} - target: {fileID: 3265842524036117303, guid: 100d85319f3af73458980fbe0578f1ff, type: 3} propertyPath: m_Name value: WhiteOrb objectReference: {fileID: 0} + - target: {fileID: 5079516671105511365, guid: 100d85319f3af73458980fbe0578f1ff, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 25 + objectReference: {fileID: 0} - target: {fileID: 5302963177863360647, guid: 100d85319f3af73458980fbe0578f1ff, type: 3} propertyPath: m_Materials.Array.size value: 1 objectReference: {fileID: 0} + - target: {fileID: 6143857131367914518, guid: 100d85319f3af73458980fbe0578f1ff, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 25 + objectReference: {fileID: 0} - target: {fileID: 6799473296136848584, guid: 100d85319f3af73458980fbe0578f1ff, type: 3} propertyPath: m_Materials.Array.size value: 1 diff --git a/Assets/Resources/Abilities/PoisonousPool_AreaOfEffectOverTimePrefab Variant.prefab b/Assets/Resources/Abilities/PoisonousPool_AreaOfEffectOverTimePrefab Variant.prefab index 1998c5f1..24314f9a 100644 --- a/Assets/Resources/Abilities/PoisonousPool_AreaOfEffectOverTimePrefab Variant.prefab +++ b/Assets/Resources/Abilities/PoisonousPool_AreaOfEffectOverTimePrefab Variant.prefab @@ -601,7 +601,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 60 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 @@ -5480,7 +5480,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 60 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 @@ -10359,7 +10359,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 60 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 1 rotation3D: 1 @@ -15230,7 +15230,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 60 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 @@ -20229,7 +20229,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 60 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 1 diff --git a/Assets/Resources/Abilities/PutridOrb_ProjectilePrefab.prefab b/Assets/Resources/Abilities/PutridOrb_ProjectilePrefab.prefab index be48148f..3473bb47 100644 --- a/Assets/Resources/Abilities/PutridOrb_ProjectilePrefab.prefab +++ b/Assets/Resources/Abilities/PutridOrb_ProjectilePrefab.prefab @@ -253,6 +253,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 482914955438942771} m_Modifications: + - target: {fileID: 2221498072345111761, guid: 977aef66e96f8f548801c683fcdb877d, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 2221498072349300554, guid: 977aef66e96f8f548801c683fcdb877d, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 25 + objectReference: {fileID: 0} - target: {fileID: 2221498073562392352, guid: 977aef66e96f8f548801c683fcdb877d, type: 3} propertyPath: m_RootOrder value: 0 @@ -301,6 +309,14 @@ PrefabInstance: propertyPath: m_Name value: PutridOrb objectReference: {fileID: 0} + - target: {fileID: 2221498073562392367, guid: 977aef66e96f8f548801c683fcdb877d, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 8292915438450308740, guid: 977aef66e96f8f548801c683fcdb877d, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 25 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 977aef66e96f8f548801c683fcdb877d, type: 3} --- !u!4 &2249094826949730953 stripped diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Barbarian Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Barbarian Variant.prefab index 1549230d..e08d3354 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Barbarian Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Barbarian Variant.prefab @@ -47,6 +47,10 @@ PrefabInstance: propertyPath: m_SynchronizeParameters.Array.data[8].Type value: 9 objectReference: {fileID: 0} + - target: {fileID: 583639914168640231, guid: 55a572819c594ad4c90a6e68c2f30e0e, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[6].SynchronizeType + value: 1 + objectReference: {fileID: 0} - target: {fileID: 686220006257547049, guid: 55a572819c594ad4c90a6e68c2f30e0e, type: 3} propertyPath: m_RootOrder value: 0 @@ -151,6 +155,10 @@ PrefabInstance: propertyPath: ObservedComponents.Array.data[4] value: objectReference: {fileID: 1788221149024619301} + - target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3} + propertyPath: ObservedComponents.Array.data[5] + value: + objectReference: {fileID: 1788221149024619301} - target: {fileID: 7726918647213528475, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: classTag value: diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Knight Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Knight Variant.prefab index e26b4986..d3b372a6 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Knight Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Knight Variant.prefab @@ -142,7 +142,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1936994702313746462, guid: 21e6880a6d86aec4fb0f43796c8fac6e, type: 3} propertyPath: m_SynchronizeParameters.Array.size - value: 6 + value: 9 objectReference: {fileID: 0} - target: {fileID: 1936994702313746462, guid: 21e6880a6d86aec4fb0f43796c8fac6e, type: 3} propertyPath: m_SynchronizeParameters.Array.data[5].Name @@ -152,6 +152,34 @@ PrefabInstance: propertyPath: m_SynchronizeParameters.Array.data[5].Type value: 9 objectReference: {fileID: 0} + - target: {fileID: 1936994702313746462, guid: 21e6880a6d86aec4fb0f43796c8fac6e, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[6].Name + value: spinning + objectReference: {fileID: 0} + - target: {fileID: 1936994702313746462, guid: 21e6880a6d86aec4fb0f43796c8fac6e, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[6].Type + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1936994702313746462, guid: 21e6880a6d86aec4fb0f43796c8fac6e, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[7].Name + value: dead + objectReference: {fileID: 0} + - target: {fileID: 1936994702313746462, guid: 21e6880a6d86aec4fb0f43796c8fac6e, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[7].Type + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1936994702313746462, guid: 21e6880a6d86aec4fb0f43796c8fac6e, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[8].Name + value: revived + objectReference: {fileID: 0} + - target: {fileID: 1936994702313746462, guid: 21e6880a6d86aec4fb0f43796c8fac6e, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[8].Type + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1936994702313746462, guid: 21e6880a6d86aec4fb0f43796c8fac6e, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[6].SynchronizeType + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2119839822041585648, guid: 21e6880a6d86aec4fb0f43796c8fac6e, type: 3} propertyPath: m_RootOrder value: 0 diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab index 3fd39d5f..6654b0ad 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab @@ -7,6 +7,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3776535574399073070} m_Modifications: + - target: {fileID: 492335034898022818, guid: 088a10fcc3f776e4cbedbecef9997f19, type: 3} + propertyPath: m_SynchronizeParameters.Array.size + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 492335034898022818, guid: 088a10fcc3f776e4cbedbecef9997f19, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[5].Name + value: melee + objectReference: {fileID: 0} + - target: {fileID: 492335034898022818, guid: 088a10fcc3f776e4cbedbecef9997f19, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[5].Type + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 492335034898022818, guid: 088a10fcc3f776e4cbedbecef9997f19, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[6].Name + value: spinning + objectReference: {fileID: 0} + - target: {fileID: 492335034898022818, guid: 088a10fcc3f776e4cbedbecef9997f19, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[6].Type + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 492335034898022818, guid: 088a10fcc3f776e4cbedbecef9997f19, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[7].Name + value: dead + objectReference: {fileID: 0} + - target: {fileID: 492335034898022818, guid: 088a10fcc3f776e4cbedbecef9997f19, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[7].Type + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 492335034898022818, guid: 088a10fcc3f776e4cbedbecef9997f19, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[8].Name + value: revived + objectReference: {fileID: 0} + - target: {fileID: 492335034898022818, guid: 088a10fcc3f776e4cbedbecef9997f19, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[8].Type + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 492335034898022818, guid: 088a10fcc3f776e4cbedbecef9997f19, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[6].SynchronizeType + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4839547708124388825, guid: 088a10fcc3f776e4cbedbecef9997f19, type: 3} propertyPath: m_RootOrder value: 0 diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab index 8aa9875f..5dbff9db 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab @@ -172,6 +172,38 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6567432688714911206, guid: 78e91c3f61b3c724fbdc0ad0d233215e, type: 3} + propertyPath: m_SynchronizeParameters.Array.size + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6567432688714911206, guid: 78e91c3f61b3c724fbdc0ad0d233215e, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[6].Name + value: spinning + objectReference: {fileID: 0} + - target: {fileID: 6567432688714911206, guid: 78e91c3f61b3c724fbdc0ad0d233215e, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[6].Type + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6567432688714911206, guid: 78e91c3f61b3c724fbdc0ad0d233215e, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[7].Name + value: dead + objectReference: {fileID: 0} + - target: {fileID: 6567432688714911206, guid: 78e91c3f61b3c724fbdc0ad0d233215e, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[7].Type + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6567432688714911206, guid: 78e91c3f61b3c724fbdc0ad0d233215e, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[8].Name + value: revived + objectReference: {fileID: 0} + - target: {fileID: 6567432688714911206, guid: 78e91c3f61b3c724fbdc0ad0d233215e, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[8].Type + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6567432688714911206, guid: 78e91c3f61b3c724fbdc0ad0d233215e, type: 3} + propertyPath: m_SynchronizeParameters.Array.data[6].SynchronizeType + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6796810841720116872, guid: 78e91c3f61b3c724fbdc0ad0d233215e, type: 3} propertyPath: m_Name value: Priest diff --git a/Assets/Scenes/0-Splash.unity b/Assets/Scenes/0-Splash.unity index 64689083..7cee3168 100644 --- a/Assets/Scenes/0-Splash.unity +++ b/Assets/Scenes/0-Splash.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.044223204, g: 0.09247248, b: 0.09673617, a: 1} + m_IndirectSpecularColor: {r: 0.06388821, g: 0.12781319, b: 0.13347746, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_AbsorbEffect.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_AbsorbEffect.asset index 9c2f09e6..5116ab3f 100644 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_AbsorbEffect.asset +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/Priest_BurstofHope_AbsorbEffect.asset @@ -19,6 +19,6 @@ MonoBehaviour: - statTag: {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} percentInfluence: 0.2 duration: 3 - applyToTargetsHit: 0 - applyToSelf: 1 + applyToTargetsHit: 1 + applyToSelf: 0 amount: 4 diff --git a/Assets/Scripts/CharacterAnimatorController.cs b/Assets/Scripts/CharacterAnimatorController.cs index 64651fdb..b5ea6bf0 100644 --- a/Assets/Scripts/CharacterAnimatorController.cs +++ b/Assets/Scripts/CharacterAnimatorController.cs @@ -56,7 +56,12 @@ public class CharacterAnimatorController : MonoBehaviour // Update is called once per frame void Update() { - if (!photonView.IsMine) return; + if (!photonView.IsMine) + { + if (characterSpin != null) + characterSpin.enabled = anim.GetBool("spinning"); + return; + } anim.SetFloat("movementSpeed", agent.velocity.magnitude); } diff --git a/Assets/Scripts/Player/AbilityKeyBinder.cs b/Assets/Scripts/Player/AbilityKeyBinder.cs index a78481ce..96b69153 100644 --- a/Assets/Scripts/Player/AbilityKeyBinder.cs +++ b/Assets/Scripts/Player/AbilityKeyBinder.cs @@ -107,7 +107,15 @@ public class AbilityKeyBinder : MonoBehaviour abilityBindInstance.pressed.SetActive(false); if (currentChanneling != null) { - StopCoroutine(currentChanneling); + + if (networkedChanneling != null) + { + networkedChanneling.StopCoroutine(currentChanneling); + } + else + { + StopCoroutine(currentChanneling); + } castingStateController.ResetChannelingCast(); CastBarHandler.Instance.CancelChannelingOnButtonReleased(); } diff --git a/Assets/Scripts/Player/PlayerReputation.cs b/Assets/Scripts/Player/PlayerReputation.cs new file mode 100644 index 00000000..9dfcc50c --- /dev/null +++ b/Assets/Scripts/Player/PlayerReputation.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerReputation : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/Player/PlayerReputation.cs.meta b/Assets/Scripts/Player/PlayerReputation.cs.meta new file mode 100644 index 00000000..336cfb48 --- /dev/null +++ b/Assets/Scripts/Player/PlayerReputation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ec4a77629e031d94d842641c595cc05f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SaveData/PlayerProgressData.cs b/Assets/Scripts/SaveData/PlayerProgressData.cs new file mode 100644 index 00000000..861317c2 --- /dev/null +++ b/Assets/Scripts/SaveData/PlayerProgressData.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; + +[System.Serializable] +public class PlayerProgressData +{ + +} diff --git a/Assets/Scripts/SaveData/PlayerProgressData.cs.meta b/Assets/Scripts/SaveData/PlayerProgressData.cs.meta new file mode 100644 index 00000000..4e074263 --- /dev/null +++ b/Assets/Scripts/SaveData/PlayerProgressData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 32b28b5771baa454382d54dedfc1a95c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Billboard.cs b/Assets/Scripts/UI/Billboard.cs index 7746d823..fed3ec4d 100644 --- a/Assets/Scripts/UI/Billboard.cs +++ b/Assets/Scripts/UI/Billboard.cs @@ -6,7 +6,13 @@ public class Billboard : MonoBehaviour { // Update is called once per frame - void Update() + /* void Update() + { + if (Camera.main == null) return; + + this.transform.forward = Camera.main.transform.forward; + }*/ + private void LateUpdate() { if (Camera.main == null) return; diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 43369e3c..921139ff 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 13 + serializedVersion: 14 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -28,6 +28,7 @@ GraphicsSettings: m_LensFlare: m_Mode: 1 m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} + m_VideoShadersIncludeMode: 2 m_AlwaysIncludedShaders: - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} @@ -35,9 +36,10 @@ GraphicsSettings: - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - m_PreloadedShaders: [] - m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, - type: 0} + m_PreloadedShaders: + - {fileID: 20000000, guid: c94e871e978500b4288ff488ab69479a, type: 2} + m_PreloadShadersBatchTimeLimit: -1 + m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_CustomRenderPipeline: {fileID: 0} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} @@ -59,5 +61,8 @@ GraphicsSettings: m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 0 m_LightsUseColorTemperature: 0 + m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 - m_AllowEnlightenSupportForUpgradedProject: 0 + m_SRPDefaultSettings: {} + m_CameraRelativeLightCulling: 1 + m_CameraRelativeShadowCulling: 1 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 719da29a..1b3b59e7 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,8 +134,34 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.8.0.3 - preloadedAssets: [] + bundleVersion: 0.8.2 + preloadedAssets: + - {fileID: 947724257692438902, guid: cd9921cbc21600a45b5c842c4e6ef004, type: 3} + - {fileID: 753911528859556811, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} + - {fileID: 4737951027918891026, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + - {fileID: 2740904024514934886, guid: c1f1568424ee50f42854769f3e1ba0b6, type: 3} + - {fileID: 7332445597516000773, guid: 49d4c037b88cfc54a9fe2d4a84012145, type: 3} + - {fileID: 758050341675869817, guid: 5245a1dc9755eec42adf1f51b0c52d08, type: 3} + - {fileID: 6063651656755616566, guid: a89ee7eec16b2bc44aa4d4e85f9e9e47, type: 3} + - {fileID: 8979840876601850889, guid: da5aac032dc71764c851bcd729afd2ff, type: 3} + - {fileID: 6684366852784880873, guid: f15e487e3a2d10649b5606f62f5754bf, type: 3} + - {fileID: 242799163458536464, guid: 1f4bc3f1d82c9554486c4e7e3bde86fc, type: 3} + - {fileID: 5409629005393311441, guid: 1cb3e6e45ad6615448f1a968b89c84e8, type: 3} + - {fileID: 7535207197812752309, guid: 263ed363454525d46aefa46b653b419d, type: 3} + - {fileID: 6744685881493449327, guid: e8d140a8b81d1a54babce1a327614447, type: 3} + - {fileID: 3137079318612183360, guid: 1643126616a6c8846b968fd839416bfe, type: 3} + - {fileID: 7455199422598815824, guid: b1f35b67c9e638443a850c78c0f87ac5, type: 3} + - {fileID: 4298339421658607672, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + - {fileID: 2367156134396898723, guid: 93e50ad2ae70b89479572eed104bd198, type: 3} + - {fileID: 4737951027918891026, guid: b64ecf6f8c859304f963282fc7771d80, type: 3} + - {fileID: 4568794013455178372, guid: 40d74aa2e3764cf41b7562c2f9b35399, type: 3} + - {fileID: 482914955127851241, guid: d16d48fd289401c44980d410c522b025, type: 3} + - {fileID: 1004020196762887022, guid: f9e892cd18bc2de4cb277f7d3459b200, type: 3} + - {fileID: 7611295262132244940, guid: 85a2162510ed2a74cb6cd8c05187d28b, type: 3} + - {fileID: 9043445715802431074, guid: 222e283b3616ff84f9094c92c14fce24, type: 3} + - {fileID: 2740904024514934886, guid: 83e773f9d0c689f45a54b8eaf5727aa5, type: 3} + - {fileID: 8389547513526139286, guid: b92cdb88e09bf1d47bec31bddd62fe50, type: 3} + - {fileID: 5286231604687820132, guid: e6bc5808d58f0ba4fbe3d5674f60b526, type: 3} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -173,7 +199,7 @@ PlayerSettings: ForceSDCardPermission: 0 CreateWallpaper: 0 APKExpansionFiles: 0 - keepLoadedShadersAlive: 0 + keepLoadedShadersAlive: 1 StripUnusedMeshComponents: 1 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988