Added new patron animations.

2014-04-27 13:13:34 -06:00 · 2014-04-27 13:13:34 -06:00 · 2abd70e08f
commit 2abd70e08f
parent d0a546ffac
14 changed files with 583 additions and 333 deletions
--- a/Assets/Sprites/Animation/player_anim_controller.controller
+++ b/Assets/Sprites/Animation/player_anim_controller.controller
@ -309,5 +309,5 @@ StateMachine:
      second:
      - {fileID: 110100000}
  m_MotionSetCount: 1
-  m_AnyStatePosition: {x: 48, y: -132, z: 0}
+  m_AnyStatePosition: {x: 72, y: -252, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
--- a/Assets/Sprites/Animation/poser3_walk.anim
+++ b/Assets/Sprites/Animation/poser3_walk.anim
@ -0,0 +1,56 @@
+%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: poser3_walk
+  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: 21300000, guid: fc1cfe7347e5e0047b1653c6826e55e2, type: 3}
+    - time: .0833333358
+      value: {fileID: 21300002, guid: fc1cfe7347e5e0047b1653c6826e55e2, type: 3}
+    - time: .150000006
+      value: {fileID: 21300004, guid: fc1cfe7347e5e0047b1653c6826e55e2, type: 3}
+    - time: .233333334
+      value: {fileID: 21300006, guid: fc1cfe7347e5e0047b1653c6826e55e2, 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_AnimationClipSettings:
+    serializedVersion: 2
+    m_StartTime: 0
+    m_StopTime: .25
+    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: []
--- a/Assets/Sprites/Animation/poser3_walk.anim.meta
+++ b/Assets/Sprites/Animation/poser3_walk.anim.meta
@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 7e1c2da380bb4c44281ff370b365612c
+NativeFormatImporter:
+  userData: 
--- a/Assets/Sprites/Animation/poser3_walk.controller
+++ b/Assets/Sprites/Animation/poser3_walk.controller
@ -0,0 +1,75 @@
+%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: poser3_walk
+  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!1101 &110100000
+Transition:
+  m_ObjectHideFlags: 3
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_SrcState: {fileID: 0}
+  m_DstState: {fileID: 110219570}
+  m_TransitionDuration: .100000001
+  m_TransitionOffset: 0
+  m_Conditions:
+  - m_ConditionMode: 5
+    m_ConditionEvent: 
+    m_EventTreshold: 0
+    m_ExitTime: .899999976
+  m_Atomic: 1
+  m_Solo: 0
+  m_Mute: 0
+--- !u!1102 &110219570
+State:
+  m_ObjectHideFlags: 3
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: poser3_walk
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Motions:
+  - {fileID: 7400000, guid: 7e1c2da380bb4c44281ff370b365612c, type: 2}
+  m_ParentStateMachine: {fileID: 110700000}
+  m_Position: {x: 48, y: 144, 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: 0}
+  m_States:
+  - {fileID: 110219570}
+  m_ChildStateMachine: []
+  m_ChildStateMachinePosition: []
+  m_OrderedTransitions:
+    data:
+      first: {fileID: 0}
+      second:
+      - {fileID: 110100000}
+  m_MotionSetCount: 1
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
--- a/Assets/Sprites/Animation/poser3_walk.controller.meta
+++ b/Assets/Sprites/Animation/poser3_walk.controller.meta
@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 2839c08b49b9b884493187549d57deb6
+NativeFormatImporter:
+  userData: 
--- a/Assets/Sprites/Animation/poser_controller.controller
+++ b/Assets/Sprites/Animation/poser_controller.controller
@ -0,0 +1,75 @@
+%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: poser_controller
+  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!1101 &110100000
+Transition:
+  m_ObjectHideFlags: 3
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_SrcState: {fileID: 0}
+  m_DstState: {fileID: 110200000}
+  m_TransitionDuration: .100000001
+  m_TransitionOffset: 0
+  m_Conditions:
+  - m_ConditionMode: 5
+    m_ConditionEvent: 
+    m_EventTreshold: 0
+    m_ExitTime: .899999976
+  m_Atomic: 1
+  m_Solo: 0
+  m_Mute: 0
+--- !u!1102 &110200000
+State:
+  m_ObjectHideFlags: 3
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: poser_walk
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Motions:
+  - {fileID: 7400000, guid: 2c15b01a6b3b7ef4a8d46894aa22ffb6, type: 2}
+  m_ParentStateMachine: {fileID: 110700000}
+  m_Position: {x: 48, y: 168, 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:
+    data:
+      first: {fileID: 0}
+      second:
+      - {fileID: 110100000}
+  m_MotionSetCount: 1
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
--- a/Assets/Sprites/Animation/poser_controller.controller.meta
+++ b/Assets/Sprites/Animation/poser_controller.controller.meta
@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 48316f5d327c6664eb2a78132b51bd43
+NativeFormatImporter:
+  userData: 
--- a/Assets/Sprites/Animation/poser_walk.anim
+++ b/Assets/Sprites/Animation/poser_walk.anim
@ -0,0 +1,56 @@
+%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: poser_walk
+  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: 21300000, guid: 0d3c405841214de46abddb0ee8bffb88, type: 3}
+    - time: .0833333358
+      value: {fileID: 21300002, guid: 0d3c405841214de46abddb0ee8bffb88, type: 3}
+    - time: .166666672
+      value: {fileID: 21300004, guid: 0d3c405841214de46abddb0ee8bffb88, type: 3}
+    - time: .25
+      value: {fileID: 21300006, guid: 0d3c405841214de46abddb0ee8bffb88, 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_AnimationClipSettings:
+    serializedVersion: 2
+    m_StartTime: 0
+    m_StopTime: .266666681
+    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: []
--- a/Assets/Sprites/Animation/poser_walk.anim.meta
+++ b/Assets/Sprites/Animation/poser_walk.anim.meta
@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 2c15b01a6b3b7ef4a8d46894aa22ffb6
+NativeFormatImporter:
+  userData: 
--- a/Assets/Sprites/poser.png.meta
+++ b/Assets/Sprites/poser.png.meta
@ -30,7 +30,7 @@ TextureImporter:
  nPOTScale: 0
  lightmap: 0
  compressionQuality: 50
-  spriteMode: 1
+  spriteMode: 2
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
@ -40,6 +40,42 @@ TextureImporter:
  textureType: 8
  buildTargetSettings: []
  spriteSheet:
-    sprites: []
+    sprites:
+    - name: poser_0
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 32
+        width: 32
+        height: 32
+      alignment: 0
+      pivot: {x: 0, y: 0}
+    - name: poser_1
+      rect:
+        serializedVersion: 2
+        x: 32
+        y: 32
+        width: 32
+        height: 32
+      alignment: 0
+      pivot: {x: 0, y: 0}
+    - name: poser_2
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 32
+        height: 32
+      alignment: 0
+      pivot: {x: 0, y: 0}
+    - name: poser_3
+      rect:
+        serializedVersion: 2
+        x: 32
+        y: 0
+        width: 32
+        height: 32
+      alignment: 0
+      pivot: {x: 0, y: 0}
  spritePackingTag: 
  userData: 
--- a/Assets/Sprites/poser3.png.meta
+++ b/Assets/Sprites/poser3.png.meta
@ -4,7 +4,7 @@ TextureImporter:
  serializedVersion: 2
  mipmaps:
    mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
    linearTexture: 0
    correctGamma: 0
    fadeOut: 0
@ -20,26 +20,62 @@ TextureImporter:
  grayScaleToAlpha: 0
  generateCubemap: 0
  seamlessCubemap: 0
-  textureFormat: -1
+  textureFormat: -3
  maxTextureSize: 1024
  textureSettings:
-    filterMode: -1
-    aniso: -1
+    filterMode: 0
+    aniso: 1
    mipBias: -1
-    wrapMode: -1
-  nPOTScale: 1
+    wrapMode: 1
+  nPOTScale: 0
  lightmap: 0
  compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 2
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: .5, y: .5}
  spritePixelsToUnits: 100
-  alphaIsTransparency: 0
-  textureType: -1
+  alphaIsTransparency: 1
+  textureType: 8
  buildTargetSettings: []
  spriteSheet:
-    sprites: []
+    sprites:
+    - name: poser3_0
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 32
+        width: 32
+        height: 32
+      alignment: 0
+      pivot: {x: 0, y: 0}
+    - name: poser3_1
+      rect:
+        serializedVersion: 2
+        x: 32
+        y: 32
+        width: 32
+        height: 32
+      alignment: 0
+      pivot: {x: 0, y: 0}
+    - name: poser3_2
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 32
+        height: 32
+      alignment: 0
+      pivot: {x: 0, y: 0}
+    - name: poser3_3
+      rect:
+        serializedVersion: 2
+        x: 32
+        y: 0
+        width: 32
+        height: 32
+      alignment: 0
+      pivot: {x: 0, y: 0}
  spritePackingTag: 
  userData: