diff --git a/Assets/Resources/Games/karateman.prefab b/Assets/Resources/Games/karateman.prefab index 8c515631..68c5f4cd 100644 --- a/Assets/Resources/Games/karateman.prefab +++ b/Assets/Resources/Games/karateman.prefab @@ -28,9 +28,10 @@ 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 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2578711457631181227 SpriteRenderer: @@ -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 @@ -5113,7 +5129,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.8862745, g: 0.52156866, b: 0.13725491, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -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} @@ -5164,7 +5181,7 @@ Transform: - {fileID: 1823940461699441785} - {fileID: 7998296216023943797} m_Father: {fileID: 1483789816297415762} - m_RootOrder: 9 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!210 &5835591724531542630 SortingGroup: @@ -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,11 +5435,12 @@ 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} m_Father: {fileID: 1483789816297415762} - m_RootOrder: 15 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1089457186893806244 GameObject: @@ -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 @@ -10389,7 +10424,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: -270761472599659251, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.8862745, g: 0.52156866, b: 0.13725491, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -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 @@ -15370,7 +15417,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.8862745, g: 0.52156866, b: 0.13725491, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -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} @@ -20772,7 +20841,7 @@ Transform: - {fileID: 7721752935214517217} - {fileID: 7422225348526634591} m_Father: {fileID: 1483789816297415762} - m_RootOrder: 16 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2133099716162141502 GameObject: @@ -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 @@ -31206,88 +31309,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2644959564095788039 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5558339493236770269} - - component: {fileID: 6418913030626917357} - m_Layer: 0 - m_Name: ref_man - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &5558339493236770269 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2644959564095788039} - 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_Children: [] - m_Father: {fileID: 3609080353678146599} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &6418913030626917357 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2644959564095788039} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -5000 - m_Sprite: {fileID: 21300000, guid: c64c7787d5638454d94c6d1fc5bb46e8, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 0.6117647} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 5.12, y: 5.12} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &2663523590501458685 GameObject: m_ObjectHideFlags: 0 @@ -31315,6 +31336,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 +31352,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -31370,88 +31393,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2707606657656961620 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8437085058865309782} - - component: {fileID: 7966717703427789461} - m_Layer: 0 - m_Name: ref_item - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &8437085058865309782 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2707606657656961620} - 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_Children: [] - m_Father: {fileID: 3609080353678146599} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &7966717703427789461 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2707606657656961620} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -5000 - m_Sprite: {fileID: 21300000, guid: 223bb24c40a67fa4aa0a9c1d23dcc149, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 0.6117647} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 5.12, y: 5.12} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &2790469215453043610 GameObject: m_ObjectHideFlags: 0 @@ -31479,9 +31420,10 @@ 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 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5147067056442997835 SpriteRenderer: @@ -31494,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 @@ -31562,6 +31505,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 +31517,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 +32079,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -36347,6 +36292,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 +36323,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 +36347,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,12 +36380,13 @@ 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} - {fileID: 4570176829701856741} m_Father: {fileID: 1483789816297415762} - m_RootOrder: 13 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!210 &7426437971534503015 SortingGroup: @@ -36449,7 +36401,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 +36414,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 +36447,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 +36494,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} @@ -36547,7 +36503,7 @@ Transform: - {fileID: 6607715910393405022} - {fileID: 6402550105555280064} m_Father: {fileID: 1483789816297415762} - m_RootOrder: 11 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3121129389948568248 GameObject: @@ -36576,6 +36532,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 +36548,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 +36617,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} @@ -36715,88 +36674,6 @@ MonoBehaviour: m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 m_PresetInfoIsWorld: 1 ---- !u!1 &3317749162070580323 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3795370127036445573} - - component: {fileID: 7189349373277129013} - m_Layer: 0 - m_Name: ref_word - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &3795370127036445573 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3317749162070580323} - 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_Children: [] - m_Father: {fileID: 3609080353678146599} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &7189349373277129013 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3317749162070580323} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -5000 - m_Sprite: {fileID: 21300000, guid: 6815c6a795c92dd4f84bc69647ca1a61, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 0.53333336} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 5.12, y: 5.12} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &3418320730155705769 GameObject: m_ObjectHideFlags: 0 @@ -36825,6 +36702,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 +36714,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 +37276,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -41607,6 +41486,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 +41517,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 +41541,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 +41573,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 +41589,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 +41657,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 +41712,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 +41725,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 +42287,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 2048 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -46547,6 +46437,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 +46468,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 +46492,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 +46524,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 +46540,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 +46609,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 +46621,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 +47183,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -51491,6 +51391,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 +51422,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: -2 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 2 @@ -51544,89 +51446,11 @@ 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: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8330865912302329553} - - component: {fileID: 3814198436135378499} - m_Layer: 0 - m_Name: screenSpace - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &8330865912302329553 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3742810944473094226} - 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_Children: [] - m_Father: {fileID: 1483789816297415762} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &3814198436135378499 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3742810944473094226} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -5002 - m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} - m_Color: {r: 1, g: 0, b: 0.365098, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &3826058516668778663 GameObject: m_ObjectHideFlags: 0 @@ -51656,6 +51480,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,13 +51580,14 @@ 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} - {fileID: 4580764379744752145} - {fileID: 6153427326708225474} m_Father: {fileID: 1483789816297415762} - m_RootOrder: 14 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3868604044228909325 GameObject: @@ -51790,6 +51616,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 +51632,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 +51701,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 +51714,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 +52276,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1280 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -56597,6 +56427,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 +56458,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 +56482,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 +56514,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 +56530,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 +56598,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 +56614,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 +56682,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 +56698,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 +56767,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 +56779,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 +57341,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 1 rotation3D: 0 gravityModifier: @@ -61705,6 +61549,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 +61580,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 +61604,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 +61636,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 +61654,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 +61724,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 +61740,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 +61753,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,22 +61782,11 @@ 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 + hitSfxOverride: Shadow: {fileID: 2136808730019920255} - ShadowInstance: {fileID: 0} HitMark: {fileID: 5218911297968347512} HitParticles: - {fileID: 4150348285995905317} @@ -61963,6 +61807,10 @@ MonoBehaviour: - {fileID: 7106630173843556496} - {fileID: 5747805804250125440} - {fileID: 1280364348460651971} + ItemBarrelMap: + - {r: 0.4509804, g: 0.3019608, b: 0.27058825, a: 1} + - {r: 0, g: 0, b: 0, a: 1} + - {r: 0.7137255, g: 0.30980393, b: 0.42352942, a: 1} ItemAlienMap: - {r: 0.14509805, g: 0.14509805, b: 0.14509805, a: 1} - {r: 0.99215686, g: 0.99607843, b: 0.99607843, a: 1} @@ -61971,15 +61819,12 @@ MonoBehaviour: - {r: 1, g: 0.08235294, b: 0.12941177, a: 1} - {r: 1, g: 0.9372549, b: 0.03137255, a: 1} - {r: 0, g: 0, b: 0, a: 0} - ItemBarrelMap: - - {r: 0.4509804, g: 0.3019608, b: 0.27058825, a: 1} - - {r: 0.3019608, g: 0.16862746, b: 0.03529412, a: 1} - - {r: 0.7137255, g: 0.30980393, b: 0.42352942, a: 1} ItemCookingLidMap: - {r: 0, g: 0, b: 0, a: 1} - {r: 1, g: 1, b: 1, a: 0} - {r: 0, g: 0, b: 0, a: 0} KickBarrelContent: 0 + ShouldGlow: 0 OnHitExpression: 0 comboId: -1 HitPosition: @@ -62051,6 +61896,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 +61912,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 +61980,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 +61996,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 +62064,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 @@ -62235,92 +62085,6 @@ MonoBehaviour: handleType: 0 leftHandleLocalPosition: {x: -9.748012, y: -17.766153, z: -24.712715} rightHandleLocalPosition: {x: 9.748012, y: 17.766153, z: 24.712715} ---- !u!1 &4461166469202109451 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3609080353678146599} - - component: {fileID: 5347082990439079511} - m_Layer: 0 - m_Name: reference - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &3609080353678146599 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4461166469202109451} - 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_Children: - - {fileID: 3848867281373793675} - - {fileID: 5558339493236770269} - - {fileID: 3795370127036445573} - - {fileID: 8437085058865309782} - m_Father: {fileID: 1483789816297415762} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &5347082990439079511 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4461166469202109451} - m_Enabled: 0 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -5000 - m_Sprite: {fileID: 21300000, guid: 81f0d9c70bb068b468db7d0af31cf321, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 0.46666667} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &4485706438535911762 GameObject: m_ObjectHideFlags: 0 @@ -62349,6 +62113,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 +62125,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 +62687,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -67129,6 +66895,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 +66926,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 +66950,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,13 +66982,14 @@ 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} - {fileID: 5398479681583471366} - {fileID: 4697915430287191595} m_Father: {fileID: 1483789816297415762} - m_RootOrder: 8 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3856490809560069226 MonoBehaviour: @@ -67278,6 +67051,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 +67063,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 +67625,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -72068,6 +71843,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 +71874,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 +71898,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 +71932,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 +71982,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 +71995,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 +72028,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 +72044,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 +72113,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 +72127,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 +72689,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -77109,6 +76897,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 +76928,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 +76952,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 +76984,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 +77000,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 +77068,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 +77122,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 +77170,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 +77186,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 +77256,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 +77265,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 +77278,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 +77335,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 +77347,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 +77909,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -82315,6 +82120,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 +82151,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 +82175,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,9 +82207,10 @@ 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 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &6796439334000697740 SpriteRenderer: @@ -82411,6 +82223,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -82445,7 +82258,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 17.777779, y: 10} + m_Size: {x: 16, y: 12} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -82479,6 +82292,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 +82304,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 +82866,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -87261,6 +87076,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 +87107,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 +87131,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,10 +87162,11 @@ 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} - m_RootOrder: 10 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5641315844638892119 GameObject: @@ -87373,6 +87195,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 +87243,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 +87298,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 +87310,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 +87872,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -92196,6 +92022,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 +92053,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 +92077,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 +92109,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 +92125,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 +92194,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 +92207,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 +92769,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -97141,6 +96977,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 +97008,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 +97032,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 +97064,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,9 +97118,8 @@ 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} - {fileID: 570774704746437793} - {fileID: 602434937145741663} - {fileID: 24004413385253441} @@ -97311,7 +97153,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} @@ -97325,13 +97166,6 @@ MonoBehaviour: - {r: 1, g: 0.58431375, b: 0.3137255, a: 1} - {r: 0.9607844, g: 0.7725491, b: 0.78823537, a: 1} - {r: 0, g: 0, b: 0, a: 0} - ShadowColors: - - {r: 0.84313726, g: 0.52156866, b: 0.23137255, a: 1} - - {r: 0.88235295, g: 0.41960785, b: 0.5294118, a: 1} - - {r: 0.3137255, g: 0.31764707, b: 0.40784317, a: 1} - - {r: 0, g: 0, b: 0, a: 1} - - {r: 0.454902, g: 0.19607845, b: 0.121568635, a: 1} - - {r: 0.654902, g: 0.4156863, b: 0.45882356, a: 1} CameraPosition: - {fileID: 3542369029029140826} - {fileID: 607707502233677433} @@ -97341,19 +97175,22 @@ MonoBehaviour: NoriGO: {fileID: 4562470404778909465} Nori: {fileID: 3856490809560069226} MappingMaterial: {fileID: 2100000, guid: 01a12550d4a6d8141bbbdf4ce2700eea, type: 2} + BodyColor: {r: 1, g: 1, b: 1, a: 1} + HighlightColor: {r: 0.81, g: 0.81, b: 0.81, a: 1} + ItemColor: {r: 1, g: 1, b: 1, a: 1} Word: {fileID: 8471847813194768760} + currentBgEffect: 0 BGPlane: {fileID: 5423016352081307686} BGEffect: {fileID: 185016033042157469} - BGGradient: {fileID: 2790469215453043610} - BGBlood: {fileID: 5404947306895237780} - BGRadial: {fileID: 8238140095837895901} + BGTextures: + - {fileID: 5147067056442997835} + - {fileID: 4189433424192044813} + - {fileID: 6796439334000697740} Wind: {fileID: 9003203273337395302} - SnowEffect: {fileID: 6887086164110906535} - SnowEffectGO: {fileID: 1216083719847348373} - FireEffect: {fileID: 5127881687583584282} - FireEffectGO: {fileID: 3592020714774141813} - RainEffect: {fileID: 2673878087330023132} - RainEffectGO: {fileID: 3977551198845255891} + Effects: + - {fileID: 6887086164110906535} + - {fileID: 5127881687583584282} + - {fileID: 2673878087330023132} --- !u!1 &6574514768376321096 GameObject: m_ObjectHideFlags: 0 @@ -97381,6 +97218,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 +97273,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 +97289,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 +97851,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -102220,6 +102060,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 +102091,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 +102115,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 +102147,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 +102201,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 +102217,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 +102285,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 +102333,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 +102349,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -102538,88 +102390,6 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &6900082977360491289 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3848867281373793675} - - component: {fileID: 4197955849851210928} - m_Layer: 0 - m_Name: ref_HitPosition.000 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &3848867281373793675 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6900082977360491289} - 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_Children: [] - m_Father: {fileID: 3609080353678146599} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &4197955849851210928 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6900082977360491289} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -5000 - m_Sprite: {fileID: 21300000, guid: fe161e100042cd6479c549e037887ee7, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 0.4392157} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 5.12, y: 5.12} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &6979528226812344444 GameObject: m_ObjectHideFlags: 0 @@ -102647,6 +102417,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 +102465,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 +102513,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 +102561,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 +102578,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 +102646,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 +102694,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 +102744,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 +102845,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 +102861,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 +102929,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 +102945,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 +103013,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 +103059,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 +103107,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 +103123,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 +103190,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} @@ -103416,7 +103203,7 @@ Transform: - {fileID: 7797479191699406299} - {fileID: 5150790184898265248} m_Father: {fileID: 1483789816297415762} - m_RootOrder: 12 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7724750281891176066 GameObject: @@ -103447,13 +103234,14 @@ 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 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -0.25} + m_AnchoredPosition: {x: -3.44, y: -0.75} m_SizeDelta: {x: 18, y: 2} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4938178472322233844 @@ -103548,6 +103336,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 +103348,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 +103910,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -108335,6 +108125,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 +108156,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 +108180,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 +108212,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 @@ -108461,11 +108258,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7919762816917508181} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 20, z: 50} + m_LocalPosition: {x: 0, y: 0, z: 50} m_LocalScale: {x: 256, y: 256, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1483789816297415762} - m_RootOrder: 2 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5423016352081307686 SpriteRenderer: @@ -108478,6 +108276,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -108508,7 +108307,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: -5002 m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} - m_Color: {r: 0.9843137, g: 0.7921569, b: 0.24313726, a: 1} + m_Color: {r: 0.985, g: 0.79, b: 0.243, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -108545,6 +108344,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 +108360,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -108590,7 +108391,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: -270761472599659251, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.8862745, g: 0.52156866, b: 0.13725491, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -108626,6 +108427,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,9 +108459,10 @@ 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 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &4189433424192044813 SpriteRenderer: @@ -108672,6 +108475,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 +108544,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 +108556,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 +109118,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -113527,6 +113333,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 +113364,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 +113388,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,9 +113420,10 @@ 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 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!212 &819146809661568170 SpriteRenderer: @@ -113623,6 +113436,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 +113504,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 +113552,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 +113568,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 +113637,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 +113651,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 +114213,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -118602,6 +118421,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 +118452,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 +118476,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 +118508,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 +118562,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 +118611,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 +118624,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 +119186,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -123565,6 +123394,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 +123425,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 +123449,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 +123481,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/Resources/Sfx/games/karateMan/lightbulbNtrHit.ogg.meta b/Assets/Resources/Sfx/games/karateMan/lightbulbNtrHit.ogg.meta new file mode 100644 index 00000000..defa8721 --- /dev/null +++ b/Assets/Resources/Sfx/games/karateMan/lightbulbNtrHit.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6ad9f1d601adf9a4889010293bb854d4 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateMan/lightbulbNtrOut.ogg.meta b/Assets/Resources/Sfx/games/karateMan/lightbulbNtrOut.ogg.meta new file mode 100644 index 00000000..84d887ce --- /dev/null +++ b/Assets/Resources/Sfx/games/karateMan/lightbulbNtrOut.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 86fe61ed86cc5bd4cb8da587c4e4cc48 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/karateMan/offbeatLightbulbNtrOut.ogg.meta b/Assets/Resources/Sfx/games/karateMan/offbeatLightbulbNtrOut.ogg.meta new file mode 100644 index 00000000..c597a312 --- /dev/null +++ b/Assets/Resources/Sfx/games/karateMan/offbeatLightbulbNtrOut.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 5e6b77f98971e73459639530f1524456 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word.controller b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word.controller index cab9a2b2..6d5440e3 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word.controller +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word.controller @@ -241,35 +241,35 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -2381588529378463098} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 250, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: -3348998483261200728} - m_Position: {x: 235, y: 65, z: 0} + m_Position: {x: 170, y: -30, z: 0} - serializedVersion: 1 m_State: {fileID: -6746426325098372422} - m_Position: {x: 270, y: 130, z: 0} + m_Position: {x: 210, y: 40, z: 0} - serializedVersion: 1 m_State: {fileID: 1136731949493752883} - m_Position: {x: 305, y: 195, z: 0} + m_Position: {x: 290, y: 180, z: 0} - serializedVersion: 1 m_State: {fileID: -3478175207042509151} - m_Position: {x: 340, y: 260, z: 0} + m_Position: {x: 330, y: 250, z: 0} - serializedVersion: 1 m_State: {fileID: -806466539819283022} - m_Position: {x: 375, y: 325, z: 0} + m_Position: {x: 370, y: 320, z: 0} - serializedVersion: 1 m_State: {fileID: -3526870332612620235} m_Position: {x: 410, y: 390, z: 0} - serializedVersion: 1 m_State: {fileID: 1133350279288983051} - m_Position: {x: 445, y: 455, z: 0} + m_Position: {x: 450, y: 460, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} + m_AnyStatePosition: {x: 40, y: 210, z: 0} + m_EntryPosition: {x: 470, y: 530, z: 0} + m_ExitPosition: {x: 110, y: 340, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 1133350279288983051} diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word00.anim b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word00.anim index f31800a2..fb928d49 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word00.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word00.anim @@ -84,7 +84,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -5.8, y: 1.5, z: 0} + value: {x: -4, y: 1, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -116,14 +116,14 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 0} + value: {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} attribute: m_Sprite path: Exclaim classID: 212 script: {fileID: 0} - curve: - time: 0 - value: {fileID: -8701253081129557890, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + value: {fileID: -5610626859485252548, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} attribute: m_Sprite path: Main classID: 212 @@ -206,8 +206,8 @@ AnimationClip: customType: 4 isPPtrCurve: 0 pptrCurveMapping: - - {fileID: 0} - - {fileID: -8701253081129557890, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + - {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + - {fileID: -5610626859485252548, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} - {fileID: 0} m_AnimationClipSettings: serializedVersion: 2 @@ -349,7 +349,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -5.8 + value: -4 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -368,7 +368,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.5 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word01.anim b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word01.anim index 8ca43ae3..93b71c79 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word01.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word01.anim @@ -84,7 +84,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -4.72, y: 1.6, z: 0} + value: {x: -4.4, y: 1, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -116,14 +116,14 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 0} + value: {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} attribute: m_Sprite path: Exclaim classID: 212 script: {fileID: 0} - curve: - time: 0 - value: {fileID: -2089169352201841507, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + value: {fileID: 1214470814246859168, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} attribute: m_Sprite path: Main classID: 212 @@ -206,8 +206,8 @@ AnimationClip: customType: 4 isPPtrCurve: 0 pptrCurveMapping: - - {fileID: 0} - - {fileID: -2089169352201841507, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + - {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + - {fileID: 1214470814246859168, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} - {fileID: 0} m_AnimationClipSettings: serializedVersion: 2 @@ -349,7 +349,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -4.72 + value: -4.4 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -368,7 +368,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.6 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word02.anim b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word02.anim index c576beaf..284fe51b 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word02.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word02.anim @@ -14,6 +14,22 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Sub - curve: serializedVersion: 2 m_Curve: @@ -46,12 +62,13 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Main + m_PositionCurves: - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1.403, y: 1, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -62,7 +79,6 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Sub - m_PositionCurves: - curve: serializedVersion: 2 m_Curve: @@ -95,25 +111,16 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Main - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: -1.403, y: 1, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Sub m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 0} + attribute: m_Sprite + path: Sub + classID: 212 + script: {fileID: 0} - curve: - time: 0 value: {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} @@ -123,18 +130,11 @@ AnimationClip: script: {fileID: 0} - curve: - time: 0 - value: {fileID: 1214470814246859168, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + value: {fileID: 3512758288782026156, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} attribute: m_Sprite path: Main classID: 212 script: {fileID: 0} - - curve: - - time: 0 - value: {fileID: 0} - attribute: m_Sprite - path: Sub - classID: 212 - script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -142,6 +142,13 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 1615840316 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 - serializedVersion: 2 path: 224731958 attribute: 0 @@ -158,11 +165,11 @@ AnimationClip: isPPtrCurve: 1 - serializedVersion: 2 path: 1615840316 - attribute: 0 + attribute: 1 script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 224731958 attribute: 1 @@ -179,10 +186,10 @@ AnimationClip: isPPtrCurve: 0 - serializedVersion: 2 path: 1615840316 - attribute: 1 + attribute: 4 script: {fileID: 0} typeID: 4 - customType: 0 + customType: 4 isPPtrCurve: 0 - serializedVersion: 2 path: 224731958 @@ -198,17 +205,10 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 - - serializedVersion: 2 - path: 1615840316 - attribute: 4 - script: {fileID: 0} - typeID: 4 - customType: 4 - isPPtrCurve: 0 pptrCurveMapping: - - {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} - - {fileID: 1214470814246859168, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} - {fileID: 0} + - {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + - {fileID: 3512758288782026156, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -230,6 +230,63 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1.403 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Sub + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Sub + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Sub + classID: 4 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -287,63 +344,6 @@ AnimationClip: path: Exclaim classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: Exclaim - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.y - path: Exclaim - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: Exclaim - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -417,7 +417,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Main + path: Sub classID: 4 script: {fileID: 0} - curve: @@ -436,7 +436,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Main + path: Sub classID: 4 script: {fileID: 0} - curve: @@ -455,63 +455,6 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Main - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -1.403 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Sub - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Sub - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z path: Sub classID: 4 script: {fileID: 0} @@ -531,7 +474,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Sub + path: Exclaim classID: 4 script: {fileID: 0} - curve: @@ -550,7 +493,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Sub + path: Exclaim classID: 4 script: {fileID: 0} - curve: @@ -569,10 +512,97 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Sub + path: Exclaim + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Main + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Main + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Main classID: 4 script: {fileID: 0} m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Sub + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Sub + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Sub + classID: 4 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: [] @@ -633,36 +663,6 @@ AnimationClip: path: Main classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Sub - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: Sub - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: Sub - classID: 4 - script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word03.anim b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word03.anim index 34b2b836..f021864d 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word03.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word03.anim @@ -14,22 +14,6 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Sub - curve: serializedVersion: 2 m_Curve: @@ -62,13 +46,12 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Main - m_PositionCurves: - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: {x: -1.403, y: 1, z: 0} + value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -79,6 +62,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Sub + m_PositionCurves: - curve: serializedVersion: 2 m_Curve: @@ -111,16 +95,25 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Main + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -1.403, y: 1, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Sub m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: 0} - attribute: m_Sprite - path: Sub - classID: 212 - script: {fileID: 0} - curve: - time: 0 value: {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} @@ -130,11 +123,18 @@ AnimationClip: script: {fileID: 0} - curve: - time: 0 - value: {fileID: 3512758288782026156, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + value: {fileID: -1278344009149830369, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} attribute: m_Sprite path: Main classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 0} + attribute: m_Sprite + path: Sub + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -142,13 +142,6 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: - - serializedVersion: 2 - path: 1615840316 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - serializedVersion: 2 path: 224731958 attribute: 0 @@ -165,11 +158,11 @@ AnimationClip: isPPtrCurve: 1 - serializedVersion: 2 path: 1615840316 - attribute: 1 + attribute: 0 script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 + typeID: 212 + customType: 23 + isPPtrCurve: 1 - serializedVersion: 2 path: 224731958 attribute: 1 @@ -186,10 +179,10 @@ AnimationClip: isPPtrCurve: 0 - serializedVersion: 2 path: 1615840316 - attribute: 4 + attribute: 1 script: {fileID: 0} typeID: 4 - customType: 4 + customType: 0 isPPtrCurve: 0 - serializedVersion: 2 path: 224731958 @@ -205,10 +198,17 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1615840316 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 pptrCurveMapping: - - {fileID: 0} - {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} - - {fileID: 3512758288782026156, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + - {fileID: -1278344009149830369, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + - {fileID: 0} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -230,63 +230,6 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -1.403 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Sub - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Sub - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Sub - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -344,6 +287,63 @@ AnimationClip: path: Exclaim classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Exclaim + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Exclaim + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Exclaim + classID: 4 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -417,7 +417,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Sub + path: Main classID: 4 script: {fileID: 0} - curve: @@ -436,7 +436,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Sub + path: Main classID: 4 script: {fileID: 0} - curve: @@ -455,6 +455,63 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z + path: Main + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1.403 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Sub + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Sub + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z path: Sub classID: 4 script: {fileID: 0} @@ -474,7 +531,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Exclaim + path: Sub classID: 4 script: {fileID: 0} - curve: @@ -493,7 +550,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Exclaim + path: Sub classID: 4 script: {fileID: 0} - curve: @@ -512,97 +569,10 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Exclaim - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: Main - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.y - path: Main - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: Main + path: Sub classID: 4 script: {fileID: 0} m_EulerEditorCurves: - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Sub - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: Sub - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: Sub - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: [] @@ -663,6 +633,36 @@ AnimationClip: path: Main classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Sub + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Sub + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Sub + classID: 4 + script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word04.anim b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word04.anim index d9b81992..ce75e1a2 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word04.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word04.anim @@ -84,7 +84,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -4.4, y: 1, z: 0} + value: {x: -4.72, y: 1.6, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -116,14 +116,14 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + value: {fileID: 0} attribute: m_Sprite path: Exclaim classID: 212 script: {fileID: 0} - curve: - time: 0 - value: {fileID: -1278344009149830369, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + value: {fileID: -2089169352201841507, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} attribute: m_Sprite path: Main classID: 212 @@ -206,8 +206,8 @@ AnimationClip: customType: 4 isPPtrCurve: 0 pptrCurveMapping: - - {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} - - {fileID: -1278344009149830369, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + - {fileID: 0} + - {fileID: -2089169352201841507, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} - {fileID: 0} m_AnimationClipSettings: serializedVersion: 2 @@ -349,7 +349,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -4.4 + value: -4.72 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -368,7 +368,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 1.6 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word06.anim b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word06.anim index fbebd744..a493e78f 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word06.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word06.anim @@ -84,7 +84,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -4, y: 1, z: 0} + value: {x: -5.8, y: 1.5, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -116,14 +116,14 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + value: {fileID: 0} attribute: m_Sprite path: Exclaim classID: 212 script: {fileID: 0} - curve: - time: 0 - value: {fileID: -5610626859485252548, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + value: {fileID: -8701253081129557890, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} attribute: m_Sprite path: Main classID: 212 @@ -206,8 +206,8 @@ AnimationClip: customType: 4 isPPtrCurve: 0 pptrCurveMapping: - - {fileID: 7844610654334982216, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} - - {fileID: -5610626859485252548, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} + - {fileID: 0} + - {fileID: -8701253081129557890, guid: 57ea36e082ce7e44581fa6fdb2cd7a49, type: 3} - {fileID: 0} m_AnimationClipSettings: serializedVersion: 2 @@ -349,7 +349,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -4 + value: -5.8 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -368,7 +368,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 1.5 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_bloody.png.meta b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_bloody.png.meta index bdd1332d..7c64f455 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_bloody.png.meta +++ b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_bloody.png.meta @@ -3,7 +3,7 @@ guid: 2126ec8bc0fd27047a483933dcc9f9b0 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -35,15 +36,15 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 2 + wrapV: 2 + wrapW: 2 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 400 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,6 +114,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs index d9d5cd2f..f97e4856 100644 --- a/Assets/Scripts/Games/KarateMan/KarateMan.cs +++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs @@ -5,13 +5,96 @@ using UnityEngine; using HeavenStudio.Util; using Jukebox; +using System.Linq; namespace HeavenStudio.Games.Loaders { using static Minigames; public static class RvlNewKarateLoader { - public static Minigame AddGame(EventCaller eventCaller) { + public static Minigame AddGame(EventCaller eventCaller) + { + RiqEntity WarningUpdater(string datamodel, RiqEntity e) + { + if (datamodel == "karateman/hitX") + { + if (e["type"] == null) return null; + + int newWarning = (int)e["type"]; + newWarning = (e["type"] < 7) ? newWarning + 1 : 0; + + e.CreateProperty("whichWarning", newWarning); + e.CreateProperty("pitchVoice", false); + e.CreateProperty("forcePitch", 1); + e.CreateProperty("customLength", false); + e.CreateProperty("cutOut", true); + + e.dynamicData.Remove("type"); + + e.datamodel = "karateman/warnings"; + return e; + } + return null; + } + RiqBeatmap.OnUpdateEntity += WarningUpdater; + + RiqEntity BackgroundUpdater(string datamodel, RiqEntity e) + { + if (e.datamodel == "karateman/set background effects") + { + var toRemove = e.dynamicData.Keys.Where(x => x != "track").ToList(); + + bool fade = e["type3"] == 3; + e.CreateProperty("presetBg", (int)e["type"]); + e.CreateProperty("startColor", e["colorA"]); + e.CreateProperty("shadowType", (int)e["type2"]); + e.CreateProperty("shadowStart", e["colorB"]); + e.CreateProperty("shadowEnd", e["colorB"]); + e.CreateProperty("textureType", (int)e["type4"]); + e.CreateProperty("autoColor", e["type5"] == (int)KarateMan.ShadowType.Tinted); + e.CreateProperty("startTexture", e["colorC"]); + e.CreateProperty("endTexture", e["colorC"]); + e.CreateProperty("endColor", fade ? e["colorD"] : e["colorA"]); + e.CreateProperty("ease", fade ? (int)Util.EasingFunction.Ease.Linear : (int)Util.EasingFunction.Ease.Instant); + e.CreateProperty("fxType", !fade ? (int)e["type3"] : 3); + + foreach (var remove in toRemove) { + e.dynamicData.Remove(remove); + } + + e.datamodel = "karateman/background appearance"; + + return e; + } + return null; + } + RiqBeatmap.OnUpdateEntity += BackgroundUpdater; + + // RiqEntity GameCapitalizer(string datamodel, RiqEntity entity) + // { + // if (datamodel.Split('/')[0] == "karateman") + // { + // string name = datamodel.Split('/')[1]; + // entity.datamodel = "karateman/" + name; + // var tempData = entity.dynamicData.ToDictionary(x => x.Key); + // foreach ((string key, dynamic item) in tempData) + // { + // if (item.GetType() == typeof(Newtonsoft.Json.Linq.JObject)) { + // entity.dynamicData[key] = new Color((float)item["r"], (float)item["g"], (float)item["b"]); + // } + // Debug.Log(key + ", " + item); + // } + // entity.version = 1; + + // return entity; + // } else if (datamodel == "gameManager/switchGame/karateman") { + // entity.datamodel = "gameManager/switchGame/karateman"; + // return entity; + // } + // return null; + // } + // RiqBeatmap.OnUpdateEntity += GameCapitalizer; + return new Minigame("karateman", "Karate Man", "fbca3e", false, false, new List() { new GameAction("bop", "Bop") @@ -23,89 +106,289 @@ namespace HeavenStudio.Games.Loaders new Param("toggle2", true, "Bop", "Whether to bop to the beat or not"), new Param("toggle", false, "Bop (Auto)", "Whether to auto bop to the beat or not") }, - 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.QueueCue(e); + 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"], e["sfx"], e["hitSfx"]); + if (!e["mute"]) KarateMan.CreateBulbSFX(e.beat, e["type"], e["sfx"], e["throwSfx"]); + }, + inactiveFunction = delegate { + var e = eventCaller.currentEntity; + KarateMan.QueueCue(e); + if (!e["mute"]) KarateMan.CreateBulbSFX(e.beat, e["type"], e["sfx"], e["throwSfx"]); + }, 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("type", KarateMan.LightBulbType.Normal, "Type", "The preset bulb type. Yellow is used for kicks while Blue is used for combos", new List() + { + new Param.CollapseParam(x => (int)x == (int)KarateMan.LightBulbType.Custom, new string[] { "colorA" }) + }), 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 Param("sfx", KarateMan.LightBulbSfx.Automatic, "SFX", "What type of SFX to use for the bulb?", new List() + { + new Param.CollapseParam(x => (int)x == (int)KarateMan.LightBulbSfx.Custom, new string[] { "throwSfx", "hitSfx" }), + }), + new Param("throwSfx", "lightbulbOut", "Throw SFX", "Custom throw SFX to use for the bulb"), + new Param("hitSfx", "lightbulbHit", "Hit SFX", "Custom hit SFX to use for the bulb"), }, }, 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["shouldGlow"], e["type"], e["pitchVoice"], e["forcePitch"], e["cutOut"], e["disableVoice"], e["woodColor"], e["hoopColor"]); + KarateMan.KickSFX(); + }, + inactiveFunction = delegate { + var e = eventCaller.currentEntity; + KarateMan.QueueCue(e); + 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("shouldGlow", true, "Bomb Glow", "Should Joe be lit up by the bomb in the barrel?"), + new Param("type", KarateMan.KarateManFaces.Smirk, "Success Expression", "The facial expression to set Joe to on hit"), + new Param("pitchVoice", false, "Pitch Voice", "Pitch the voice of this cue?", new List() + { + new Param.CollapseParam(x => (bool)x, new string[] { "forcePitch" }), + }), + new Param("forcePitch", new EntityTypes.Float(0.5f, 2f, 1f), "Force Pitch", "Override the automatic pitching if not set to 1"), + new Param("cutOut", true, "Cut Out Voice", "Will this cue be cut out by another voice?"), + new Param("disableVoice", false, "Disable Voice", "When enabled, there will be no voice during this cue"), + new Param("woodColor", new Color(0.451f, 0.302f, 0.271f), "Barrel Wood Color", "Color of the barrel's wood"), + new Param("hoopColor", new Color(0.714f, 0.309f, 0.424f), "Barrel Hoop Color", "Color of the barrel's hoops"), } }, 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["pitchVoice"], e["forcePitch"], e["cutOut"], e["disableVoice"]); + KarateMan.ComboSFX(); + }, + inactiveFunction = delegate { + var e = eventCaller.currentEntity; + KarateMan.QueueCue(e); + 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("pitchVoice", false, "Pitch Voice", "Pitch the voice of this cue?", new List() + { + new Param.CollapseParam(x => (bool)x, new string[] { "forcePitch" }), + }), + new Param("forcePitch", new EntityTypes.Float(0.5f, 2f, 1f), "Force Pitch", "Override the automatic pitching if not set to 1"), + new Param("cutOut", true, "Cut Out Voice", "Will this cue be cut out by another voice?"), + new Param("disableVoice", false, "Disable Voice", "When enabled, there will be no voice during this cue"), } }, - new GameAction("hitX", "Warnings") + new GameAction("warnings", "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.length, e["whichWarning"], e["pitchVoice"], e["forcePitch"], e["customLength"]); + }, defaultLength = 1f, + resizable = true, parameters = new List() { - new Param("type", KarateMan.HitThree.HitThree, "Type", "The warning text to show") + new Param("whichWarning", KarateMan.HitThree.HitThree, "Which Warning", "The warning text to show and the sfx to play"), + new Param("pitchVoice", false, "Pitch Voice", "Pitch the voice of this cue?", new List() + { + new Param.CollapseParam(x => (bool)x, new string[] { "forcePitch" }), + }), + new Param("forcePitch", new EntityTypes.Float(0.5f, 2f, 1f), "Force Pitch", "Override the automatic pitching if not set to 1"), + new Param("customLength", false, "Custom Length", "Have the warning text appear for the length of the block"), + new Param("cutOut", true, "Cut Out Voice", "Will this cue be cut out by another voice?"), }, - inactiveFunction = delegate { var e = eventCaller.currentEntity; KarateMan.DoWordSound(e.beat, e["type"]); } + inactiveFunction = delegate { + var e = eventCaller.currentEntity; + KarateMan.DoWordSound(e.beat, e.length, e["whichWarning"], e["pitchVoice"], e["forcePitch"], e["customLength"]); + } }, new GameAction("special camera", "Special Camera") { - function = delegate { var e = eventCaller.currentEntity; KarateMan.DoSpecialCamera(e.beat, e.length, e["toggle"]); }, + function = delegate { var e = eventCaller.currentEntity; KarateMan.DoSpecialCamera(e.beat, e.length, e["toggle"]); }, defaultLength = 8f, resizable = true, parameters = new List() { new Param("toggle", true, "Return Camera", "Camera zooms back in?"), }, - inactiveFunction = delegate { var e = eventCaller.currentEntity; KarateMan.DoSpecialCamera(e.beat, e.length, e["toggle"]); } + inactiveFunction = delegate { var e = eventCaller.currentEntity; KarateMan.DoSpecialCamera(e.beat, e.length, e["toggle"]); } }, new GameAction("prepare", "Preparation Stance") { function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.Prepare(e.beat, e.length);}, - resizable = true + resizable = true, }, - new GameAction("set gameplay modifiers", "Gameplay Modifiers") + new GameAction("set gameplay modifiers", "Flow/Gameplay Modifiers") { - function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.SetGameplayMods(e.beat, e["type"], e["toggle"]); }, + function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.SetGameplayMods(e.beat, e["fxType"], e["type"], e["toggle"]); }, defaultLength = 0.5f, parameters = new List() { - new Param("type", KarateMan.NoriMode.None, "Flow Bar type", "The type of Flow bar to use"), + new Param("fxType", KarateMan.BackgroundFXType.None, "FX Type", "The background effect to be displayed"), + new Param("type", KarateMan.NoriMode.None, "Flow Bar type", "The type of Flow bar to use", new List() + { + new Param.CollapseParam(x => (int)x != (int)KarateMan.NoriMode.None, new string[] { "startColor" }) + }), + new Param("hitsPerHeart", new EntityTypes.Float(0f, 20f, 0f), "Hits Per Heart", "How many hits will it take for each heart to light up? (0 will do it automatically.)"), new Param("toggle", true, "Enable Combos", "Allow the player to combo? (Contextual combos will still be allowed even when off)"), + //new Param("toggle2", true, "Enable Kicks", "Allow the player to kick? (Contextual kicks will still be allowed even when off)"), + }, + }, + new GameAction("background appearance", "Background Appearance") + { + function = delegate { + var e = eventCaller.currentEntity; + KarateMan.instance.BackgroundColor( + e.beat, e.length, + e["presetBg"], e["startColor"], e["endColor"], e["ease"], + e["shadowType"], e["shadowStart"], e["shadowEnd"], + e["textureType"], e["autoColor"], e["startTexture"], e["endTexture"] + ); + // backwards compatibility + if (e["fxType"] != 3) KarateMan.instance.currentBgEffect = e["fxType"]; + }, + defaultLength = 0.5f, + resizable = true, + parameters = new List() // uncomment these collapses when overlapping collapses are implemented + { + new Param("presetBg", KarateMan.BackgroundType.Yellow, "Preset BG Color", "The preset background type (will by default fade from the existing background color)", new List() + { + new Param.CollapseParam(x => (int)x == (int)KarateMan.BackgroundType.Custom, new string[] { "startColor", "endColor" }) + }), + new Param("startColor", new Color(0.985f, 0.79f, 0.243f), "Start BG Color", "The background color to start with"), + new Param("endColor", new Color(0.985f, 0.79f, 0.243f), "End BG Color", "The background color to end with"), + new Param("ease", Util.EasingFunction.Ease.Instant, "BG Color Ease", "Ease to use when fading color", new List() + { + //new Param.CollapseParam(x => (int)x != (int)Util.EasingFunction.Ease.Instant, new string[] { "startColor" }) + }), + new Param("shadowType", KarateMan.ShadowType.Tinted, "Shadow Type", "The shadow type. If Tinted doesn't work with your background color try Custom", new List() + { + new Param.CollapseParam(x => (int)x == (int)KarateMan.ShadowType.Custom, new string[] { "shadowStart", "shadowEnd" }), + }), + new Param("shadowStart", new Color(), "Start Shadow Color", "The shadow color to start with"), + new Param("shadowEnd", new Color(), "End Shadow Color", "The shadow color to end with"), + + new Param("textureType", KarateMan.BackgroundTextureType.Plain, "Texture", "The type of background texture to use", new List() + { + new Param.CollapseParam(x => (int)x != (int)KarateMan.BackgroundTextureType.Plain, new string[] { "startTexture", "endTexture" }) + }), + new Param("autoColor", true, "Use BG Color For Texture", "Use a tint of the background color for the texture?", new List() + { + //new Param.CollapseParam(x => (int)x != (int)KarateMan.ShadowType.Tinted, new string[] { "startTexture", "endTexture" }) + }), + new Param("startTexture", new Color(), "Start Texture Color", "The texture color to start with"), + new Param("endTexture", new Color(), "End Texture Color", "The texture color to end with"), + new Param("fxType", new EntityTypes.Integer(0, 3, 3), "Check Tooltip", "Ping @AstrlJelly on discord if you see this; it should be hidden.", new List() + { + new Param.CollapseParam(x => false, new string[] { "fxType" }) + }), + }, + }, + // new GameAction("set background effects", "Background Appearance (OLD)") + // { + // 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.SetBgFx(e["type4"], e["type5"], e["colorC"], e["colorD"]); + // }, + // defaultLength = 0.5f, + // resizable = true, + // 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. When fading the background colour shadows fade to this color"), + // new Param("type3", KarateMan.BackgroundFXType.None, "FX Type", "The background effect to be displayed. Fade uses the entity length to determine colour fading speed"), + // new Param("type4", KarateMan.BackgroundTextureType.Plain, "Texture", "The type of background texture to use"), + // 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"), + // }, + // }, + new GameAction("set object colors", "Object Colors") + { + function = delegate { + var e = eventCaller.currentEntity; + KarateMan.instance.UpdateMaterialColour(e["colorA"], e["colorB"], e["colorC"]); + }, + defaultLength = 0.5f, + parameters = new List() + { + new Param("colorA", new Color(1,1,1,1), "Joe Body Color", "The color to use for Karate Joe's body"), + 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"), + }, + }, + new GameAction("particle effects", "Particle Effects") + { + function = delegate { + var e = eventCaller.currentEntity; + KarateMan.instance.SetParticleEffect(e.beat, e["type"], e["instant"], e["valA"], e["valB"]); + }, + defaultLength = 0.5f, + parameters = new List() + { + new Param("type", KarateMan.ParticleType.None, "Particle Type", "The type of particle effect to spawn. Using \"None\" will stop all effects"), + new Param("instant", false, "Instant", "Start/Stop particles instantly"), + new Param("valA", new EntityTypes.Float(0f, 64f, 1f), "Wind Strength", "The strength of the particle wind"), + new Param("valB", new EntityTypes.Float(1f, 16f, 1f), "Particle Intensity", "The intensity of the particle effect") + }, + }, + new GameAction("force facial expression", "Set Facial Expression") + { + function = delegate { KarateMan.instance.SetFaceExpression(eventCaller.currentEntity["type"]); }, + defaultLength = 0.5f, + resizable = true, + parameters = new List() + { + new Param("type", KarateMan.KarateManFaces.Normal, "Facial Expression", "The facial expression to force Joe to. Special moves may override this") } }, - new GameAction("set background effects", "Background Appearance") + + // blah blah blah compatibility + new GameAction("hitX", "Old Warning (you shouldn't see this.)") { - 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, + hidden = true, + parameters = new List(){ + new Param("type", KarateMan.HitThree.HitThree, "Which Warning", "The warning text to show and the sfx to play"), + }, + }, + new GameAction("set background effects", "Background Appearance (OLD)") + { + hidden = true, parameters = new List() { new Param("type", KarateMan.BackgroundType.Yellow, "Background Type", "The preset background type"), @@ -117,130 +400,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") - { - function = delegate { var e = eventCaller.currentEntity; KarateMan.UpdateMaterialColour(e["colorA"], e["colorB"], e["colorC"]); }, - defaultLength = 0.5f, - parameters = new List() - { - new Param("colorA", new Color(1,1,1,1), "Joe Body Color", "The color to use for Karate Joe's body"), - 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") - { - function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.SetParticleEffect(e.beat, e["type"], e["valA"], e["valB"]); }, - defaultLength = 0.5f, - parameters = new List() - { - new Param("type", KarateMan.ParticleType.None, "Particle Type", "The type of particle effect to spawn. Using \"None\" will stop all effects"), - new Param("valA", new EntityTypes.Float(0f, 64f, 1f), "Wind Strength", "The strength of the particle wind"), - new Param("valB", new EntityTypes.Float(1f, 16f, 1f), "Particle Intensity", "The intensity of the particle effect") - } - }, - new GameAction("force facial expression", "Set Facial Expression") - { - function = delegate { KarateMan.instance.SetFaceExpression(eventCaller.currentEntity["type"]); }, - defaultLength = 0.5f, - parameters = new List() - { - 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"}, @@ -256,8 +416,8 @@ namespace HeavenStudio.Games using Scripts_KarateMan; public class KarateMan : Minigame { - public static KarateMan instance; + #region Enums public enum HitType { Pot = 0, @@ -272,14 +432,14 @@ namespace HeavenStudio.Games public enum HitThree { - HitTwo, - HitThree, - HitThreeAlt, - HitFour, - Grr, - Warning, - Combo, - HitOne, + HitOne, // 0 + HitTwo, // 1 + HitThree, // 2 + HitThreeAlt, // 3 + HitFour, // 4 + Grr, // 5 + Warning, // 6 + Combo, // 7 } public enum LightBulbType @@ -287,7 +447,15 @@ namespace HeavenStudio.Games Normal, Blue, Yellow, - Custom + Custom + } + + public enum LightBulbSfx + { + Automatic, + Megamix, + DS, + Custom } public enum BackgroundType @@ -305,8 +473,7 @@ namespace HeavenStudio.Games { None, Sunburst, - Rings, - Fade + Rings } public enum BackgroundTextureType @@ -355,19 +522,23 @@ namespace HeavenStudio.Games None, Tengoku, Mania, + ManiaHorizontal, } - public static bool IsComboEnable = true; //only stops Out combo inputs, this basically makes combo contextual + #endregion + + static List queuedCues = new(); + 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; } } public Color[] LightBulbColors; public Color[] BackgroundColors; - public Color[] ShadowColors; //camera positions (normal, special) [Header("Camera Positions")] public Transform[] CameraPosition; Vector3 cameraPosition; + // for future astrl : maybe make these not static? (use a RiqEntity check on game switch) static double startCamSpecial = double.MinValue; static double wantsReturn = double.MinValue; static float cameraReturnLength = 0f; @@ -383,134 +554,168 @@ namespace HeavenStudio.Games [Header("Colour Map")] public Material MappingMaterial; - public static Color BodyColor = Color.white; - public static Color HighlightColor = new Color(0.81f,0.81f,0.81f,1); - public static Color ItemColor = Color.white; + public Color BodyColor = Color.white; + public Color HighlightColor = new Color(0.81f, 0.81f, 0.81f); + public Color ItemColor = Color.white; [Header("Word")] public Animator Word; + static double wordStartTime = double.MinValue; static double wordClearTime = double.MinValue; - const float hitVoiceOffset = 0.042f; [Header("Backgrounds")] - static int bgType = (int) BackgroundType.Yellow; - public static int currentBgEffect = (int) BackgroundFXType.None; - static double bgFadeTime = double.MinValue; - static float bgFadeDuration = 0f; - static Color bgColour = Color.white; + // 0 = bg color, 1 = shadow color, 2 = filter color + private double[] colorStartBeats = new double[3] { + -1, + -1, + -1 + }; + private float[] colorLengths = new float[3]; + private Color[] colorStarts, colorEnds = new Color[3]; + private Util.EasingFunction.Ease[] colorEases = new Util.EasingFunction.Ease[3]; + + public int currentBgEffect = (int)BackgroundFXType.None; + public SpriteRenderer BGPlane; public GameObject BGEffect; - Color bgColourLast; + + public SpriteRenderer[] BGTextures; Animator bgEffectAnimator; SpriteRenderer bgEffectSpriteRenderer; - static int textureType = (int) BackgroundTextureType.Plain; - static int textureFilterType = (int) ShadowType.Tinted; - static Color filterColour = Color.white; - static Color filterColourNext = Color.white; - public GameObject BGGradient; - SpriteRenderer bgGradientRenderer; - public GameObject BGBlood; - SpriteRenderer bgBloodRenderer; - public GameObject BGRadial; - SpriteRenderer bgRadialRenderer; - - [Header("Shadows")] - static int currentShadowType = (int) ShadowType.Tinted; - static Color customShadowColour = Color.white; - static Color oldShadowColour; - [Header("Particles")] - //wind + // wind public WindZone Wind; - //snow - public ParticleSystem SnowEffect; - public GameObject SnowEffectGO; - //fire - public ParticleSystem FireEffect; - public GameObject FireEffectGO; - //rain - public ParticleSystem RainEffect; - public GameObject RainEffectGO; + public ParticleSystem[] Effects; [Header("Unloaded Game Calls")] - //public static Queue ItemQueue = new Queue(); - 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 List voiceEntities, hitVoiceEntities = new(); + + public static KarateMan instance; private void Awake() { instance = this; - KarateManPot.ResetLastCombo(); - cameraPosition = CameraPosition[0].position; - } - - 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); - } - } - } - - private void Start() - { - var cond = Conductor.instance; - GameCamera.additionalPosition = cameraPosition - GameCamera.defaultPosition; + KarateManPot.ResetLastCombo(); + bgEffectAnimator = BGEffect.GetComponent(); bgEffectSpriteRenderer = BGEffect.GetComponent(); - bgGradientRenderer = BGGradient.GetComponent(); - bgBloodRenderer = BGBlood.GetComponent(); - bgRadialRenderer = BGRadial.GetComponent(); + colorEnds = + colorStarts = new Color[] { + BackgroundColors[0], + TintColor(BackgroundColors[0]), + new(), + }; - 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); + Update(); } + private void Start() + { + Update(); + } + + public override void OnGameSwitch(double beat) + { + // queued objects + if (queuedCues.Count > 0) { + foreach (var e in queuedCues) { + switch (e.datamodel) { + case "karateman/hit" : CreateItem(e.beat, e["type"], e["type2"]); break; + case "karateman/bulb" : CreateBulbSpecial(e.beat, e["type"], e["colorA"], e["type2"], e["sfx"], e["hitSfx"]); break; + case "karateman/kick" : Kick(e.beat, e["toggle"], e["shouldGlow"], e["type"], e["pitchVoice"], e["forcePitch"], e["cutOut"], e["disableVoice"], e["woodColor"], e["hoopColor"]); break; + case "karateman/combo": Combo(e.beat, e["type"], e["pitchVoice"], e["forcePitch"], e["cutOut"], e["disableVoice"]); break; + default : Debug.LogError($"Karate Man has failed to cue an object with datamodel {e.datamodel} at beat {e.beat}"); break; + } + } + queuedCues.Clear(); + } + + EntityPreCheck(beat); + } + + public override void OnPlay(double beat) + { + EntityPreCheck(beat); + } + + void EntityPreCheck(double beat) + { + List prevEntities = GameManager.instance.Beatmap.Entities.FindAll(c => c.datamodel.Split(0) == "karateman"); + + RiqEntity voice = prevEntities.FindLast(c => c.beat < beat && c.datamodel == "karateman/warnings"); + if (wordClearTime > beat && wordStartTime < beat && voice != null) { + DoWord(voice.beat, voice.length, voice["whichWarning"], false, 1, voice["customLength"], false); + } + + // init colors + RiqEntity bg = prevEntities.FindLast(c => c.beat <= beat && c.datamodel == "karateman/background appearance"); + RiqEntity obj = prevEntities.FindLast(c => c.beat <= beat && c.datamodel == "karateman/set object colors"); + + if (bg != null) { + BackgroundColor( + bg.beat, bg.length, + bg["presetBg"], bg["startColor"], bg["endColor"], bg["ease"], + bg["shadowType"], bg["shadowStart"], bg["shadowEnd"], + bg["textureType"], bg["autoColor"], bg["startTexture"], bg["endTexture"] + ); + if (bg["fxType"] != 3) currentBgEffect = bg["fxType"]; + } else { + var c = new Color(); + BackgroundColor(0, 0, 0, c, c, (int)Util.EasingFunction.Ease.Instant, 0, c, c, 0, true, c, c); + } + + if (obj != null) { + UpdateMaterialColour(obj["colorA"], obj["colorB"], obj["colorC"]); + } else { + UpdateMaterialColour(Color.white, new Color(0.81f, 0.81f, 0.81f), Color.white); + } + + // init modifier(s) + RiqEntity bop = prevEntities.FindLast(c => c.beat < beat && c.datamodel == "karateman/bop"); + ToggleBop(0, 0, false, bop?["toggle"] ?? true); + + // get all entities to later check against eachother to cut out voices + voiceEntities = prevEntities.FindAll(c => c.beat > beat && (c.datamodel is "karateman/kick" or "karateman/combo")); + hitVoiceEntities = prevEntities.FindAll(c => c.beat > beat && (c.datamodel is "karateman/warnings" && c["whichWarning"] <= (int)HitThree.HitFour)); + } + + private void Update() { var cond = Conductor.instance; - if (!cond.isPlaying) - SetBgEffectsToLast(cond.songPositionInBeatsAsDouble); + var songPos = cond.songPositionInBeatsAsDouble; + + if (!cond.isPlaying) { + EntityPreCheck(songPos); + } switch (currentBgEffect) { case (int) BackgroundFXType.Sunburst: - bgEffectAnimator.DoNormalizedAnimation("Sunburst", (cond.songPositionInBeats*0.5f) % 1f); + bgEffectAnimator.DoNormalizedAnimation("Sunburst", (float)(songPos * 0.5) % 1f); break; case (int) BackgroundFXType.Rings: - bgEffectAnimator.DoNormalizedAnimation("Rings", (cond.songPositionInBeats*0.5f) % 1f); + bgEffectAnimator.DoNormalizedAnimation("Rings", (float)(songPos * 0.5) % 1f); break; default: bgEffectAnimator.Play("NoPose", -1, 0); break; } - if (cond.songPositionInBeatsAsDouble >= wordClearTime) - { + + if (songPos >= wordClearTime && songPos < wordStartTime) { Word.Play("NoPose"); } - if (cond.songPositionInBeatsAsDouble >= startCamSpecial && cond.songPositionInBeatsAsDouble <= wantsReturn) + if (songPos >= startCamSpecial && songPos <= wantsReturn) { float camX = 0f; float camY = 0f; float camZ = 0f; - if (cond.songPositionInBeatsAsDouble <= startCamSpecial + cameraReturnLength) + if (songPos <= startCamSpecial + cameraReturnLength) { float prog = cond.GetPositionFromBeat(startCamSpecial, cameraReturnLength); camX = Util.EasingFunction.EaseOutCubic(CameraPosition[0].position.x, CameraPosition[1].position.x, prog); @@ -518,7 +723,7 @@ namespace HeavenStudio.Games camZ = Util.EasingFunction.EaseOutCubic(CameraPosition[0].position.z, CameraPosition[1].position.z, prog); cameraPosition = new Vector3(camX, camY, camZ); } - else if (cond.songPositionInBeatsAsDouble >= wantsReturn - cameraReturnLength) + else if (songPos >= wantsReturn - cameraReturnLength) { float prog = cond.GetPositionFromBeat(wantsReturn - cameraReturnLength, cameraReturnLength); camX = Util.EasingFunction.EaseOutQuad(CameraPosition[1].position.x, CameraPosition[0].position.x, prog); @@ -538,73 +743,30 @@ namespace HeavenStudio.Games cameraPosition = CameraPosition[0].position; } - float fadeProg = cond.GetPositionFromBeat(bgFadeTime, bgFadeDuration); - if (bgFadeTime != double.MinValue && fadeProg >= 0) - { - if (fadeProg >= 1f) - { - bgFadeTime = double.MinValue; - bgFadeDuration = 0f; - BGPlane.color = bgColour; - filterColour = filterColourNext; - UpdateFilterColour(bgColour, filterColour); - oldShadowColour = GetShadowColor(true); - } - else - { - Color col = Color.LerpUnclamped(bgColourLast, bgColour, fadeProg); - BGPlane.color = col; - UpdateFilterColour(col, Color.LerpUnclamped(filterColour, filterColourNext, fadeProg)); - } - } - + BackgroundColorUpdate(); GameCamera.additionalPosition = cameraPosition - GameCamera.defaultPosition; BGEffect.transform.position = new Vector3(GameCamera.instance.transform.position.x, GameCamera.instance.transform.position.y, 0); + + Debug.Log("GameCamera.additionalPosition : " + GameCamera.additionalPosition); + Debug.Log("cameraPosition : " + cameraPosition); } - static List allHits = new List(); - static List allEnds = new List(); - public static int CountHitsToEnd(double fromBeat) + private void OnDestroy() { - allHits = EventCaller.GetAllInGameManagerList("karateman", new string[] { "hit", "bulb", "kick", "combo" }); - allEnds = EventCaller.GetAllInGameManagerList("gameManager", new string[] { "switchGame", "end" }); - - allHits.Sort((x, y) => x.beat.CompareTo(y.beat)); - allEnds.Sort((x, y) => x.beat.CompareTo(y.beat)); - double endBeat = double.MaxValue; - - //get the beat of the closest end event - foreach (var end in allEnds) - { - if (end.beat > fromBeat) - { - endBeat = end.beat; - break; - } + foreach (var evt in scheduledInputs) { + evt.Disable(); } - - //count each hit event beginning from our current beat to the beat of the closest game switch or end - // this still counts hits even if they happen after a switch / end!!! - int count = 0; - string type; - for (int i = 0; i < allHits.Count; i++) - { - var h = allHits[i]; - if (h.beat >= fromBeat) - { - if (h.beat < endBeat) - { - //kicks and combos count for 2 hits - type = (h.datamodel.Split('/'))[1]; - count += (type == "kick" || type == "combo" ? 2 : 1); - } - else - break; - } + if (!Conductor.instance.NotStopped()) { + if (queuedCues.Count > 0) queuedCues.Clear(); + startCamSpecial = double.MinValue; + wantsReturn = double.MinValue; + cameraReturnLength = 0f; + cameraAngle = CameraAngle.Normal; } - return count; } + private Color TintColor(Color color) => Color.LerpUnclamped(color, new Color(195 / 255f, 48 / 255f, 2 / 255f), 0.45f); + public static void DoSpecialCamera(double beat, float length, bool returns) { if (cameraAngle == CameraAngle.Normal) @@ -613,111 +775,78 @@ namespace HeavenStudio.Games cameraAngle = CameraAngle.Special; } wantsReturn = returns ? beat + length - 0.001f : double.MaxValue; - cameraReturnLength = Mathf.Min(2f, length*0.5f); + cameraReturnLength = Mathf.Min(2f, length * 0.5f); } - public void DoWord(double beat, int type, bool doSound = true) + public void DoWord(double beat, double length, int type, bool pitchVoice, float forcePitch, bool customLength, bool doSound = true) { - Word.Play(DoWordSound(beat, type, doSound)); + Word.Play(DoWordSound(beat, length, type, customLength, pitchVoice, forcePitch, doSound)); } - public static string DoWordSound(double beat, int type, bool doSound = true) + public static string DoWordSound(double beat, double length, int type, bool customLength, bool pitchVoice = false, float forcePitch = 1, bool doSound = true) { - String word = "NoPose"; - double clear = 0f; - switch (type) + double clear = type switch { + <= (int)HitThree.HitFour => beat + 4f, + <= (int)HitThree.Warning => beat + 1f, + _ => beat + 3f, + }; + + if (type <= (int)HitThree.HitFour && doSound) { - case (int) HitThree.HitTwo: - word = "Word02"; - clear = beat + 4f; - if (doSound) - MultiSound.Play(new MultiSound.Sound[] - { - new MultiSound.Sound("karateman/hit", beat + 0.5f, offset: hitVoiceOffset), - new MultiSound.Sound("karateman/two", beat + 1f), - }, forcePlay: true); - break; - case (int) HitThree.HitThree: - word = "Word03"; - clear = beat + 4f; - if (doSound) - MultiSound.Play(new MultiSound.Sound[] - { - new MultiSound.Sound("karateman/hit", beat + 0.5f, offset: hitVoiceOffset), - new MultiSound.Sound("karateman/three", beat + 1f), - }, forcePlay: true); - break; - case (int) HitThree.HitThreeAlt: - word = "Word03"; - clear = beat + 4f; - if (doSound) - MultiSound.Play(new MultiSound.Sound[] - { - new MultiSound.Sound("karateman/hitAlt", beat + 0.5f, offset: hitVoiceOffset), - new MultiSound.Sound("karateman/threeAlt", beat + 1f), - }, forcePlay: true); - break; - case (int) HitThree.HitFour: - word = "Word04"; - clear = beat + 4f; - if (doSound) - MultiSound.Play(new MultiSound.Sound[] - { - new MultiSound.Sound("karateman/hit", beat + 0.5f, offset: hitVoiceOffset), - new MultiSound.Sound("karateman/four", beat + 1f), - }, forcePlay: true); - break; - case (int) HitThree.Grr: - word = "Word01"; - clear = beat + 1f; - break; - case (int) HitThree.Warning: - word = "Word05"; - clear = beat + 1f; - break; - case (int) HitThree.Combo: - word = "Word00"; - clear = beat + 3f; - break; - case (int) HitThree.HitOne: //really? - word = "Word06"; - clear = beat + 4f; - if (doSound) - MultiSound.Play(new MultiSound.Sound[] - { - new MultiSound.Sound("karateman/hit", beat + 0.5f, offset: hitVoiceOffset), - new MultiSound.Sound("karateman/one", beat + 1f), - }, forcePlay: true); - break; + string number = ((HitThree)type).ToString()[3..]; + number = char.ToLower(number[0]).ToString() + number[1..]; + var sounds = new MultiSound.Sound[] { + new MultiSound.Sound($"karateman/{(type == (int)HitThree.HitThreeAlt ? "hitAlt" : "hit")}", beat + 0.5f, offset: 0.042f), + new MultiSound.Sound($"karateman/{number}", beat + 1f), + }; + if (pitchVoice) { + Array.ForEach(sounds, x => x.pitch = (forcePitch == 1) ? Conductor.instance.GetBpmAtBeat(x.beat) / 125 : forcePitch); + } + MultiSound.Play(sounds, forcePlay: true); } - if (Conductor.instance.songPositionInBeatsAsDouble <= clear && Conductor.instance.songPositionInBeatsAsDouble >= beat) - { - wordClearTime = clear; + + var songPos = Conductor.instance.songPositionInBeatsAsDouble; + if (songPos <= clear && songPos >= beat) { + wordClearTime = customLength ? (beat + length) : clear; + wordStartTime = beat; } - return word; + return $"Word0{(type < (int)HitThree.HitThreeAlt ? type : type - 1)}"; } - public void CreateItem(double beat, int type, int expression, bool muteSound = false) + public static void QueueCue(RiqEntity entity) { + queuedCues.Add(entity); + } - string outSound; - if ((beat + 0.5f) % 1.0 == 0f) - outSound = "karateman/offbeatObjectOut"; - else - outSound = "karateman/objectOut"; + public static void CreateItemSFX(double beat, int type, bool muteSound = false) + { + if (!muteSound) SoundByte.PlayOneShotGame($"karateman/{(beat % 1.0 == 0.5 ? $"offbeatObject" : "object")}Out", forcePlay: true); + } + public static void CreateBulbSFX(double beat, int type, int sfx, string throwSfx) + { + string obj = sfx switch { + (int)LightBulbSfx.Automatic => type == (int)LightBulbType.Yellow ? "LightbulbNtr" : "Lightbulb", + (int)LightBulbSfx.DS => "LightbulbNtr", + (int)LightBulbSfx.Custom => throwSfx, + _ => "Lightbulb", + }; + if (sfx != (int)LightBulbSfx.Custom) { + obj = (beat % 1.0 == 0.5) ? $"offbeat{obj}Out" : obj.ToLower() + "Out"; + } + SoundByte.PlayOneShotGame($"karateman/{obj}", forcePlay: true); + } + + 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]); + mobj.SetBulbColor(LightBulbColors[0]); break; case (int) HitType.Rock: CreateItemInstance(beat, "Item02", expression, KarateManPot.ItemType.Rock); @@ -741,29 +870,32 @@ namespace HeavenStudio.Games CreateItemInstance(beat, "Item00", expression); break; } - if (!muteSound) SoundByte.PlayOneShotGame(outSound, forcePlay: true); } - public void CreateBulbSpecial(double beat, int type, Color c, int expression) + public void CreateBulbSpecial(double beat, int type, Color color, int expression, int sfx, string hitSfx = "") { - var mobj = CreateItemInstance(beat, "Item01", expression, KarateManPot.ItemType.Bulb); + string obj = sfx switch { + (int)LightBulbSfx.Automatic => type == (int)LightBulbType.Yellow ? "LightbulbNtr" : "Lightbulb", + (int)LightBulbSfx.DS => "LightbulbNtr", + (int)LightBulbSfx.Custom => hitSfx, + _ => "Lightbulb", + }; + if (sfx != (int)LightBulbSfx.Custom) obj += "Hit"; + var mobj = CreateItemInstance(beat, "Item01", expression, KarateManPot.ItemType.Bulb, hitSfxOverride: $"karateman/{obj}"); - if (type == (int) LightBulbType.Custom) - mobj.GetComponent().SetBulbColor(c); - else - mobj.GetComponent().SetBulbColor(LightBulbColors[type]); - - string outSound = "karateman/" + ((beat + 0.5) % 1 == 0 ? "offbeatLightbulbOut" : "lightbulbOut"); - SoundByte.PlayOneShotGame(outSound, forcePlay: true); + mobj.SetBulbColor((type == (int)LightBulbType.Custom) ? color : LightBulbColors[type]); } - public void Combo(double beat, int expression) + public static void ComboSFX() { SoundByte.PlayOneShotGame("karateman/barrelOutCombos", forcePlay: true); + } + public void Combo(double beat, int expression, bool pitchVoice, float forcePitch, bool cutOut, bool noVoice) + { int comboId = KarateManPot.GetNewCombo(); - BeatAction.New(this, new List() + BeatAction.New(this, new List() { new BeatAction.Action(beat, delegate { CreateItemInstance(beat, "Item00", 0, KarateManPot.ItemType.ComboPot1, comboId); }), new BeatAction.Action(beat + 0.25f, delegate { CreateItemInstance(beat + 0.25f, "Item00", 0, KarateManPot.ItemType.ComboPot2, comboId); }), @@ -773,35 +905,73 @@ 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[] + 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) + }; + + if (pitchVoice) { + sounds.ForEach(x => x.pitch = (forcePitch == 1) ? Conductor.instance.GetBpmAtBeat(x.beat) / 125 : forcePitch); + } + + if (voiceEntities.Count > 0 && cutOut) { - 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); + RiqEntity firstVoice = voiceEntities.Find(x => x.beat >= beat + 1); + RiqEntity firstHitVoice = hitVoiceEntities.Find(x => x.beat >= beat + 1); + if (firstVoice != null) sounds.RemoveAll(x => x.beat > firstVoice.beat); + if (firstHitVoice != null) sounds.RemoveAll(x => x.beat > firstHitVoice.beat - 0.5); + } + + 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); - - 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); } - public GameObject CreateItemInstance(double beat, string awakeAnim, int successExpression, KarateManPot.ItemType type = KarateManPot.ItemType.Pot, int comboId = -1, bool content = false) + public void Kick(double beat, bool ball, bool glow, int expression, bool pitchVoice, float forcePitch, bool cutOut, bool noVoice, Color woodColor, Color hoopColor) { - GameObject mobj = GameObject.Instantiate(Item, ItemHolder); + var barrel = CreateItemInstance(beat, "Item05", expression, KarateManPot.ItemType.KickBarrel, content: ball, shouldGlow: glow); + // red : new Color(0.451f, 0.302f, 0.271f) + // green : new Color(0.302f, 0.169f, 0.035f) - unused? + // blue : new Color(0.714f, 0.31f, 0.424f) + barrel.ItemBarrelMap[0] = woodColor; + barrel.ItemBarrelMap[2] = hoopColor; + + if (noVoice) return; + + List sounds = new() { + 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), + }; + + if (pitchVoice) { + sounds.ForEach(x => x.pitch = (forcePitch == 1) ? Conductor.instance.GetBpmAtBeat(x.beat) / 125 : forcePitch); + } + + if (voiceEntities.Count > 0 && cutOut) + { + RiqEntity firstVoice = voiceEntities.Find(x => x.beat >= beat + 1); + RiqEntity firstHitVoice = hitVoiceEntities.Find(x => x.beat >= beat + 1); + if (firstVoice != null) sounds.RemoveAll(x => x.beat > firstVoice.beat); + if (firstHitVoice != null) sounds.RemoveAll(x => x.beat > firstHitVoice.beat); + } + + MultiSound.Play(sounds.ToArray(), forcePlay: true); + } + + public KarateManPot CreateItemInstance(double beat, string awakeAnim, int successExpression, KarateManPot.ItemType type = KarateManPot.ItemType.Pot, int comboId = -1, bool content = false, bool shouldGlow = false, string hitSfxOverride = null) + { + GameObject mobj = Instantiate(Item, ItemHolder); KarateManPot mobjDat = mobj.GetComponent(); mobjDat.type = type; mobjDat.startBeat = beat; @@ -809,256 +979,118 @@ namespace HeavenStudio.Games mobjDat.comboId = comboId; mobjDat.OnHitExpression = successExpression; mobjDat.KickBarrelContent = content; + mobjDat.ShouldGlow = shouldGlow; + mobjDat.hitSfxOverride = hitSfxOverride; mobj.SetActive(true); - return mobj; + return mobjDat; } - void SetBgEffectsToLast(double beat) + public void BackgroundColor(double beat, float length, int presetBG, Color colorStart, Color colorEnd, int colorEaseSet, int shadowType, Color shadowStart, Color shadowEnd, int textureType, bool autoColor, Color filterStart, Color filterEnd) { - 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"]); + for (int i = 0; i < colorStarts.Length; i++) { + colorStartBeats[i] = beat; + colorLengths[i] = length; + colorEases[i] = (Util.EasingFunction.Ease)colorEaseSet; } - 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"]); + + bool preset = presetBG != (int)BackgroundType.Custom; + bool tinted = shadowType == (int)ShadowType.Tinted; + Color bgColorStart = preset ? BGPlane.color : colorStart; + colorStarts = new Color[] { + bgColorStart, + tinted ? TintColor(bgColorStart) : shadowStart, + autoColor ? TintColor(bgColorStart): filterStart, + }; + + Color bgColorEnd = preset ? BackgroundColors[presetBG] : colorEnd; + colorEnds = new Color[] { + bgColorEnd, + tinted ? TintColor(bgColorEnd) : shadowEnd, + autoColor ? TintColor(bgColorEnd) : filterEnd, + }; + + for (int i = 0; i < BGTextures.Length; i++) { + BGTextures[i].gameObject.SetActive(textureType == (i + 1)); } - 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); + + BackgroundColorUpdate(); } - 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) + private void BackgroundColorUpdate() { - WantBgChangeStart = beat; - WantBgChangeLength = length; - bgType = newBgType; - currentShadowType = newShadowType; - bgColour = bgCol; - customShadowColour = shadowCol; - currentBgEffect = bgFx; - textureType = texture; - textureFilterType = textureFilter; - filterColour = filterCol; - filterColourNext = filterColNext; - } + SpriteRenderer[][] spriteRenderers = new[] { + new[] { BGPlane }, + Joe.Shadows, + BGTextures, + }; - public void SetBgAndShadowCol(double beat, float length, int newBgType, int shadowType, Color a, Color b, int fx) - { - SetBgFx(fx, beat, length); - UpdateShadowColour(shadowType, b); - - bgType = newBgType; - if (bgType == (int) BackgroundType.Custom) - bgColour = a; - else - bgColour = BackgroundColors[newBgType]; - BGPlane.color = bgColour; - - //😢 - if (fx != (int) BackgroundFXType.Fade) + for (int i = 0; i < spriteRenderers.Length; i++) { - bgColourLast = bgColour; - oldShadowColour = GetShadowColor(true); - } + float normalizedBeat = Mathf.Clamp01(Conductor.instance.GetPositionFromBeat(colorStartBeats[i], colorLengths[i])); + if (double.IsNaN(normalizedBeat)) normalizedBeat = 0; // happens if the game is stopped onto the first beat + var func = Util.EasingFunction.GetEasingFunction(colorEases[i]); + float[] color = new float[3] { + func(colorStarts[i].r, colorEnds[i].r, normalizedBeat), + func(colorStarts[i].g, colorEnds[i].g, normalizedBeat), + func(colorStarts[i].b, colorEnds[i].b, normalizedBeat), + }; - if (textureFilterType == (int) ShadowType.Tinted) - filterColour = Color.LerpUnclamped(bgColour, ShadowBlendColor, 0.45f); - } - - public void SetBgFx(int fx, double beat, float length) - { - switch (fx) - { - case (int) BackgroundFXType.Fade: - bgColourLast = bgColour; - bgFadeTime = beat; - bgFadeDuration = length; - break; - default: - currentBgEffect = fx; - break; + foreach (var renderer in spriteRenderers[i]) { + renderer.color = new Color(color[0], color[1], color[2]); + } } } - public void SetBgTexture(int type, int filterType, Color filterColor, Color nextColor) - { - textureType = type; - textureFilterType = filterType; - if (textureFilterType == (int) ShadowType.Tinted) - filterColour = Color.LerpUnclamped(bgColour, filterColor, 0.45f); - else - { - filterColour = filterColor; - filterColourNext = nextColor; - } - switch (textureType) - { - case (int) BackgroundTextureType.Blood: - BGBlood.SetActive(true); - BGGradient.SetActive(false); - BGRadial.SetActive(false); - break; - case (int) BackgroundTextureType.Gradient: - BGGradient.SetActive(true); - BGBlood.SetActive(false); - BGRadial.SetActive(false); - break; - case (int) BackgroundTextureType.Radial: - BGRadial.SetActive(true); - BGBlood.SetActive(false); - BGGradient.SetActive(false); - break; - default: - BGGradient.SetActive(false); - BGBlood.SetActive(false); - BGRadial.SetActive(false); - break; - } - UpdateFilterColour(bgColour, filterColour); - } - - public void SetGameplayMods(double beat, int mode, bool combo) + public void SetGameplayMods(double beat, int fxType, int mode, bool combo) { NoriGO.SetActive(true); Nori.SetNoriMode(beat, mode); + currentBgEffect = fxType; IsComboEnable = combo; } - void UpdateFilterColour(Color bgColor, Color filterColor) - { - bgGradientRenderer = BGGradient.GetComponent(); - bgBloodRenderer = BGBlood.GetComponent(); - bgRadialRenderer = BGRadial.GetComponent(); - Color col; - if (textureFilterType == (int) ShadowType.Tinted) - col = Color.LerpUnclamped(bgColor, ShadowBlendColor, 0.45f); - else - col = filterColor; - - bgGradientRenderer.color = col; - bgBloodRenderer.color = col; - bgRadialRenderer.color = col; - } - - public static Color ShadowBlendColor = new Color(195 / 255f, 48 / 255f, 2 / 255f); - public Color GetShadowColor(bool next = false) - { - Color lastCol, nextCol; - lastCol = oldShadowColour; - - if(currentShadowType == (int) ShadowType.Custom) - nextCol = customShadowColour; - else if(bgType < (int) BackgroundType.Custom) - nextCol = ShadowColors[bgType]; - else - nextCol = Color.LerpUnclamped(bgColour, ShadowBlendColor, 0.45f); - - float fadeProg = Conductor.instance.GetPositionFromBeat(bgFadeTime, bgFadeDuration); - if (fadeProg <= 1f && fadeProg >= 0) - { - return Color.LerpUnclamped(lastCol, nextCol, fadeProg); - } - return next ? nextCol : lastCol; - } - - public void UpdateShadowColour(int type, Color colour) - { - - if(currentShadowType == (int) ShadowType.Custom) - oldShadowColour = customShadowColour; - else if(bgType < (int) BackgroundType.Custom) - oldShadowColour = ShadowColors[bgType]; - else - oldShadowColour = Color.LerpUnclamped(bgColour, ShadowBlendColor, 0.45f); - - currentShadowType = type; - customShadowColour = colour; - } - - public static void UpdateMaterialColour(Color mainCol, Color highlightCol, Color objectCol) + public void UpdateMaterialColour(Color mainCol, Color highlightCol, Color objectCol) { BodyColor = mainCol; HighlightColor = highlightCol; ItemColor = objectCol; } - public void SetParticleEffect(double beat, int type, float windStrength, float particleStrength) + public void SetParticleEffect(double beat, int type, bool instant, float windStrength, float particleStrength) { - ParticleSystem.EmissionModule emm; - switch (type) - { - case (int) ParticleType.Snow: - SnowEffectGO.SetActive(true); - SnowEffect.Play(); - emm = SnowEffect.emission; - emm.rateOverTime = particleStrength * 6f; - break; - case (int) ParticleType.Fire: - FireEffectGO.SetActive(true); - FireEffect.Play(); - emm = FireEffect.emission; - emm.rateOverTime = particleStrength * 6f; - break; - case (int) ParticleType.Rain: - RainEffectGO.SetActive(true); - RainEffect.Play(); - emm = RainEffect.emission; - emm.rateOverTime = particleStrength * 32f; - break; - default: - SnowEffect.Stop(); - FireEffect.Stop(); - RainEffect.Stop(); - break; + if (type == (int) ParticleType.None) { + foreach (var eff in Effects) eff.Stop(); + return; } + + ParticleSystem particleSystem = Effects[type - 1]; + + particleSystem.gameObject.SetActive(true); + particleSystem.Play(); + + var emm = particleSystem.emission; + var main = particleSystem.main; + + emm.rateOverTime = particleStrength * (type == (int)ParticleType.Rain ? 32f : 6f); + main.prewarm = instant; + Wind.windMain = windStrength; } public void ToggleBop(double beat, float length, bool toggle, bool autoBop) { - if (autoBop) - Joe.bop.length = float.MaxValue; - else - Joe.bop.length = 0; + Joe.bop.length = autoBop ? float.MaxValue : 0; + if (toggle) { - for (int i = 0; i < length; i++) - { - BeatAction.New(instance, new List() - { - new BeatAction.Action(beat + i, delegate - { - Joe.Bop(); - }) - }); - } + var actions = new List(); + for (int i = 0; i < length; i++) actions.Add(new(beat + i, delegate { Joe.Bop(); })); + BeatAction.New(instance, actions); } } - public static void ToggleBopUnloaded(bool toggle) - { - WantBop = toggle; - } - public void Prepare(double beat, float length) { Joe.Prepare(beat, length); @@ -1069,4 +1101,4 @@ namespace HeavenStudio.Games Joe.SetFaceExpression(face); } } -} +} \ No newline at end of file diff --git a/Assets/Scripts/Games/KarateMan/KarateManJoe.cs b/Assets/Scripts/Games/KarateMan/KarateManJoe.cs index e4df90d1..69a8e0fa 100644 --- a/Assets/Scripts/Games/KarateMan/KarateManJoe.cs +++ b/Assets/Scripts/Games/KarateMan/KarateManJoe.cs @@ -18,7 +18,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan public Color BombGlowTint; double bombGlowStart = double.MinValue; float bombGlowLength = 0f; - float bombGlowIntensity; + float bombGlowIntensity = 0f; const float bombGlowRatio = 1f; double lastPunchTime = double.MinValue; @@ -46,10 +46,6 @@ namespace HeavenStudio.Games.Scripts_KarateMan Conductor.instance.GetPositionFromBeat(lastChargeTime, 2.75f) <= 0.25f || inNuriLock; } } public bool inNuriLock { get { return (Conductor.instance.songPositionInBeatsAsDouble >= noNuriJabTime && Conductor.instance.songPositionInBeatsAsDouble < noNuriJabTime + 1f); } } - private void Awake() - { - } - private void Update() { var cond = Conductor.instance; @@ -68,7 +64,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan bombGlowLength = 0f; } } - UpdateShadowColour(); + UpdateJoeColour(); if (canEmote && wantFace >= 0) { @@ -334,15 +330,10 @@ namespace HeavenStudio.Games.Scripts_KarateMan canEmote = false; } - public void UpdateShadowColour() + public void UpdateJoeColour() { - foreach (var shadow in Shadows) - { - shadow.color = KarateMan.instance.GetShadowColor(); - } - - Color mainCol = KarateMan.BodyColor; - Color highlightCol = KarateMan.HighlightColor; + Color mainCol = KarateMan.instance.BodyColor; + Color highlightCol = KarateMan.instance.HighlightColor; if (bombGlowIntensity > 0) { @@ -383,6 +374,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan public void RemoveBombGlow(double beat, float length = 0.5f) { + if (double.IsNaN(bombGlowIntensity)) return; bombGlowStart = beat; bombGlowLength = length; bombGlowIntensity = 0f; diff --git a/Assets/Scripts/Games/KarateMan/KarateManNoriController.cs b/Assets/Scripts/Games/KarateMan/KarateManNoriController.cs index 5c9633d6..08cf12db 100644 --- a/Assets/Scripts/Games/KarateMan/KarateManNoriController.cs +++ b/Assets/Scripts/Games/KarateMan/KarateManNoriController.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; +using Jukebox; using HeavenStudio.Util; @@ -53,10 +54,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan { float scaleFactor = 0f; //clear all children of the holder - if (NoriHolder != null) - { - foreach (Transform child in NoriHolder) - { + if (NoriHolder != null) { + foreach (Transform child in NoriHolder) { Destroy(child.gameObject); } } @@ -81,9 +80,20 @@ namespace HeavenStudio.Games.Scripts_KarateMan NoriManiaInk01.SetActive(false); playedJust = false; - inputsToSwitch = KarateMan.CountHitsToEnd(fromBeat); + inputsToSwitch = CountHitsToEnd(fromBeat); break; - default: + case (int) KarateMan.NoriMode.ManiaHorizontal: + MaxNori = 10; + Nori = Mathf.Clamp(startingNori, 0, MaxNori); + scaleFactor = ScaleFactorMania; + NoriHolder = NoriHolderMania01; + NoriManiaInk00.SetActive(true); + NoriManiaInk01.SetActive(true); + playedJust = false; + + inputsToSwitch = CountHitsToEnd(fromBeat); + break; + default: //KarateMan.NoriMode.None MaxNori = 0; Nori = 0; NoriManiaInk00.SetActive(false); @@ -238,21 +248,14 @@ namespace HeavenStudio.Games.Scripts_KarateMan Material mat = NoriHeartMaterials[i]; if (noriMode == (int) KarateMan.NoriMode.Tengoku) { - if (Nori == MaxNori) - { + if (Nori == MaxNori) { mat.SetColor("_ColorAlpha", NoriColorsTengoku[3]); - } - else - { - if (KarateMan.instance.NoriPerformance < 0.6) - mat.SetColor("_ColorAlpha", NoriColorsTengoku[0]); - else - { - if (i < 2) - mat.SetColor("_ColorAlpha", NoriColorsTengoku[1]); - else - mat.SetColor("_ColorAlpha", NoriColorsTengoku[2]); - } + } else if (KarateMan.instance.NoriPerformance < 0.6) { + mat.SetColor("_ColorAlpha", NoriColorsTengoku[0]); + } else if (i < 2) { + mat.SetColor("_ColorAlpha", NoriColorsTengoku[1]); + } else { + mat.SetColor("_ColorAlpha", NoriColorsTengoku[2]); } } else @@ -270,12 +273,10 @@ namespace HeavenStudio.Games.Scripts_KarateMan flashPeriod = Mathf.Sin(cond.songPositionInBeats * Mathf.PI); if (KarateMan.instance.NoriPerformance < 0.6) c = NoriColorsMania[0]; - else - { - if (i < MaxNori - 2) - c = NoriColorsMania[1]; - else - c = NoriColorsMania[2]; + else if (i < MaxNori - 2) { + c = NoriColorsMania[1]; + } else { + c = NoriColorsMania[2]; } c *= (flashPeriod * 0.5f) + 1f; } @@ -289,15 +290,51 @@ namespace HeavenStudio.Games.Scripts_KarateMan { Transform target = GameCamera.instance.transform; - Vector3 displacement = target.forward * CameraOffset; + Vector3 displacement = target.forward * CameraOffset; transform.position = target.position + displacement; transform.rotation = target.rotation; UpdateHeartColours(); - float inkRot = (Conductor.instance.songPositionInBeats/ 8f) % 1f; + float inkRot = (Conductor.instance.songPositionInBeats / 8f) % 1f; NoriManiaInk00.transform.localRotation = Quaternion.Euler(0, 0, inkRot * 360); NoriManiaInk01.transform.localRotation = Quaternion.Euler(0, 0, inkRot * 360); } + public int CountHitsToEnd(double fromBeat) + { + List allHits = EventCaller.GetAllInGameManagerList("karateman", new string[] { "hit", "bulb", "kick", "combo" }); + List allEnds = EventCaller.GetAllInGameManagerList("gameManager", new string[] { "switchGame", "end" }); + + allHits.Sort((x, y) => x.beat.CompareTo(y.beat)); + allEnds.Sort((x, y) => x.beat.CompareTo(y.beat)); + double endBeat = double.MaxValue; + + //get the beat of the closest end event + foreach (var end in allEnds) { + if (end.beat > fromBeat) { + endBeat = end.beat; + break; + } + } + + //count each hit event beginning from our current beat to the beat of the closest game switch or end + int count = 0; + string type; + for (int i = 0; i < allHits.Count; i++) + { + RiqEntity h = allHits[i]; + if (h.beat >= fromBeat) + { + if (h.beat < endBeat) { + //kicks and combos count for 2 hits + type = h.datamodel.Split('/')[1]; + count += (type is "kick" or "combo") ? 2 : 1; + } else { + break; + } + } + } + return count; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Games/KarateMan/KarateManPot.cs b/Assets/Scripts/Games/KarateMan/KarateManPot.cs index 9f8726a1..90828bba 100644 --- a/Assets/Scripts/Games/KarateMan/KarateManPot.cs +++ b/Assets/Scripts/Games/KarateMan/KarateManPot.cs @@ -13,10 +13,12 @@ namespace HeavenStudio.Games.Scripts_KarateMan public double startBeat; public ItemType type; public int path = 1; + public string hitSfxOverride; public GameObject Shadow; - public GameObject ShadowInstance; - SpriteRenderer shadowRenderer; + private GameObject ShadowInstance; + private SpriteRenderer shadowRenderer; + //hit effects public GameObject HitMark; @@ -28,12 +30,13 @@ namespace HeavenStudio.Games.Scripts_KarateMan [SerializeField] SpriteRenderer[] cellRenderers; Material[] cellMaterials; + public Color[] ItemBarrelMap; [SerializeField] Color[] ItemAlienMap; [SerializeField] Color[] ItemBombMap; - [SerializeField] Color[] ItemBarrelMap; [SerializeField] Color[] ItemCookingLidMap; public bool KickBarrelContent = false; + public bool ShouldGlow = false; public int OnHitExpression = (int) KarateMan.KarateManFaces.Normal; public int comboId = -1; @@ -128,13 +131,13 @@ namespace HeavenStudio.Games.Scripts_KarateMan case ItemType.Alien: alpha = ItemAlienMap[0]; bravo = ItemAlienMap[1]; - delta = KarateMan.ItemColor; + delta = KarateMan.instance.ItemColor; break; case ItemType.Bomb: case ItemType.KickBomb: alpha = ItemBombMap[0]; bravo = ItemBombMap[1]; - delta = KarateMan.ItemColor; + delta = KarateMan.instance.ItemColor; break; case ItemType.KickBarrel: case ItemType.ComboBarrel: @@ -146,12 +149,10 @@ namespace HeavenStudio.Games.Scripts_KarateMan case ItemType.CookingLid: alpha = ItemCookingLidMap[0]; bravo = ItemCookingLidMap[1]; - delta = KarateMan.ItemColor; + delta = KarateMan.instance.ItemColor; break; default: - alpha = KarateMan.ItemColor; - bravo = KarateMan.ItemColor; - delta = KarateMan.ItemColor; + alpha = bravo = delta = KarateMan.instance.ItemColor; break; } for (int i = 0; i < cellRenderers.Length; i++) { @@ -254,9 +255,11 @@ namespace HeavenStudio.Games.Scripts_KarateMan transform.rotation = Quaternion.Euler(0, 0, transform.rotation.eulerAngles.z + (-360f * Time.deltaTime) + UnityEngine.Random.Range(0f, 360f)); - ShadowInstance = GameObject.Instantiate(Shadow, KarateMan.instance.ItemHolder); + + + ShadowInstance = Instantiate(Shadow, KarateMan.instance.ItemHolder); shadowRenderer = ShadowInstance.GetComponent(); - shadowRenderer.color = KarateMan.instance.GetShadowColor(); + shadowRenderer.color = KarateMan.instance.Joe.Shadows[0].color; ShadowInstance.SetActive(true); ShadowInstance.transform.position = new Vector3(transform.position.x, floorHeight - 0.5f, transform.position.z); } @@ -289,8 +292,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan ParticleSystem p = Instantiate(HitParticles[7], transform.position, Quaternion.identity, KarateMan.instance.ItemHolder); p.Play(); - GameObject.Destroy(ShadowInstance.gameObject); - GameObject.Destroy(gameObject); + Destroy(ShadowInstance.gameObject); + Destroy(gameObject); return; } else if (prog >= 2f || (ItemKickable() && prog >= 1f)) { @@ -299,8 +302,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan ParticleSystem p = Instantiate(HitParticles[7], ItemCurves[6].GetPoint(1f), Quaternion.identity, KarateMan.instance.ItemHolder); p.Play(); } - GameObject.Destroy(ShadowInstance.gameObject); - GameObject.Destroy(gameObject); + Destroy(ShadowInstance.gameObject); + Destroy(gameObject); return; } else if (CurrentCurve == null && prog < 1f - ItemSlipRt[path]) { @@ -318,8 +321,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan ParticleSystem p = Instantiate(HitParticles[7], CurrentCurve.GetPoint(1f), Quaternion.identity, KarateMan.instance.ItemHolder); p.Play(); - GameObject.Destroy(ShadowInstance.gameObject); - GameObject.Destroy(gameObject); + Destroy(ShadowInstance.gameObject); + Destroy(gameObject); SoundByte.PlayOneShotGame("karateman/bombBreak", volume: 0.25f); return; @@ -334,8 +337,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan else if (type == ItemType.KickBall && cond.songPositionInBeatsAsDouble < startBeat + curveTargetBeat + 1f) return; - GameObject.Destroy(ShadowInstance.gameObject); - GameObject.Destroy(gameObject); + Destroy(ShadowInstance.gameObject); + Destroy(gameObject); return; } else { @@ -359,8 +362,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan ParticleSystem p = Instantiate(HitParticles[7], CurrentCurve.GetPoint(1f), Quaternion.identity, KarateMan.instance.ItemHolder); p.Play(); - GameObject.Destroy(ShadowInstance.gameObject); - GameObject.Destroy(gameObject); + Destroy(ShadowInstance.gameObject); + Destroy(gameObject); return; } else if (cond.songPositionInBeatsAsDouble >= startBeat + Mathf.Max(2f, curveTargetBeat) || (ItemKickable() && prog >= 1f) || CurrentCurve == null) { @@ -369,8 +372,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan ParticleSystem p = Instantiate(HitParticles[7], ItemCurves[8].GetPoint(1f), Quaternion.identity, KarateMan.instance.ItemHolder); p.Play(); } - GameObject.Destroy(ShadowInstance.gameObject); - GameObject.Destroy(gameObject); + Destroy(ShadowInstance.gameObject); + Destroy(gameObject); return; } else { @@ -396,14 +399,14 @@ namespace HeavenStudio.Games.Scripts_KarateMan ParticleSystem p = Instantiate(HitParticles[7], pos, Quaternion.identity, KarateMan.instance.ItemHolder); p.Play(); - GameObject.Destroy(ShadowInstance.gameObject); - GameObject.Destroy(gameObject); + Destroy(ShadowInstance.gameObject); + Destroy(gameObject); return; } else if (cond.songPositionInBeatsAsDouble >= startBeat + 3f) { - GameObject.Destroy(ShadowInstance.gameObject); - GameObject.Destroy(gameObject); + Destroy(ShadowInstance.gameObject); + Destroy(gameObject); return; } if (prog <= 1f) @@ -414,13 +417,13 @@ namespace HeavenStudio.Games.Scripts_KarateMan break; } ShadowInstance.transform.position = new Vector3(transform.position.x, floorHeight - 0.5f, transform.position.z); - shadowRenderer.color = KarateMan.instance.GetShadowColor(); + shadowRenderer.color = KarateMan.instance.Joe.Shadows[0].color; SetColourMapping(); } void CreateHitMark(bool useLocalPos = false) { - GameObject hitMark = GameObject.Instantiate(HitMark, KarateMan.instance.ItemHolder); + GameObject hitMark = Instantiate(HitMark, KarateMan.instance.ItemHolder); if (useLocalPos) hitMark.transform.localPosition = transform.position; else @@ -439,8 +442,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan { case ItemType.Bulb: CurrentCurve = ItemCurves[straight ? 1 : 0]; - curveTargetBeat = straight ? 1f : 1.5f;; - SoundByte.PlayOneShotGame("karateman/lightbulbHit", forcePlay: true); + curveTargetBeat = straight ? 1f : 1.5f; + SoundByte.PlayOneShotGame(hitSfxOverride ?? "karateman/lightbulbHit", forcePlay: true); p = Instantiate(HitParticles[5], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); if (effectTint.a == 0) @@ -565,11 +568,10 @@ namespace HeavenStudio.Games.Scripts_KarateMan p.Play(); break; case ItemType.KickBarrel: - if (KickBarrelContent) + if (KickBarrelContent) { game.CreateItemInstance(startBeat + 1f, "Item03", OnHitExpression, ItemType.KickBall); - else - { - game.Joe.ApplyBombGlow(); + } else { + if (ShouldGlow) game.Joe.ApplyBombGlow(); game.CreateItemInstance(startBeat + 1f, "Item04", OnHitExpression, ItemType.KickBomb); } SoundByte.PlayOneShotGame("karateman/barrelBreak", forcePlay: true);