From 1d2070ba6115c1f6799dfcff0e75be85da40d556 Mon Sep 17 00:00:00 2001 From: AstrlJelly Date: Fri, 11 Aug 2023 02:09:12 -0400 Subject: [PATCH] starting out with adding so many things * voiceless kicks and combos (that one was easy) * queuing objects/specials * starting on cutting out the voice -i was using MultiSound.Delete() but i found it very inconsistent and janky so im switching to a check of the next block and if it should cut out the voice * got rid of basically all of the static variables in favor of checking the last color blocks -also means that the bg and object colors getting held over between remixes shouldn't happen anymore * removed all of the super backwards compatibility -im almost certain these blocks are only available in .tengoku files though, so nobody should have any issues --- Assets/Resources/Games/karateman.prefab | 497 +++++++++++++++++--- Assets/Scripts/Games/KarateMan/KarateMan.cs | 444 ++++++++--------- Assets/Scripts/Util/MultiSound.cs | 2 +- 3 files changed, 657 insertions(+), 286 deletions(-) diff --git a/Assets/Resources/Games/karateman.prefab b/Assets/Resources/Games/karateman.prefab index 8c5156313..299f1f5f7 100644 --- a/Assets/Resources/Games/karateman.prefab +++ b/Assets/Resources/Games/karateman.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: 0.14, y: 0.14, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1483789816297415762} m_RootOrder: 6 @@ -43,6 +44,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -85,7 +87,7 @@ SpriteRenderer: m_SpriteSortPoint: 0 --- !u!95 &1350485389048523557 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -98,10 +100,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &320815790973455367 GameObject: m_ObjectHideFlags: 0 @@ -130,6 +134,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: 4384190945371648687} m_RootOrder: 3 @@ -141,19 +146,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 320815790973455367} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.05 simulationSpeed: 2 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -703,6 +708,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -4910,6 +4916,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4940,6 +4947,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -4963,6 +4971,10 @@ ParticleSystemRenderer: 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 &355682620365669090 GameObject: @@ -4990,6 +5002,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: 3325930061220206449} m_RootOrder: 0 @@ -5021,6 +5034,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.834, y: -3.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7516792099538371658} m_RootOrder: 1 @@ -5068,6 +5082,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: 3200089345939772346} m_RootOrder: 7 @@ -5083,6 +5098,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5152,6 +5168,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.9, y: -1.4, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 632063457541129794} - {fileID: 7177767493498575702} @@ -5179,7 +5196,7 @@ SortingGroup: m_SortingOrder: 0 --- !u!95 &3234329793564267697 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -5192,10 +5209,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &5897754239051819249 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5249,6 +5268,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.8, y: -1.485, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5764267227668832721} m_RootOrder: 4 @@ -5264,6 +5284,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5331,6 +5352,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4468064543835661468} m_RootOrder: 6 @@ -5346,6 +5368,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5412,6 +5435,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: - {fileID: 607707502233677433} - {fileID: 3542369029029140826} @@ -5444,6 +5468,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.6, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 769274001585151052} m_RootOrder: 0 @@ -5476,6 +5501,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: 4075641491734246754} m_RootOrder: 1 @@ -5487,19 +5513,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1110938364634006980} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.11 simulationSpeed: 1.5 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -6049,6 +6075,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -10263,6 +10290,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10293,6 +10321,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -10316,6 +10345,10 @@ ParticleSystemRenderer: 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 &1167401957980262561 GameObject: @@ -10344,6 +10377,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.024, y: -4.592, z: 0} m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3200089345939772346} m_RootOrder: 6 @@ -10359,6 +10393,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -10427,6 +10462,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: - {fileID: 7410197207962498405} m_Father: {fileID: 4384190945371648687} @@ -10439,19 +10475,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1216083719847348373} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 1 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -11001,6 +11037,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1280 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -15150,6 +15187,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15180,6 +15218,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 4 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -15203,6 +15242,10 @@ ParticleSystemRenderer: 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 &1254968169744446728 GameObject: @@ -15231,6 +15274,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 21, y: -3.5, z: 50} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4982149263030314109} m_RootOrder: 1 @@ -15278,6 +15322,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.8, y: -1.485, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5563384789630518309} m_RootOrder: 0 @@ -15325,6 +15370,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: 3200089345939772346} m_RootOrder: 8 @@ -15340,6 +15386,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -15407,6 +15454,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.769, y: -2.05, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5764267227668832721} m_RootOrder: 2 @@ -15422,6 +15470,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -15490,6 +15539,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: 9068443125549471668} m_RootOrder: 0 @@ -15501,19 +15551,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1504071493476237604} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.05 simulationSpeed: 1.25 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -16063,6 +16113,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 1 rotation3D: 0 gravityModifier: @@ -20270,6 +20321,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -20300,6 +20352,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 1 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -20323,6 +20376,10 @@ ParticleSystemRenderer: 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 &1526398004374946629 GameObject: @@ -20351,6 +20408,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4468064543835661468} m_RootOrder: 4 @@ -20366,6 +20424,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -20434,6 +20493,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.05, y: 2.959, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8034657903636395852} m_Father: {fileID: 3200089345939772346} @@ -20450,6 +20510,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -20492,7 +20553,7 @@ SpriteRenderer: m_SpriteSortPoint: 0 --- !u!95 &5536880711032662789 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -20505,10 +20566,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1684620099579289651 GameObject: m_ObjectHideFlags: 0 @@ -20536,6 +20599,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -4.5, z: 0} m_LocalScale: {x: 0.96, y: 0.96, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2394675568617853720} m_RootOrder: 0 @@ -20551,6 +20615,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -20618,6 +20683,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 15, y: -3.5, z: -2} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4689631526136439814} m_RootOrder: 1 @@ -20665,6 +20731,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.962, y: -0.33, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7797479191699406299} m_RootOrder: 0 @@ -20712,6 +20779,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.038, y: -0.33, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4689631526136439814} m_RootOrder: 0 @@ -20758,6 +20826,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: - {fileID: 6215320469375229430} - {fileID: 1611998689740621921} @@ -20801,6 +20870,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.539, y: 0.971, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2355715578197540923} m_Father: {fileID: 3200089345939772346} @@ -20817,6 +20887,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -20884,6 +20955,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3325930061220206449} m_RootOrder: 2 @@ -20899,6 +20971,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -20967,6 +21040,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: [] m_Father: {fileID: 7721752935214517217} m_RootOrder: 0 @@ -20978,19 +21052,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2152170782775741408} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.05 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -21540,6 +21614,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -25749,6 +25824,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -25779,6 +25855,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -25802,6 +25879,10 @@ ParticleSystemRenderer: 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 &2185108278542468920 GameObject: @@ -25830,6 +25911,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4468064543835661468} m_RootOrder: 2 @@ -25845,6 +25927,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -25913,6 +25996,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: 7422225348526634591} m_RootOrder: 0 @@ -25924,19 +26008,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2264726186881870112} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 1 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -26486,6 +26570,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -30635,6 +30720,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -30665,6 +30751,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 1 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 4 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -30688,6 +30775,10 @@ ParticleSystemRenderer: 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 &2286814261142518773 GameObject: @@ -30716,6 +30807,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: 430082172757052006} m_RootOrder: 0 @@ -30731,6 +30823,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -30798,6 +30891,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: - {fileID: 6532205774815845642} - {fileID: 3501177130740773097} @@ -30851,6 +30945,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.013, y: -2.589, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7864713269776622127} m_Father: {fileID: 3200089345939772346} @@ -30867,6 +30962,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -30934,6 +31030,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: - {fileID: 7290949952937468431} - {fileID: 3575285284218698538} @@ -30987,6 +31084,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1.15, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 632063457541129794} m_RootOrder: 0 @@ -31002,6 +31100,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -31069,6 +31168,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4468064543835661468} m_RootOrder: 1 @@ -31084,6 +31184,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -31151,6 +31252,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -4.4, y: 1, z: 0} m_LocalScale: {x: 4.5, y: 4.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7258878608994582430} m_RootOrder: 0 @@ -31166,6 +31268,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -31233,6 +31336,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.02, y: -1.08, z: 0} m_LocalScale: {x: 2.35, y: 2.35, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3609080353678146599} m_RootOrder: 1 @@ -31248,6 +31352,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -31315,6 +31420,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -9, y: -4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 504328619051278505} m_RootOrder: 2 @@ -31330,6 +31436,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -31397,6 +31504,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.35, y: 2.35, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3609080353678146599} m_RootOrder: 3 @@ -31412,6 +31520,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -31479,6 +31588,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 50, y: 0.2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1483789816297415762} m_RootOrder: 3 @@ -31494,6 +31604,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -31562,6 +31673,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: 6215320469375229430} m_RootOrder: 0 @@ -31573,19 +31685,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2819362971596324871} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.05 simulationSpeed: 2.8 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -32135,6 +32247,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -36347,6 +36460,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -36377,6 +36491,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 4 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -36400,6 +36515,10 @@ ParticleSystemRenderer: 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 &2977027034337794333 GameObject: @@ -36429,6 +36548,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.5, y: 0, z: 0} m_LocalScale: {x: 0.8, y: 0.8, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 337299350949514993} - {fileID: 79217107384843364} @@ -36449,7 +36569,7 @@ SortingGroup: m_SortingOrder: -100 --- !u!95 &8471847813194768760 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -36462,10 +36582,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &2984170029978105125 GameObject: m_ObjectHideFlags: 0 @@ -36493,6 +36615,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 8, y: -3.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5054440503976402883} m_RootOrder: 1 @@ -36539,6 +36662,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: - {fileID: 320160549894608069} - {fileID: 8785326923463350633} @@ -36576,6 +36700,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.403, y: 1, z: 0} m_LocalScale: {x: 4.5, y: 4.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7258878608994582430} m_RootOrder: 1 @@ -36591,6 +36716,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -36659,6 +36785,7 @@ RectTransform: 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: 3330579849842867243} - {fileID: 5348445960594656213} @@ -36742,6 +36869,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.8, y: 1.5, z: 0} m_LocalScale: {x: 3, y: 3, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3609080353678146599} m_RootOrder: 2 @@ -36757,6 +36885,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -36825,6 +36954,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: 6215320469375229430} m_RootOrder: 2 @@ -36836,19 +36966,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3418320730155705769} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.05 simulationSpeed: 2.25 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -37398,6 +37528,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -41607,6 +41738,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -41637,6 +41769,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -41660,6 +41793,10 @@ ParticleSystemRenderer: 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 &3424199812263106991 GameObject: @@ -41688,6 +41825,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.081, y: -0.691, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6153427326708225474} m_RootOrder: 1 @@ -41703,6 +41841,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -41770,6 +41909,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: - {fileID: 8169270648613731847} - {fileID: 208937695667241414} @@ -41824,6 +41964,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: -1, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3076077621649390382} m_Father: {fileID: 4384190945371648687} @@ -41836,19 +41977,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3592020714774141813} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 1 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -42398,6 +42539,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 2048 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -46547,6 +46689,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -46577,6 +46720,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 4 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -46600,6 +46744,10 @@ ParticleSystemRenderer: 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 &3628647816790808034 GameObject: @@ -46628,6 +46776,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4468064543835661468} m_RootOrder: 3 @@ -46643,6 +46792,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -46711,6 +46861,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: 4743945187255848078} m_RootOrder: 0 @@ -46722,19 +46873,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3689589630429448267} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.05 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -47284,6 +47435,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -51491,6 +51643,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -51521,6 +51674,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: -2 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 2 @@ -51544,6 +51698,10 @@ ParticleSystemRenderer: 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 &3742810944473094226 GameObject: @@ -51572,6 +51730,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 18, y: 10.8, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1483789816297415762} m_RootOrder: 1 @@ -51587,6 +51746,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -51656,6 +51816,7 @@ RectTransform: 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: 2451790077583954414} m_RootOrder: 1 @@ -51755,6 +51916,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: - {fileID: 8380209919518305174} - {fileID: 4468064543835661468} @@ -51790,6 +51952,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.038, y: -0.33, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5764267227668832721} m_RootOrder: 1 @@ -51805,6 +51968,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -51873,6 +52037,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: - {fileID: 5850329048864192056} m_Father: {fileID: 4384190945371648687} @@ -51885,19 +52050,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3977551198845255891} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -52447,6 +52612,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1280 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -56597,6 +56763,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -56627,6 +56794,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 1 + m_MeshDistribution: 0 m_SortMode: 4 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -56650,6 +56818,10 @@ ParticleSystemRenderer: 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 &3981107990670541191 GameObject: @@ -56678,6 +56850,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4468064543835661468} m_RootOrder: 5 @@ -56693,6 +56866,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -56760,6 +56934,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.074, y: -0.032, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3200089345939772346} m_RootOrder: 1 @@ -56775,6 +56950,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -56842,6 +57018,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.08, y: 1, z: 0} m_LocalScale: {x: 4.5, y: 4.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7258878608994582430} m_RootOrder: 2 @@ -56857,6 +57034,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -56925,6 +57103,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: 7209290203234161271} m_RootOrder: 0 @@ -56936,19 +57115,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4113834639111779471} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.05 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -57498,6 +57677,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 1 rotation3D: 0 gravityModifier: @@ -61705,6 +61885,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -61735,6 +61916,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: -1 m_RenderMode: 1 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -61758,6 +61940,10 @@ ParticleSystemRenderer: 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 &4135153408433308712 GameObject: @@ -61786,6 +61972,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.564, y: 0.969, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1918118826710310044} - {fileID: 94978065138399634} @@ -61803,6 +61990,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -61872,6 +62060,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: - {fileID: 5470115725760242074} - {fileID: 4762568045240060841} @@ -61887,7 +62076,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &4749435639220470785 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -61900,10 +62089,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!210 &3665793817517499916 SortingGroup: m_ObjectHideFlags: 0 @@ -61927,17 +62118,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fe0aa75ca1a42347aea0b0b14b024a4, type: 3} m_Name: m_EditorClassIdentifier: - inList: 0 - state: - gameObject: {fileID: 0} - early: 0 - perfect: 0 - late: 0 - createBeat: 0 - eligibleHitsList: [] - aceTimes: 0 - isEligible: 0 - triggersAutoplay: 1 startBeat: 0 type: 0 path: 1 @@ -62051,6 +62231,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4468064543835661468} m_RootOrder: 0 @@ -62066,6 +62247,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -62133,6 +62315,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 9, y: 5.4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 504328619051278505} m_RootOrder: 3 @@ -62148,6 +62331,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -62215,6 +62399,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.962, y: -0.33, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4982149263030314109} m_RootOrder: 0 @@ -62262,6 +62447,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3848867281373793675} - {fileID: 5558339493236770269} @@ -62281,6 +62467,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -62349,6 +62536,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: 4075641491734246754} m_RootOrder: 0 @@ -62360,19 +62548,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4485706438535911762} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.05 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -62922,6 +63110,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -67129,6 +67318,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -67159,6 +67349,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -67182,6 +67373,10 @@ ParticleSystemRenderer: 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 &4562470404778909465 GameObject: @@ -67210,6 +67405,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: - {fileID: 4602674661767132279} - {fileID: 2451790077583954414} @@ -67278,6 +67474,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: 6215320469375229430} m_RootOrder: 1 @@ -67289,19 +67486,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4608551727560295043} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.05 simulationSpeed: 2.5 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -67851,6 +68048,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -72068,6 +72266,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -72098,6 +72297,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -72121,6 +72321,10 @@ ParticleSystemRenderer: 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 &4687146461093134549 GameObject: @@ -72151,6 +72355,7 @@ RectTransform: 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: 504328619051278505} m_RootOrder: 0 @@ -72200,7 +72405,7 @@ MonoBehaviour: m_PixelsPerUnitMultiplier: 1 --- !u!95 &8169380290633937995 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -72213,10 +72418,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &4756044026693426509 GameObject: m_ObjectHideFlags: 0 @@ -72244,6 +72451,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 3.494, y: -3.739, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5764267227668832721} m_RootOrder: 3 @@ -72259,6 +72467,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -72327,6 +72536,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: - {fileID: 3627863441328215549} - {fileID: 4229909259743018123} @@ -72340,19 +72550,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4866480775033261194} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.05 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -72902,6 +73112,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -77109,6 +77320,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -77139,6 +77351,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -77162,6 +77375,10 @@ ParticleSystemRenderer: 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 &4939167786638959338 GameObject: @@ -77190,6 +77407,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: 430082172757052006} m_RootOrder: 1 @@ -77205,6 +77423,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -77272,6 +77491,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: - {fileID: 8906330806401648573} - {fileID: 3344200712112006560} @@ -77325,6 +77545,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 15, y: -3.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5150790184898265248} m_RootOrder: 1 @@ -77372,6 +77593,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4468064543835661468} m_RootOrder: 8 @@ -77387,6 +77609,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -77456,6 +77679,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: - {fileID: 7019368942529031031} - {fileID: 8567066984769460187} @@ -77464,7 +77688,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &7224055226350217353 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -77477,10 +77701,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &351631121493088109 MonoBehaviour: m_ObjectHideFlags: 0 @@ -77532,6 +77758,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: 4384190945371648687} m_RootOrder: 4 @@ -77543,19 +77770,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5346757374579480478} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.05 simulationSpeed: 2 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -78105,6 +78332,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -82315,6 +82543,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -82345,6 +82574,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -82368,6 +82598,10 @@ ParticleSystemRenderer: 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 &5404947306895237780 GameObject: @@ -82396,6 +82630,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 6.1, y: 5.6, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1483789816297415762} m_RootOrder: 4 @@ -82411,6 +82646,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -82479,6 +82715,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: 6215320469375229430} m_RootOrder: 3 @@ -82490,19 +82727,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5558955341554139200} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.05 simulationSpeed: 2.25 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -83052,6 +83289,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -87261,6 +87499,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -87291,6 +87530,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -87314,6 +87554,10 @@ ParticleSystemRenderer: 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 &5617176006396949645 GameObject: @@ -87341,6 +87585,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: - {fileID: 7344154808606932117} m_Father: {fileID: 1483789816297415762} @@ -87373,6 +87618,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 9.25, y: -3.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5563384789630518309} m_RootOrder: 1 @@ -87420,6 +87666,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: - {fileID: 5291316370690989749} - {fileID: 2010174462455352108} @@ -87474,6 +87721,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: 1114632065716707751} m_RootOrder: 0 @@ -87485,19 +87733,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6009269315202756997} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 1 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -88047,6 +88295,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -92196,6 +92445,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -92226,6 +92476,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 1 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 4 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -92249,6 +92500,10 @@ ParticleSystemRenderer: 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 &6133880555762376977 GameObject: @@ -92277,6 +92532,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.104, y: 0.717, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6153427326708225474} m_RootOrder: 0 @@ -92292,6 +92548,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -92360,6 +92617,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: - {fileID: 2981037658632583607} m_Father: {fileID: 4384190945371648687} @@ -92372,19 +92630,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6135222885747277439} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.05 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -92934,6 +93192,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -97141,6 +97400,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -97171,6 +97431,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -97194,6 +97455,10 @@ ParticleSystemRenderer: 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 &6441149207388293964 GameObject: @@ -97222,6 +97487,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: - {fileID: 1507714514432023537} - {fileID: 7766585513545450152} @@ -97275,6 +97541,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: - {fileID: 3609080353678146599} - {fileID: 8330865912302329553} @@ -97311,7 +97578,6 @@ MonoBehaviour: SoundSequences: [] EligibleHits: [] scheduledInputs: [] - firstEnable: 0 LightBulbColors: - {r: 0, g: 0, b: 0, a: 0} - {r: 0.23137255, g: 1, b: 1, a: 1} @@ -97381,6 +97647,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: - {fileID: 2042206774723335725} - {fileID: 7276856425239073995} @@ -97435,6 +97702,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: - {fileID: 5756124762218697206} - {fileID: 3232280657715442695} @@ -97450,19 +97718,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6647447743610793799} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.05 simulationSpeed: 2.5 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -98012,6 +98280,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -102220,6 +102489,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -102250,6 +102520,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -102273,6 +102544,10 @@ ParticleSystemRenderer: 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 &6703760478237622290 GameObject: @@ -102301,6 +102576,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: - {fileID: 5959473432926702246} - {fileID: 7935047667012083206} @@ -102354,6 +102630,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2.436, y: 4.001, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5093678095867524236} m_RootOrder: 0 @@ -102369,6 +102646,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -102436,6 +102714,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.584, y: 1.612, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7516792099538371658} m_RootOrder: 0 @@ -102483,6 +102762,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4468064543835661468} m_RootOrder: 7 @@ -102498,6 +102778,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -102565,6 +102846,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.02, y: -1.0800002, z: 0} m_LocalScale: {x: 2.35, y: 2.35, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3609080353678146599} m_RootOrder: 0 @@ -102580,6 +102862,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -102647,6 +102930,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.038, y: -0.33, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1675496839687250270} m_RootOrder: 0 @@ -102694,6 +102978,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.5, y: -3.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9050889269876678613} m_RootOrder: 1 @@ -102741,6 +103026,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 14, y: -3.5, z: 0.15} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1675496839687250270} m_RootOrder: 1 @@ -102788,6 +103074,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.842, y: -3.032, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4882792716288565075} m_Father: {fileID: 3200089345939772346} @@ -102804,6 +103091,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -102871,6 +103159,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.038, y: -0.33, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9050889269876678613} m_RootOrder: 0 @@ -102918,6 +103207,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3.494, y: -3.739, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7654967304496385897} m_RootOrder: 0 @@ -102967,6 +103257,7 @@ RectTransform: 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: 2451790077583954414} m_RootOrder: 0 @@ -103067,6 +103358,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.584, y: 1.612, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5764267227668832721} m_RootOrder: 5 @@ -103082,6 +103374,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -103149,6 +103442,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.92, y: -3.5, z: 0} m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5764267227668832721} m_RootOrder: 0 @@ -103164,6 +103458,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -103231,6 +103526,7 @@ Transform: m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 16, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4384190945371648687} m_RootOrder: 8 @@ -103276,6 +103572,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 11, y: -3.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7654967304496385897} m_RootOrder: 1 @@ -103323,6 +103620,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.551, y: 3.558, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4106660502671760627} m_RootOrder: 0 @@ -103338,6 +103636,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -103404,6 +103703,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: - {fileID: 1675496839687250270} - {fileID: 4689631526136439814} @@ -103447,6 +103747,7 @@ RectTransform: 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: 2451790077583954414} m_RootOrder: 2 @@ -103548,6 +103849,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: 4743945187255848078} m_RootOrder: 1 @@ -103559,19 +103861,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7779193320400728963} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.11 simulationSpeed: 1.25 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -104121,6 +104423,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -108335,6 +108638,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -108365,6 +108669,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: -2 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 2 @@ -108388,6 +108693,10 @@ ParticleSystemRenderer: 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 &7885567851022778951 GameObject: @@ -108416,6 +108725,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.769, y: -2.05, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5054440503976402883} m_RootOrder: 0 @@ -108463,6 +108773,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 20, z: 50} m_LocalScale: {x: 256, y: 256, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1483789816297415762} m_RootOrder: 2 @@ -108478,6 +108789,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -108545,6 +108857,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.108, y: -4.968, z: 0} m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3200089345939772346} m_RootOrder: 9 @@ -108560,6 +108873,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -108626,6 +108940,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.8, z: -8.25} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 769274001585151052} m_RootOrder: 1 @@ -108657,6 +108972,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -4.16, y: 1.66, z: 0} m_LocalScale: {x: 2.64, y: 2.64, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1483789816297415762} m_RootOrder: 5 @@ -108672,6 +108988,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -108740,6 +109057,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: 4384190945371648687} m_RootOrder: 1 @@ -108751,19 +109069,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8608989639834320249} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.05 simulationSpeed: 2.75 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -109313,6 +109631,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -113527,6 +113846,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -113557,6 +113877,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -113580,6 +113901,10 @@ ParticleSystemRenderer: 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 &8614986770603621515 GameObject: @@ -113608,6 +113933,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: -4.5, z: 0} m_LocalScale: {x: 256, y: 100, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1483789816297415762} m_RootOrder: 7 @@ -113623,6 +113949,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -113690,6 +114017,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3.25, y: -3.5, z: 5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7797479191699406299} m_RootOrder: 1 @@ -113737,6 +114065,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.02499998, y: -0.002000034, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1480025883097948509} m_RootOrder: 0 @@ -113752,6 +114081,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -113820,6 +114150,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: - {fileID: 7347305193174683817} - {fileID: 6138782212452089821} @@ -113833,19 +114164,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8748898915747637832} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.05 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -114395,6 +114726,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -118602,6 +118934,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -118632,6 +118965,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: -2 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 2 @@ -118655,6 +118989,10 @@ ParticleSystemRenderer: 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 &8764914108708816761 GameObject: @@ -118683,6 +119021,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: - {fileID: 6910808327794061275} - {fileID: 8160168586138905709} @@ -118736,6 +119075,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.038, y: 0.33, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5150790184898265248} m_RootOrder: 0 @@ -118784,6 +119124,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: - {fileID: 7644869555450886937} m_Father: {fileID: 4384190945371648687} @@ -118796,19 +119137,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9202986449610168952} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.05 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -119358,6 +119699,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -123565,6 +123907,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -123595,6 +123938,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: -1 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 2 @@ -123618,6 +123962,10 @@ ParticleSystemRenderer: 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 &9220090776867258397 GameObject: @@ -123646,6 +123994,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: - {fileID: 7193050631968789796} - {fileID: 5522135299373641616} diff --git a/Assets/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs index 11f19e3d8..ebe8c2544 100644 --- a/Assets/Scripts/Games/KarateMan/KarateMan.cs +++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs @@ -26,54 +26,101 @@ namespace HeavenStudio.Games.Loaders inactiveFunction = delegate { KarateMan.ToggleBopUnloaded(eventCaller.currentEntity["toggle"]); } }, new GameAction("hit", "Toss Object") { - function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.CreateItem(e.beat, e["type"], e["type2"], e["mute"]); }, + function = delegate { + var e = eventCaller.currentEntity; + KarateMan.instance.CreateItem(e.beat, e["type"], e["type2"]); + KarateMan.CreateItemSFX(e.beat, e["type"], e["mute"]); + }, + inactiveFunction = delegate { + var e = eventCaller.currentEntity; + KarateMan.QueueItem(e.beat, e["type"], e["type2"]); + KarateMan.CreateItemSFX(e.beat, e["type"], e["mute"]); + }, defaultLength = 2, parameters = new List() { new Param("type", KarateMan.HitType.Pot, "Object", "The object to fire"), new Param("type2", KarateMan.KarateManFaces.Normal, "Success Expression", "The facial expression to set Joe to on hit"), - new Param("mute", false, "Mute", "Should the throwing sound be muted?") + new Param("mute", false, "Mute", "Should the throwing sound be muted?"), } }, new GameAction("bulb", "Toss Lightbulb") { - function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.CreateBulbSpecial(e.beat, e["type"], e["colorA"], e["type2"]); }, + function = delegate { + var e = eventCaller.currentEntity; + KarateMan.instance.CreateBulbSpecial(e.beat, e["type"], e["colorA"], e["type2"]); + KarateMan.CreateItemSFX(e.beat, e["type"], e["mute"], true); + }, + inactiveFunction = delegate { + var e = eventCaller.currentEntity; + KarateMan.QueueBulb(e.beat, e["type"], e["colorA"], e["type2"]); + KarateMan.CreateItemSFX(e.beat, e["type"], e["mute"], true); + }, defaultLength = 2, parameters = new List() { new Param("type", KarateMan.LightBulbType.Normal, "Type", "The preset bulb type. Yellow is used for kicks while Blue is used for combos"), new Param("colorA", new Color(1f,1f,1f), "Custom Color", "The color to use when the bulb type is set to Custom"), - new Param("type2", KarateMan.KarateManFaces.Normal, "Success Expression", "The facial expression to set Joe to on hit") + new Param("type2", KarateMan.KarateManFaces.Normal, "Success Expression", "The facial expression to set Joe to on hit"), + new Param("mute", false, "Mute", "Should the throwing sound be muted?"), }, }, new GameAction("kick", "Special: Kick") { - function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.Kick(e.beat, e["toggle"], e["type"]); }, + function = delegate { + var e = eventCaller.currentEntity; + KarateMan.instance.Kick(e.beat, e["toggle"], e["type"], e["cutOut"], e["disableVoice"]); + KarateMan.KickSFX(); + }, + inactiveFunction = delegate { + var e = eventCaller.currentEntity; + KarateMan.QueueKick(e.beat, e["toggle"], e["type"], e["cutOut"], e["disableVoice"]); + KarateMan.KickSFX(); + }, defaultLength = 4f, parameters = new List() { new Param("toggle", false, "Contains Ball", "Barrel contains a ball instead of a bomb?"), - new Param("type", KarateMan.KarateManFaces.Smirk, "Success Expression", "The facial expression to set Joe to on hit") + new Param("type", KarateMan.KarateManFaces.Smirk, "Success Expression", "The facial expression to set Joe to on hit"), + new Param("cutOut", true, "Cut Out Voice", "Should this cue cut out the last voice line played?"), + new Param("disableVoice", false, "Disable Voice", "When enabled, there will be no voice during this cue"), } }, new GameAction("combo", "Special: Combo") { - function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.Combo(e.beat, e["type"]); }, + function = delegate { + var e = eventCaller.currentEntity; + KarateMan.instance.Combo(e.beat, e["type"], e["cutOut"], e["disableVoice"]); + KarateMan.ComboSFX(); + }, + inactiveFunction = delegate { + var e = eventCaller.currentEntity; + KarateMan.QueueCombo(e.beat, e["type"], e["cutOut"], e["disableVoice"]); + KarateMan.ComboSFX(); + }, defaultLength = 4, parameters = new List() { - new Param("type", KarateMan.KarateManFaces.Happy, "Success Expression", "The facial expression to set Joe to on hit") + new Param("type", KarateMan.KarateManFaces.Happy, "Success Expression", "The facial expression to set Joe to on hit"), + new Param("cutOut", true, "Cut Out Voice", "Should this cue cut out the last voice line played?"), + new Param("disableVoice", false, "Disable Voice", "When enabled, there will be no voice during this cue"), } }, new GameAction("hitX", "Warnings") { - function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.DoWord(e.beat, e["type"]); }, + function = delegate { + var e = eventCaller.currentEntity; + KarateMan.instance.DoWord(e.beat, e["type"]); + }, defaultLength = 1f, parameters = new List() { new Param("type", KarateMan.HitThree.HitThree, "Type", "The warning text to show") }, - inactiveFunction = delegate { var e = eventCaller.currentEntity; KarateMan.DoWordSound(e.beat, e["type"]); } + inactiveFunction = delegate { + var e = eventCaller.currentEntity; + KarateMan.DoWordSound(e.beat, e["type"]); + } }, new GameAction("special camera", "Special Camera") { @@ -103,7 +150,11 @@ namespace HeavenStudio.Games.Loaders }, new GameAction("set background effects", "Background Appearance") { - function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.SetBgAndShadowCol(e.beat, e.length, e["type"], e["type2"], e["colorA"], e["colorB"], e["type3"]); KarateMan.instance.SetBgTexture(e["type4"], e["type5"], e["colorC"], e["colorD"]); }, + function = delegate { + var e = eventCaller.currentEntity; + KarateMan.instance.SetBgAndShadowCol(e.beat, e.length, e["type"], e["type2"], e["colorA"], e["colorB"], e["type3"]); + KarateMan.instance.SetBgTexture(e["type4"], e["type5"], e["colorC"], e["colorD"]); + }, defaultLength = 0.5f, resizable = true, parameters = new List() @@ -117,9 +168,7 @@ namespace HeavenStudio.Games.Loaders new Param("type5", KarateMan.ShadowType.Tinted, "Color Filter Type", "The method used to apply colour to the texture"), new Param("colorC", new Color(), "Custom Filter Color", "The filter color to use when color filter type is set to Custom"), new Param("colorD", new Color(), "Fading Filter Color", "When using the Fade background effect, make filter colour fade to this colour"), - }, - inactiveFunction = delegate { var e = eventCaller.currentEntity; KarateMan.SetBgEffectsUnloaded(e.beat, e.length, e["type"], e["type2"], e["colorA"], e["colorB"], e["type3"], e["type4"], e["type5"], e["colorC"], e["colorD"]); } }, new GameAction("set object colors", "Object Colors") { @@ -131,7 +180,6 @@ namespace HeavenStudio.Games.Loaders new Param("colorB", new Color(0.81f,0.81f,0.81f,1), "Joe Highlight Color", "The color to use for Karate Joe's highlights"), new Param("colorC", new Color(1,1,1,1), "Item Color", "The color to use for the thrown items"), }, - inactiveFunction = delegate { var e = eventCaller.currentEntity; KarateMan.UpdateMaterialColour(e["colorA"], e["colorB"], e["colorC"]); } }, new GameAction("particle effects", "Particle Effects") { @@ -153,95 +201,6 @@ namespace HeavenStudio.Games.Loaders new Param("type", KarateMan.KarateManFaces.Normal, "Facial Expression", "The facial expression to force Joe to. Special moves may override this") } }, - - // These are still here for backwards-compatibility but are hidden in the editor - new GameAction("pot", "") - { - function = delegate { KarateMan.instance.CreateItem(eventCaller.currentEntity.beat, 0, (int) KarateMan.HitType.Pot); }, - defaultLength = 2, - hidden = true - }, - new GameAction("rock", "") - { - function = delegate { KarateMan.instance.CreateItem(eventCaller.currentEntity.beat, 0, (int) KarateMan.HitType.Rock); }, - defaultLength = 2, - hidden = true - }, - new GameAction("ball", "") - { - function = delegate { KarateMan.instance.CreateItem(eventCaller.currentEntity.beat, 0, (int) KarateMan.HitType.Ball); }, - defaultLength = 2, - hidden = true - }, - new GameAction("tacobell", "") - { - function = delegate { KarateMan.instance.CreateItem(eventCaller.currentEntity.beat, 0, (int) KarateMan.HitType.TacoBell); }, - defaultLength = 2, - hidden = true - }, - new GameAction("bgfxon", "") - { - function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.SetBgFx((int) KarateMan.BackgroundFXType.Sunburst, e.beat, e.length); }, - hidden = true - }, - new GameAction("bgfxoff", "") - { - function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.SetBgFx((int) KarateMan.BackgroundFXType.None, e.beat, e.length); }, - hidden = true - }, - new GameAction("hit3", "") - { - function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.DoWord(e.beat, e["type"]); }, - parameters = new List() - { - new Param("type", KarateMan.HitThree.HitThree, "Type", "The warning text to show") - }, - hidden = true - }, - new GameAction("hit4", "") - { - function = delegate { KarateMan.instance.DoWord(eventCaller.currentEntity.beat, (int) KarateMan.HitThree.HitFour); }, - hidden = true - }, - new GameAction("set background color", "") - { - - function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.SetBgAndShadowCol(e.beat, e.length, e["type"], e["type2"], e["colorA"], e["colorB"], (int) KarateMan.currentBgEffect); }, - defaultLength = 0.5f, - parameters = new List() - { - new Param("type", KarateMan.BackgroundType.Yellow, "Background Type", "The preset background type"), - new Param("type2", KarateMan.ShadowType.Tinted, "Shadow Type", "The shadow type. If Tinted doesn't work with your background color try Custom"), - new Param("colorA", new Color(), "Custom Background Color", "The background color to use when background type is set to Custom"), - new Param("colorB", new Color(), "Custom Shadow Color", "The shadow color to use when shadow type is set to Custom"), - - }, - hidden = true - }, - new GameAction("set background fx", "") - { - function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.SetBgFx(e["type"], e.beat, e.length); }, - defaultLength = 0.5f, - parameters = new List() - { - new Param("type", KarateMan.BackgroundFXType.None, "FX Type", "The background effect to be displayed") - }, - hidden = true - }, - - new GameAction("set background texture", "") - { - function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.SetBgTexture(e["type"], e["type2"], e["colorA"], e["colorB"]); }, - defaultLength = 0.5f, - parameters = new List() - { - new Param("type", KarateMan.BackgroundTextureType.Plain, "Texture", "The type of background texture to use"), - new Param("type2", KarateMan.ShadowType.Tinted, "Color Filter Type", "The method used to apply colour to the texture"), - new Param("colorA", new Color(), "Custom Filter Color", "The filter color to use when color filter type is set to Custom"), - new Param("colorB", new Color(), "Fading Filter Color", "When using the Fade background effect, make filter colour fade to this colour"), - }, - hidden = true - }, }, new List() {"agb", "ntr", "rvl", "ctr", "pco", "normal"}, "karate", "en", @@ -256,6 +215,27 @@ namespace HeavenStudio.Games using Scripts_KarateMan; public class KarateMan : Minigame { + static List queuedObjects = new(); + static List queuedBulbs = new(); + struct QueuedObject + { + public double beat; + public int type; + public int expression; + public Color color; + } + + static List queuedKicks = new(); + static List queuedCombos = new(); + struct QueuedSpecial + { + public double beat; + public int expression; + public bool cutOut; + public bool noVoice; + public bool ball; + } + public static KarateMan instance; public enum HitType @@ -356,7 +336,8 @@ namespace HeavenStudio.Games Tengoku, Mania, } - public static bool IsComboEnable = true; //only stops Out combo inputs, this basically makes combo contextual + + public static bool IsComboEnable = true; //only stops Out combo inputs, this basically makes combo contextual public bool IsNoriActive { get { return Nori.MaxNori > 0; } } public float NoriPerformance { get { if (IsNoriActive) return Nori.Nori / Nori.MaxNori; else return 1f; } } @@ -439,8 +420,7 @@ namespace HeavenStudio.Games public static bool WantBop = true; public static bool WantNori = true; public static int WantNoriType = (int) NoriMode.None; - public static double WantBgChangeStart = double.MinValue; - public static float WantBgChangeLength = 0f; + public static List voiceEntities = new(); private void Awake() { @@ -449,18 +429,55 @@ namespace HeavenStudio.Games cameraPosition = CameraPosition[0].position; } + public override void OnGameSwitch(double beat) + { + // queued objects + if (queuedObjects.Count > 0) { + foreach (var qObj in queuedObjects) { CreateItem(qObj.beat, qObj.type, qObj.expression); } + queuedObjects.Clear(); + } + + if (queuedBulbs.Count > 0) { + foreach (var qObj in queuedBulbs) { CreateBulbSpecial(qObj.beat, qObj.type, qObj.color, qObj.expression); } + queuedBulbs.Clear(); + } + + if (queuedKicks.Count > 0) { + foreach (var qObj in queuedKicks) { Kick(qObj.beat, qObj.ball, qObj.expression, qObj.cutOut, qObj.noVoice); } + queuedKicks.Clear(); + } + + if (queuedCombos.Count > 0) { + foreach (var qObj in queuedCombos) { Combo(qObj.beat, qObj.expression, qObj.cutOut, qObj.noVoice); } + queuedCombos.Clear(); + } + + List prevEntities = GameManager.instance.Beatmap.Entities.FindAll(c => c.datamodel.Split(0) == "karateman"); + // init colors + RiqEntity bg = prevEntities.FindLast(c => c.beat < beat && c.datamodel.Split(1) == "set background effects"); + RiqEntity obj = prevEntities.FindLast(c => c.beat < beat && c.datamodel.Split(1) == "set object colors"); + + if (bg != null) { + SetBgAndShadowCol(bg.beat, 0, bg["type"], bg["type2"], bg["colorA"], bg["colorB"], bg["type3"] == (int)BackgroundFXType.Fade ? 0 : bg["type3"]); + SetBgTexture(bg["type4"], bg["type5"], bg["colorC"], bg["colorD"]); + } else { + SetBgAndShadowCol(0, 0, 0, 0, new Color(), new Color(), 0); + SetBgTexture(0, 0, new Color(), new Color()); + } + + if (obj != null) { + UpdateMaterialColour(obj["colorA"], obj["colorB"], obj["colorC"]); + } else { + UpdateMaterialColour(Color.white, new Color(0.81f, 0.81f, 0.81f), Color.white); + } + + // get all entities to later check against eachother to cut out voices + voiceEntities = prevEntities.FindAll(c => c.beat > beat && (c.datamodel.Split(1) is "kick" or "combo") || (c.datamodel.Split(1) is "hitX" && c["type"] <= 3 || c[""] == 7)); + } + public override void OnPlay(double beat) { - var cond = Conductor.instance; - if (!cond.isPlaying) - { - SetBgEffectsToLast(beat); - // remove all children of the ItemHolder - foreach (Transform child in ItemHolder) - { - Destroy(child.gameObject); - } - } + OnGameSwitch(beat); } private void Start() @@ -475,18 +492,12 @@ namespace HeavenStudio.Games bgBloodRenderer = BGBlood.GetComponent(); bgRadialRenderer = BGRadial.GetComponent(); - SetBgEffectsToLast(cond.songPositionInBeatsAsDouble); - SetBgAndShadowCol(WantBgChangeStart, WantBgChangeLength, bgType, (int) currentShadowType, bgColour, customShadowColour, (int)currentBgEffect); - SetBgTexture(textureType, textureFilterType, filterColour, filterColour); - UpdateMaterialColour(BodyColor, HighlightColor, ItemColor); ToggleBop(0, 0, false, WantBop); } private void Update() { var cond = Conductor.instance; - if (!cond.isPlaying) - SetBgEffectsToLast(cond.songPositionInBeatsAsDouble); switch (currentBgEffect) { @@ -562,6 +573,16 @@ namespace HeavenStudio.Games BGEffect.transform.position = new Vector3(GameCamera.instance.transform.position.x, GameCamera.instance.transform.position.y, 0); } + private void OnDestroy() + { + if (!Conductor.instance.NotStopped()) { + if (queuedObjects.Count > 0) queuedObjects.Clear(); + if (queuedBulbs.Count > 0) queuedBulbs.Clear(); + if (queuedKicks.Count > 0) queuedKicks.Clear(); + if (queuedCombos.Count > 0) queuedCombos.Clear(); + } + } + static List allHits = new List(); static List allEnds = new List(); public static int CountHitsToEnd(double fromBeat) @@ -623,7 +644,7 @@ namespace HeavenStudio.Games public static string DoWordSound(double beat, int type, bool doSound = true) { - String word = "NoPose"; + string word = "NoPose"; double clear = 0f; switch (type) { @@ -631,8 +652,7 @@ namespace HeavenStudio.Games word = "Word02"; clear = beat + 4f; if (doSound) - MultiSound.Play(new MultiSound.Sound[] - { + MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("karateman/hit", beat + 0.5f, offset: hitVoiceOffset), new MultiSound.Sound("karateman/two", beat + 1f), }, forcePlay: true); @@ -641,8 +661,7 @@ namespace HeavenStudio.Games word = "Word03"; clear = beat + 4f; if (doSound) - MultiSound.Play(new MultiSound.Sound[] - { + MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("karateman/hit", beat + 0.5f, offset: hitVoiceOffset), new MultiSound.Sound("karateman/three", beat + 1f), }, forcePlay: true); @@ -651,8 +670,7 @@ namespace HeavenStudio.Games word = "Word03"; clear = beat + 4f; if (doSound) - MultiSound.Play(new MultiSound.Sound[] - { + MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("karateman/hitAlt", beat + 0.5f, offset: hitVoiceOffset), new MultiSound.Sound("karateman/threeAlt", beat + 1f), }, forcePlay: true); @@ -683,8 +701,7 @@ namespace HeavenStudio.Games word = "Word06"; clear = beat + 4f; if (doSound) - MultiSound.Play(new MultiSound.Sound[] - { + MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("karateman/hit", beat + 0.5f, offset: hitVoiceOffset), new MultiSound.Sound("karateman/one", beat + 1f), }, forcePlay: true); @@ -697,25 +714,36 @@ namespace HeavenStudio.Games return word; } - public void CreateItem(double beat, int type, int expression, bool muteSound = false) + public static void CreateItemSFX(double beat, int type, bool muteSound = false, bool isBulb = false) { - string outSound; - if ((beat + 0.5f) % 1.0 == 0f) - outSound = "karateman/offbeatObjectOut"; - else - outSound = "karateman/objectOut"; + string whichObj = (type == (int)HitType.Lightbulb || isBulb) ? "Lightbulb" : "Object"; + if ((beat + 0.5f) % 1.0 == 0f) { + outSound = $"karateman/offbeat{whichObj}Out"; + } else { + outSound = $"karateman/{whichObj.ToLower()}Out"; + } + if (!muteSound) SoundByte.PlayOneShotGame(outSound, forcePlay: true); + } + + public static void QueueItem(double beat, int type, int expression) + { + queuedObjects.Add(new QueuedObject() { + beat = beat, + type = type, + expression = expression, + }); + } + + public void CreateItem(double beat, int type, int expression) + { switch (type) { case (int) HitType.Pot: CreateItemInstance(beat, "Item00", expression); break; case (int) HitType.Lightbulb: - if ((beat + 0.5f) % 1.0 == 0f) - outSound = "karateman/offbeatLightbulbOut"; - else - outSound = "karateman/lightbulbOut"; var mobj = CreateItemInstance(beat, "Item01", expression, KarateManPot.ItemType.Bulb); mobj.GetComponent().SetBulbColor(LightBulbColors[0]); break; @@ -741,26 +769,46 @@ namespace HeavenStudio.Games CreateItemInstance(beat, "Item00", expression); break; } - if (!muteSound) SoundByte.PlayOneShotGame(outSound, forcePlay: true); + } + + public static void QueueBulb(double beat, int type, Color color, int expression) + { + queuedBulbs.Add(new QueuedObject() { + beat = beat, + type = type, + color = color, + expression = expression, + }); } public void CreateBulbSpecial(double beat, int type, Color c, int expression) { var mobj = CreateItemInstance(beat, "Item01", expression, KarateManPot.ItemType.Bulb); - if (type == (int) LightBulbType.Custom) + if (type == (int) LightBulbType.Custom) { mobj.GetComponent().SetBulbColor(c); - else + } else { mobj.GetComponent().SetBulbColor(LightBulbColors[type]); - - string outSound = "karateman/" + ((beat + 0.5) % 1 == 0 ? "offbeatLightbulbOut" : "lightbulbOut"); - SoundByte.PlayOneShotGame(outSound, forcePlay: true); + } } - public void Combo(double beat, int expression) + public static void ComboSFX() { SoundByte.PlayOneShotGame("karateman/barrelOutCombos", forcePlay: true); + } + public static void QueueCombo(double beat, int expression, bool cutOut, bool noVoice) + { + queuedCombos.Add(new QueuedSpecial() { + beat = beat, + expression = expression, + cutOut = cutOut, + noVoice = noVoice + }); + } + + public void Combo(double beat, int expression, bool cutOut, bool noVoice) + { int comboId = KarateManPot.GetNewCombo(); BeatAction.New(gameObject, new List() @@ -773,30 +821,50 @@ namespace HeavenStudio.Games new BeatAction.Action(beat + 1.5f, delegate { CreateItemInstance(beat + 1.5f, "Item05", expression, KarateManPot.ItemType.ComboBarrel, comboId); }), }); - MultiSound.Play(new MultiSound.Sound[] - { - new MultiSound.Sound("karateman/punchy1", beat + 1f), - new MultiSound.Sound("karateman/punchy2", beat + 1.25f), - new MultiSound.Sound("karateman/punchy3", beat + 1.5f), - new MultiSound.Sound("karateman/punchy4", beat + 1.75f), - new MultiSound.Sound("karateman/ko", beat + 2f), - new MultiSound.Sound("karateman/pow", beat + 2.5f) - }, forcePlay: true); + if (noVoice) return; + + List sounds = new() { + new MultiSound.Sound("karateman/punchy1", beat + 1f), + new MultiSound.Sound("karateman/punchy2", beat + 1.25f), + new MultiSound.Sound("karateman/punchy3", beat + 1.5f), + new MultiSound.Sound("karateman/punchy4", beat + 1.75f), + new MultiSound.Sound("karateman/ko", beat + 2f), + new MultiSound.Sound("karateman/pow", beat + 2.5f) + }; + + + + MultiSound.Play(sounds.ToArray(), forcePlay: true); } - public void Kick(double beat, bool ball, int expression) + public static void KickSFX() { SoundByte.PlayOneShotGame("karateman/barrelOutKicks", forcePlay: true); + } + public static void QueueKick(double beat, bool ball, int expression, bool cutOut, bool noVoice) + { + queuedKicks.Add(new QueuedSpecial() { + beat = beat, + expression = expression, + cutOut = cutOut, + noVoice = noVoice, + ball = ball, + }); + } + + public void Kick(double beat, bool ball, int expression, bool cutOut, bool noVoice) + { CreateItemInstance(beat, "Item05", expression, KarateManPot.ItemType.KickBarrel, content: ball); - MultiSound.Play(new MultiSound.Sound[] - { - new MultiSound.Sound("karateman/punchKick1", beat + 1f), - new MultiSound.Sound("karateman/punchKick2", beat + 1.5f), - new MultiSound.Sound("karateman/punchKick3", beat + 1.75f), - new MultiSound.Sound("karateman/punchKick4", beat + 2.5f), - }, forcePlay: true); + if (!noVoice) { + MultiSound.Play(new MultiSound.Sound[] { + new MultiSound.Sound("karateman/punchKick1", beat + 1f), + new MultiSound.Sound("karateman/punchKick2", beat + 1.5f), + new MultiSound.Sound("karateman/punchKick3", beat + 1.75f), + new MultiSound.Sound("karateman/punchKick4", beat + 2.5f), + }, forcePlay: true); + } } public GameObject CreateItemInstance(double beat, string awakeAnim, int successExpression, KarateManPot.ItemType type = KarateManPot.ItemType.Pot, int comboId = -1, bool content = false) @@ -815,52 +883,6 @@ namespace HeavenStudio.Games return mobj; } - void SetBgEffectsToLast(double beat) - { - var bgfx = GameManager.instance.Beatmap.Entities.FindAll(en => en.datamodel == "karateman/set background effects"); - for (int i = 0; i < bgfx.Count; i++) - { - var e = bgfx[i]; - if (e.beat > beat) - break; - SetBgEffectsUnloaded(e.beat, e.length, e["type"], e["type2"], e["colorA"], e["colorB"], e["type3"], e["type4"], e["type5"], e["colorC"], e["colorD"]); - } - var camfx = GameManager.instance.Beatmap.Entities.FindAll(en => en.datamodel == "karateman/special camera"); - DoSpecialCamera(0, 0, true); - for (int i = 0; i < camfx.Count; i++) - { - var e = camfx[i]; - if (e.beat > beat) - break; - DoSpecialCamera(e.beat, e.length, e["toggle"]); - } - var objfx = GameManager.instance.Beatmap.Entities.FindAll(en => en.datamodel == "karateman/set object colors"); - for (int i = 0; i < objfx.Count; i++) - { - var e = objfx[i]; - if (e.beat > beat) - break; - UpdateMaterialColour(e["colorA"], e["colorB"], e["colorC"]); - } - SetBgAndShadowCol(WantBgChangeStart, WantBgChangeLength, bgType, (int) currentShadowType, bgColour, customShadowColour, (int)currentBgEffect); - SetBgTexture(textureType, textureFilterType, filterColour, filterColour); - } - - public static void SetBgEffectsUnloaded(double beat, float length, int newBgType, int newShadowType, Color bgCol, Color shadowCol, int bgFx, int texture, int textureFilter, Color filterCol, Color filterColNext) - { - WantBgChangeStart = beat; - WantBgChangeLength = length; - bgType = newBgType; - currentShadowType = newShadowType; - bgColour = bgCol; - customShadowColour = shadowCol; - currentBgEffect = bgFx; - textureType = texture; - textureFilterType = textureFilter; - filterColour = filterCol; - filterColourNext = filterColNext; - } - public void SetBgAndShadowCol(double beat, float length, int newBgType, int shadowType, Color a, Color b, int fx) { SetBgFx(fx, beat, length); diff --git a/Assets/Scripts/Util/MultiSound.cs b/Assets/Scripts/Util/MultiSound.cs index f22a30aa9..d8f771fc3 100644 --- a/Assets/Scripts/Util/MultiSound.cs +++ b/Assets/Scripts/Util/MultiSound.cs @@ -33,7 +33,6 @@ namespace HeavenStudio.Util } } - public static MultiSound Play(Sound[] snds, bool game = true, bool forcePlay = false) { List sounds = snds.ToList(); @@ -70,6 +69,7 @@ namespace HeavenStudio.Util public void Delete() { + foreach (var sound in playingSounds) Destroy(sound); GameManager.instance.SoundObjects.Remove(gameObject); Destroy(gameObject); }