Restore changes from client animation branch

Assets/Prefabs/Characters/Client.prefab

@@ -98,7 +98,7 @@ Animator:
   m_GameObject: {fileID: 5304524770463492230}
   m_Enabled: 1
   m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 436e203f2fb3d6349b7c6846830ed358, type: 2}
+  m_Controller: {fileID: 9100000, guid: 7078733c7320e4542911d235520f6da0, type: 2}
   m_CullingMode: 0
   m_UpdateMode: 0
   m_ApplyRootMotion: 0

Assets/Prefabs/Characters/Client.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2dde00c8c5857d2438fd92435d8c3abb
+guid: d5f064665ddb88e4b8ad24a1b1f2ef3a
 PrefabImporter:
   externalObjects: {}
   userData: 

Assets/Resources/Clients/Client Variant.prefab

@@ -1,71 +1,71 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1001 &6889193585265462230
+--- !u!1001 &4611587587836137444
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 5304524770463492230, guid: 2dde00c8c5857d2438fd92435d8c3abb,
+    - target: {fileID: 5304524770463492230, guid: d5f064665ddb88e4b8ad24a1b1f2ef3a,
         type: 3}
       propertyPath: m_Name
       value: Client
       objectReference: {fileID: 0}
-    - target: {fileID: 5304524770463492235, guid: 2dde00c8c5857d2438fd92435d8c3abb,
+    - target: {fileID: 5304524770463492235, guid: d5f064665ddb88e4b8ad24a1b1f2ef3a,
         type: 3}
       propertyPath: m_RootOrder
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 5304524770463492235, guid: 2dde00c8c5857d2438fd92435d8c3abb,
+    - target: {fileID: 5304524770463492235, guid: d5f064665ddb88e4b8ad24a1b1f2ef3a,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -0.74587655
+      value: -0.06
       objectReference: {fileID: 0}
-    - target: {fileID: 5304524770463492235, guid: 2dde00c8c5857d2438fd92435d8c3abb,
+    - target: {fileID: 5304524770463492235, guid: d5f064665ddb88e4b8ad24a1b1f2ef3a,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -2.7487383
+      value: -2.25
       objectReference: {fileID: 0}
-    - target: {fileID: 5304524770463492235, guid: 2dde00c8c5857d2438fd92435d8c3abb,
+    - target: {fileID: 5304524770463492235, guid: d5f064665ddb88e4b8ad24a1b1f2ef3a,
         type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 5304524770463492235, guid: 2dde00c8c5857d2438fd92435d8c3abb,
+    - target: {fileID: 5304524770463492235, guid: d5f064665ddb88e4b8ad24a1b1f2ef3a,
         type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 5304524770463492235, guid: 2dde00c8c5857d2438fd92435d8c3abb,
+    - target: {fileID: 5304524770463492235, guid: d5f064665ddb88e4b8ad24a1b1f2ef3a,
         type: 3}
       propertyPath: m_LocalRotation.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 5304524770463492235, guid: 2dde00c8c5857d2438fd92435d8c3abb,
+    - target: {fileID: 5304524770463492235, guid: d5f064665ddb88e4b8ad24a1b1f2ef3a,
         type: 3}
       propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 5304524770463492235, guid: 2dde00c8c5857d2438fd92435d8c3abb,
+    - target: {fileID: 5304524770463492235, guid: d5f064665ddb88e4b8ad24a1b1f2ef3a,
         type: 3}
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 5304524770463492235, guid: 2dde00c8c5857d2438fd92435d8c3abb,
+    - target: {fileID: 5304524770463492235, guid: d5f064665ddb88e4b8ad24a1b1f2ef3a,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 5304524770463492235, guid: 2dde00c8c5857d2438fd92435d8c3abb,
+    - target: {fileID: 5304524770463492235, guid: d5f064665ddb88e4b8ad24a1b1f2ef3a,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 5304524770463492235, guid: 2dde00c8c5857d2438fd92435d8c3abb,
+    - target: {fileID: 5304524770463492235, guid: d5f064665ddb88e4b8ad24a1b1f2ef3a,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 2dde00c8c5857d2438fd92435d8c3abb, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: d5f064665ddb88e4b8ad24a1b1f2ef3a, type: 3}

Assets/Resources/Clients/Client Variant.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ad918e7d4527b9746846a3bb8b22aacc
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Tests/SampleScene.unity

@@ -139,7 +139,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &67618025
 Transform:
   m_ObjectHideFlags: 0
@@ -169,7 +169,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &85305550
 Transform:
   m_ObjectHideFlags: 0
@@ -242,7 +242,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &212980859
 Transform:
   m_ObjectHideFlags: 0
@@ -272,7 +272,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &238532360
 Transform:
   m_ObjectHideFlags: 0
@@ -3083,7 +3083,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &357681232
 Transform:
   m_ObjectHideFlags: 0
@@ -3113,7 +3113,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &380775748
 Transform:
   m_ObjectHideFlags: 0
@@ -3143,7 +3143,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &470646073
 Transform:
   m_ObjectHideFlags: 0
@@ -3173,7 +3173,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &517950146
 Transform:
   m_ObjectHideFlags: 0
@@ -3286,7 +3286,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &574958270
 Transform:
   m_ObjectHideFlags: 0
@@ -3549,7 +3549,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &837069667
 Transform:
   m_ObjectHideFlags: 0
@@ -3579,7 +3579,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &885015724
 Transform:
   m_ObjectHideFlags: 0
@@ -3656,7 +3656,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1008398020
 Transform:
   m_ObjectHideFlags: 0
@@ -3686,7 +3686,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1083716189
 Transform:
   m_ObjectHideFlags: 0
@@ -3716,7 +3716,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1145344842
 Transform:
   m_ObjectHideFlags: 0
@@ -7691,7 +7691,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1229262388
 Transform:
   m_ObjectHideFlags: 0
@@ -7721,7 +7721,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1234209811
 Transform:
   m_ObjectHideFlags: 0
@@ -7751,7 +7751,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1247189296
 Transform:
   m_ObjectHideFlags: 0
@@ -7766,36 +7766,6 @@ Transform:
   m_Father: {fileID: 1863361785}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1358267601
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1358267602}
-  m_Layer: 0
-  m_Name: Chair (23)
-  m_TagString: Untagged
-  m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1358267602
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1358267601}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -2.52, y: 2.36, z: 2.5482712}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_Children: []
-  m_Father: {fileID: 1863361785}
-  m_RootOrder: 23
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1486551543
 GameObject:
   m_ObjectHideFlags: 0
@@ -7820,7 +7790,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1486551543}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 3.65, y: -6.94, z: -3.6281848}
+  m_LocalPosition: {x: 4.86, y: -3.7, z: -3.6281848}
   m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
   m_Children: []
   m_Father: {fileID: 1160225022}
@@ -32610,7 +32580,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1646582703
 Transform:
   m_ObjectHideFlags: 0
@@ -32640,7 +32610,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1653625651
 Transform:
   m_ObjectHideFlags: 0
@@ -32670,7 +32640,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1678986453
 Transform:
   m_ObjectHideFlags: 0
@@ -32700,7 +32670,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1733442112
 Transform:
   m_ObjectHideFlags: 0
@@ -32730,7 +32700,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1756509215
 Transform:
   m_ObjectHideFlags: 0
@@ -32817,7 +32787,6 @@ Transform:
   - {fileID: 67618025}
   - {fileID: 238532360}
   - {fileID: 1653625651}
-  - {fileID: 1358267602}
   m_Father: {fileID: 1160225022}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -32836,7 +32805,7 @@ GameObject:
   m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1905354804
 Transform:
   m_ObjectHideFlags: 0