diff --git a/Assets/_Project/Animations/Default.anim b/Assets/_Project/Animations/Default.anim index a662ac4..534df32 100644 --- a/Assets/_Project/Animations/Default.anim +++ b/Assets/_Project/Animations/Default.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: 1 + time: 0.16666667 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -39,7 +39,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: CubeAnim + path: PlayerObject m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] @@ -51,7 +51,7 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 2387847166 + path: 2189091576 attribute: 1 script: {fileID: 0} typeID: 4 @@ -63,7 +63,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.16666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -92,7 +92,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 0.16666667 value: 0 inSlope: 0 outSlope: 0 @@ -104,7 +104,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -120,7 +120,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 0.16666667 value: 0 inSlope: 0 outSlope: 0 @@ -132,7 +132,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -148,7 +148,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 0.16666667 value: 0 inSlope: 0 outSlope: 0 @@ -160,7 +160,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} m_EulerEditorCurves: [] diff --git a/Assets/_Project/Animations/CubeAnimCtl.controller b/Assets/_Project/Animations/PlayerAnimController.controller similarity index 98% rename from Assets/_Project/Animations/CubeAnimCtl.controller rename to Assets/_Project/Animations/PlayerAnimController.controller index daf91a2..e6091f2 100644 --- a/Assets/_Project/Animations/CubeAnimCtl.controller +++ b/Assets/_Project/Animations/PlayerAnimController.controller @@ -145,7 +145,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0 + m_TransitionDuration: 0.2 m_TransitionOffset: 0 m_ExitTime: 1 m_HasExitTime: 0 @@ -315,7 +315,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: CubeAnimCtl + m_Name: PlayerAnimController serializedVersion: 5 m_AnimatorParameters: - m_Name: state @@ -323,7 +323,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -471,9 +471,9 @@ AnimatorStateMachine: m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} + m_AnyStatePosition: {x: 50, y: 120, z: 0} + m_EntryPosition: {x: 50, y: 180, z: 0} + m_ExitPosition: {x: 50, y: 70, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -359137941183271379} --- !u!1102 &7250601107131478602 diff --git a/Assets/_Project/Animations/CubeAnimCtl.controller.meta b/Assets/_Project/Animations/PlayerAnimController.controller.meta similarity index 100% rename from Assets/_Project/Animations/CubeAnimCtl.controller.meta rename to Assets/_Project/Animations/PlayerAnimController.controller.meta diff --git a/Assets/_Project/Animations/Pop_sm_Shake.anim b/Assets/_Project/Animations/Pop_Shake_Stretch_sm.anim similarity index 96% rename from Assets/_Project/Animations/Pop_sm_Shake.anim rename to Assets/_Project/Animations/Pop_Shake_Stretch_sm.anim index 63b4b31..bbfe7c5 100644 --- a/Assets/_Project/Animations/Pop_sm_Shake.anim +++ b/Assets/_Project/Animations/Pop_Shake_Stretch_sm.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Pop_sm_Shake + m_Name: Pop_Shake_Stretch_sm serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 @@ -28,7 +28,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.33333334 - value: {x: 0, y: 25, z: 0} + value: {x: 0, y: 0, z: 25} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -37,7 +37,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.4 - value: {x: 0, y: -10, z: 0} + value: {x: 0, y: 0, z: -10} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -46,7 +46,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.46666667 - value: {x: 0, y: 25, z: 0} + value: {x: 0, y: 0, z: 25} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -55,7 +55,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.53333336 - value: {x: 0, y: -10, z: 0} + value: {x: 0, y: 0, z: -10} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -64,7 +64,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6 - value: {x: 0, y: 25, z: 0} + value: {x: 0, y: 0, z: 25} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -83,7 +83,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: CubeAnim + path: PlayerObject m_PositionCurves: [] m_ScaleCurves: - curve: @@ -119,7 +119,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: CubeAnim + path: PlayerObject m_FloatCurves: [] m_PPtrCurves: [] m_SampleRate: 60 @@ -130,14 +130,14 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 2387847166 + path: 2189091576 attribute: 4 script: {fileID: 0} typeID: 4 customType: 4 isPPtrCurve: 0 - serializedVersion: 2 - path: 2387847166 + path: 2189091576 attribute: 3 script: {fileID: 0} typeID: 4 @@ -199,7 +199,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.x - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -236,7 +236,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.y - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -273,7 +273,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.z - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -346,7 +346,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -363,7 +363,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 25 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -372,7 +372,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.4 - value: -10 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -381,7 +381,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.46666667 - value: 25 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -390,7 +390,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.53333336 - value: -10 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -399,7 +399,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6 - value: 25 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -419,7 +419,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -436,7 +436,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 0 + value: 25 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -445,7 +445,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.4 - value: 0 + value: -10 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -454,7 +454,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.46666667 - value: 0 + value: 25 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -463,7 +463,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.53333336 - value: 0 + value: -10 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -472,7 +472,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6 - value: 0 + value: 25 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -492,7 +492,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} m_EulerEditorCurves: @@ -503,7 +503,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -513,7 +513,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -523,7 +523,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} m_HasGenericRootTransform: 0 diff --git a/Assets/_Project/Animations/Pop_Shake_Stretch_sm.anim.meta b/Assets/_Project/Animations/Pop_Shake_Stretch_sm.anim.meta new file mode 100644 index 0000000..4a8dcea --- /dev/null +++ b/Assets/_Project/Animations/Pop_Shake_Stretch_sm.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c50274a05d5324201ba563f7beeaa01a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Project/Animations/Pop_Shake_md.anim b/Assets/_Project/Animations/Pop_Shake_md.anim new file mode 100644 index 0000000..b210383 --- /dev/null +++ b/Assets/_Project/Animations/Pop_Shake_md.anim @@ -0,0 +1,567 @@ +%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: Pop_Shake_md + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.35 + 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.43333334 + value: {x: 0, y: 0, z: 20} + 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.51666665 + value: {x: 0, y: 0, z: -20} + 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.6166667 + value: {x: 0, y: 0, z: 20} + 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.7 + value: {x: 0, y: 0, z: -20} + 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.78333336 + value: {x: 0, y: 0, z: 20} + 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: 1 + 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: PlayerObject/FaceCamera + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 1, z: 1} + 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.6166667 + value: {x: 1.5, y: 1.5, z: 1} + 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: 1 + value: {x: 1, y: 1, z: 1} + 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: PlayerObject/FaceCamera + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + 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: 3628283646 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3628283646 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.35 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.51666665 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.7 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.78333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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: localEulerAnglesRaw.x + path: PlayerObject/FaceCamera + 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.35 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.51666665 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.7 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.78333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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: localEulerAnglesRaw.y + path: PlayerObject/FaceCamera + 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.35 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: 20 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.51666665 + value: -20 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6166667 + value: 20 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.7 + value: -20 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.78333336 + value: 20 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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: localEulerAnglesRaw.z + path: PlayerObject/FaceCamera + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6166667 + value: 1.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + 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_LocalScale.x + path: PlayerObject/FaceCamera + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6166667 + value: 1.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + 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_LocalScale.y + path: PlayerObject/FaceCamera + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6166667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + 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_LocalScale.z + path: PlayerObject/FaceCamera + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: PlayerObject/FaceCamera + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: PlayerObject/FaceCamera + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: PlayerObject/FaceCamera + classID: 4 + script: {fileID: 0} + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/_Project/Animations/Pop_md_Shake.anim.meta b/Assets/_Project/Animations/Pop_Shake_md.anim.meta similarity index 100% rename from Assets/_Project/Animations/Pop_md_Shake.anim.meta rename to Assets/_Project/Animations/Pop_Shake_md.anim.meta diff --git a/Assets/_Project/Animations/Pop_md_Shake.anim b/Assets/_Project/Animations/Pop_Shake_sm.anim similarity index 95% rename from Assets/_Project/Animations/Pop_md_Shake.anim rename to Assets/_Project/Animations/Pop_Shake_sm.anim index 750e1be..889143a 100644 --- a/Assets/_Project/Animations/Pop_md_Shake.anim +++ b/Assets/_Project/Animations/Pop_Shake_sm.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Pop_md_Shake + m_Name: Pop_Shake_sm serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 @@ -28,7 +28,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.33333334 - value: {x: 0, y: 25, z: 0} + value: {x: 0, y: 0, z: 25} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -37,7 +37,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.4 - value: {x: 0, y: -10, z: 0} + value: {x: 0, y: 0, z: -10} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -46,7 +46,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.46666667 - value: {x: 0, y: 25, z: 0} + value: {x: 0, y: 0, z: 25} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -55,7 +55,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.53333336 - value: {x: 0, y: -10, z: 0} + value: {x: 0, y: 0, z: -10} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -64,7 +64,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6 - value: {x: 0, y: 25, z: 0} + value: {x: 0, y: 0, z: 25} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -83,7 +83,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: CubeAnim + path: PlayerObject m_PositionCurves: [] m_ScaleCurves: - curve: @@ -100,7 +100,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5 - value: {x: 2, y: 1, z: 2} + value: {x: 1.25, y: 1.25, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -119,7 +119,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: CubeAnim + path: PlayerObject m_FloatCurves: [] m_PPtrCurves: [] m_SampleRate: 60 @@ -130,14 +130,14 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 2387847166 + path: 2189091576 attribute: 4 script: {fileID: 0} typeID: 4 customType: 4 isPPtrCurve: 0 - serializedVersion: 2 - path: 2387847166 + path: 2189091576 attribute: 3 script: {fileID: 0} typeID: 4 @@ -179,7 +179,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 2 + value: 1.25 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -199,7 +199,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.x - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -216,7 +216,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 1 + value: 1.25 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -236,7 +236,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.y - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -253,7 +253,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 2 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -273,7 +273,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.z - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -346,7 +346,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -363,7 +363,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 25 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -372,7 +372,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.4 - value: -10 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -381,7 +381,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.46666667 - value: 25 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -390,7 +390,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.53333336 - value: -10 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -399,7 +399,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6 - value: 25 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -419,7 +419,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -436,7 +436,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 0 + value: 25 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -445,7 +445,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.4 - value: 0 + value: -10 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -454,7 +454,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.46666667 - value: 0 + value: 25 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -463,7 +463,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.53333336 - value: 0 + value: -10 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -472,7 +472,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6 - value: 0 + value: 25 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -492,7 +492,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} m_EulerEditorCurves: @@ -503,7 +503,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -513,7 +513,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -523,7 +523,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} m_HasGenericRootTransform: 0 diff --git a/Assets/_Project/Animations/Pop_sm_Shake.anim.meta b/Assets/_Project/Animations/Pop_Shake_sm.anim.meta similarity index 100% rename from Assets/_Project/Animations/Pop_sm_Shake.anim.meta rename to Assets/_Project/Animations/Pop_Shake_sm.anim.meta diff --git a/Assets/_Project/Animations/Pop_sm.anim b/Assets/_Project/Animations/Pop_sm.anim index c34acfa..2c10761 100644 --- a/Assets/_Project/Animations/Pop_sm.anim +++ b/Assets/_Project/Animations/Pop_sm.anim @@ -49,7 +49,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: CubeAnim + path: PlayerObject m_FloatCurves: [] m_PPtrCurves: [] m_SampleRate: 60 @@ -60,7 +60,7 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 2387847166 + path: 2189091576 attribute: 3 script: {fileID: 0} typeID: 4 @@ -122,7 +122,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.x - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -159,7 +159,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.y - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -196,7 +196,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.z - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} m_EulerEditorCurves: [] diff --git a/Assets/_Project/Animations/Swirl_r_md.anim b/Assets/_Project/Animations/Swirl_r_md.anim index 5cfbfdb..d8465cb 100644 --- a/Assets/_Project/Animations/Swirl_r_md.anim +++ b/Assets/_Project/Animations/Swirl_r_md.anim @@ -27,71 +27,71 @@ 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.16666667 - value: {x: 0, y: 45, z: 0} - inSlope: {x: 0, y: 270, z: 0} - outSlope: {x: 0, y: 270, z: 0} + time: 0.25 + value: {x: 0, y: 0, z: -45} + inSlope: {x: 0, y: 0, z: -180} + outSlope: {x: 0, y: 0, z: -180} 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.33333334 - value: {x: 0, y: 90, z: 0} - inSlope: {x: 0, y: 270.00003, z: 0} - outSlope: {x: 0, y: 270.00003, z: 0} + time: 0.5 + value: {x: 0, y: 0, z: -90} + inSlope: {x: 0, y: 0, z: -180} + outSlope: {x: 0, y: 0, z: -180} 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.5 - value: {x: 0, y: 135, z: 0} - inSlope: {x: 0, y: 270, z: 0} - outSlope: {x: 0, y: 270, z: 0} + time: 0.75 + value: {x: 0, y: 0, z: -135} + inSlope: {x: 0, y: 0, z: -180} + outSlope: {x: 0, y: 0, z: -180} 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: 180, z: 0} - inSlope: {x: 0, y: 270.00003, z: 0} - outSlope: {x: 0, y: 270.00003, z: 0} + time: 1 + value: {x: 0, y: 0, z: -180} + inSlope: {x: 0, y: 0, z: -180} + outSlope: {x: 0, y: 0, z: -180} 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.8333333 - value: {x: 0, y: 225, z: 0} - inSlope: {x: 0, y: 270.00003, z: 0} - outSlope: {x: 0, y: 270.00003, z: 0} + time: 1.25 + value: {x: 0, y: 0, z: -225} + inSlope: {x: 0, y: 0, z: -180} + outSlope: {x: 0, y: 0, z: -180} 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: 1 - value: {x: 0, y: 270, z: 0} - inSlope: {x: 0, y: 270.00003, z: 0} - outSlope: {x: 0, y: 270.00003, z: 0} + time: 1.5 + value: {x: 0, y: 0, z: -270} + inSlope: {x: 0, y: 0, z: -180} + outSlope: {x: 0, y: 0, z: -180} 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: 1.1666666 - value: {x: 0, y: 315, z: 0} - inSlope: {x: 0, y: 269.99997, z: 0} - outSlope: {x: 0, y: 269.99997, z: 0} + time: 1.75 + value: {x: 0, y: 0, z: -315} + inSlope: {x: 0, y: 0, z: -180} + outSlope: {x: 0, y: 0, z: -180} 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: 1.3333334 - value: {x: 0, y: 360, z: 0} + time: 2 + value: {x: 0, y: 0, z: -360} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -101,7 +101,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: CubeAnim + path: PlayerObject m_PositionCurves: - curve: serializedVersion: 2 @@ -116,70 +116,70 @@ 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.16666667 - value: {x: 0.5, y: 0, z: 1} - inSlope: {x: 4.5, y: 0, z: 4.5} - outSlope: {x: 4.5, y: 0, z: 4.5} + time: 0.25 + value: {x: 2, y: -1, z: 0} + inSlope: {x: 6, y: -6, z: 0} + outSlope: {x: 6, y: -6, 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.33333334 - value: {x: 1.5, y: 0, z: 1.5} - inSlope: {x: 6.0000005, y: 0, z: 0} - outSlope: {x: 6.0000005, y: 0, z: 0} + time: 0.5 + value: {x: 3, y: -3, z: 0} + inSlope: {x: 0, y: -8, z: 0} + outSlope: {x: 0, y: -8, 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.5 - value: {x: 2.5, y: 0, z: 1} - inSlope: {x: 4.5, y: 0, z: -4.5} - outSlope: {x: 4.5, y: 0, z: -4.5} + time: 0.75 + value: {x: 2, y: -5, z: 0} + inSlope: {x: -6, y: -6, z: 0} + outSlope: {x: -6, y: -6, 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: 3, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: -6.0000005} - outSlope: {x: 0, y: 0, z: -6.0000005} + time: 1 + value: {x: 0, y: -6, z: 0} + inSlope: {x: -8, y: 0, z: 0} + outSlope: {x: -8, 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.8333333 - value: {x: 2.5, y: 0, z: -1} - inSlope: {x: -4.5000005, y: 0, z: -4.5000005} - outSlope: {x: -4.5000005, y: 0, z: -4.5000005} + time: 1.25 + value: {x: -2, y: -5, z: 0} + inSlope: {x: -6, y: 6, z: 0} + outSlope: {x: -6, y: 6, 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: 1 - value: {x: 1.5, y: 0, z: -1.5} - inSlope: {x: -6.0000005, y: 0, z: 0} - outSlope: {x: -6.0000005, y: 0, z: 0} + time: 1.5 + value: {x: -3, y: -3, z: 0} + inSlope: {x: 0, y: 8, z: 0} + outSlope: {x: 0, y: 8, 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: 1.1666666 - value: {x: 0.5, y: 0, z: -1} - inSlope: {x: -4.4999995, y: 0, z: 4.4999995} - outSlope: {x: -4.4999995, y: 0, z: 4.4999995} + time: 1.75 + value: {x: -2, y: -1, z: 0} + inSlope: {x: 6, y: 6, z: 0} + outSlope: {x: 6, y: 6, 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: 1.3333334 + time: 2 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -190,7 +190,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: CubeAnim + path: PlayerObject m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] @@ -202,14 +202,14 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 2387847166 + path: 2189091576 attribute: 1 script: {fileID: 0} typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 2387847166 + path: 2189091576 attribute: 4 script: {fileID: 0} typeID: 4 @@ -221,7 +221,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.3333334 + m_StopTime: 2 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -250,70 +250,70 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 - value: 0.5 - inSlope: 4.5 - outSlope: 4.5 + time: 0.25 + value: 2 + inSlope: 6 + outSlope: 6 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 - value: 1.5 - inSlope: 6.0000005 - outSlope: 6.0000005 + time: 0.5 + value: 3 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 - value: 2.5 - inSlope: 4.5 - outSlope: 4.5 + time: 0.75 + value: 2 + inSlope: -6 + outSlope: -6 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 - value: 3 - inSlope: 0 - outSlope: 0 + time: 1 + value: 0 + inSlope: -8 + outSlope: -8 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8333333 - value: 2.5 - inSlope: -4.5000005 - outSlope: -4.5000005 + time: 1.25 + value: -2 + inSlope: -6 + outSlope: -6 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 - value: 1.5 - inSlope: -6.0000005 - outSlope: -6.0000005 + time: 1.5 + value: -3 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1666666 - value: 0.5 - inSlope: -4.4999995 - outSlope: -4.4999995 + time: 1.75 + value: -2 + inSlope: 6 + outSlope: 6 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 + time: 2 value: 0 inSlope: 0 outSlope: 0 @@ -325,7 +325,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -341,35 +341,35 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 - value: 0 - inSlope: 0 - outSlope: 0 + time: 0.25 + value: -1 + inSlope: -6 + outSlope: -6 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 - value: 0 - inSlope: 0 - outSlope: 0 + time: 0.5 + value: -3 + inSlope: -8 + outSlope: -8 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 + time: 0.75 + value: -5 + inSlope: -6 + outSlope: -6 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 - value: 0 + time: 1 + value: -6 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -377,34 +377,34 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8333333 - value: 0 - inSlope: 0 - outSlope: 0 + time: 1.25 + value: -5 + inSlope: 6 + outSlope: 6 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 + time: 1.5 + value: -3 + inSlope: 8 + outSlope: 8 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1666666 - value: 0 - inSlope: 0 - outSlope: 0 + time: 1.75 + value: -1 + inSlope: 6 + outSlope: 6 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 + time: 2 value: 0 inSlope: 0 outSlope: 0 @@ -416,7 +416,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -432,17 +432,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 - value: 1 - inSlope: 4.5 - outSlope: 4.5 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 - value: 1.5 + time: 0.5 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -450,35 +450,35 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: -4.5 - outSlope: -4.5 + time: 0.75 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 1 value: 0 - inSlope: -6.0000005 - outSlope: -6.0000005 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8333333 - value: -1 - inSlope: -4.5000005 - outSlope: -4.5000005 + time: 1.25 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 - value: -1.5 + time: 1.5 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -486,16 +486,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1666666 - value: -1 - inSlope: 4.4999995 - outSlope: 4.4999995 + time: 1.75 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 + time: 2 value: 0 inSlope: 0 outSlope: 0 @@ -507,7 +507,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -523,7 +523,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.25 value: 0 inSlope: 0 outSlope: 0 @@ -532,7 +532,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -541,7 +541,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.75 value: 0 inSlope: 0 outSlope: 0 @@ -550,7 +550,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -559,7 +559,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8333333 + time: 1.25 value: 0 inSlope: 0 outSlope: 0 @@ -568,7 +568,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 1.5 value: 0 inSlope: 0 outSlope: 0 @@ -577,7 +577,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1666666 + time: 1.75 value: 0 inSlope: 0 outSlope: 0 @@ -586,7 +586,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 + time: 2 value: 0 inSlope: 0 outSlope: 0 @@ -598,7 +598,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -614,71 +614,71 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 - value: 45 - inSlope: 270 - outSlope: 270 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 - value: 90 - inSlope: 270.00003 - outSlope: 270.00003 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 - value: 135 - inSlope: 270 - outSlope: 270 + time: 0.75 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 - value: 180 - inSlope: 270.00003 - outSlope: 270.00003 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8333333 - value: 225 - inSlope: 270.00003 - outSlope: 270.00003 + time: 1.25 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 - value: 270 - inSlope: 270.00003 - outSlope: 270.00003 + time: 1.5 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1666666 - value: 315 - inSlope: 269.99997 - outSlope: 269.99997 + time: 1.75 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 - value: 360 + time: 2 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -689,7 +689,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -705,71 +705,71 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 - value: 0 - inSlope: 0 - outSlope: 0 + time: 0.25 + value: -45 + inSlope: -180 + outSlope: -180 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 - value: 0 - inSlope: 0 - outSlope: 0 + time: 0.5 + value: -90 + inSlope: -180 + outSlope: -180 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 + time: 0.75 + value: -135 + inSlope: -180 + outSlope: -180 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 - value: 0 - inSlope: 0 - outSlope: 0 + time: 1 + value: -180 + inSlope: -180 + outSlope: -180 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8333333 - value: 0 - inSlope: 0 - outSlope: 0 + time: 1.25 + value: -225 + inSlope: -180 + outSlope: -180 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 + time: 1.5 + value: -270 + inSlope: -180 + outSlope: -180 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1666666 - value: 0 - inSlope: 0 - outSlope: 0 + time: 1.75 + value: -315 + inSlope: -180 + outSlope: -180 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 - value: 0 + time: 2 + value: -360 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -780,7 +780,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} m_EulerEditorCurves: @@ -791,7 +791,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -801,7 +801,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -811,7 +811,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} m_HasGenericRootTransform: 0 diff --git a/Assets/_Project/Animations/Swirl_r_sm.anim b/Assets/_Project/Animations/Swirl_r_sm.anim index 28334a3..799f664 100644 --- a/Assets/_Project/Animations/Swirl_r_sm.anim +++ b/Assets/_Project/Animations/Swirl_r_sm.anim @@ -28,34 +28,34 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.45 - value: {x: 0, y: 90, z: 0} - inSlope: {x: 0, y: 189.4737, z: 0} - outSlope: {x: 0, y: 189.4737, z: 0} + value: {x: 0, y: 0, z: -90} + inSlope: {x: 0, y: 0, z: -189.4737} + outSlope: {x: 0, y: 0, z: -189.4737} 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.95 - value: {x: 0, y: 180, z: 0} - inSlope: {x: 0, y: 180, z: 0} - outSlope: {x: 0, y: 180, z: 0} + value: {x: 0, y: 0, z: -180} + inSlope: {x: 0, y: 0, z: -180} + outSlope: {x: 0, y: 0, z: -180} 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: 1.45 - value: {x: 0, y: 270, z: 0} - inSlope: {x: 0, y: 183.05086, z: 0} - outSlope: {x: 0, y: 183.05086, z: 0} + value: {x: 0, y: 0, z: -270} + inSlope: {x: 0, y: 0, z: -183.05086} + outSlope: {x: 0, y: 0, z: -183.05086} 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: 1.9333333 - value: {x: 0, y: 360, z: 0} + value: {x: 0, y: 0, z: -360} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -65,7 +65,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: CubeAnim + path: PlayerObject m_PositionCurves: - curve: serializedVersion: 2 @@ -81,27 +81,27 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5 - value: {x: 1, y: 0, z: 1} - inSlope: {x: 2, y: 0, z: 0} - outSlope: {x: 2, y: 0, z: 0} + value: {x: 2, y: 2, z: 0} + inSlope: {x: 4, y: 0, z: 0} + outSlope: {x: 4, 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: 1 - value: {x: 2, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: -2} - outSlope: {x: 0, y: 0, z: -2} + value: {x: 4, y: 0, z: 0} + inSlope: {x: 0, y: -4, z: 0} + outSlope: {x: 0, y: -4, 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: 1.5 - value: {x: 1, y: 0, z: -1} - inSlope: {x: -2, y: 0, z: 0} - outSlope: {x: -2, y: 0, z: 0} + value: {x: 2, y: -2, z: 0} + inSlope: {x: -4, y: 0, z: 0} + outSlope: {x: -4, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -118,7 +118,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: CubeAnim + path: PlayerObject m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] @@ -130,14 +130,14 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 2387847166 + path: 2189091576 attribute: 1 script: {fileID: 0} typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 2387847166 + path: 2189091576 attribute: 4 script: {fileID: 0} typeID: 4 @@ -179,16 +179,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 1 - inSlope: 2 - outSlope: 2 + value: 2 + inSlope: 4 + outSlope: 4 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 2 + value: 4 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -197,9 +197,9 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.5 - value: 1 - inSlope: -2 - outSlope: -2 + value: 2 + inSlope: -4 + outSlope: -4 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -217,7 +217,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -234,7 +234,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0 + value: 2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -244,15 +244,15 @@ AnimationClip: - serializedVersion: 3 time: 1 value: 0 - inSlope: 0 - outSlope: 0 + inSlope: -4 + outSlope: -4 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1.5 - value: 0 + value: -2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -272,7 +272,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -289,7 +289,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -299,15 +299,15 @@ AnimationClip: - serializedVersion: 3 time: 1 value: 0 - inSlope: -2 - outSlope: -2 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1.5 - value: -1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -327,7 +327,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -382,7 +382,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -399,34 +399,34 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.45 - value: 90 - inSlope: 189.4737 - outSlope: 189.4737 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.95 - value: 180 - inSlope: 180 - outSlope: 180 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1.45 - value: 270 - inSlope: 183.05086 - outSlope: 183.05086 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1.9333333 - value: 360 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -437,7 +437,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -454,34 +454,34 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.45 - value: 0 - inSlope: 0 - outSlope: 0 + value: -90 + inSlope: -189.4737 + outSlope: -189.4737 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.95 - value: 0 - inSlope: 0 - outSlope: 0 + value: -180 + inSlope: -180 + outSlope: -180 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1.45 - value: 0 - inSlope: 0 - outSlope: 0 + value: -270 + inSlope: -183.05086 + outSlope: -183.05086 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1.9333333 - value: 0 + value: -360 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -492,7 +492,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} m_EulerEditorCurves: @@ -503,7 +503,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -513,7 +513,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} - curve: @@ -523,7 +523,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: CubeAnim + path: PlayerObject classID: 4 script: {fileID: 0} m_HasGenericRootTransform: 0 diff --git a/Assets/_Project/Prefabs/PlayerPrefab.prefab b/Assets/_Project/Prefabs/PlayerPrefab.prefab index b44bf46..b0a2d1d 100644 --- a/Assets/_Project/Prefabs/PlayerPrefab.prefab +++ b/Assets/_Project/Prefabs/PlayerPrefab.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b70c43acb1fbff1ea2f9495809f930f086f3c7192b52cc21fa8ddc52566c1653 -size 32392 +oid sha256:aeb798d2af12e81b9e4a18303ef23b07c2647bd0ba35fc640835578940188835 +size 32997 diff --git a/Assets/_Project/Prefabs/TrailColor.prefab b/Assets/_Project/Prefabs/TrailColor.prefab new file mode 100644 index 0000000..e0ca67b --- /dev/null +++ b/Assets/_Project/Prefabs/TrailColor.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e263a7d24cc9eb2297680fe7d2b4b1df9abe9364f8d6d6252cf3dea840a7beaf +size 4016 diff --git a/Assets/_Project/Prefabs/TrailColor.prefab.meta b/Assets/_Project/Prefabs/TrailColor.prefab.meta new file mode 100644 index 0000000..d9369c8 --- /dev/null +++ b/Assets/_Project/Prefabs/TrailColor.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6d235259a4bf44f33bd3788fc4ff9c95 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Project/Prefabs/TrailingMonster.prefab b/Assets/_Project/Prefabs/TrailingMonster.prefab new file mode 100644 index 0000000..3ef7a65 --- /dev/null +++ b/Assets/_Project/Prefabs/TrailingMonster.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79228f0a04623ccb4d3b1eb1547306d04d15def58fc8656ec445fc89923e951b +size 873 diff --git a/Assets/_Project/Prefabs/TrailingMonster.prefab.meta b/Assets/_Project/Prefabs/TrailingMonster.prefab.meta new file mode 100644 index 0000000..89375d7 --- /dev/null +++ b/Assets/_Project/Prefabs/TrailingMonster.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e0010077fb580412581b6e09fa66ba19 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Project/Scripts/Effects/FaceCamera.cs b/Assets/_Project/Scripts/Effects/FaceCamera.cs index e32b9d1..4c0044f 100644 --- a/Assets/_Project/Scripts/Effects/FaceCamera.cs +++ b/Assets/_Project/Scripts/Effects/FaceCamera.cs @@ -4,6 +4,8 @@ public class FaceCamera : MonoBehaviour { + // make a game object face the camera regardless of its parent transform + Camera cam; private void Awake () @@ -13,8 +15,8 @@ private void Awake () void Update () { - // turn on the Y axis to face face camera + // turn on the Y axis to face camera transform.rotation = Quaternion.Euler (0, cam.transform.eulerAngles.y, 0); - } + } diff --git a/Assets/_Project/Scripts/Effects/FaceForward.cs b/Assets/_Project/Scripts/Effects/FaceForward.cs new file mode 100644 index 0000000..1c2b409 --- /dev/null +++ b/Assets/_Project/Scripts/Effects/FaceForward.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class FaceForward : MonoBehaviour { + + + public Transform parent; + public Quaternion rotation; + public float angle; + + + void Update () + { + // get local rotation of object to match + rotation = parent.localRotation; + // set angles + transform.localEulerAngles = new Vector3 ( + rotation.x, + rotation.y, + rotation.z + ); + + // Draw a ray pointing in the forward direction + Debug.DrawRay (transform.position, Vector3.forward, Color.green); + } + + +} diff --git a/Assets/_Project/Scripts/Effects/FaceForward.cs.meta b/Assets/_Project/Scripts/Effects/FaceForward.cs.meta new file mode 100644 index 0000000..095c57c --- /dev/null +++ b/Assets/_Project/Scripts/Effects/FaceForward.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d56eb0be45e61456faec64fc822a2dd4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Project/Scripts/Effects/TurnTowardsVelocity.cs b/Assets/_Project/Scripts/Effects/FaceTowardsVelocity.cs similarity index 93% rename from Assets/_Project/Scripts/Effects/TurnTowardsVelocity.cs rename to Assets/_Project/Scripts/Effects/FaceTowardsVelocity.cs index 01c50e2..188996d 100644 --- a/Assets/_Project/Scripts/Effects/TurnTowardsVelocity.cs +++ b/Assets/_Project/Scripts/Effects/FaceTowardsVelocity.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -public class TurnTowardsVelocity : MonoBehaviour { +public class FaceTowardsVelocity : MonoBehaviour { // get RigidBody2d of parent public Rigidbody2D rb2d; diff --git a/Assets/_Project/Scripts/Effects/TurnTowardsVelocity.cs.meta b/Assets/_Project/Scripts/Effects/FaceTowardsVelocity.cs.meta similarity index 100% rename from Assets/_Project/Scripts/Effects/TurnTowardsVelocity.cs.meta rename to Assets/_Project/Scripts/Effects/FaceTowardsVelocity.cs.meta diff --git a/Assets/_Project/Scripts/Effects/LockTransform.cs b/Assets/_Project/Scripts/Effects/LockTransform.cs new file mode 100644 index 0000000..971aaa2 --- /dev/null +++ b/Assets/_Project/Scripts/Effects/LockTransform.cs @@ -0,0 +1,59 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LockTransform : MonoBehaviour { + + + public Vector3 lockPosition; + Vector3 holdPosition; + + public Vector3 lockScale; + Vector3 holdScale; + + void LateUpdate () + { + + // POSITION + + holdPosition = new Vector3 ( + transform.position.x, + transform.position.y, + transform.position.z + ); + + if (lockPosition.x != 0) + holdPosition.x = lockPosition.x; + if (lockPosition.y != 0) + holdPosition.y = lockPosition.y; + if (lockPosition.z != 0) { + holdPosition.z = lockPosition.z; + Debug.Log ("akjshhdkha"); + + } + // keep position on specific axis + transform.position = holdPosition; + + + // SCALE + + holdScale = new Vector3 ( + transform.localScale.x, + transform.localScale.y, + transform.localScale.z + ); + if (lockScale.x != 0) + holdScale.x = lockScale.x; + if (lockScale.y != 0) + holdScale.y = lockScale.y; + if (lockScale.z != 0) + holdScale.z = lockScale.z; + + // keep scale sam + transform.localScale = holdScale; + + + } + + +} diff --git a/Assets/_Project/Scripts/Effects/LockTransform.cs.meta b/Assets/_Project/Scripts/Effects/LockTransform.cs.meta new file mode 100644 index 0000000..926127e --- /dev/null +++ b/Assets/_Project/Scripts/Effects/LockTransform.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5dde93b438cf64735ac642734928cf45 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Project/Scripts/Effects/ShowDirectionRay.cs b/Assets/_Project/Scripts/Effects/ShowDirectionRay.cs new file mode 100644 index 0000000..7af8a7c --- /dev/null +++ b/Assets/_Project/Scripts/Effects/ShowDirectionRay.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ShowDirectionRay : MonoBehaviour { + + + void Update () + { + // draw rays pointing in the standard directions + Debug.DrawRay (transform.position, transform.up * 5f, Color.green); + Debug.DrawRay (transform.position, transform.forward * 5f, Color.blue); + Debug.DrawRay (transform.position, transform.right * 5f, Color.red); + } + + +} \ No newline at end of file diff --git a/Assets/_Project/Scripts/Effects/ShowDirectionRay.cs.meta b/Assets/_Project/Scripts/Effects/ShowDirectionRay.cs.meta new file mode 100644 index 0000000..6e87351 --- /dev/null +++ b/Assets/_Project/Scripts/Effects/ShowDirectionRay.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ceac2c9530fe14e5c9d63be9670c3a78 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index d03751d..eb6c86b 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,5 +1,45 @@ { "dependencies": { + "com.unity.2d.animation": { + "version": "4.2.6", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.2d.common": "3.0.1", + "com.unity.mathematics": "1.1.0", + "com.unity.2d.sprite": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.2d.common": { + "version": "3.0.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.2d.sprite": "1.0.0", + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.2d.psdimporter": { + "version": "3.1.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.2d.common": "3.0.1", + "com.unity.2d.animation": "4.2.6", + "com.unity.2d.sprite": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.collab-proxy": { "version": "1.3.8", "depth": 0, @@ -37,6 +77,13 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.mathematics": { + "version": "1.1.0", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.render-pipelines.core": { "version": "8.2.0", "depth": 1,