Push

Added the levels, ability to run and turn both ways, as well as pause menu.
aps16104 · Mar 24, 2020 · 674b92e · 674b92e
1 parent 4bfb9be
commit 674b92e
Show file tree

Hide file tree

Showing 186 changed files with 13,279 additions and 139 deletions.
diff --git a/RPG/Assets/Animations/AnimationsScene1.meta b/RPG/Assets/Animations/AnimationsScene1.meta
diff --git a/RPG/Assets/Animations/AnimationsScene1/Idle.anim b/RPG/Assets/Animations/AnimationsScene1/Idle.anim
@@ -0,0 +1,101 @@
+%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: Idle
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: 8e090a323c3366a4e8406c26cf7a122f, type: 3}
+    - time: 0.083333336
+      value: {fileID: 21300000, guid: bcf8f425c2342014898fd97105674c67, type: 3}
+    - time: 0.16666667
+      value: {fileID: 21300000, guid: 1d74867836965d3469a56134f847923b, type: 3}
+    - time: 0.25
+      value: {fileID: 21300000, guid: fc2ded30a0ccd974bafa8d9e8c0eeb7e, type: 3}
+    - time: 0.33333334
+      value: {fileID: 21300000, guid: d4efd91c6d4b3de499e39e4ab7b13df3, type: 3}
+    - time: 0.41666666
+      value: {fileID: 21300000, guid: ab22828c375e376499c401613c20aad6, type: 3}
+    - time: 0.5
+      value: {fileID: 21300000, guid: 9dde7a52aa6fd2a4299acb14dab6c422, type: 3}
+    - time: 0.5833333
+      value: {fileID: 21300000, guid: 207efd9c898252841a79e57b78a97dc7, type: 3}
+    - time: 0.6666667
+      value: {fileID: 21300000, guid: 3241747d976332b42925b61b2ce12208, type: 3}
+    - time: 0.75
+      value: {fileID: 21300000, guid: 022c8bd79a7dcfa4f997deecb8688e72, type: 3}
+    - time: 0.8333333
+      value: {fileID: 21300000, guid: 3416b2b3cf7adbb438e80c9081d31c5a, type: 3}
+    - time: 0.9166667
+      value: {fileID: 21300000, guid: 3e23c0de9f1711d4ca396d8660d97a35, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 12
+  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: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 21300000, guid: 8e090a323c3366a4e8406c26cf7a122f, type: 3}
+    - {fileID: 21300000, guid: bcf8f425c2342014898fd97105674c67, type: 3}
+    - {fileID: 21300000, guid: 1d74867836965d3469a56134f847923b, type: 3}
+    - {fileID: 21300000, guid: fc2ded30a0ccd974bafa8d9e8c0eeb7e, type: 3}
+    - {fileID: 21300000, guid: d4efd91c6d4b3de499e39e4ab7b13df3, type: 3}
+    - {fileID: 21300000, guid: ab22828c375e376499c401613c20aad6, type: 3}
+    - {fileID: 21300000, guid: 9dde7a52aa6fd2a4299acb14dab6c422, type: 3}
+    - {fileID: 21300000, guid: 207efd9c898252841a79e57b78a97dc7, type: 3}
+    - {fileID: 21300000, guid: 3241747d976332b42925b61b2ce12208, type: 3}
+    - {fileID: 21300000, guid: 022c8bd79a7dcfa4f997deecb8688e72, type: 3}
+    - {fileID: 21300000, guid: 3416b2b3cf7adbb438e80c9081d31c5a, type: 3}
+    - {fileID: 21300000, guid: 3e23c0de9f1711d4ca396d8660d97a35, type: 3}
+  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: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
diff --git a/RPG/Assets/Animations/P_Tackle.anim.meta → ...nimations/AnimationsScene1/Idle.anim.meta b/RPG/Assets/Animations/P_Tackle.anim.meta → ...nimations/AnimationsScene1/Idle.anim.meta
diff --git a/RPG/Assets/Animations/P_Tackle.anim → ...sets/Animations/AnimationsScene1/Run.anim b/RPG/Assets/Animations/P_Tackle.anim → ...sets/Animations/AnimationsScene1/Run.anim
@@ -6,7 +6,7 @@ AnimationClip:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: P_Tackle
+  m_Name: Run
   serializedVersion: 6
   m_Legacy: 0
   m_Compressed: 0
@@ -20,20 +20,28 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
+      value: {fileID: 21300000, guid: 557821c0b2219cf4da72a05e94b51b5f, type: 3}
+    - time: 0.083333336
+      value: {fileID: 21300000, guid: 557821c0b2219cf4da72a05e94b51b5f, type: 3}
+    - time: 0.16666667
+      value: {fileID: 21300000, guid: 2b1e98da62868a848ba19504d73e9e71, type: 3}
+    - time: 0.25
+      value: {fileID: 21300000, guid: 3c86dea0c0088744591cb92c38ac55f5, type: 3}
+    - time: 0.33333334
+      value: {fileID: 21300000, guid: 5d7da9768b68b464b9c3b87878e9cc50, type: 3}
+    - time: 0.41666666
+      value: {fileID: 21300000, guid: 073be82b0e9bcc94bae10a19bc3f0d0b, type: 3}
+    - time: 0.5
+      value: {fileID: 21300000, guid: 62336ffdd817f974eb7711570a31b884, type: 3}
+    - time: 0.5833333
+      value: {fileID: 21300000, guid: c2b9d7f0840191b4a8da64cd8ad4be37, type: 3}
+    - time: 0.6666667
       value: {fileID: 21300000, guid: 63a6e249f870c5143b2315084b88ab98, type: 3}
-    - time: 0.2
-      value: {fileID: 21300000, guid: 9abb8f1c6e3416149959f6d8f2428b9b, type: 3}
-    - time: 0.4
-      value: {fileID: 21300000, guid: 9ca64824d1d625d4cbd5d5e1b5adaa61, type: 3}
-    - time: 0.6
-      value: {fileID: 21300000, guid: 52e8dc53ff2bb9b4cb891378d61aae57, type: 3}
-    - time: 0.8
-      value: {fileID: 21300000, guid: ad4c73a6e8ad27f44bba0489b35de61d, type: 3}
     attribute: m_Sprite
     path: 
     classID: 212
     script: {fileID: 0}
-  m_SampleRate: 5
+  m_SampleRate: 12
   m_WrapMode: 0
   m_Bounds:
     m_Center: {x: 0, y: 0, z: 0}
@@ -48,22 +56,26 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
+    - {fileID: 21300000, guid: 557821c0b2219cf4da72a05e94b51b5f, type: 3}
+    - {fileID: 21300000, guid: 557821c0b2219cf4da72a05e94b51b5f, type: 3}
+    - {fileID: 21300000, guid: 2b1e98da62868a848ba19504d73e9e71, type: 3}
+    - {fileID: 21300000, guid: 3c86dea0c0088744591cb92c38ac55f5, type: 3}
+    - {fileID: 21300000, guid: 5d7da9768b68b464b9c3b87878e9cc50, type: 3}
+    - {fileID: 21300000, guid: 073be82b0e9bcc94bae10a19bc3f0d0b, type: 3}
+    - {fileID: 21300000, guid: 62336ffdd817f974eb7711570a31b884, type: 3}
+    - {fileID: 21300000, guid: c2b9d7f0840191b4a8da64cd8ad4be37, type: 3}
     - {fileID: 21300000, guid: 63a6e249f870c5143b2315084b88ab98, type: 3}
-    - {fileID: 21300000, guid: 9abb8f1c6e3416149959f6d8f2428b9b, type: 3}
-    - {fileID: 21300000, guid: 9ca64824d1d625d4cbd5d5e1b5adaa61, type: 3}
-    - {fileID: 21300000, guid: 52e8dc53ff2bb9b4cb891378d61aae57, type: 3}
-    - {fileID: 21300000, guid: ad4c73a6e8ad27f44bba0489b35de61d, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 1
+    m_StopTime: 0.75
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
     m_HasAdditiveReferencePose: 0
-    m_LoopTime: 0
+    m_LoopTime: 1
     m_LoopBlend: 0
     m_LoopBlendOrientation: 0
     m_LoopBlendPositionY: 0

diff --git a/RPG/Assets/Animations/AnimationsScene1/Run.anim.meta b/RPG/Assets/Animations/AnimationsScene1/Run.anim.meta
diff --git a/RPG/Assets/Animations/AnimationsScene1/knight.controller b/RPG/Assets/Animations/AnimationsScene1/knight.controller
@@ -0,0 +1,159 @@
+%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: knight
+  serializedVersion: 5
+  m_AnimatorParameters:
+  - m_Name: Run
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 1107715721839420656}
+    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 &1101507933718077180
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Run
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102577094844757488}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 0
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1101670776926065890
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: Run
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102527519102569434}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.6666666
+  m_HasExitTime: 0
+  m_HasFixedDuration: 0
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &1102527519102569434
+AnimatorState:
+  serializedVersion: 5
+  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:
+  - {fileID: 1101507933718077180}
+  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: 3a5f96d0ec3c87e45888d37a78b38014, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &1102577094844757488
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Run
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1101670776926065890}
+  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: 51b00f9a1d10da84c92973a4c2056e29, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &1107715721839420656
+AnimatorStateMachine:
+  serializedVersion: 5
+  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: 1102577094844757488}
+    m_Position: {x: 468, y: 36, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102527519102569434}
+    m_Position: {x: 467, y: 137, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 324, y: -168, 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: 1102527519102569434}
diff --git a/RPG/Assets/Animations/AnimationsScene1/knight.controller.meta b/RPG/Assets/Animations/AnimationsScene1/knight.controller.meta