Finished Menu Animations, Started Options

vladimirdlc · Mar 21, 2017 · e583117 · e583117
1 parent a804367
commit e583117
Show file tree

Hide file tree

Showing 49 changed files with 9,115 additions and 160 deletions.
diff --git a/Assets/Animations/Controllers/CameraMainMenu.controller b/Assets/Animations/Controllers/CameraMainMenu.controller
diff --git a/Assets/Animations/Controllers/PressStartButton.controller b/Assets/Animations/Controllers/PressStartButton.controller
@@ -14,6 +14,12 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 0}
+  - m_Name: doReturn
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -51,6 +57,30 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &1101673891458503306
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: doReturn
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102949082370408618}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &1102182221014466480
 AnimatorState:
   serializedVersion: 5
@@ -60,7 +90,8 @@ AnimatorState:
   m_Name: Empty
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 1101673891458503306}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0

diff --git a/Assets/Animations/MainMenu/CameraCreditsComeBack.anim b/Assets/Animations/MainMenu/CameraCreditsComeBack.anim
@@ -59,7 +59,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: 60
+        value: 70
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -261,7 +261,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: 60
+        value: 70
         inSlope: 0
         outSlope: 0
         tangentMode: 136

diff --git a/Assets/Animations/MainMenu/CameraCreditsTranslate.anim b/Assets/Animations/MainMenu/CameraCreditsTranslate.anim
@@ -65,7 +65,7 @@ AnimationClip:
         tangentMode: 136
       - serializedVersion: 2
         time: 1
-        value: 60
+        value: 70
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -267,7 +267,7 @@ AnimationClip:
         tangentMode: 136
       - serializedVersion: 2
         time: 1
-        value: 60
+        value: 70
         inSlope: 0
         outSlope: 0
         tangentMode: 136