diff --git a/Assets/Resources/Games/shootEmUp.prefab b/Assets/Resources/Games/shootEmUp.prefab index 291a77329..83c82f903 100644 --- a/Assets/Resources/Games/shootEmUp.prefab +++ b/Assets/Resources/Games/shootEmUp.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 8611212883825605423} m_Layer: 0 - m_Name: effect + m_Name: trajectory_origin m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -33,7 +33,7 @@ Transform: - {fileID: 2370305679927989038} - {fileID: 3684576524819384839} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &571687235652840287 GameObject: @@ -5084,7 +5084,7 @@ GameObject: - component: {fileID: 4387408012345099223} - component: {fileID: 8487170915356781443} m_Layer: 0 - m_Name: shoot_enemy_2 + m_Name: far m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5274,7 +5274,7 @@ Transform: - {fileID: 8500212854981857084} - {fileID: 3513958199165799594} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2347190105160782308 GameObject: @@ -5390,7 +5390,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5813499711186931250} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &4539050977762387867 SpriteRenderer: @@ -5623,7 +5623,7 @@ GameObject: - component: {fileID: 5702385477547808336} - component: {fileID: 5475609568409472891} m_Layer: 0 - m_Name: shoot_spawn + m_Name: trajectory m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5726,7 +5726,7 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 5813499711186931250} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2135883111423774495 SpriteRenderer: @@ -5864,6 +5864,61 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4303528567249743020 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8859579195073521555} + - component: {fileID: 3088991104019264833} + m_Layer: 0 + m_Name: DamageEffect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8859579195073521555 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4303528567249743020} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8165491228461975300} + - {fileID: 4437501663200756748} + m_Father: {fileID: 5813499711186931250} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &3088991104019264833 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4303528567249743020} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: ace13c1f58a90be408b2678d748ea67d, 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 &4410455793510420165 GameObject: m_ObjectHideFlags: 0 @@ -5893,7 +5948,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!1 &4955648182705357081 GameObject: @@ -15709,6 +15764,81 @@ ParticleSystemRenderer: m_MeshWeighting2: 1 m_MeshWeighting3: 1 m_MaskInteraction: 0 +--- !u!1 &5488597762532265674 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4381680764320635558} + - component: {fileID: 3717426265326166232} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &4381680764320635558 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5488597762532265674} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4437501663200756748} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &3717426265326166232 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5488597762532265674} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.01 + far clip plane: 1000 + field of view: 53.15 + orthographic: 1 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &5701065556445568984 GameObject: m_ObjectHideFlags: 0 @@ -15827,6 +15957,7 @@ Transform: - {fileID: 7860111563605842767} - {fileID: 9061701609461501601} - {fileID: 2492230152170177564} + - {fileID: 8859579195073521555} - {fileID: 5037680614202236387} - {fileID: 3963809439886282465} - {fileID: 3425657190638438162} @@ -15850,9 +15981,11 @@ MonoBehaviour: m_EditorClassIdentifier: SoundSequences: [] scheduledInputs: [] + cameraPos: {fileID: 4437501663200756748} baseEnemy: {fileID: 4955648182705357081} enemyHolder: {fileID: 3963809439886282465} shipAnim: {fileID: 4274233878513507453} + damageAnim: {fileID: 3088991104019264833} PlacementPattern: - posPattern: - posData: @@ -25907,6 +26040,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &7923967869903280535 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8165491228461975300} + - component: {fileID: 2926151324596375173} + m_Layer: 0 + m_Name: Red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8165491228461975300 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7923967869903280535} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 64, y: 40, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8859579195073521555} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2926151324596375173 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7923967869903280535} + 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: 2000 + m_Sprite: {fileID: 7482667652216324306, guid: ef2fa2a75dc283e40b9d4fe1f20dc6fb, type: 3} + m_Color: {r: 1, g: 0, b: 0.0627451, a: 0} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &8014677656571810012 GameObject: m_ObjectHideFlags: 0 @@ -26002,7 +26219,7 @@ GameObject: - component: {fileID: 6617605327472394276} - component: {fileID: 8668025502961143430} m_Layer: 0 - m_Name: shoot_muzzle_0 + m_Name: muzzle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -26075,6 +26292,38 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &8251013706263840347 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4437501663200756748} + m_Layer: 0 + m_Name: shootCam + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4437501663200756748 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8251013706263840347} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4381680764320635558} + m_Father: {fileID: 8859579195073521555} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8464307514600482920 GameObject: m_ObjectHideFlags: 0 @@ -26086,7 +26335,7 @@ GameObject: - component: {fileID: 3768447100777554682} - component: {fileID: 4836004292017515883} m_Layer: 0 - m_Name: shoot_beam_1 + m_Name: laser m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -31068,5 +31317,5 @@ Transform: m_Children: - {fileID: 937894074171941959} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/DamageEffect.controller b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/DamageEffect.controller new file mode 100644 index 000000000..946244c96 --- /dev/null +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/DamageEffect.controller @@ -0,0 +1,124 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DamageEffect + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 4799881914385310919} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &2235012883491280356 +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: 4628333480054944628} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &4628333480054944628 +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: +--- !u!1107 &4799881914385310919 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 5748794749500982027} + m_Position: {x: 310, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4628333480054944628} + m_Position: {x: 260, y: 10, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 4628333480054944628} +--- !u!1102 &5748794749500982027 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: damage + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 2235012883491280356} + 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: 7400000, guid: ea19eb3e8e39e9c4fb57679424dccc16, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/DamageEffect.controller.meta b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/DamageEffect.controller.meta new file mode 100644 index 000000000..6386cff8b --- /dev/null +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/DamageEffect.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ace13c1f58a90be408b2678d748ea67d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/damage.anim b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/damage.anim new file mode 100644 index 000000000..d0ca6e48d --- /dev/null +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/damage.anim @@ -0,0 +1,268 @@ +%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: damage + 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: 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} + 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.6666667 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.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: shootCam + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.27450982 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Red + classID: 212 + script: {fileID: 0} + 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: + - serializedVersion: 2 + path: 3288356314 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3257669999 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.6666667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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: 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 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: shootCam + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: shootCam + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: shootCam + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.27450982 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Red + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/damage.anim.meta b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/damage.anim.meta new file mode 100644 index 000000000..9f02c6ef0 --- /dev/null +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/damage.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ea19eb3e8e39e9c4fb57679424dccc16 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemyIdle.anim b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemyIdle.anim index 073bd3c68..cc9e739f9 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemyIdle.anim +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemyIdle.anim @@ -18,7 +18,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemySpawn.anim b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemySpawn.anim index 1dc8d6f58..11d9adfef 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemySpawn.anim +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/enemySpawn.anim @@ -23,15 +23,15 @@ AnimationClip: time: 0 value: {x: 1.2, y: 1.2, z: 1.2} inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: -0.011675384, y: 0.049542207, z: -6} + outSlope: {x: -3, y: -3, z: -3} tangentMode: 0 - weightedMode: 2 + weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.99734306, y: 1, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.06666667 + time: 0.13333334 value: {x: 0.8, y: 0.8, z: 0.8} - inSlope: {x: -6, y: -6, z: -6} + inSlope: {x: -3, y: -3, z: -3} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 @@ -40,8 +40,36 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: sprite/shoot_enemy_2 + path: sprite/far m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: trajectory + classID: 212 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -49,15 +77,15 @@ AnimationClip: time: 0 value: 0.5 inSlope: 0 - outSlope: -7.4999995 + outSlope: -3.7499998 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 + time: 0.13333334 value: 0 - inSlope: -7.4999995 + inSlope: -3.7499998 outSlope: 0 tangentMode: 69 weightedMode: 0 @@ -67,39 +95,11 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.a - path: sprite/shoot_enemy_2 - classID: 212 - 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.016666668 - 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_Color.a - path: shoot_spawn + path: sprite/far classID: 212 script: {fileID: 0} m_PPtrCurves: [] - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -107,21 +107,21 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 508696010 + path: 1233911557 attribute: 3 script: {fileID: 0} typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 508696010 + path: 3830968071 attribute: 304273561 script: {fileID: 0} typeID: 212 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 4155853592 + path: 1233911557 attribute: 304273561 script: {fileID: 0} typeID: 212 @@ -133,7 +133,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.06666667 + m_StopTime: 0.13333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -149,6 +149,34 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: trajectory + classID: 212 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -156,15 +184,15 @@ AnimationClip: time: 0 value: 0.5 inSlope: 0 - outSlope: -7.4999995 + outSlope: -3.7499998 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 + time: 0.13333334 value: 0 - inSlope: -7.4999995 + inSlope: -3.7499998 outSlope: 0 tangentMode: 69 weightedMode: 0 @@ -174,7 +202,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.a - path: sprite/shoot_enemy_2 + path: sprite/far classID: 212 script: {fileID: 0} - curve: @@ -184,15 +212,15 @@ AnimationClip: time: 0 value: 1.2 inSlope: 0 - outSlope: -0.011675384 - tangentMode: 5 - weightedMode: 2 + outSlope: -3 + tangentMode: 69 + weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.99734306 + outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 + time: 0.13333334 value: 0.8 - inSlope: -6 + inSlope: -3 outSlope: 0 tangentMode: 69 weightedMode: 0 @@ -202,7 +230,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.x - path: sprite/shoot_enemy_2 + path: sprite/far classID: 4 script: {fileID: 0} - curve: @@ -212,15 +240,15 @@ AnimationClip: time: 0 value: 1.2 inSlope: 0 - outSlope: 0.049542207 - tangentMode: 5 - weightedMode: 2 + outSlope: -3 + tangentMode: 69 + weightedMode: 0 inWeight: 0.33333334 - outWeight: 1 + outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 + time: 0.13333334 value: 0.8 - inSlope: -6 + inSlope: -3 outSlope: 0 tangentMode: 69 weightedMode: 0 @@ -230,7 +258,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.y - path: sprite/shoot_enemy_2 + path: sprite/far classID: 4 script: {fileID: 0} - curve: @@ -240,15 +268,15 @@ AnimationClip: time: 0 value: 1.2 inSlope: 0 - outSlope: -6 - tangentMode: 5 - weightedMode: 2 + outSlope: -3 + tangentMode: 69 + weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 + time: 0.13333334 value: 0.8 - inSlope: -6 + inSlope: -3 outSlope: 0 tangentMode: 69 weightedMode: 0 @@ -258,37 +286,9 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.z - path: sprite/shoot_enemy_2 + path: sprite/far 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.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.016666668 - 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_Color.a - path: shoot_spawn - classID: 212 - script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/shipDamage.anim b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/shipDamage.anim index 360366d90..c4c8d625b 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/shipDamage.anim +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/shipDamage.anim @@ -28,7 +28,7 @@ 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.33333334 + time: 0.93333334 value: {x: 0, y: 0.407, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} @@ -40,19 +40,314 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: face + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0.814, 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: 0, y: 0.823, 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.2 + value: {x: 0, y: 0.854, 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.3 + value: {x: 0, y: 0.909, 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: muzzle m_ScaleCurves: [] - m_FloatCurves: [] + m_FloatCurves: + - 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.9 + value: 1 + 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_Color.r + path: + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9 + value: 1 + 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_Color.g + path: + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9 + value: 1 + 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_Color.b + path: + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9 + value: 11 + 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_Color.g + path: muzzle + classID: 212 + 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.9 + value: 1 + 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_Color.r + path: muzzle + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9 + value: 1 + 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_Color.b + path: muzzle + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9 + value: 1 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: face + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9 + value: 1 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: face + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9 + value: 1 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: face + classID: 212 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 value: {fileID: -335952756, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} - - time: 0.33333334 + - time: 0.93333334 value: {fileID: -1038559483, guid: c0445b9380dc33d44b0c690894ddec9c, type: 3} attribute: m_Sprite path: face classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -66,6 +361,76 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2649673370 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2649673370 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2649673370 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2649673370 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 85228391 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 85228391 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 85228391 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 85228391 attribute: 0 @@ -81,7 +446,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.35000002 + m_StopTime: 0.9666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -110,7 +475,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.93333334 value: 0 inSlope: Infinity outSlope: Infinity @@ -138,7 +503,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.93333334 value: 0.407 inSlope: Infinity outSlope: Infinity @@ -166,7 +531,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.93333334 value: 0 inSlope: Infinity outSlope: Infinity @@ -181,6 +546,396 @@ AnimationClip: path: face 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.13333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + 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.x + path: muzzle + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.814 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0.823 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 0.854 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 0.909 + 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: muzzle + 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.13333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + 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: muzzle + 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.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9 + value: 1 + 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_Color.r + path: + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9 + value: 1 + 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_Color.g + path: + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9 + value: 1 + 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_Color.b + path: + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9 + value: 11 + 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_Color.g + path: muzzle + classID: 212 + 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.9 + value: 1 + 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_Color.r + path: muzzle + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9 + value: 1 + 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_Color.b + path: muzzle + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9 + value: 1 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: face + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9 + value: 1 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: face + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9 + value: 1 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: face + classID: 212 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/shipShoot.anim b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/shipShoot.anim index 5791d9923..801ef47d2 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/Animations/shipShoot.anim +++ b/Assets/Resources/Sprites/Games/ShootEmUp/Animations/shipShoot.anim @@ -57,7 +57,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: shoot_muzzle_0 + path: muzzle m_ScaleCurves: [] m_FloatCurves: - curve: @@ -65,7 +65,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 255 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -102,7 +102,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 255 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -139,7 +139,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 255 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -232,7 +232,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 255 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -261,7 +261,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._AddColor.r - path: shoot_muzzle_0 + path: muzzle classID: 212 script: {fileID: 0} - curve: @@ -269,7 +269,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 255 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -298,7 +298,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._AddColor.g - path: shoot_muzzle_0 + path: muzzle classID: 212 script: {fileID: 0} - curve: @@ -306,7 +306,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 255 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -335,7 +335,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._AddColor.b - path: shoot_muzzle_0 + path: muzzle classID: 212 script: {fileID: 0} - curve: @@ -363,7 +363,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._AddColor.a - path: shoot_muzzle_0 + path: muzzle classID: 212 script: {fileID: 0} m_PPtrCurves: [] @@ -375,7 +375,7 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 278229184 + path: 2649673370 attribute: 1 script: {fileID: 0} typeID: 4 @@ -417,28 +417,28 @@ AnimationClip: customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 278229184 + path: 2649673370 attribute: 1140649264 script: {fileID: 0} typeID: 212 customType: 22 isPPtrCurve: 0 - serializedVersion: 2 - path: 278229184 + path: 2649673370 attribute: 1409084720 script: {fileID: 0} typeID: 212 customType: 22 isPPtrCurve: 0 - serializedVersion: 2 - path: 278229184 + path: 2649673370 attribute: 1677520176 script: {fileID: 0} typeID: 212 customType: 22 isPPtrCurve: 0 - serializedVersion: 2 - path: 278229184 + path: 2649673370 attribute: 1945955632 script: {fileID: 0} typeID: 212 @@ -509,7 +509,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: shoot_muzzle_0 + path: muzzle classID: 4 script: {fileID: 0} - curve: @@ -555,7 +555,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: shoot_muzzle_0 + path: muzzle classID: 4 script: {fileID: 0} - curve: @@ -601,7 +601,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: shoot_muzzle_0 + path: muzzle classID: 4 script: {fileID: 0} - curve: @@ -609,7 +609,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 255 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -646,7 +646,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 255 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -683,7 +683,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 255 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -776,7 +776,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 255 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -805,7 +805,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._AddColor.r - path: shoot_muzzle_0 + path: muzzle classID: 212 script: {fileID: 0} - curve: @@ -813,7 +813,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 255 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -842,7 +842,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._AddColor.g - path: shoot_muzzle_0 + path: muzzle classID: 212 script: {fileID: 0} - curve: @@ -850,7 +850,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 255 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -879,7 +879,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._AddColor.b - path: shoot_muzzle_0 + path: muzzle classID: 212 script: {fileID: 0} - curve: @@ -907,7 +907,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._AddColor.a - path: shoot_muzzle_0 + path: muzzle classID: 212 script: {fileID: 0} m_EulerEditorCurves: [] diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/shoot_main.png b/Assets/Resources/Sprites/Games/ShootEmUp/shoot_main.png index 4812cf6ff..67d3ec648 100644 Binary files a/Assets/Resources/Sprites/Games/ShootEmUp/shoot_main.png and b/Assets/Resources/Sprites/Games/ShootEmUp/shoot_main.png differ diff --git a/Assets/Resources/Sprites/Games/ShootEmUp/shoot_main.png.meta b/Assets/Resources/Sprites/Games/ShootEmUp/shoot_main.png.meta index 4e6c6c29d..cb40782d7 100644 --- a/Assets/Resources/Sprites/Games/ShootEmUp/shoot_main.png.meta +++ b/Assets/Resources/Sprites/Games/ShootEmUp/shoot_main.png.meta @@ -231,7 +231,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: shoot_beam_1 + name: shoot_laser_1 rect: serializedVersion: 2 x: 8 @@ -252,7 +252,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: shoot_beam_2 + name: shoot_laser_2 rect: serializedVersion: 2 x: 264 @@ -273,7 +273,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: shoot_beam_3 + name: shoot_laser_3 rect: serializedVersion: 2 x: 520 @@ -294,7 +294,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: shoot_beam_4 + name: shoot_laser_4 rect: serializedVersion: 2 x: 776 @@ -315,7 +315,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: shoot_beam_5 + name: shoot_laser_5 rect: serializedVersion: 2 x: 1024 @@ -336,7 +336,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: shoot_beam_6 + name: shoot_laser_6 rect: serializedVersion: 2 x: 1288 @@ -357,7 +357,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: shoot_beam_7 + name: shoot_laser_7 rect: serializedVersion: 2 x: 1544 @@ -378,7 +378,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: shoot_beam_8 + name: shoot_laser_8 rect: serializedVersion: 2 x: 1800 @@ -399,7 +399,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: shoot_beam_9 + name: shoot_laser_9 rect: serializedVersion: 2 x: 2056 @@ -420,7 +420,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: shoot_beam_ + name: shoot_laser_10 rect: serializedVersion: 2 x: 2312 @@ -934,16 +934,6 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: - shoot_beam_: 639876594 - shoot_beam_1: -80151480 - shoot_beam_2: -699956437 - shoot_beam_3: -1387073146 - shoot_beam_4: -2049787610 - shoot_beam_5: -1035767384 - shoot_beam_6: -1425704675 - shoot_beam_7: 1192824803 - shoot_beam_8: -1120405300 - shoot_beam_9: 515187223 shoot_circle: 1487568205 shoot_earth: 769114757 shoot_effect_0: 433249484 @@ -951,6 +941,16 @@ TextureImporter: shoot_enemy_0: -2136356488 shoot_enemy_1: -2032356040 shoot_enemy_2: -2103752361 + shoot_laser_1: -80151480 + shoot_laser_10: 639876594 + shoot_laser_2: -699956437 + shoot_laser_3: -1387073146 + shoot_laser_4: -2049787610 + shoot_laser_5: -1035767384 + shoot_laser_6: -1425704675 + shoot_laser_7: 1192824803 + shoot_laser_8: -1120405300 + shoot_laser_9: 515187223 shoot_main_0: -1214197752 shoot_main_1: 1060486047 shoot_main_13: -1428911822 diff --git a/Assets/Scripts/Games/ShootEmUp/ShootEmUp.cs b/Assets/Scripts/Games/ShootEmUp/ShootEmUp.cs index 2d8f87454..edbaffeae 100644 --- a/Assets/Scripts/Games/ShootEmUp/ShootEmUp.cs +++ b/Assets/Scripts/Games/ShootEmUp/ShootEmUp.cs @@ -49,9 +49,14 @@ namespace HeavenStudio.Games using Scripts_ShootEmUp; public class ShootEmUp : Minigame { + [Header("Camera")] + [SerializeField] Transform cameraPos; + + [Header("References")] public GameObject baseEnemy; public Transform enemyHolder; public Animator shipAnim; + public Animator damageAnim; private List spawnedEnemies = new List(); @@ -98,6 +103,18 @@ namespace HeavenStudio.Games instance = this; } + + void Update() + { + Debug.Log("?"); + Debug.Log(GameCamera.AdditionalPosition); + Debug.Log(GameCamera.AdditionalFoV); + GameCamera.AdditionalPosition = cameraPos.position; + // Debug.Log(GameCamera.AdditionalPosition); + // GameCamera.AdditionalPosition = new Vector3(-10,-10,10); + // Debug.Log(GameCamera.AdditionalPosition); + } + public override void OnGameSwitch(double beat) { if (Conductor.instance.isPlaying && !Conductor.instance.isPaused) @@ -270,6 +287,7 @@ namespace HeavenStudio.Games public void Damage() { shipAnim.Play("shipDamage"); + damageAnim.Play("damage"); } } } \ No newline at end of file