Improved mechanics, added animations and saved ready for Unity 4.5.1!

jabza · Aug 24, 2014 · 58e7d8c · 58e7d8c
1 parent ae1133b
commit 58e7d8c
Show file tree

Hide file tree

Showing 44 changed files with 19,794 additions and 325 deletions.
diff --git a/Assets/Animations.meta b/Assets/Animations.meta
diff --git a/Assets/Animations/Conveyor.controller b/Assets/Animations/Conveyor.controller
@@ -0,0 +1,53 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Conveyor
+  serializedVersion: 2
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 3
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 110700000}
+    m_Mask: {fileID: 0}
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_StateMachineMotionSetIndex: 0
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &110200000
+State:
+  m_ObjectHideFlags: 3
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: conveyorAnimation
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Motions:
+  - {fileID: 7400000, guid: 7bd58e75a174b644a88572d3d755c0bd, type: 2}
+  m_ParentStateMachine: {fileID: 110700000}
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_Mirror: 0
+  m_Tag: 
+--- !u!1107 &110700000
+StateMachine:
+  serializedVersion: 2
+  m_ObjectHideFlags: 3
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Base Layer
+  m_DefaultState: {fileID: 110200000}
+  m_States:
+  - {fileID: 110200000}
+  m_ChildStateMachine: []
+  m_ChildStateMachinePosition: []
+  m_OrderedTransitions: {}
+  m_MotionSetCount: 1
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
diff --git a/Assets/Animations/Conveyor.controller.meta b/Assets/Animations/Conveyor.controller.meta
diff --git a/Assets/Animations/conveyorAnimation.anim b/Assets/Animations/conveyorAnimation.anim
@@ -0,0 +1,153 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: conveyorAnimation
+  serializedVersion: 4
+  m_AnimationType: 2
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 21300002, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .0333333351
+      value: {fileID: 21300004, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .0666666701
+      value: {fileID: 21300006, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .100000001
+      value: {fileID: 21300008, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .13333334
+      value: {fileID: 21300010, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .166666672
+      value: {fileID: 21300012, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .200000003
+      value: {fileID: 21300014, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .233333334
+      value: {fileID: 21300016, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .266666681
+      value: {fileID: 21300018, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .300000012
+      value: {fileID: 21300020, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .333333343
+      value: {fileID: 21300022, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .366666675
+      value: {fileID: 21300024, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .400000006
+      value: {fileID: 21300026, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .433333337
+      value: {fileID: 21300028, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .466666669
+      value: {fileID: 21300030, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .5
+      value: {fileID: 21300032, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .533333361
+      value: {fileID: 21300034, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .566666663
+      value: {fileID: 21300036, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .600000024
+      value: {fileID: 21300038, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .633333325
+      value: {fileID: 21300040, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .666666687
+      value: {fileID: 21300042, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .699999988
+      value: {fileID: 21300044, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .733333349
+      value: {fileID: 21300046, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .766666651
+      value: {fileID: 21300048, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .800000012
+      value: {fileID: 21300050, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .833333313
+      value: {fileID: 21300052, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .866666675
+      value: {fileID: 21300054, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .899999976
+      value: {fileID: 21300056, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .933333337
+      value: {fileID: 21300058, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: .966666639
+      value: {fileID: 21300060, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: 1
+      value: {fileID: 21300062, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - time: 1.0333333
+      value: {fileID: 21300064, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  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:
+    - path: 0
+      attribute: 0
+      script: {fileID: 0}
+      classID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 21300002, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300004, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300006, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300008, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300010, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300012, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300014, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300016, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300018, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300020, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300022, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300024, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300026, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300028, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300030, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300032, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300034, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300036, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300038, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300040, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300042, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300044, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300046, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300048, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300050, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300052, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300054, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300056, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300058, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300060, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300062, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+    - {fileID: 21300064, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_StartTime: 0
+    m_StopTime: 1.04999995
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 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_Events: []
diff --git a/Assets/Animations/conveyorAnimation.anim.meta b/Assets/Animations/conveyorAnimation.anim.meta
diff --git a/Assets/Fonts.meta b/Assets/Fonts.meta
diff --git a/Assets/Fonts/slkscr.ttf b/Assets/Fonts/slkscr.ttf
diff --git a/Assets/Fonts/slkscr.ttf.meta b/Assets/Fonts/slkscr.ttf.meta
diff --git a/Assets/Prefabs/Conveyor.prefab b/Assets/Prefabs/Conveyor.prefab
@@ -13,6 +13,7 @@ GameObject:
   - 114: {fileID: 11400000}
   - 50: {fileID: 5000000}
   - 61: {fileID: 6100000}
+  - 95: {fileID: 9500000}
   m_Layer: 0
   m_Name: Conveyor
   m_TagString: Conveyor
@@ -58,6 +59,21 @@ BoxCollider2D:
   m_IsTrigger: 1
   m_Size: {x: 1, y: 1}
   m_Center: {x: 0, y: 0}
+--- !u!95 &9500000
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 100000}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: f3d8d873a0c87a34f8d9a4354a057eed, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 1
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -69,6 +85,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 91612bc0189d723408d1ff243f0afb63, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  mDirection: 0
 --- !u!114 &11400002
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -100,7 +117,7 @@ SpriteRenderer:
   m_ScaleInLightmap: 1
   m_SortingLayerID: 2955207623
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 47653c83d218bfb4eb835452858bf7f0, type: 3}
+  m_Sprite: {fileID: 21300002, guid: 581e7760d133ae946ab5b2a9c977591b, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
 --- !u!1001 &100100000
 Prefab: