From d5b76084386048b30a5ac3c83d13330f9a990361 Mon Sep 17 00:00:00 2001 From: fu-majime Date: Fri, 15 Mar 2024 22:17:48 +0900 Subject: [PATCH] trajectory --- Assets/Resources/Games/shootEmUp.prefab | 395 +++++--- Assets/Resources/Sfx/games/shootEmUp/15.wav | Bin 0 -> 16442 bytes .../Resources/Sfx/games/shootEmUp/15.wav.meta | 22 + Assets/Resources/Sfx/games/shootEmUp/16.wav | Bin 0 -> 18808 bytes .../Resources/Sfx/games/shootEmUp/16.wav.meta | 22 + .../ShootEmUp/Animations/Effect/hit.anim | 60 -- .../ShootEmUp/Animations/Effect/impact.anim | 920 ++++++++++++++++++ .../{hit.anim.meta => impact.anim.meta} | 0 .../{hit.controller => impact.controller} | 6 +- ...controller.meta => impact.controller.meta} | 0 .../Animations/Effect/trajectory.anim | 12 +- .../Animations/Effect/trajectory.anim.meta | 2 +- .../Animations/Effect/trajectory.controller | 6 +- .../Animations/Effect/trajectory_damage.anim | 25 +- .../Effect/trajectory_damage.anim.meta | 2 +- .../Animations/MonitorHolder.controller | 2 +- .../Games/ShootEmUp/Animations/damage.anim | 104 +- .../ShootEmUp/Animations/enemy.controller | 4 +- .../ShootEmUp/Animations/enemyAttack.anim | 20 +- .../Games/ShootEmUp/Animations/enemyMiss.anim | 74 +- .../ShootEmUp/Animations/enemySpawn.anim | 122 ++- .../Games/ShootEmUp/Animations/laser.anim | 46 +- ...aserholder.controller => laser.controller} | 60 +- ....controller.meta => laser.controller.meta} | 0 .../ShootEmUp/Animations/shipDamage.anim | 9 +- Assets/Scripts/Games/ShootEmUp/Enemy.cs | 100 +- Assets/Scripts/Games/ShootEmUp/Ship.cs | 35 + Assets/Scripts/Games/ShootEmUp/Ship.cs.meta | 11 + Assets/Scripts/Games/ShootEmUp/ShootEmUp.cs | 21 +- 29 files changed, 1622 insertions(+), 458 deletions(-) create mode 100644 Assets/Resources/Sfx/games/shootEmUp/15.wav create mode 100644 Assets/Resources/Sfx/games/shootEmUp/15.wav.meta create mode 100644 Assets/Resources/Sfx/games/shootEmUp/16.wav create mode 100644 Assets/Resources/Sfx/games/shootEmUp/16.wav.meta delete mode 100644 Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/hit.anim create mode 100644 Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/impact.anim rename Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/{hit.anim.meta => impact.anim.meta} (100%) rename Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/{hit.controller => impact.controller} (96%) rename Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/{hit.controller.meta => impact.controller.meta} (100%) rename Assets/Resources/Sprites/Games/ShootEmUp/Animations/{laserholder.controller => laser.controller} (57%) rename Assets/Resources/Sprites/Games/ShootEmUp/Animations/{laserholder.controller.meta => laser.controller.meta} (100%) create mode 100644 Assets/Scripts/Games/ShootEmUp/Ship.cs create mode 100644 Assets/Scripts/Games/ShootEmUp/Ship.cs.meta diff --git a/Assets/Resources/Games/shootEmUp.prefab b/Assets/Resources/Games/shootEmUp.prefab index aab2cdb88..005c6c3c7 100644 --- a/Assets/Resources/Games/shootEmUp.prefab +++ b/Assets/Resources/Games/shootEmUp.prefab @@ -110,7 +110,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 235219454747548232} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -5.05, y: 3.7, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} m_ConstrainProportionsScale: 1 m_Children: @@ -228,7 +228,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 1 m_Sprite: {fileID: 81652156, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_FlipX: 1 m_FlipY: 1 m_DrawMode: 0 @@ -348,12 +348,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 571687235652840287} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.34, z: 0} + m_LocalPosition: {x: 0, y: 0.34000003, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5813499711186931250} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!198 &710340991194746281 ParticleSystem: @@ -5250,12 +5250,12 @@ GameObject: - component: {fileID: 6137118448434182433} - component: {fileID: 4632575707632497822} m_Layer: 0 - m_Name: MonitorHolder + m_Name: Monitor m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &6137118448434182433 Transform: m_ObjectHideFlags: 0 @@ -5323,14 +5323,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 862899565980310928} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1949994609555536563} - {fileID: 119918007499355646} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 7 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &2111292267210865605 Animator: @@ -5534,6 +5534,7 @@ GameObject: - component: {fileID: 2952379210448327737} - component: {fileID: 9175901542127733709} - component: {fileID: 4274233878513507453} + - component: {fileID: 7425109218906405028} m_Layer: 0 m_Name: ship m_TagString: Untagged @@ -5642,6 +5643,22 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &7425109218906405028 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 956406389716080777} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 87bd9c513ec32b94bb62186246367f8a, type: 3} + m_Name: + m_EditorClassIdentifier: + shipAnim: {fileID: 4274233878513507453} + laserAnim: {fileID: 8588679386917878025} + damageAnim: {fileID: 2111292267210865605} + isDamage: 0 --- !u!1 &1030329598307254571 GameObject: m_ObjectHideFlags: 0 @@ -6089,7 +6106,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.03, y: 0, z: 0} m_LocalScale: {x: 1.22124, y: 1.22124, z: 1.22124} - m_ConstrainProportionsScale: 0 + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 5436772292607555438} m_RootOrder: 0 @@ -6276,7 +6293,7 @@ GameObject: - component: {fileID: 1571735958841297569} - component: {fileID: 2887113037929383587} m_Layer: 0 - m_Name: hit + m_Name: impact m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -6290,7 +6307,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2170601587458816440} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 5, y: -3, z: 0} + m_LocalPosition: {x: 0, y: 0.4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: @@ -6660,7 +6677,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 1 m_Sprite: {fileID: 81652156, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_FlipX: 0 m_FlipY: 1 m_DrawMode: 0 @@ -6784,7 +6801,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5813499711186931250} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8901463518339414129 SpriteRenderer: @@ -7201,7 +7218,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2957500801995135582} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -6.35, y: 2.683, z: 0} + m_LocalPosition: {x: -6.35, y: 2.6830003, z: 0} m_LocalScale: {x: 4.135684, y: 4.135684, z: 4.135684} m_ConstrainProportionsScale: 1 m_Children: [] @@ -7358,125 +7375,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!1 &3360474275124803555 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6349976001601901966} - - component: {fileID: 2002662403163101101} - - component: {fileID: 194845364374413268} - - component: {fileID: 8978570203643655430} - m_Layer: 0 - m_Name: trajectory - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &6349976001601901966 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3360474275124803555} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.25, z: 0} - m_LocalScale: {x: 2, y: 1, z: 2} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3425657190638438162} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2002662403163101101 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3360474275124803555} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 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: 0 - m_Sprite: {fileID: -728753420, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.6, y: 3.08} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!114 &194845364374413268 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3360474275124803555} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e6e3fb390508efc449743bceb7029fb1, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!95 &8978570203643655430 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3360474275124803555} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: af2284cf0950fb84bbb73e55ec3b43b3, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 --- !u!1 &3493030634282587638 GameObject: m_ObjectHideFlags: 0 @@ -7656,7 +7554,7 @@ GameObject: - component: {fileID: 423610964436518203} - component: {fileID: 383003839305094915} m_Layer: 0 - m_Name: sprite + m_Name: sprite (2) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -7670,7 +7568,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3690288990920757303} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.2, y: -1, z: 0} + m_LocalPosition: {x: -1, y: -1.15, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 2.5} m_ConstrainProportionsScale: 1 m_Children: [] @@ -7717,7 +7615,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 1 m_Sprite: {fileID: 81652156, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -17574,7 +17472,7 @@ GameObject: - component: {fileID: 1475325695220042023} - component: {fileID: 8588679386917878025} m_Layer: 0 - m_Name: laserholder + m_Name: laser m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -17840,7 +17738,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 1 m_Sprite: {fileID: 81652156, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -18077,9 +17975,128 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: effectHolder: {fileID: 727132065477534931} - trajectoryEffect: {fileID: 3360474275124803555} + trajectoryEffect: {fileID: 5431016040243098561} originEffect: {fileID: 235219454747548232} - hitEffect: {fileID: 2170601587458816440} + impactEffect: {fileID: 2170601587458816440} +--- !u!1 &5156512203197860032 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3969861781120183164} + - component: {fileID: 883183528123645629} + - component: {fileID: 6347156363099204576} + - component: {fileID: 7293273434037067590} + m_Layer: 0 + m_Name: sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3969861781120183164 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5156512203197860032} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 1, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7003406322826167011} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45.92} +--- !u!212 &883183528123645629 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5156512203197860032} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 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: 0 + m_Sprite: {fileID: -728753420, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.6, y: 3.08} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &6347156363099204576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5156512203197860032} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e6e3fb390508efc449743bceb7029fb1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!95 &7293273434037067590 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5156512203197860032} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: af2284cf0950fb84bbb73e55ec3b43b3, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &5314482478550443480 GameObject: m_ObjectHideFlags: 0 @@ -23041,6 +23058,73 @@ ParticleSystemRenderer: m_MeshWeighting2: 1 m_MeshWeighting3: 1 m_MaskInteraction: 0 +--- !u!1 &5431016040243098561 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7003406322826167011} + - component: {fileID: 8928611695330511359} + - component: {fileID: 1472383238373602715} + m_Layer: 0 + m_Name: trajectory + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &7003406322826167011 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5431016040243098561} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.25, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3969861781120183164} + m_Father: {fileID: 3425657190638438162} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &8928611695330511359 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5431016040243098561} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: af2284cf0950fb84bbb73e55ec3b43b3, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &1472383238373602715 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5431016040243098561} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e6e3fb390508efc449743bceb7029fb1, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5475151872123585379 GameObject: m_ObjectHideFlags: 0 @@ -28319,9 +28403,9 @@ Transform: - {fileID: 5753892721576749661} - {fileID: 7860111563605842767} - {fileID: 1475325695220042023} + - {fileID: 2865458385928011202} - {fileID: 9061701609461501601} - {fileID: 2492230152170177564} - - {fileID: 2865458385928011202} - {fileID: 5037680614202236387} - {fileID: 3963809439886282465} - {fileID: 727132065477534931} @@ -28349,10 +28433,9 @@ MonoBehaviour: cameraPos: {fileID: 119918007499355646} baseEnemy: {fileID: 4955648182705357081} enemyHolder: {fileID: 3963809439886282465} - shipAnim: {fileID: 4274233878513507453} - damageAnim: {fileID: 2111292267210865605} + playerShip: {fileID: 7425109218906405028} hitEffect: {fileID: 5161883498074052860} - scaleSpeed: 0.1 + scaleSpeed: 0.2 PlacementPattern: - posPattern: - posData: @@ -38697,7 +38780,7 @@ GameObject: - component: {fileID: 3513958199165799594} - component: {fileID: 9046906449646178527} m_Layer: 0 - m_Name: sprite + m_Name: sprite (4) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -38711,7 +38794,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7460860944434110557} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.2, y: 1.02, z: 0} + m_LocalPosition: {x: 1, y: 1.15, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 2.5} m_ConstrainProportionsScale: 1 m_Children: [] @@ -38758,7 +38841,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 1 m_Sprite: {fileID: 81652156, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 1 @@ -39019,7 +39102,7 @@ GameObject: - component: {fileID: 3707061185523925642} - component: {fileID: 1545536802719450828} m_Layer: 0 - m_Name: sprite + m_Name: sprite (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -39033,7 +39116,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7783163205691081203} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.2, y: 1, z: 0} + m_LocalPosition: {x: -1, y: 1.15, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 2.5} m_ConstrainProportionsScale: 1 m_Children: [] @@ -39080,7 +39163,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 1 m_Sprite: {fileID: 81652156, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -39103,7 +39186,7 @@ GameObject: - component: {fileID: 8500212854981857084} - component: {fileID: 1813215479354591702} m_Layer: 0 - m_Name: sprite + m_Name: sprite (3) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -39117,7 +39200,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8014677656571810012} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.2, y: -1, z: 0} + m_LocalPosition: {x: 1, y: -1.15, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 2.5} m_ConstrainProportionsScale: 1 m_Children: [] @@ -39164,7 +39247,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 1 m_Sprite: {fileID: 81652156, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 1 @@ -39439,7 +39522,7 @@ GameObject: - component: {fileID: 3768447100777554682} - component: {fileID: 4836004292017515883} m_Layer: 0 - m_Name: laser + m_Name: sprite m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -39670,7 +39753,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 1 m_Sprite: {fileID: 81652156, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_FlipX: 1 m_FlipY: 0 m_DrawMode: 0 @@ -44589,7 +44672,7 @@ Transform: m_Children: - {fileID: 8611212883825605423} - {fileID: 5513796590127273081} - - {fileID: 6349976001601901966} + - {fileID: 7003406322826167011} - {fileID: 937894074171941959} m_Father: {fileID: 5813499711186931250} m_RootOrder: 11 diff --git a/Assets/Resources/Sfx/games/shootEmUp/15.wav b/Assets/Resources/Sfx/games/shootEmUp/15.wav new file mode 100644 index 0000000000000000000000000000000000000000..49d4d203dc13319ce8154a5f8194bc99fe72ad5f GIT binary patch literal 16442 zcmWlg1y~g8+s5DN+1>?~7Er;CV|RCV2gla)x4Vwr-QCBd$L{X#M#TmN6scuv;;nB! zxZqk~c7bQ+edd0C_x*Nm)x3G-h5+0BDOMFLI!hQ8;PD^pIR@={9#Mb6;rK9*$~98@}9^X|Fb@5BaFklXtEG6 zeKW0>ve{_;yB0xp<_v&LQ+c_iF>nX>+#G3#&`l~Ydgw%0M*jkq@x?(Mypc>6#|f#}2`H#Q`je-00vJlp zgZe^wsXe%-_e3`Eh`wdIaebwpj{BgTKVQ9|w+Glf+B}MuBIC(EI1x1mH^FvhF9>7I zU=y~3DBjCAWQNllOtJ{Y8)Oct3)Z9m!Buby?nWzt&Ugm?208(N&*KEpoD{%TWHva8 zOOiO|Dfo(`aTqRwUf=+E1FP%b@GM#dZ-5N`8=y#8GrTy1$_ zin2De*L3ve`s)Gx1%8SzKraoELY?dFH-O3W)>lUo9czSFIhQ|gK-ZlQ%!28Y>7(tS znV0IZ&(XhdJ0ER(EB#IUXd+txev;8#wD3)`OB&qoe+<{6x^$hq(>9%nLtnrSicuI$ zqb-FKTs`^^(}Y*qmZSu3PU2}f?vga$>=!414Pc&8*M@i~UdOcM_ZjtQ3aT*WnHo$Z znnU)nt%O!w7-+|^!fH+-qp6z>W5=+)*|Mz0JO&eJ8G4Ymp^bn_hmn0a7FQ%|nfs)o zJ{?Ary`&$Cf+;u}?4$xIi~qzYPzSx4J^&@6MNo&AaT-4^?zfe5T}io7x1UE zC#1G4IKm7xF_uG?2uB(Io7NsS#2pxwDaIc+H+GhEJY~KF+ZLWcEu7=RRCw;kNN=p< z=R1jwEh`*{!fV-DvkmcVjpxoeR+?Lq&uE>z&Eb|#ldH^V_ND$j5CW@nUD<=U9ce80 zHoYNN(Km2_`GX!Ils&*Lp!uK=_nh8ArAQL)f;G??Xuu-(5F3*UWGSt|MR9|Ssu3`N zxxxI!tOI6d2Pg}IG>=ZA@$6at7VlwKFrR2O+6Tk}3%Cz5K|fHPUL(~>f4mNtr)H2v zN|0JO7x_^f9Dq*Ia^yGaLLSlspd+rN9nmvTqH#VGQ8fCD^Kk@fV^sQ+aV`pBEu-Rf zna$uHDyy%7J;@u=5?96d@ZTg3m(X&9zhRD8%zB3j>cyq!)?H}HkBUz}em);Qu~baV zK|Wqz9&~sg7tHoM=v{G#>7KmQY!ct-CA2L1jHylAu(9TrwkPs(I@9-BnPY8dZKgN- zS|nq%>1gOlYm{_~T(&%no^F|?k5o(J$I>D5cDw?daJ%d;a^_`sXXe_6+cLPd^cfzj zCh2q8q2hkNJ?;YP@dJhVY;F7;j-~6^ZS*mX-57Az)*VKQ&Oa6IL|tOxS{46&P5?ZghhHPl+b=u4KD>xg>><( zTtdEse*5QuTGs8>G*tLwtOxR;>~;B#ZDUxC5P`AiP0>kQjTZoj-yc$ zjp3RzDI}ELEq@R$!U*&L`w$0%${5_j=;v{;zSfKO(0Oezm(0F3u1c@|1Er9vR6-ZD zim(MaKypwRN=1!H4{XD2@N+#I4rb!H99TN|74_sz_@HuF+l&jy7Zjy8(3X%xTqXWD zpM){)3+~}}+2@|yzqgM*k?>d8OY<-!7I@P(6yD)328%L;0cXW;zcoCtrW;3^$yXbGN0;XH?$zodD}9WnsDI>jYe3!WKpYS34AIyZy z^`80({kuK~ey8Q7>gL%r5rs0BxuM?UZ|}doY3~?M9i2kzIqq0{q+fVB##2_@FD{V| zS~9{`n`hx^+73jq2aIN-#rvku)>_s+;IZ!k5***$HKd9^rsq1XAK5W-6<5*lC$2@7 znnDlQLaWb&Ic}KWGm}B8v|lh0GtGy%Sv1VGoR_eE@S4?+PEiO zz?hjnBnvkJc}!bo0vHW^v^ZTy0h0zkQ%vrVd{T!l!f*5zdNa}!{Acv#s%Qhe4X>-L zdKZ_aF}Ne_hAPv07-(D77O*9ZMyl3Fzl_F`Ik*@~!|O?TG!+&{Hz0-+3>CHqcYvWJ zjdmh-^bj(ro1rz{tEcq2^o*!kuSk{jgIX3EP5<(oN%=Ena|~DWT2v~R#l2-Ne{J^s z4sI4w%e2AV*<8dGC2hw~)Xg*#IGM&^yj0ezhIDsPJ+9EhTcRG?mKWrG$q4d}&)h`I zKzoAos6CmL`D(`6`~&A&)65U3ib91?QYwBzGo>L?MN(fqtW9Q5u)EO&J(F84cht(l zk6dMT7n%&uvY){Dz+KN|PiIei_RsRRcDMdmRahmhzjDuU{l|#?gPympnb_8p;PsWt zuKqUnW{1>#lOEr%$oH@a*BfU|F-iIDD+z1J&)M$ONgBr8|05y%efF2H&q*)0O-Z^o z?A{)+RXIJehizuCobIzFh2P@6*%vc+(#Q6nsCxbuRbq$ZWHl1EB{O}?Gq+{SAY1CD zFY!NQQY{^sa!?bFYo)U*daG%J2`ep^E0I#@x@z+D@hl1cV(W8>WC!U@^R;xXCSTG~ zRE{RSz)6$Hj(pSaL5}%rnbf2{(MJjwzXR`@r&?hr=jD)vVK-$Hmn8J$G%kZ_Kr^K8 z_BKwBxs~&Xts*@b*d`QlHL%x$_7Aq-cO3-|ue-85NgHU{W}Rqi?z&E|7x={k_S0g% z)o%L?K57}X1k;8LQ4_rDp~tjMj3&eN!K6H?sBk13HC0P+L+n?i7smDQm8NhXNJ7va z*ooS(=h!^DhKv`7i*3MTW)nJuUkE$Jb40?28IhmI-T^VD6}O2wp<3 z_{ID|_8Fh)_%Gxbe=b;zO?PSL=fRDi|M7Q;8f9PYN|#sR*l;ExL+pUdqF>CIaLsWR z^Q5%&)YM$4$IOC#z%(HbE=QdBuj#YxCEE$T;2)7GbdyS`ohwB3Km zIj>l^BKZa0)V}$B@CI`~XO5)|x)dn%mdf?yTlI2mdv+elR9g6YDi#`pGQ7JyQ}v77 z2s>w;92j0W8D3Bdy}ABmxIubp|DfIu7ULfC$Go{uZP!}}yUWK!j&oDaxJU3eG83Nr zyfx)f_N|U6JBW-8-KagwZK)0rs#)h+pIB6T<&gdSC2t$J-{vyCgelpX`4^n)LwCp# z<~4k6m$$?Z$AMsa;DXZ3o*KKz+*lh&D#&%kX6!OjK>rhGljnhSZied{H_zVy@)lm+ z09l_$Ys9*l<|qp`;C~3Uq)XBjrZO!=D*Q|u7^}Ut7%=St4~d7i)GMJ1s4>Q1x^R}Q zgi50NU@q%qc#LT-w+GZjMd&t}Gc{mR;9jzwtHOU~DTy+=RaG{hsZX-hFntt=XKT{Q zuqz(GtzaY7>B<*;i6*1r$|3C_s0f1EeC-n&gKBF~8>$b|?`bQwamM_997U?K>e8pc zBKW*MTRW(?R!74d;1g-1uhoj_MPU?5#Vhdybd8?jtI8X>2%N3o*9HZ+(`ED~b7}4}oW*C!vRK2O7S>2iRJ&<|^dtBwozC~P6tfgHUErGYiRO0V zPkbk1MOqDhb!a`;aLWzugk?j#Gx85+sJ=$&AnlJBF1eKv%n7NCDuY4)#lk;R~nJC8O&OPwCU+yIs$t3VQrK&D( zSYvZ{^^Sjp>7J{dzxf01=4yDS^6D}}EO*F3wv1E}c)gc$EqSSh=b77FFi8qFD+I#{z~?~fIJs1CYx{B$MWIY#lpS* z_9&T87pJo>b^^aZcw+HcCNoFDd?{DhOnZDA`LGLWTj^$GW5!jm&r{WM9n4JoU&a&i z!`a)qNtj@N6rJG+sB7RzIn{iH7Wmi0d`m6qfqy5IoSFQI>;|b-3$91?arnS+R4g#s zT%{CDYG5Cz49jUxE;=RDJ#d5dvWHN4vI53vC-pIE-(VTqpUXu}l|*<+sK8v(tLuIA z*;wr?9iwZeS|E&Qw(H zE7y}*ZaJ+)d$Dh&I#PMQru0A#6aHeXz|T6xNbxz_4jcg$*?w#R)195i-R7)ZJm5hA z=}YE-vgEuLtHJ6nF$mTht)GYCBr7ZJbPKE;18XOK5uZ3K>*c1J9Vj87p|mK2PSB!V z(&sSQ+!W?DH^_A;L}Y(aRy&-#F~15(wJ5?gLpQF$CD2SZms>_}u_xsbV7PjOF*)wX z+T+rxkn^cv0-j^ebnY@Q*6s(KN|?WIFr3tp7n^5@m4!X*3{+I_W2`(sh&1l_EnStZ z4VA%#X4tzt|u6M&v^hfY8eZusk7vN|G1*tj(tw7IF zIPL=*s}|J^x8XtLB>9L2DsJT&zCvaFSRhql&=&oJG6CHe>R9$^?S8fOywgX6b0$Gr z!6Mq8&Qc1}D_?E$Ze8&Mm67w4`Jy8MTVJ=oRwKJuh#0y)bXm;Sh)m&?mKKbHAJtv@ zG*f?Pq~pBxw)GR!&Hs(~U7M^Q3z9wosw8YNcauIk5*%yHAEfH?Eg>KFAj=)oLMEZ5 z@UDDC4rSJ|Bcw@k3MK_Pfl>Sk?ydSkn;7nhEva|^z9-ktU$b4eWQ*nLQm~V}Gp4PQ zBunG8d8i{FD>8*JwvnRl7Q&HhUTM^J>NgS8{4&?dqk z@_zn5Iv$e)(Dn2NWL^hBb!t+ z@lny4B*EJxkk1RTUBg~!=_p^ylvfCcsjf%!?Zv4ig0TDn(pTA`y|r$0K)TOhU@SVy zR*YI1Q>n1irzx~f_$kLNa##5*yp#@UUwuU5BrEIE9?}%PlCj-d4}AiW%;7Q z0dX$<;H#=NHxF=6H$6c&1+%_Vm54(tO+Gra9na{$xEQSA`;C7|$#jI)m9_u_F#}~i zfMaNe(o(t4^fQfNW_at9)|@pE=3A#$(TKWAKcfxM>(eOMO{s}pRmV&%s1V%A7NJniU+!p8NrC`OQ^r|F z>Z7ZH)s_5GTbcJ1baDYy`{CIELazK>mLTw+4`UeyVo_(y@WYbctHPRyKKoV zxbdoH?!CnO?zfhA;(KkM?O4gb-Eo0h!RyKz=a9H`rfT7CFxIM>FUk{{OCV9~L}Ha3 z=9yH3d7=&gHJz`7Y>>}RBfUrmW(oL@Hs#Jp8K&Z)f4N6!rE^z88+G%DMDXU&?v`h4 zG>w5{;Tmv9xWFytJwgP(jrF2Iv^#g2QNRMzC|7-P0lvZ%(pltJ@RGkY^Fx}+m(%BK z&$wl5D!yW@gUO^Rodx`0lD;0ra!GJY!4l;h>P=JeK7YX5kgFib{&3$x7z1wwhp7%! z2_E*BRxgus1Zchdo%JBOtB(o%>$?+Nsx(DQ*e{3=L}_18+u&Ybp>L9MgXCG(yKGFG zg4Lc*`U$$j7x852%_+>L@~s?ejQG)QER58n(4|8<-ReK+4e$RW(I9VchX-l5?x`s2wsDO9B1b9 z{g~EhI66TosLu{!Z-b5oapv(-{1&C7?PM1nWH62Y3{qK#9K~JKJY7aMxEM~>i=w_n zhn>}7>KgTuwi-UszABIOe^Dva4E{uS^r`9?Ee`g@8(}~{h^N4Y`bTsc4bp2EiZ29R zqGR+n-X4J(WUg(6Bbqkx|AAuALQ*XI>BVwyXj!##qWg((PqUhAuGsg(&wliSIph@h9 z(pUIp>=tWTf6#O}bfo8tmleXKCcSVPw6ABPxj(- zq&e8f3dF*GGliL&aQm2|$ffIam^fdIV9p60Obf_L>|$55mze_YC3lS5&-YH}v@i z4NcW7fdnmv48kSg9lV>nXwQeQegyrW>3qo{cZHJ#k!g!Z`FB3se|ai%ywUo^YNkB@ zAi)zpT$z6+=HnIT-}WT??C{I6j))qjyUKTef!4}*jm)%ILaRlNwGIRie2++FcRT6U z_aCXZ9IZ;1c7{uWpgTGxUUa_KzS7V7PVhUrsIz2X9CnK#WK@6Nr;#3 zavwdPvY#mh%pS=tl{CGU1+X7JL9YnWDk{Bb6%#eDkcw~tx)Jt4(cl6&k80?>n7-l! zt`oBpm4scv3!H%p4HcKn))cNV#{;SUyQGcbZ@q+vm@oEbRQ)-{e+||{ht+&g)V4$v zAqdpb!^mp=mcOrhh+oR&z@b`q_>a+n>}Wc6k~3UW=Ds>bi%=p1dz909CF#69OP%KY#DT^*m*qsH?1*7A1u0b4i6{oLZG?>?F!RgkZXC&Oxl$3<5b`}-Rxz4UN& zpSvK=wr&h7?k*zd7fx0#Sch5~`8K@^`bQ+5H$^hx)=iG136sOeD02;pd^gBgr-c!C zM$h6ONQb02dXW4y>b*!C=DkfdIfaSPOXFO7GV`$TIXw!N8~)KfJd+O<^Qn~!6Ay4! z`~gij`1uj84A+C(W^}bEb6jXQII5r_lfd0(YBTq2pChXXz4ak<3m#;2%*s-h7$eU& zO&0fnm-v6U9=}7dv8SZ!u6y!fZ36C$N9xOhot3k!3i^Qikg8qyMj%?rh6~U_XhZS1 zGIQL}E)(Ehtw!*pI#(-ad|pJh;3C=+eK|Uy-t`YM`b%rWx9X;KGCF^9aJTveJtaSl zIbdNRDR9rX-q%^3NgoO`#m}(1?}E}hFwFbyVbYmCWNMwH*c1FWc#eA)x*^c`?6Ify zIIFpw>y$0cekf{zHKTA#&PlZ;v!0(MCfSFEHxBzI<^*@?SHu3cPWrv>%^X=N5o#YN z*WnkNZWjHPFa>AnnT8(Q7xrhI34}qOZD*QhO_vTb$Ay1w^KIJ&zxvDQ%`5VT5=V5^ z*k*ETwI*3eTaY1oDoT{{#M0t;E{F6`)(3(HA>Az{<2)fcyuHvWD3OEeMy;(u%C54X zx%T{5Y{fFanHhziK$giBIy0}?@zQxd0LB6*txWQmVeAc302VR*nJxGW>WLQVZ%IWy z9~4LP_20VP&>v-#H)CPS#UX1HlYKg9=slW zs_fFs>XWtW`d@IcE^8-r9~=q`^f#KOz7LiQ76wYIN15uDi{=e5-QP+d1;e$)@3T(V z4IHdfy~GWt88*PB1|0eoHeD3J|RR%`K9g_FDmuhpM%jfD4nl6-=0Q1_ulI2%3_ z9&;9|SQ@i;XnAI=Ch8kNJb#KU&39r3PzUIRf_i5%id^D8@h;{s5C`6ZmRu5J!*_8c zH~{K_-E3f*-`T&ISHOH_zX#Wh+tfVdQdCj}~C-KHE~2w8`u6%VGK}>Vh@dnPq(~*NKR6C(@rn zQMwBEwAFRKq+hu8{AfPH8Y8TszqvzP3shR=!9}ARP=oYLa8wp5!+2Ct|4fVUJ7E(9 z*iqb6zB9Lx{HYCqX=E6<$>!@uO!5DA`f7cv%3lnCXBMv8_GX{U&1?R#? zFbTdvKHQJqWCG-!He0E!t~4?NXN`1*iA%J!6PpK`1ZOGNgOPd}94RlC$KpOH$C$D^ zYe;K?n}bTAG@7V2R5~jKuq*dn-oZtHy3`H-=iia@<74&jk-Qk1?rdeb$z7BV%dI^L zABSZ8)V%C-X`J-lblrAM&L{uqs&OwqfsZqb#RjIP@?^d)r~=9}-DrVk)Bk2Fn1-35 zESQE{D%&&6J%!@jAg+ecR#v4RA}1~sPl@-1QrrusFPp+PVBav)*o_7&TfqFmzF|kO z&6tNEmZ`@$n6;o5m;)|?t)L`WN@M7sM#7{dSOva-Cq|XJf}ivj&89r)5B7pR;I@$n zSPo`@WH1ms1;0Rnq21OPuR59O#k6J`GBugG%tb~qG~fWX413V%=#RlTFc|bU5-=k` zPvgqJL7UPoq%LujJp2q_#7FTWTo1c3Z`>)*pmC@n647(G%y6nKFvW29Ug{V0OJ&j`UB%9cl3+;X?>TzML(}!HXffdzFMs}*Q50AdbVBy{soU1E^l{K z-AEqDXb@V83Qz^S8W$xC$xl*@Hl!P9N8>-w0N;R}8OH2qHZd2NqUNj4&d)wG zXq3Wc7=OWTc9%iW%d^GV7?x*qm^;j2<{&eIsl?bBpHcsAz)QE&@-&_7BW(yzf>^;v z@Ic%E*T6w^6rD5l^bd3xZAQtcCK_zxF*MzgPzv)aekxnCbbXL1eopN2% zZE32wR2pF8oaf~$%s{rJP{;a@C6irFtFtxb;g;JbS-xeOVgA4!(jG&B)+SXr!I~d> z#riK3PkYfbjGLQFoLq(}+}u(~pf}-9e3``Xb){FVV%i?^jJ$@!*ztG|Zmi7()rA&( z4e==XOvmy!$VC(ZmJ2V$>xSPxNtnzbRstVU8w|xf0kU;z1#q6NXwYL3cY(3oGX5YL zY4qetxD`r)rPPgv;ytYw=pE5e!qM6WYwHFdXx)_e!H?P;eW|)$FT|OoF}xla8OT;s zlqT8|?X~h+bs6=~)7Kdc`i|aS{iz-cUi7)~Src!1qQ5J&Xxp(1HOwe~W&DRSr7OlC z;oAxcS_`pnNOaEgi(@}t;}(jk_B_WEyE$q{$Pvw+H`f1~_TcYYzK3gZkBgKsW&Ruo zr}Gsvzkb?`n3B(8uw$g@sHlckje7%TsEx#3{CV5k@CbYn{v+MBc6FqfqD&UEpB~hw zGD(t5^_-n~Y5cN?<>DmunQnutX)QhvmqNAK)7(;dt2h#@24(4Yy&mo_m*jl1-P)O$ z1wTJh`Joh%O4=?9i@51*C8jEkG;~8h@{sqNBvU{T=EHCDwC zb|?9!OXvg2K_k%z=q4YqM;n0}p=tiXfu4H4)yctcmhiHeBCVpE*(7r_el<0Ihv8W)=FV^*_?dj9;rIN(ci{eI9)K-uCcjW9!~Nne z3$OV#Tru`IXaQz%YlNJnqZfLbbD2T3MJA9z7*2lrkun)AL zZ)6qGl(K$%@RCuzq5-Tu5KCJpXlt@}DrKNnxT5eIK4TrkKJ}mVKlkMX9t6q+j~ep} zuQ&5wD&)N3K2e<~{cZiqOhMz}Eq`Kg)$fb<0#~vare@=4j@zcZz>^#Y%(osMKFj3& z4E-ItBBanc$l-TO_7X5Z|7*}9j*{<$tcsi++Rap8Og#53F~XDdHt8STeM+}>y|5hM zo;nv5oftP5oGPrLE9~vCd0}s86C4!V+FLkVS}L(-ydPdyJ|kf2CH2-n7y-Czp(~h_ zK&{Wl{7?KU zxVf5qaeltiE4RIOo%q%fXWGxF$(@BWxVAwchNCCkCaIhCh~Riyl!+C_~s2 zA^UCX$avHiNm@c-fhUwilKX)}{yVq_$brq&WV9F^gYVe2OmiRbcF;a(EmY`-N{Hst z?!nuN8*T%4wZ_4PY64Co5)@EfbYJ6js9sP@@)MmarA>j${+31#wCt~O_p3i_98#|4 zp%90oh1AH>F;C5(`Z+8 zTRa2qr``JaO_t*Sa4xrRH2uZwiJD&GiWKm7fFe{Z|Agg9&(U>0PTFBkw~Qp5kzyEt zJ~B0|VXjkAbBq3px~e^Yu;uEyY$nQHDzb>lGEb;rR@kuIcNyk_G&G6N5Wm>Eg;lrJ z<5yeyILeE|{jUq^aF?AUUG2m|DKU0=bb*rp{l%{b`Y^N2_C%Z^R1w{l>GuC57uoM` zuRUhBIktw!3D*mIYVX;-%q^Jgo$G(0^@8uo1e^-TfR=0*T*R2-dIryH!(g5<4>w_+ zq7KS*^#wYv)d<}8{r~LsH{J%~xOu2#AR%a0(gJO?4Qft6)%rpnO@MpUiNQ_5roJA& zI-a%uq3k+aH>peDLiPktlJB@D@m1ypYyPC_2}vKw;+Rr^JKmztwtt-W(IjrHqCHUwb}$9xR2{#2XY1*!9T^<(m1Xn`v`nxk8^e- zSNw(8gyPcwgfVP!It%U7HGQYp&KYgKgMKKZwKjMvIc#w0{$eg|hi}0i>PoeS#;HH_ z!PKm`3HAt<35uEo8H2eGVfxaa+J~SVT;OlvKkY5*Yo#tlH%L{qB6!AMUwx|P1x6|9 z>P5qS?TY;B9@Vb>6Fd_*5p=4Bii!r9qix5@{KB<`w}Z9(1z$q%CZ@!M9xD@!co5o6 zj^XCHhB#|w&$`-&=4Sr9TL-{f0+SUv1MaAa3 zwgoft2Kt7R*N(&C?<_lo3UZcy8sEUTek^(QL%mk~L*!)fOGLMDOOa=ZQpnR_4?Ubc zEjJ2V=6-5AMQ$+@ti9Z2Os&BNtpi#_TZm_cb|4l_2DKdjg*OpDtG%^_MjE4`v<4<_Oi@EATb|y~pqYr)b@@10c%>|NJ&(|D&NA}nUOy-A?cuNyfb+Ab;5GBrFlVNCcehR@IT9pRd*%|3MT&nc0a zI6!W}m2~3p6`&?r9*xRYz>%-TpVZ}zxFr*AgY~VWpVcIBT8^iBu3PUVd;=fVro!nW z3!=)Yx3WqEgUoxDqGaKobGWP->9Z@=yD%X$F?XpcD`J|Z31Yw#(^~N&*PELP&Kv98 zA%C>>lj|B+Z4Y)3-1%-d4i^4I!j&xr#lG{NmQ_@sfS}mNi+hSbdePD9lV6|e9 z22;FW>Et4hBU*w#4A%crC;l(~O7uRL3+7Rl&c|ETS%LqNHeeWo%zgOFd36hr|Ec$e zA9w=(-!Ki9(1PCnf#X^!rIhLkL~7kofBY2H)5-*{2P&#r!M1#q%|@)b`}~*niQd<* z?wu<6rB7)Zqsn0=5-OhxkzO^qwEx+qPjmg4Z-Q5fMT#s);6f{EyK?^UdX)sQSt{vT z>wXuq-!u^)FWf;l2h(1y&g@ohNad|zXKmf3e&TH~1rw(=#%kIfa0tKMnN}}t%nr9# zv+qZh^xo2I$06>g|7_t(|6{G6K$4a=6wL4MjeOtN6cXN*1%Y|A!1_BZ)qQ|JlKVWX zmuD5N*Nwke>@vXq!fJ;BEy7{Mq zZY2L3=@Vf)%;+EdY5F`NM3RkcPHg_J>}I~PTz&4BURjSP8w~ZqpbC^x-*}1#qx8uz zTCWhe=DFx=rA25*;B?YX9?g6R{Fm$UTu@r(2VRyxJ}k>s$x$&f@pO@cS&wdBd{w0& zEq`TNWR58OY5EcRDPgg*Ju_e5rF7DI;t$e{kf{;P!|nF&=9iqH#xiSAnYX_(I+y8F zdUk|XJi|Js;9~Gh)QKb%W<`DT6gD!9*vpIkM2`$OhkQD+M)3&#TY86rqwtAWqfgvy zd~8eso2c|PJ!EbLhM`MV&JiZLg=u^Z>e3sdl5D#C+i^B5Gd$C@RUe`4z&xA4v?61{ zLw<<4x3ryJp}+X!#=f5!JSPtj62<#sj(pQxRj{jC!4kcTtE62AHJGkkfSlBlRX3`} zj}yldr~#x93H1veR_6t4243hbw93j+B~odw-Vf~Z&mm)Rps-{9L$5{AyzlZee#iK# z@~hdKo|xa9cSoRTaJdrjJ}&GUh*us3h6XPvRyD(SF29nen&Ji@g%)71H!6Re_hT^6 zGw^-2`;&72h`Jkb(mdIn897Gpo$5@Pomu~9sHY4w%zD?cKdgQ9z0hO)F|E6v!t9ez z*>WQXCeA9-z}l2u1h>;MQbmaLS~1@%R8JV_eibs;iuh8-xmX+i$`phn@MZav^FN!{ za^BuA1UlODl_*cX2DYkqg%$E%kV#g_3qoIu#{Mi=$Pea*;yW}`o@J>jZx-Hg8Q?Dc zpOLlvAbq#gluC)m#3k%p@`$cuD68<-g%8{XW-K!w%)__IYGx$(Kypb%<^VT~`36ce z2S{ftswD^cHGBd8cA+n>JYe zGw2SM#p!ag)yK?GcEjeTFJQ*Ue{ZC|MHZjCFgz@&f0Z){?2j#v7r#H7`Dc2Ve}{FT zxq9fgNHwN|W1k-IXQ@#-4gH53U8Cj+Gjeh#T$GgiAPv+v}Qob7vjfTp!p-uF&ijX9Wjo%lI7rsQ3>%!}2D4JPz|w zoXIaW#mD5)^U)5(7d8j=ya6*)gVue7&2vN#roxJfJAQhSib2M&I1yGOm5Vp2-advrO3)`ERj&c)!2_#3faW~}v7#ortmI`hMcjFB1 zzIK*)&9mj<%of%j+69L(Ovswz^&Qo;66lCLT#BW=O+}>hY?xflv?XD>oBR2h?zTS^ zZOnk+cj<`BWj@09XO6%!>@1$_P?#`Ixhs_Q#_lf9|l zgN28D?bXh~3R;MM(|_Ib*{>P1%Pha79s<=Z)ugEflha4$yzu;2&^~4E;gx50C%tZ0 zt=Rd}J7YS2O}&(U?@>mPp!U7b%Ov`D$an0B`cZ^fMX<=f+UE@f=uz>vb6>dIdBt|e z)fczS<~{wtj``lY-r<(9c2ndA^H(KFS??TQwteXd=C@fDe<`+lMSoj0@vyCD=pg&S z=!d1d^Cf?qeEuKtzlPxxNsEdVEqbo#o#0XYIedajeXHpN_cr?y&L+M!^%PpMv%qey zqP32DW#mOU3JkSUug5z{StviZq~c$E7rCCWgjSF&Qfp>5wF-NM2jUdzFn5AQ;s`cF z`x4CO-TYB{NJQ)~G8_WxfzxS!_9yM6_YGvK^-%jje`PW%2wqZV2FeEK2O9)GDbLl# z>hxf7HB1@n8&&A_d@Z=>o8@a8m}(IGSwRlkJn2=7E+=C6|14*nziBf7HHv#SKF$M{O0UU?>vK8o+jJo*~? zWwJcjzFkO*WW&FRq53sd!LjV%kghRHOFt$ZbI!2m;ak|)*yq+a{j#3W=YGRuj^y~h z^j-Q%pU3^B#*i`_xCXx?a*LZb6rb*XrS zexV$9h5JD&(9=dOXM>6C5%5-gZ|X)PsaC)`MI95B*z%l5bM*fI2}Rs7(nx3wnaHd`}A(d#%3afgzB<7+eLv z4}8llmeW~z6fxGns33x=>qr!~^@%HH*tle+=I-OwObWmN&H(#$0pP#qZMK_YYv7h38u&?p%Kv3OnQo>%vE-l{A zRGe&e91(l6B?5A0T54^5S%-+0heErB*?b$n#8`5xEUe~?uLC`qPd&}UYnD0UI>=F> zIeUvL0=>^hl^GC}aNg*>GPp!xD-)QmjUga<|-GZct=x?}^dm}wzeTG-B z4MLmoE;UqL=ARMlsbM8SNe@iI z#ktPhWsoJdjKt0d-x|HX{JD0%KVfIca_>EVKlYW?As-@*wcmLb|1{mBtiTmuE8n-g zoq_dCn%vQuz!9ZapqV!{)ts7g^8IcL^H1xw)rGbdTXjvpx6^fVd`=V_LT`P2{r-P& zoTD1;6|p8h*>cg~euq(MgGD7tHQgmG0ZUhh*CGZJ^E|)recvw)s5!P+vioNAg1k?e z38oh@SBiZNEgsyO{X=ONwk2{icZv_OE+g?;t{{jhWVgBsjTWgej=jX3W-6PfGVcP7 z+0I-gSdobo7cnvPD6MAfM7|DI8J@`lGKI*DUZxVr_n1PdfUoVbq9JnR1Z z`$-j5Q<-^l`^vfJp4;iywNs~=T>%)>c3{T|)8>S^0RSNVi5Lh#hl>Cp;0DHxo-?`! zeb4{@Lrq}^-ryb{@prw)vFH6?Y4TLVJ+l4!dw$X8X&)L^xopuHRSD|Vsu>_emFG|7lf<{ zvg>VfSaoVuIj5<0q>&W6%q@*Cb(;~4V#VZ)J{KGB(%gVMwR^}P_7~2*mBl&96%Rb} zU616idmCl;b$hEf+GZMW*=ifKb@<@1Rns#URcEUwaw2Q-N${QpUb?D+%ixzP;JoAv zHmxYv7WU5WUc4o<{K7R=ouaY zm1QSyO%FXaqLoiy)$fGj;gLQ)PF;JyIbdXLqqxT3>fU!YitE-wW6G*FPwaB6{`$*r zu0&Nm?%2Cs8STSJcB4-eZT9D3t$zo5P7c&V*hIH)`|u8yuo+#gUCp^pl3YjEYI zoh*|hk5{dCH+Z~s-ARr2f?SCQsJytMxtL zd|KCtpyZEk7i&Geo8@Y$b$-1M2#y<3H0a_NCpuY$&J%jtckPe`?o-eayU zIitzA0Ue*DWCq7h7k-Bv99;Lc+rtOfn=EfA*?VQK`idI{f1h45HFCtmpVe z-d>q?KR()G-u2esZf$2^_mPu9gFMN1{PIb%6#k@2TSpbqGR#9>Jc;9%~o4!e^i_lZ2hC2OYa)>+e<}*tYZs2 zgj*dv{jRHi^yseYVT@@yf88x%AT# z5OdMHi#P=h4oWE=e&r56U4IJTI8BR|T_OsHzB{4}_q-xrD{IazxBh9>E9LwTbfmN! z`m_Ecmr#Ef*U4g1)dut=yt(eSu1&33V)G9r{9A1`E0nkXRvQk~UkiO!=QX^`G^;7i z?xh;k=52guXR;-WDX@?IRKIX$WjB*qlU|wxmTSUN)AD!wrr}qW4MAkvdeEy3^D13Y z;`@XGGVWtwMx~N&c&$AI>Q#>T8C+g3+Ox?AzRiQM?C#z#^oD?wUD}FwZiQ7Y_x8}< zj;R}e+vZZ$TTcYh5M~K_tE;*Nwc+3Ew=7G~G@!E{<6=sEQ(mrk-o`qdZxpX*yf2ZRo*mHA_3_8d4_y(DO*Y*LwOI%G5muN8k$9%u`gPEAq-zCRkUgW!+~{*%t~AOV<}#=0Xzl2-%&;qR5os5@PkbQ0 zv6Xx~YfZ>G9@WGhGo9l+) z!g#Iv>&KC4VHH_HgZR$x!%9cG1#m?Riz6pPt!&azgCi`UV99ECW1#8j^BP{mSw>6#Iavy#F%UYuji~HjG``3`ti?zLiyQV+;(A%|3L-(Sk=O#AW??3ZJL3$dP z6@I8=4sK1j+HHz5A6+T6#%%mKy!=Vo*IN5D&FgIN>>D*bboiY!cl^V-_Is`!&pD7- z;LNSoM}Dmxt!`NMt8kurQwv*M|Il3AR#{~5^F-XYpHtr6Ej#>9DHQY1zDl$$BtroU z2WsM6@?3sPH(1XKSLXncO+FDhm%j&fzM-m;^wycRzYTxhsd}-WR5?B?74@iHzrmyS znZbLjJojJm1dDs=Qn}JqE-@ zJ2qyn|4=S%4+@B0V>$k1)bE3?NuULL#$3d_4vKMpt!%A%9W|z`q;f}8KL6j{LDG=+ zK5bsZN%k#2bHT{m**T-Y0ne5VHU&MX{7|~y{J8Ft4!822S}Sa3#|$m3T~|^&C%#Jf zcAVSzV64?8qIuK6h(Wd%W$nuv@sp#^R_TvdmyFcT(Qa-ruUDjhQk93jckWr^ERph z*Ve_A(ui?6g931%WcFa929O=otfg2WZ&Kiwa=wreTGtaA4H{_C^Z(adwV&;1T>0vqc%%T&?T zKG!_g+W7m0bi|zY5^!9ntnfcvo8-mTeDJ9>+0F08>O8;Fy~Yo0$7Vl#{z>@Z?&5L7 zef^J)uh-^GG0(F2#oTxJ%NIeUzf1CXwpCP`$6;H&((?s;;fo@+_-a*z+pZsHU2FSn zwcO<|72M4lmJ=mD$!o0M8u)~<)jx$NG7~*>?2BuMS52tg9cB?GzIi8f5121a3A|>$ zgGSXm;z;vn++RIEf4Tp|fllqWh>}BILv&G1TPNJF`?dAWx;L6lB{!aoE9jBm>%Lz> ziv%s1geHlDo}I+`xm@1KR#U?A%!7^9Mb*Vc4|bOuUH=I%C$F>KV>fxnS5N8qwd*`k zljZMfZSeL7DY@$YR9YSLu3-9QpFG{Y#4;GuSC`_y$nQ|lfCgQg{Rn4%R%U6nr;4xn zboV~y)+Ii!+X@G%joA@Zn^Se_lNk3*IaLNAN{#O+I}aaHYCn#zN}FW_aMJZ zrtiy^H(%Z3i{HDB5Xcv7n-rK5f4X~mQgy9^%@bqxXl;H6otHmuxc=zC$?LuD4t)<{ zBKEaUZ?G%wvgTrgqmA8s_5>`IIyyH*Pl{etw@&;TFHd&4TwD}me);>?lQnkYd#mWO z^i%amYUBI+|7(9ym0gt^_CmnnNk6<_g=BU3!<*A>jmve}%QuVDMP#{T230jqZ?+a+ z%%2tF?XUWrQm|Zj{-WOPbeo}ieL8O!a<<(GGG^%x*ZgwT#9nj{jyf6oy{wO^m9}0@ znpo)i+T73?9@0Z!1sg@AgpP7+;eW?@*+G03Xf7*Et&@pM!kR{BL}{hl$`p0CincYQ z(c8Qt>z{#BndiPM8=Wn+o_+kW@9%$~tIE21_y65L^#ohTEtsF>w^JEZcsOreRx&RD z_tZ_*SuvjeTjIrW16m});ht&a!|n6cvpn`^E+}s5VgJ3QK#DsS-&fzYVM4I6su|PE z_T+ar|FU``g`ri4N)9|dm$spp|509?YApP4w4iBX?Ut;|f`Byt68jTL9isJiHE+lc z%QR;ns#@h-CX{pMgRXma47uIDY4S*RtXGHdaW&qVE38|JHa++GxFFN@``n5~>Ri!^ zGV8DEIwXF8w>D&WP*Px&r%hNR^zx1Lzh55t%i$btUzO(nvqMQnX4ZdEN%jq!9^BYV60yS<&Ce^}2p9^zvz z?5r;HA0$3eAJweP8dYqneI+Uouk&3HcTE={4fT0}X8foT5~Gik%pcQLog$*DhWu*H zE>r5~Y^tg@6gelBAMvQ;nXi2CF$X@c2{E4V_{z1<-6#JO+CtmX^uuFJ=zqk!><%d~ z=YQ;OI~#IU=<}l$nHBE!5pyv$`_UJvW%=)T(L+0*&hW=q1`*bd24!|z0^=Arx%xl65;o=KX3oM)z1ja41l zaAQE-;16=Ht%=tgrrY=IpS)%AkBeW=VC0IcE>~F8`#oRidk5ZWak7CG&qPx~hG{S4 z9x}WzK6Cp1DQJ6EjV!LBiWM$Hi$Ybic{t5AYg7nq-rd`7F&yOA$EL+_c zmES3O>TUOQF}D_1MNA4!2HwJR(#2tN$gZ!#cDrA!c6W5s^%D)!2upS16UP zbu0CSdFnagGu0i9S9CWcYq<`vY*RM~Sqm;?dz0AU_wwTG@y?UJ`FKJ0#)^FPBiCI9 zSe^j}LVGLKi@+-Vgo@en@YsYp zi=7_|2Jp+GJv~#5|Kx|~bod_m`w$$)O{^MQxx@oR=E`q=pW@=;ZfG^XCrTy01wy_2 zi@-hDojp`@O#Z5>l>Rc!{#Py7s&*IxJqOu=*&T4xk$@xpy+YFTTWwu` z7v{CH?bGjKr)RJK7VEJ%`I7EzdYAGu(e0WgyGzxZ9V1mknFGcqzmMjH6nW!Tf!o7Z z!*M15IN!N80|Dio9OZ14k}I!Z?%;*hyX<;zzu+y_$=MSe{lm+`O8HgxPK3a(l^ya| zfx`iv_4{jn*!Gdnm7hyac@@P7q9yC5us-T};BA7%CYt@~27+Jdv5GcIXQEcd=-2q( zaBRqWVeS~cKE_Q*uKJ|^5pqwvTgqn-Yx|Qqj&GtbLxi(Mo+X=@(Oj-E!xX9AWayy$ za9q&4M%41!ZjYxEO%`}to>TeQrC<1D)vjVo(L!56MgL#J%saw9hW?{O)>MGE+UIO5 zc+(IQ78h*iyenRmpsM91^9x@(Ls-2du(YRru16m?S=Km`m`cirs38Ejv;)L{2?@)K+)9qajfxNh;s zU*{_V&0Wjmj4phV*K0$25QS3RN&~mLoPtZ4^O{QbwrND^7MmK&RoariH9eRkno%0N z>%^e5KI7r^ick}D`7h+EMr%56-l}crdBYx;Z7n$fo}xd6rNSeAw(m?Ijwx_Dcvml0 ze+gTZGpaM{GBQXw>Gr`UkK?X;Iwn8Wls?bIqId#5rugmtNHeC5pY{}g%7cOP>? z3Dexs-vYhtZ&n-w#u;K9CBL5kOhsMl9f|9YmRZW({|?`#jy1Ng`O7&| z_Lt+uTfoL|G`Z(HEDQNw=F)Gy3&yj%4Hw}P`%d|-+e`nxY@#E}WpC{hp*pcRcYpaz z__tJ#PC;>o;Y@>EB{e1gB^%)Pi{+{!&3^h6&y$|h!y3e#^DT26E6KID_K*V_syr*| zWd4`$VM?u$K0f-2!AYiSANehDd175)X^-5=*{U^#kE=4o73hGn z%)Z)jSbC|HGxgmZzRUfOd;02QwFe9xbmhW;(ldoO%s0s2QdZgItP6z=@Ke{3o)dKc z>TVnMX-}fBN-fw>vs>MVBvigAs%ttezZXo#y4Dd&2Qc59THXp>2pteEsj|xw${xdQ zZkJT^?P;b=;W3_Qds=mm{1wp6zZaTW9bGv@dEl}~oniH<$Z&Rb33eY(W?72`jyB!- zw!g{~@UpZzJ#>t+lmr(Nf`ci`)QeabHdyR2<}_-LuEB1y;&3W8y4^lUy|!t(3wfqT!fvP|Yi;L*b^1>MGrg}emumhk z_@{h2;9S$)D?LkmD!kw8`hf+`eU@$3Th35fi!Z~gOgk{hHoN+iDOt{E%2^h)msgOr z%w6!#`Je5C(wAXywBQg6Z~$qGHp?&KtV%JzYA z4o`EXU61u>C4WTcqkX`r*=&}OFySvz2iAa0vCuKi-pk&>c|l%JvPdL3ho^!!Xc+f} z&E?$HHGF4=L2tR*>KHDOd>88}r{N&rFAoy>I#xSl;4+O(^%kb$t)P&M5)asnww~fR z&`|YRyH+z-1-Rv?B@960!3iGOA4}`cQ zsu7$5CX&YBD=dQ@$zf-Zd4y@SFrNKWTg*L_G(s_ItM}0^tnmPwEMm>~@DiUWKlxe`)vden2C4m;c3i z;4%pn2io08ib3>>a>Zzc{hH~8$f`SPM}a!xIDC^aqANs!3)NPgMl%wHl7EQ~%u+I) zXB}sS-|~3!4A%&M+0NJw$RYeBO*+#+8H3yK5iY0PCK;xv)+yJ`mn!yGcNG|9hqEPY zdu~oN&9)NJi;N>OzDERPX5X>PxRrb&(^_sKzQgBHANABy85G4I z<$94{_UxJu)mqCNWdYxZKZlAzeQuAgwZ|IIB3D7TMcYx+N|U5%$W0R$R4y%EU3$f| zLHdP{iW#=I4j1xDGt&EnzwA;i@2Re;*2}f@6>g_>_u1vlHZGjK#I$FENNaJmZJjaD zl{C2v@cVQSDqP!Hp3+tRo(tosbmAZHGsOR~I=Ue>-@XYq6W~wPh+Ng@s$=m^a zz|q}Qw|bFrou!Xut@WW)!%fgP)Zb7Ge1^v0*2)8TZtz;;-cA)QH?zGrKB#(Bd8}r< zwbEW;$*B3$7~x0+V^nutrg#nUUh1ysCaID*U$z!&$k{RHD&; zV3Isp{shbTCcH>J+LR4O&82?!M~)?OXV4I@lKp^@KcuTNv~jU%<}zh?vJ@eQL4jS0 zS_{W(o>vrBZMC@Jlj_l0hCPn8=s%T-U&gY0k!GznUbT>k2LC9hrL*E}@wX5p9TwAU zz9xq`PtcM!Z~)VjOJJW6Mt(0c_#xAT|AW2AJm3PjfuO!zF0-T@tVI1G!G~~9Fh@yp zu5c7f9=HTIAS3BdQ=(BSM2$2auV9Vp&8mAK)%ni+)9mG(gNhqYyu^54V@p)V%SE1UhHnVR?GbuqBEY*e0IDdW;>qFiX=+2!-l<0Ri*dShEtI` zW11eG1wK>sEA8Q>CrkV+PFUAR9TgM0*bqnRNhbT&ngvzq)?)O^<&f)6)o|R{vB3#G&bqm9E_E5+e%%OcqVQO_Yd>$BAzx9y^K9;QP|Z2#R4G-v><#gJI1aTV4V=eJ z*Q*!ULYR1$X8KIIPUYRANaHy6507ykjnxxjC|b)Ua5@-3)MOQ|l>Eg~aXie{G}U=B zuN+C1)8YxuICt4F8>QG9)wDMMDSDu2RcEb_%O9>Ev|%9D9&LRfPJ^XfqV~6&&i9(v zH!jumxo~aa(<;VUpDg7z=_VUGX;wm&)L7^)?i0_7OK~_mRvoJ~ss%ODcG9fj&%;mB zUqU1%>~qy6_BHP3ykMDQIcSd;ri+~Sr(M*FXJ zw(1g8Sxl$m8NJI<}+dKcY(>;SV$Kq-|V5<^#f&lfux~97OnuBUj&0B4h?wM)@vjOBO zN2PY6Bs3E0I_ukqTMt`zIZjGv$XRHIPth~3Msq~}%22GU;LJEeS|q*2v8a-L!)nk6 za!Z*l4Um2+^I#+@A)S>M(tf!BJmV&)cCwS;5?}%Ip#u%%#_?VG4*X}%lbg<7VXndp zU?EIH{m@BL7X#9qWXczv`L?!pN%Tio_{CfVJco0M5jKb4@DAB2eimoa(~smo@jaNW zatnKjd4?t0IfP7RYx4uR-^dHs6>{xq_6mELqrdP>>5C?!QzVI8K%e-{Oo^N*Mhh|G6cLM8dweqvbea$5VIAIW8N zIow?KGFk)ckSwv+eNQWEIK{)dtySIeKohK`qxWAZTQgpUc3ZT4z&wB??oy)qvS zMXeVkfX`36qxSn%4q48y2%5{Xt;xICcGMNK(?LNY~$8_Cz+hR%YIcfbmCjeHl-UptoAjO>oYZ%*+;U&s+jiKekgaC?(7qog6Aotlo{j?0LfA5 zgEL&%Ati%j%vn^QOv4nN(R!|2i`-YZ_0rAcN3f4jG}tLsIK9MLa%1^|$lE6y&s5E> zxnxTbE(^Vd$5Ip`h7zBpK670wbqV?=hN-%`n!(%!_$OX0cN34zEgQKQf#)!Q`9Gw)&m|dX8RN}NVfrvR%x~@| zyBr^~53{XyW;zmVovfdnjd2U6CEuO@!gL48cnqElHlfGxlpN^LI8KUZl|yOwQw#Qz*aL>ltgaJGUoU=wHE%Z)KPQVIs9Izhszlc?giISGg*I3 zlf?`r1Ic*M2(YBS^4@W{`gO%Ib1%G=J@_R9>v^ zVqGK8;bUA{xP=;$)Ki$|>=bQdmrLpaNDT|%F!+va$4~7WD}EM)6ud3#Wjg`eYx=p> z_P*h9OIx4a$gzga9#wjdornFElhSNyj5Ny;UA>`bSMmPp<6=D9OUUNc45T%=ygSjUmd*pjuCWzG$_E{tS`bDQ{AT8F-eA(&>-QFUwW zRP8i=v+~p`S}xkZnVXbp3o1&ytee3fn&vK@4I!#{L@4k^Ig1M8>rIoHQb+qS6kr$Qi&vfl*W&nCq-D?jrqnj zOQoZ}QbC!20=pN72p=6a@7R_rulcWkWrR@S$|!+b@!j^8jhHGk>v zY4*UEPGCv4`b($Sv%1f&29FVLEwydfwWP0b(4?&rsxF%vIPZ{$+yqTG^$M;5m&?yn zr>Sb#!{89Ei&s+=9VlNVzwsq;w0)WLj9egxivdCtB^g~rdqF06jBc@;`TzJi+!c0( zdWzmfn~7G-tb@1pbwFvZaz%RVK=vg2Y@s;_&|ENl(znzUvJ;p=T&n7C{ssFK?IrDn zB1?Bmz9UG!EoE8eq<+Xnq?O{q%Hj2DYdv#M5=RuwtRO}0&BBy2CG*)r_c zrEqc!M4)`e!klNOqEFx&s-?Q4`IoyQPjLX7pRJd$68D5T;GOL2C@`t5({U56i+&(e zEm|Gxgc9WtbBBA#_JX~{JJqPDb@3|GLF~^n>f7qZy5laaXI<|ij|sZ=;I?C$<)eAN zGXSM&pn4-tx3;OSDvz%^VZAS<;@jA)yd!_HUG-`oE@V$=&!9`byqCAzas7SuH?%}} zTj}`iQczv~OejM)84g|o4bV2WTJ=tM&Tv+jr0RnZEM>Aam-L4X?KI8NP3f|uonxhd zB~N*;u*SB_GS$%mJkrc_4RWoo%jBcktq6g|@;1TfSZDpWrliVX9w`QZe()vO56?3* z`8Vnnnoeq#e}yLFrb2?FsW^wMg&NqGbe2;cA1s`u)ILSZz@5QUtd|?fQ-}-Gox8@* zRT(EAL4F7)W|5 zqBKHj3n^pQjMZ_vdFmMc4=$hU$d|IW;1gxHL}V}ch(D@nr@|!7k!Ctl?N_tQQY2=< z!TbqTA-9Ct2mZmXI2KH1MsUr!VX8uHXTu@gZ~i9CQ;x}ba;EI1$oLoIsS2WV@(5?X zIoH_RGTT`TGmI}+fZE~;v4MD6YKmJUJ2MiEB01zWGe*-_-`+LRBitj?P|A;C4l?Vh zhw6j*wuma9%4Md5j_=ZJtOMg=6Zo9$QTizN$q>XcA~;Ukfs=@E(={!1cXgY!22FpJ zn)7G;ndj_wrWwf++KCBDChm+``K;}3ndHwNP~x2GcAEw12niEUKD%m7dk>EzPA-@GyIoeaP%! zAMwrAE7jdp`OIpNNx9TK_?8XQG|&~OLzoxxdFM=93-edwTT6;)1FM)p=ruWmSCMSc z8$8EaB}Sel=PU8xI*MYoOi!T28{|V$J^4NMLc5q$bQrBdJ zs&1LKB@Uy#wta-q2rS^+>Ox%3>WA`wlN*%%bP{fmMXE8n<(h%2ZmMwg4|Nc~4yMXC zg#p4SITKje6{=8Gf2KP=FSM}@u(Y+wLJ}E+Lf}HBMobXDi}#iO5HMGm2Ha}yHf4*! z=nd+G{248m#xwx`;W+St1j^l<#BR6ioZezM?#wJyaq0`KC(d;6_5iUqNkBJIG*ir# zsjl!Mx=He=7V$+oh+~kRv-64ys&ben__)2PvCt$r&ynWLD<&UImuya*vJ|aiBiMCp zf3_Xt#oT4;at>C*YT5VfL)1?hChQWca3OPr%V6igWI0Z_CryVI$`ZSx!HTbRQ27A6 zac=4#G%va^GjYB&LFVyHID!A6sjXSgHYXG0V5JANfoS1O_2=@HMptnrlcd?By`%od zb_0EtH_|@INj0Q>pdRs%Hwjni?s1Lc#(1deaZZvek5ha=IM^wNI-Z*Em}cACz*{aK zedqcfbG^=I<7dum7GSQj&K26@!{`$Gm?=R)%x0zv>M(Zpwrd=p#cn82n{GI-ErRo% zPb~GU6P)Q%J0%i-$8ShC1leh55?MnsI3N8}T@9B2_mg$u?*DdiX?_!+h(BU=AQq@3BSItB2E#G?E+v{VBh02C`|5-*;wM@0x=x zu6BpehRk5QXyOdt3`4axHjL^GF6L#gUF7&UJDXp)Oc!cTjMQM!*@wT(|fSMgD4 zySPXijIV+$^n@X+W)J<6@RUcMJ zaLY7}wg0J7 z*%YQdo5)4-O;l?2N8XR=NuRh)IgI9WH$j!7f%%e!6<>pOYzlXk`Aq_ad6t3ZYWohH z#basP3YfNMVU16kTR^}Ze}+`H)7(Y`W4b~;X2*IS#|S4jToHqWbDawEw@XPUL8 zb-2B?a9cbgeZV`|x9TF*8s;21iY@pn(J~#>ypGj<)WsOO87!J643HR$M^$OLRKXe@ zmMQjf+hOY$%W4~xCd1)uGd7l4zyi|DpR3e?K<9fe!vaS`Wl2C zw)Iv|CzSgt-m)mR78y}=PO(q33(oe^enD_-6;>-Vkq;Neg)#Nu3h2*G)THXB8lJk` zaDAd*$$!Vgom!i(9ZG+~Q1&TMgbmheb8}0kWs&`+_@5Gs>qr5Pu8vLeFy^PKo92}& zko||MBt`;Rs7-X+<@!urA8p0M@oUfvorbk7u6CKr zEZ4P$`UN6O{{hs z^GJC|_1ux%RxXHLg`C79HMHTH1IFi$VK77ejb94JOBqx(xdWDfHn1sbi!`7E){{<5 zXU!(VJbf$v2(}7F=W8(#PXO(}PGzJBgf-4`r=8wgj#BQ6`9iL|kMx2(+gjaNTU%v; zex#E4qCMya{0LToyCj72zX4QpuEoWu&v9G9OnHl7vo*AO+Rw^u*l*lirXg&HviMhe zAJ;Bwr}A7FpxlJ-z#*zOFr){F!-6owKEW{`YgCK0)A>8_7`ch(%beI=>O)-67{DkS zq=kwZ+(&1?L202q%$^~2W}Ms~Tn4iOb|#}Sgv;3?b_=tGX~bJq>-i^?^%Y3nqzY-K zGFz^847J{{W(u#Bd7wMW1}ks};?1_z2YQBix*K+}H)ZTRBYY8^;zuc$Oy{n0m87mS z&|1&#C#vLh@s9JXeV{WLVBI0FN}p$*M+{@RB}!vqfLxzB%XdbNgk)3@Hq3##<#X;iUbuZKr5N!_+CNYQ|1_OGoUb*0#>}iVhk<8=NM6mYsm- z!?pEwV<@lrgZqlwliG3vu}mnE8^CQSm$X)F@;3Yr-Y?G=>O1;7emm(s3*3vDt-7Qg zs=KPG;nI*D<+I=UVJcqJQ9DfY1?>#{Gnhul|akoPz% zg>|?$rnG8D+Sn67JcT(YSbnI_ycV5%-#T1Rg7a(k5Yrn1k)?ON!wsY-i>P(~CRF%|;Iu zR%#+a*&%(E&Pi*P=P;G)#jimR$z~A23}Iq`pZrdOWngzhxJ^2}bj$G&!1us*pNAMYw$lp_C@TVCY?kU}t63J6$GV2OI%8hB> zj8Sw-w9vB2&Xk_uP-ZH(n(06uNl2Ql41$lD zpX>*A0HcEsabu;c94_yZvy`r6F9-y;6{k2^cqLpGcgSyX9-ZTlNL_@pVjGapF5&;? zX0U+!&8^{vqK3Gc?5^BU=E?1Z1p5aYbdHl0>--B<<@+b~G!e5ksmFajh34-)i1LZI0q;e&L?$M{Jt}#2v zAmyOapS*&dm@KNW=-~|#izBHjH){LoAFgRpIOLkM)~kPT!bbv&zL#P22=n)LJZWTh2nwxK?if1&0=<; zgH$j0Ktl0Sd6)D}IxG)WhT=pp5fw5jb|>S>_%a>XM_gC_E%%I_%2u*nxu@($_)6I- z`Uq2nQXx_7Cw7rODz5M~)0v%zmQzpdrs(1dd0Z|9&^>&)(t>n{EvSul^Z>G`6XU`z zWh&t^+PNgG#e0-<$|U8BoTT{E_x*$_@Jb0&p5PE@rnar4mi;Gb<=M&tk^$E-GBcUk zizdQea1Z**?&3VydJvK^*d4D@#wiu}0ldw$Wp;tT6dy?|4is&Y8{SF$$Ok1u2`0hd zGbtm_!3nBgZ-TRdNPdG3%odL2n{yiWGy;^T#0$S1vz&`XtK0@JR7Oh<@d~|zbPt@Q z)xVAD!>F zkQ%%kUS&UX1GppXW_B6tK$pOJyhNF%{HGkiZNWSE8MUVx$U-y_okLpGkqndK1LM?TI+b{?r)EjmHXJ}MA;p+;*D@ZgdU^Vm_n?j<(k1Q3rHR>N&!r&1*xP+hW%$jg~ZXZ%r##~0{d8@5tU;a{TdR4=Z=>0~>6 zjf}9G48|>RK3NCbqaRQv|0qYK?i8P=ZlXeDE zu|PS-HF<-wpDOK3(IR#rx1Mc_II8Vp+y`WXQ6Pk@#6NHy5<$}O9sGjMwK85zTtEuA z58aqeYyfXimGR5zeAEjpQl?3zqPyG{cLQ@^CJdxovoGi~#h)?YH(sIik}uId_EzZ) z3ea)(DLa>016PnYRAu@kPgD9~1sjMBk0xWmI#>&pAS1JzZOR@%B_N%&B3XDVzDwWJ zhlG=DI1b0+1^7Nr!Ts@4<)oZU@lRADXqQm&#q2QBF5{)IE)R`>ue zgSSBh&E;jF0H~oqOopu?qO;W{!jcVmCbefFPNdnDMRC>>|4>SlEqDmIM6D>rskkZO zz*%Zb7Oj{-lnS@NZE!a{Lan+ASTKxa(DU`cF*q1E!wEP~`AdmZrYJ%5lM=4PE@Uj( zM-EeMA&#DJ7HooEqIakd-2(ju>rr(7K=(HO;2Zf<J_2qECJVPf)CU1dOC5d5^@uBt#{$a!>i`uvKwlHwgj$+UF!2WC!F})pyaVUJ z1yBL{!)H*99PlIzgzM>|A1m1vMpe{H_JV^?^fgjRZd`kV;nqpdp@=STETvDzm z*Oae{4o}DVl;Q8CmbL>kzRrj|dV_WVsk$zwc(W?3Wp z|G#)2o`;j^Q?r!Fao_o&6!>dWR@c+Is90mV`17SBf z4PK*OYl()SRuuoP!$06}&=)+UQBB2L@FL3MC*vgShD(&s%0=a zWOAIe2H(LT+OxdTcyt2YLo<*Y+C)3pCTiJy+MQ-$KWtYDDN-C(CeryXP2MTbkuS?l z6`OJc_afPJ@A?L`rWFv3mZSgB6|@2MN3lqvyy85~;JxrPjqF`oCmrcdWGZk0*U4xa z$>((MOz13nNqMc96>l7keQ_AQr?nDW@e<-ob8aP#>u1!E8OQud``<@22dU6{+Svwx zE#v?`ro5M%%Seu*H?Ky^6XibCDy#fN$;DRk477zi;Tsr^mY^r7l>TI(^Jp{biF8!8 z+C=w&^1p!dbGVAeAcA^{hecGy+6s2ijJ!&#qya^coivI&Xhn>mJ{EB)&ZD?^nf~?SW6YCo zwCnC5M`?8&rZLVS3ei)P52Z0%5BAXK`~#NL`dJMI04IHdH_4>fKau9%NYL;9YiiC`PitW&edj$|sb|PF z@{Z!Em4fVKjf+KzctE?WEPY6{gWMECIzJ z1wN*=P)Or&6g(n*DF^96?h!P2dIC3>`shPzBV%AiAW^R_;=6og*d7X;it*Rs!*Od=`69c2b-AcL#QQCN*sY-5&VeuABNxnfj?kjG#x zReDQ6eXxhbl6SOHdMf|Q`{iYH!=$2^hiTWn2Mp*0^MEa;`;-h=O4Rr-`Lr}ezJ@*E z9puAwL2p2Jst7fqG20JzQ&w0?ku98h<`m7YOqvgqX;zewSl|nu(Qgs)H3BHlIzy|u z8kn(Nej`1Q{*wXi799YB^XQb70=L5%a0$gB4QvTk6Bk<9m&ieSTgHHzQ|+iTnu;c% zBhUlv#+Q_D$~7DXI@1cY13frFJH{wr1Aoze)Rgl6XB3eR;n8>%Wf2Fc6&q+aJ)!qe zgD9T;P5W^}vW!lNC&6i29eUb>=E4W)3&XJ({Q&f~sWL}dfn}0J?Meq0GLwv=`F@{f zW(c{6FVfqu!)SE3;C#xtR#Cjk#YZXDXMvIQ3~BH?#o4B4G-{2$!D>4BT)?7ohT1!y z?wBUfj!;e*qQXrSEU!@p;_lRMBd7;QQ+2)ziKd8sn)Zp#pav|aRnh`}rG2dv^rxPi ziVna|z>TESX)jaWuk6Nah>2F!RoZL6;obN=ZbK0u8%%+_s0Up@E&9zb>0c4QBCa&U zs>lu612@uo52dJ(K{?u3IvusACmK)gkjoTJOgIDo4WeNEzmCzk_)v7-jaH&0ltukM7ykW!E!=%*mSq$M@bk=4r)kC13R7%Z z&WcK#ny8rNN0~0u3YoaV{K!7AQY?Z3GYvC}5ch{xW`#LRj6g`Kk;!zlY^kND>E`lt z!xX8_7JKi0N_+m7uAR29jk^sBGzruO-0?q%eqvZTGPX^)L*N83o;_j z%$3Q#Q|am0q&IvQd!m*m*_Vn_Pt~d*o{Kqgb-Ybstfa=9a?h)B*Z{XbVh1HtE6bn6 z&8yVtbLrL8Ic?S<%X7cx?)K_+`l9gvV_c6~Oirgm zbk7m>w}4K_R}E`B$sd#1N{gD%GU+F+uP8h*vFfBfQpGtAYMn zYu!qk_JVt*UzXEf#laYu%~83p%-ZP%C0Vf!{9eqYyq4<YsoHtJcW6wd*fRHYuyQf*hsjFB;);;zE<*HocHyg6xZ zI{@Fk_Vofi**-m}QrAFlSNe^w&G37c`$l}K zwnta~aDFFGK9JQl{O{ybP5#<021D%*J{7nob;@y89QK;#JtKxEWBEDAmBbF-y+U-J zz^UoHo8qkA{Hs%8ig0k6&cEAP{oz;Os>4fG=_#w;P{lW}cn~YsshQu?OZ~*+1aEd) zqg4*>lZ|Kf@3rQNZT55oGivPNfGS%I(H?5_N!7HYZg*7f^rJD3VMM;Dm5A=|snOoD z_!*Kroc$NI)q+_ktW*}a#}0b!a2f%pyx7m<>1K-sS6Ff`Y?S4<$Q4-$MT=)CLL`)yPagwE0|aWrS~y; zJZ27HbA-rtm#4c$=QK`L!C<@JuJLY97PnAKo$RV(oc5VL*glHAGOxG6;#yH^PX7Uj CoWR8Z literal 0 HcmV?d00001 diff --git a/Assets/Resources/Sfx/games/shootEmUp/16.wav.meta b/Assets/Resources/Sfx/games/shootEmUp/16.wav.meta new file mode 100644 index 000000000..cc7c59207 --- /dev/null +++ b/Assets/Resources/Sfx/games/shootEmUp/16.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8a2f6fa406d304a4ca765e508b9b33bc +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/ShootEmUp/Animations/Effect/hit.anim b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/hit.anim deleted file mode 100644 index b429c17ba..000000000 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/hit.anim +++ /dev/null @@ -1,60 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: hit - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 30 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: - - time: 0.1 - functionName: End - data: - objectReferenceParameter: {fileID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/impact.anim b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/impact.anim new file mode 100644 index 000000000..b2a45fa73 --- /dev/null +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/impact.anim @@ -0,0 +1,920 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: impact + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -1, y: 1.15, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.06666667 + value: {x: -1.4, y: 1.75, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.13333334 + value: {x: -1.2, y: 1.25, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: sprite (1) + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -1, y: -1.15, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.06666667 + value: {x: -1.4, y: -1.75, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.13333334 + value: {x: -1.2, y: -1.25, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: sprite (2) + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: -1.15, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.06666667 + value: {x: 1.4, y: -1.75, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.13333334 + value: {x: 1.2, y: -1.25, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: sprite (3) + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 1.15, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.06666667 + value: {x: 1.4, y: 1.75, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.13333334 + value: {x: 1.2, y: 1.25, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: sprite (4) + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: sprite (1) + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: sprite (2) + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: sprite (3) + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: sprite (4) + classID: 1 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 81652156, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} + - time: 0.13333334 + value: {fileID: 433249484, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} + attribute: m_Sprite + path: sprite (1) + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 81652156, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} + - time: 0.13333334 + value: {fileID: 433249484, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} + attribute: m_Sprite + path: sprite (2) + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 81652156, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} + - time: 0.13333334 + value: {fileID: 433249484, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} + attribute: m_Sprite + path: sprite (3) + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 81652156, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} + - time: 0.13333334 + value: {fileID: 433249484, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} + attribute: m_Sprite + path: sprite (4) + classID: 212 + script: {fileID: 0} + m_SampleRate: 30 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 770611889 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 113494386 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 534313011 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1352232692 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 770611889 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 113494386 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 534313011 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1352232692 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 770611889 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 113494386 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 534313011 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 1352232692 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 81652156, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} + - {fileID: 433249484, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} + - {fileID: 81652156, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} + - {fileID: 433249484, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} + - {fileID: 81652156, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} + - {fileID: 433249484, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} + - {fileID: 81652156, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} + - {fileID: 433249484, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.2 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: -1.4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: -1.2 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: sprite (1) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.15 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1.75 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 1.25 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: sprite (1) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: sprite (1) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: sprite (1) + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: -1.4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: -1.2 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: sprite (2) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1.15 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: -1.75 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: -1.25 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: sprite (2) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: sprite (2) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: sprite (2) + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1.4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 1.2 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: sprite (3) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1.15 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: -1.75 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: -1.25 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: sprite (3) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: sprite (3) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: sprite (3) + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1.4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 1.2 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: sprite (4) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.15 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1.75 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 1.25 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: sprite (4) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: sprite (4) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: sprite (4) + classID: 1 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: + - time: 0.2 + functionName: End + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/hit.anim.meta b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/impact.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/hit.anim.meta rename to Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/impact.anim.meta diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/hit.controller b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/impact.controller similarity index 96% rename from Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/hit.controller rename to Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/impact.controller index b876e9b27..1b998c0e0 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/hit.controller +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/impact.controller @@ -11,7 +11,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -1570117999851459092} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 240, y: 20, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -29,7 +29,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: hit + m_Name: impact m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -54,7 +54,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: hit + m_Name: impact serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/hit.controller.meta b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/impact.controller.meta similarity index 100% rename from Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/hit.controller.meta rename to Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/impact.controller.meta diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory.anim b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory.anim index 34557954b..fdb0bcb2b 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory.anim +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory.anim @@ -58,7 +58,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: + path: sprite m_FloatCurves: - curve: serializedVersion: 2 @@ -85,7 +85,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.a - path: + path: sprite classID: 212 script: {fileID: 0} m_PPtrCurves: [] @@ -157,7 +157,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.a - path: + path: sprite classID: 212 script: {fileID: 0} - curve: @@ -203,7 +203,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.x - path: + path: sprite classID: 4 script: {fileID: 0} - curve: @@ -249,7 +249,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.y - path: + path: sprite classID: 4 script: {fileID: 0} - curve: @@ -295,7 +295,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.z - path: + path: sprite classID: 4 script: {fileID: 0} m_EulerEditorCurves: [] diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory.anim.meta b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory.anim.meta index 90b66b6d3..aba9c8c59 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory.anim.meta +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 528395b444e4a08408359c713341633a +guid: 6de638dcbe4b13743b518905b921ecc7 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory.controller b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory.controller index 209fe262c..2b37822ab 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory.controller +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory.controller @@ -20,7 +20,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 528395b444e4a08408359c713341633a, type: 2} + m_Motion: {fileID: 7400000, guid: 6de638dcbe4b13743b518905b921ecc7, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -40,7 +40,7 @@ AnimatorStateMachine: m_Position: {x: 200, y: 0, z: 0} - serializedVersion: 1 m_State: {fileID: 7147520371516902758} - m_Position: {x: 235, y: 65, z: 0} + m_Position: {x: 230, y: 60, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -93,7 +93,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 1963616477944d34a8ba35c1e3627fd0, type: 2} + m_Motion: {fileID: 7400000, guid: 1e687081f372aa344ab4586170bd726a, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory_damage.anim b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory_damage.anim index f2c3e913c..ee41351a1 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory_damage.anim +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory_damage.anim @@ -58,7 +58,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: + path: sprite m_FloatCurves: - curve: serializedVersion: 2 @@ -85,7 +85,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.a - path: + path: sprite classID: 212 script: {fileID: 0} m_PPtrCurves: [] @@ -97,14 +97,14 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 891129758 attribute: 3 script: {fileID: 0} typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 0 + path: 891129758 attribute: 304273561 script: {fileID: 0} typeID: 212 @@ -175,7 +175,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.x - path: + path: sprite classID: 4 script: {fileID: 0} - curve: @@ -221,7 +221,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.y - path: + path: sprite classID: 4 script: {fileID: 0} - curve: @@ -267,7 +267,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.z - path: + path: sprite classID: 4 script: {fileID: 0} - curve: @@ -295,10 +295,17 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.a - path: + path: sprite classID: 212 script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.13333334 + functionName: End + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory_damage.anim.meta b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory_damage.anim.meta index 03d443380..8ce36a23f 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory_damage.anim.meta +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/Effect/trajectory_damage.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1963616477944d34a8ba35c1e3627fd0 +guid: 1e687081f372aa344ab4586170bd726a NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/MonitorHolder.controller b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/MonitorHolder.controller index df9239f45..b3f38195b 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/MonitorHolder.controller +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/MonitorHolder.controller @@ -30,7 +30,7 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -5567145048941355662} + m_DefaultState: {fileID: 4140833689692224193} --- !u!1102 &-5567145048941355662 AnimatorState: serializedVersion: 6 diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/damage.anim b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/damage.anim index d0ca6e48d..1b2e6f722 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/damage.anim +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/damage.anim @@ -20,24 +20,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -1, 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.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.033333335 - value: {x: 1, 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.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.06666667 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -46,7 +28,34 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.6666667 + time: 0.06666667 + value: {x: 0.25, 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.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.13333334 + value: {x: -0.125, 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.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.2 + value: {x: 0.0625, 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.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.23333333 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -73,7 +82,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.23333333 value: 0 inSlope: 0 outSlope: 0 @@ -116,7 +125,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.6666667 + m_StopTime: 0.23333333 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -137,24 +146,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 value: 0 inSlope: 0 outSlope: 0 @@ -163,7 +154,34 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.06666667 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: -0.125 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 0.0625 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 value: 0 inSlope: 0 outSlope: 0 @@ -191,7 +209,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.23333333 value: 0 inSlope: 0 outSlope: 0 @@ -219,7 +237,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.23333333 value: 0 inSlope: 0 outSlope: 0 @@ -247,7 +265,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.23333333 value: 0 inSlope: 0 outSlope: 0 diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemy.controller b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemy.controller index e7f59a1f2..cf6cb7381 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemy.controller +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemy.controller @@ -8,7 +8,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: enemySpawn - m_Speed: 1 + m_Speed: 2 m_CycleOffset: 0 m_Transitions: - {fileID: 7431207317530354340} @@ -35,7 +35,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: enemyMiss - m_Speed: 1 + m_Speed: 2 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemyAttack.anim b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemyAttack.anim index a10a1fa8c..ff6eb8933 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemyAttack.anim +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemyAttack.anim @@ -182,7 +182,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -210,7 +210,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -238,7 +238,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -266,7 +266,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -534,7 +534,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.16666667 + m_StopTime: 0.2 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -563,7 +563,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -591,7 +591,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -619,7 +619,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -647,7 +647,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.2 value: 0 inSlope: Infinity outSlope: Infinity @@ -1243,7 +1243,7 @@ AnimationClip: m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: - - time: 0.16666667 + - time: 0.2 functionName: End data: objectReferenceParameter: {fileID: 0} diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemyMiss.anim b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemyMiss.anim index c19744a4c..dab929d79 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemyMiss.anim +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemyMiss.anim @@ -516,35 +516,7 @@ AnimationClip: m_RotationOrder: 4 path: sprite m_ScaleCurves: [] - m_FloatCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1.4 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: sprite - classID: 1 - script: {fileID: 0} + m_FloatCurves: [] m_PPtrCurves: [] m_SampleRate: 30 m_WrapMode: 0 @@ -567,13 +539,6 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 - - serializedVersion: 2 - path: 891129758 - attribute: 2086281974 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -2114,34 +2079,6 @@ AnimationClip: path: sprite classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1.4 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: sprite - classID: 1 - script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 @@ -2175,4 +2112,11 @@ AnimationClip: script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 1.4 + functionName: End + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemySpawn.anim b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemySpawn.anim index b6d878d1b..e820aaafc 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemySpawn.anim +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemySpawn.anim @@ -23,15 +23,24 @@ AnimationClip: time: 0 value: {x: 1.2, y: 1.2, z: 1.2} inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: -3, y: -3, z: -3} + outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.13333334 - value: {x: 0.8, y: 0.8, z: 0.8} - inSlope: {x: -3, y: -3, z: -3} + time: 0.06666667 + value: {x: 1.2, y: 1.2, z: 1.2} + inSlope: {x: -0, y: -0, z: -0} + outSlope: {x: -1.5000005, y: -1.5000005, z: -1.5000005} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.2 + value: {x: 1, y: 1, z: 1} + inSlope: {x: -1.5000005, y: -1.5000005, z: -1.5000005} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 @@ -47,17 +56,35 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.5 + value: 0.66667 inSlope: 0 - outSlope: -3.7499998 + outSlope: -2.5000503 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.06666667 + value: 0.5 + inSlope: -2.5000503 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 0.5 + inSlope: -0 + outSlope: -15.000001 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 value: 0 - inSlope: -3.7499998 + inSlope: -15.000001 outSlope: 0 tangentMode: 69 weightedMode: 0 @@ -98,7 +125,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.13333334 + m_StopTime: 0.23333333 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -119,17 +146,35 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.5 + value: 0.66667 inSlope: 0 - outSlope: -3.7499998 + outSlope: -2.5000503 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.06666667 + value: 0.5 + inSlope: -2.5000503 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 0.5 + inSlope: -0 + outSlope: -15.000001 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 value: 0 - inSlope: -3.7499998 + inSlope: -15.000001 outSlope: 0 tangentMode: 69 weightedMode: 0 @@ -149,15 +194,24 @@ AnimationClip: time: 0 value: 1.2 inSlope: 0 - outSlope: -3 + outSlope: 0 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 - value: 0.8 - inSlope: -3 + time: 0.06666667 + value: 1.2 + inSlope: -0 + outSlope: -1.5000005 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 1 + inSlope: -1.5000005 outSlope: 0 tangentMode: 69 weightedMode: 0 @@ -177,15 +231,24 @@ AnimationClip: time: 0 value: 1.2 inSlope: 0 - outSlope: -3 + outSlope: 0 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 - value: 0.8 - inSlope: -3 + time: 0.06666667 + value: 1.2 + inSlope: -0 + outSlope: -1.5000005 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 1 + inSlope: -1.5000005 outSlope: 0 tangentMode: 69 weightedMode: 0 @@ -205,15 +268,24 @@ AnimationClip: time: 0 value: 1.2 inSlope: 0 - outSlope: -3 + outSlope: 0 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 - value: 0.8 - inSlope: -3 + time: 0.06666667 + value: 1.2 + inSlope: -0 + outSlope: -1.5000005 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 1 + inSlope: -1.5000005 outSlope: 0 tangentMode: 69 weightedMode: 0 diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/laser.anim b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/laser.anim index e45f738e9..b8e051805 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/laser.anim +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/laser.anim @@ -66,7 +66,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: laser + path: sprite m_ScaleCurves: [] m_FloatCurves: - curve: @@ -90,11 +90,20 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 0.6333333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: laser + path: sprite classID: 1 script: {fileID: 0} - curve: @@ -122,7 +131,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_SortingOrder - path: laser + path: sprite classID: 212 script: {fileID: 0} m_PPtrCurves: @@ -146,7 +155,7 @@ AnimationClip: - time: 0.53333336 value: {fileID: 639876594, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} attribute: m_Sprite - path: laser + path: sprite classID: 212 script: {fileID: 0} m_SampleRate: 30 @@ -157,28 +166,28 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 3914114252 + path: 891129758 attribute: 1 script: {fileID: 0} typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 3914114252 + path: 891129758 attribute: 2086281974 script: {fileID: 0} typeID: 1 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 3914114252 + path: 891129758 attribute: 3762991556 script: {fileID: 0} typeID: 212 customType: 26 isPPtrCurve: 0 - serializedVersion: 2 - path: 3914114252 + path: 891129758 attribute: 0 script: {fileID: 0} typeID: 212 @@ -199,7 +208,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.6 + m_StopTime: 0.6333333 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -236,11 +245,20 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 0.6333333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: laser + path: sprite classID: 1 script: {fileID: 0} - curve: @@ -295,7 +313,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: laser + path: sprite classID: 4 script: {fileID: 0} - curve: @@ -350,7 +368,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: laser + path: sprite classID: 4 script: {fileID: 0} - curve: @@ -405,7 +423,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: laser + path: sprite classID: 4 script: {fileID: 0} - curve: @@ -433,7 +451,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_SortingOrder - path: laser + path: sprite classID: 212 script: {fileID: 0} m_EulerEditorCurves: [] diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/laserholder.controller b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/laser.controller similarity index 57% rename from Assets/Resources/Sprites/Games/ShootEmUp/Animations/laserholder.controller rename to Assets/Resources/Sprites/Games/ShootEmUp/Animations/laser.controller index 8c786e2bb..48116604a 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/laserholder.controller +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/laser.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: laserholder + m_Name: laser serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: @@ -33,7 +33,10 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 5352389157652938509} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 260, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5383766966166234218} + m_Position: {x: 250, y: 10, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -43,7 +46,29 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 5352389157652938509} + m_DefaultState: {fileID: 5383766966166234218} +--- !u!1101 &2925820447795866210 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5383766966166234218} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5833334 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &5352389157652938509 AnimatorState: serializedVersion: 6 @@ -54,7 +79,8 @@ AnimatorState: m_Name: laser m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 2925820447795866210} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -70,3 +96,29 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &5383766966166234218 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/laserholder.controller.meta b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/laser.controller.meta similarity index 100% rename from Assets/Resources/Sprites/Games/ShootEmUp/Animations/laserholder.controller.meta rename to Assets/Resources/Sprites/Games/ShootEmUp/Animations/laser.controller.meta diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/shipDamage.anim b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/shipDamage.anim index c4c8d625b..7c03ed858 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/shipDamage.anim +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/shipDamage.anim @@ -939,4 +939,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.13333334 + functionName: DamageEnd + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Scripts/Games/ShootEmUp/Enemy.cs b/Assets/Scripts/Games/ShootEmUp/Enemy.cs index f019ac98b..c2cda2c43 100644 --- a/Assets/Scripts/Games/ShootEmUp/Enemy.cs +++ b/Assets/Scripts/Games/ShootEmUp/Enemy.cs @@ -16,7 +16,7 @@ namespace HeavenStudio.Games.Scripts_ShootEmUp public Transform effectHolder; public GameObject trajectoryEffect; public GameObject originEffect; - public GameObject hitEffect; + public GameObject impactEffect; [NonSerialized] public float scaleSpeed; Vector3 scaleRate => new Vector3(scaleSpeed, scaleSpeed, scaleSpeed) / (Conductor.instance.pitchedSecPerBeat * 2f); @@ -39,16 +39,22 @@ namespace HeavenStudio.Games.Scripts_ShootEmUp private void Just(PlayerActionEvent caller, float state) { SoundByte.PlayOneShotGame("shootEmUp/shoot"); - game.shipAnim.Play("shipShoot", 0, 0); + game.playerShip.Shoot(); + if (state <= -1f || state >= 1f) + { + + JudgeAnim("miss"); + return; + } game.hitEffect.Play(); - JustAnim(); + JudgeAnim("just"); } private void Miss(PlayerActionEvent caller) { - // this is where perfect challenge breaks - game.Damage(); - AttackAnim(); + SoundByte.PlayOneShotGame("shootEmUp/15"); + game.playerShip.Damage(); + JudgeAnim("attack"); } private void Empty(PlayerActionEvent caller) {} @@ -76,62 +82,72 @@ namespace HeavenStudio.Games.Scripts_ShootEmUp trajectory.transform.localPosition = this.transform.localPosition; Vector3 angle = new Vector3(0, 0, 0); - if (pos.x > 0 && pos.y > 0) { + if (pos.x > 0 && pos.y >= 0) { angle = new Vector3(0, 0, -70); - } else if (pos.x < 0 && pos.y > 0) { + } else if (pos.x < 0 && pos.y >= 0) { angle = new Vector3(0, 0, 70); - } else if (pos.x > 0 && pos.y < 0) { + } else if (pos.x > 0 && pos.y <= 0) { angle = new Vector3(0, 0, -110); - } else if (pos.x < 0 && pos.y < 0) { + } else if (pos.x < 0 && pos.y <= 0) { angle = new Vector3(0, 0, 110); } trajectory.transform.eulerAngles = angle; trajectory.gameObject.SetActive(true); } - public void AttackAnim() + public void JudgeAnim(string type) { - var origin = Instantiate(originEffect, effectHolder); - origin.transform.localPosition = this.transform.localPosition; + Vector3 currentPos = this.transform.localPosition; + Vector3 nextPos = new Vector3(0, 0.29f, 0); + + GameObject origin = Instantiate(originEffect, effectHolder); + origin.transform.localPosition = currentPos; origin.gameObject.SetActive(true); - this.GetComponent().Play("enemyAttack", 0, 0); isScale = false; transform.localScale = new Vector3(1.25f, 1.25f, 1.25f); - var trajectory = Instantiate(trajectoryEffect, effectHolder); - var hit = Instantiate(hitEffect, effectHolder); + GameObject trajectory = Instantiate(trajectoryEffect, effectHolder); + GameObject impact; - Vector3 attackPos = new Vector3(0, 0, 0); - Vector3 angle = new Vector3(0, 0, 0); - if (pos.x > 0) { - attackPos = new Vector3(-5, -3, 0); - angle = new Vector3(0, 0, -70); - } else if (pos.x < 0) { - attackPos = new Vector3(5, -3, 0); - angle = new Vector3(0, 0, 70); + switch (type) + { + case "just": + this.GetComponent().Play("enemyAttack", 0, 0); + impact = Instantiate(impactEffect, effectHolder); + impact.transform.localPosition = nextPos; + impact.gameObject.SetActive(true); + break; + case "attack": + this.GetComponent().Play("enemyAttack", 0, 0); + if (pos.x > 0) { + nextPos = new Vector3(-5, -3, 0); + } else if (pos.x < 0) { + nextPos = new Vector3(5, -3, 0); + } else { + nextPos = new Vector3(0, -1.25f, 0); + } + impact = Instantiate(impactEffect, effectHolder); + impact.transform.localPosition = nextPos; + impact.gameObject.SetActive(true); + break; + case "miss": + this.GetComponent().DoScaledAnimationAsync("enemyMiss", 0.5f); + break; + default: + break; } - transform.localPosition = attackPos; - trajectory.transform.localPosition = attackPos; + float angleDegrees = 180 - Mathf.Atan2(nextPos.x - currentPos.x, nextPos.y - currentPos.y) * Mathf.Rad2Deg; + Vector3 angle = new Vector3(0, 0, angleDegrees); + Vector3 scale = new Vector3(1, Vector3.Distance(nextPos, currentPos)*0.16f, 1); + + this.transform.localPosition = nextPos; + trajectory.transform.localPosition = nextPos; trajectory.transform.eulerAngles = angle; + trajectory.transform.localScale = scale; trajectory.gameObject.SetActive(true); - hit.transform.localPosition = attackPos; - hit.gameObject.SetActive(true); - } - - public void JustAnim() - { - this.GetComponent().Play("enemyAttack", 0, 0); - isScale = false; - transform.localScale = new Vector3(1.25f, 1.25f, 1.25f); - - var hit = Instantiate(hitEffect, effectHolder); - - Vector3 attackPos = new Vector3(0, 0.29f, 0); - transform.localPosition = attackPos; - hit.transform.localPosition = attackPos; - hit.gameObject.SetActive(true); + trajectory.GetComponent().Play("trajectory_damage", 0, 0); } void End() diff --git a/Assets/Scripts/Games/ShootEmUp/Ship.cs b/Assets/Scripts/Games/ShootEmUp/Ship.cs new file mode 100644 index 000000000..02c7d3728 --- /dev/null +++ b/Assets/Scripts/Games/ShootEmUp/Ship.cs @@ -0,0 +1,35 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +using HeavenStudio.Util; + +namespace HeavenStudio.Games.Scripts_ShootEmUp +{ + public class Ship : MonoBehaviour + { + public Animator shipAnim; + public Animator laserAnim; + public Animator damageAnim; + + public bool isDamage = false; + + public void Shoot() + { + shipAnim.Play("shipShoot", 0, 0); + laserAnim.Play("laser", 0, 0); + } + + public void Damage() + { + isDamage = true; + shipAnim.Play("shipDamage", 0, 0); + damageAnim.Play("damage", 0, 0); + } + + public void DamageEnd() + { + isDamage = false; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Games/ShootEmUp/Ship.cs.meta b/Assets/Scripts/Games/ShootEmUp/Ship.cs.meta new file mode 100644 index 000000000..d4f0222f8 --- /dev/null +++ b/Assets/Scripts/Games/ShootEmUp/Ship.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 87bd9c513ec32b94bb62186246367f8a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/ShootEmUp/ShootEmUp.cs b/Assets/Scripts/Games/ShootEmUp/ShootEmUp.cs index fd9e82cd7..669b9567b 100644 --- a/Assets/Scripts/Games/ShootEmUp/ShootEmUp.cs +++ b/Assets/Scripts/Games/ShootEmUp/ShootEmUp.cs @@ -55,8 +55,7 @@ namespace HeavenStudio.Games [Header("References")] public GameObject baseEnemy; public Transform enemyHolder; - public Animator shipAnim; - public Animator damageAnim; + public Ship playerShip; public ParticleSystem hitEffect; public float scaleSpeed; @@ -114,7 +113,11 @@ namespace HeavenStudio.Games if (PlayerInput.GetIsAction(InputAction_Press) && !IsExpectingInputNow(InputAction_Press)) { - Debug.Log("?"); + if (!playerShip.isDamage) + { + SoundByte.PlayOneShotGame("shootEmUp/16"); + playerShip.Shoot(); + } } GameCamera.AdditionalPosition = cameraPos.position; } @@ -201,7 +204,7 @@ namespace HeavenStudio.Games if (placement >= 0 && placement < (int)PlacementType.Manual) { - PatternItem plcPattern = PlacementPattern[Math.Min(placement, PlacementPattern.Length - 1)]; + PatternItem plcPattern = PlacementPattern[Mathf.Min(placement, PlacementPattern.Length - 1)]; int relevantInputsCount = relevantInputs.Count; int posPatternLength = plcPattern.posPattern.Length; @@ -210,9 +213,9 @@ namespace HeavenStudio.Games var evt = relevantInputs[i]; crHandlerInstance.AddEvent(evt.beat); - int relevantIndex = Math.Min(relevantInputsCount - 1, posPatternLength - 1); + int relevantIndex = Mathf.Min(relevantInputsCount - 1, posPatternLength - 1); var posData = plcPattern.posPattern[relevantIndex].posData; - int posDataIndex = Math.Min(posData.Length - 1, i); + int posDataIndex = Mathf.Min(posData.Length - 1, i); var pos = posData[posDataIndex]; SpawnEnemy(evt.beat, pos.x, pos.y, evt.beat >= gameSwitchBeat, interval); @@ -277,11 +280,5 @@ namespace HeavenStudio.Games }), }); } - - public void Damage() - { - shipAnim.Play("shipDamage", 0, 0); - damageAnim.Play("damage", 0, 0); - } } } \ No newline at end of file