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 000000000..49d4d203d Binary files /dev/null and b/Assets/Resources/Sfx/games/shootEmUp/15.wav differ diff --git a/Assets/Resources/Sfx/games/shootEmUp/15.wav.meta b/Assets/Resources/Sfx/games/shootEmUp/15.wav.meta new file mode 100644 index 000000000..09818a7a7 --- /dev/null +++ b/Assets/Resources/Sfx/games/shootEmUp/15.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 34772eb90b380d149bae661b5ba7ea54 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/shootEmUp/16.wav b/Assets/Resources/Sfx/games/shootEmUp/16.wav new file mode 100644 index 000000000..1491c4cb2 Binary files /dev/null and b/Assets/Resources/Sfx/games/shootEmUp/16.wav differ 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