#7 #4 Canvas fixes

vladimirdlc · Mar 23, 2017 · 29ad958 · 29ad958
1 parent 6fca5d1
commit 29ad958
Show file tree

Hide file tree

Showing 8 changed files with 795 additions and 373 deletions.
diff --git a/Assets/Models/Environmental/Levels/Level 5.meta b/Assets/Models/Environmental/Levels/Level 5.meta
diff --git a/Assets/Models/Environmental/Levels/Level 5/Scene 5 dog.overrideController b/Assets/Models/Environmental/Levels/Level 5/Scene 5 dog.overrideController
@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!221 &22100000
+AnimatorOverrideController:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Scene 5 dog
+  m_Controller: {fileID: 9100000, guid: d4e1aa0238ba2474b8fbce487a079213, type: 2}
+  m_Clips:
+  - m_OriginalClip: {fileID: 7400000, guid: b24c13a6401c160419f899135a393482, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: b24c13a6401c160419f899135a393482, type: 2}
+  - m_OriginalClip: {fileID: 7400000, guid: 55e8ee82a9004d444a57283e247927cc, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: 55e8ee82a9004d444a57283e247927cc, type: 2}
+  - m_OriginalClip: {fileID: 7400000, guid: c3f05fb96660dce43ad24cded0d382ad, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: 0f04ca08e54980f49a2f12337096d8ff, type: 2}
diff --git a/...hanics/Paradox Warning Canvas.prefab.meta → ...vel 5/Scene 5 dog.overrideController.meta b/...hanics/Paradox Warning Canvas.prefab.meta → ...vel 5/Scene 5 dog.overrideController.meta
diff --git a/Assets/Prefabs/UI/Time Mechanics/Overseer Time canvas.prefab b/Assets/Prefabs/UI/Time Mechanics/Overseer Time canvas.prefab
@@ -58,7 +58,7 @@ GameObject:
   - component: {fileID: 114099682382522144}
   m_Layer: 5
   m_Name: Overseer Time canvas
-  m_TagString: CanvasGroundCharacter
+  m_TagString: CanvasOverseer
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0