Rev 10827 from p4

Assets/Animation/Characters/Robot/AnimationSets/AnimGraph.asset

   - {fileID: 11400000, guid: a193b63d04a8f1b4abe313a6e4182995, type: 2}
   - {fileID: 11400000, guid: 3e6d25ade3544b943a33a49185f40be5, type: 2}
   - {fileID: 11400000, guid: 6c846f109f0c0084192507dfacc708a5, type: 2}
+  - {fileID: 11400000, guid: 2dd8fff18d2d71b4aaed703d84ebfeae, type: 2}

Assets/Animation/Characters/Robot/AnimationSets/Run.asset

   m_Name: Run
   m_EditorClassIdentifier: 
   animMovePlaySpeed: 1
-  damping: 0.05
+  damping: 0.07
   maxStep: 12.5
   stateResetWindow: 0.15
   animAim: {fileID: 7400000, guid: 4bff752e42cef454596b3dc693043579, type: 3}
   - clip: {fileID: 7400000, guid: 352a8400a87888b4f80c9ac28fffccbb, type: 3}
     position: {x: 0.7, y: 0.7}
     speed: 1
-    weight: 0
+    weight: 0.000053205255
-    weight: 0
+    weight: 0.99674505
     clipLength: 0.73333335
   - clip: {fileID: 7400000, guid: 41c84d5a212532242b90bd1c1417e2d4, type: 3}
     position: {x: 0.7, y: -0.7}
   - clip: {fileID: 7400000, guid: 6000933a870501643bc39c47a1c12d27, type: 3}
     position: {x: 0, y: -1}
     speed: 1
-    weight: 0.9999486
+    weight: 0
-    weight: 0.0000513189
+    weight: 0
     clipLength: 0.73333335
   - clip: {fileID: 7400000, guid: 5c7d61afc53d4474d9c2d58f2bee8522, type: 3}
     position: {x: -1, y: 0}
     position: {x: -0.7, y: 0.7}
     speed: 1
     weight: 0
+    clipLength: 0.73333335
+  - clip: {fileID: 7400000, guid: a754b3263649e3e4393316c1f432afa9, type: 3}
+    position: {x: 0, y: 0}
+    speed: 1
+    weight: 0.0032017448
     clipLength: 0.73333335
   enableIK: 1
   actionAnimations:

Assets/Animation/Characters/Robot/AnimationSets/Squash.asset

   m_Name: Squash
   m_EditorClassIdentifier: 
   animSquash: {fileID: 7400000, guid: 5c321b6d06428094cb7271f36ce9ae7b, type: 3}
-  minTimeBetweenSquashing: 0.25
+  dirChangeMinAngle: 35
+  dirChangeTimePenalty: 0.4
   stop:
     weight: 0.3
     playSpeed: 2
+  changeDir:
+    weight: 0.4
+    playSpeed: 1.75
   doubleJump:
     weight: 0.35
     playSpeed: 1.5

Assets/Animation/Characters/Robot/Clips/Stand--Poses.anim.fbx.meta

       name: Poses
       takeName: Poses
       firstFrame: 0
-      lastFrame: 15
+      lastFrame: 33
       wrapMode: 0
       orientationOffsetY: 0
       level: 0
     hasTranslationDoF: 0
     hasExtraRoot: 0
     skeletonHasParents: 1
-  lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: b25f47f9f630b1346b0b7f9aaa6c697a, type: 3}
+  lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: b25f47f9f630b1346b0b7f9aaa6c697a,
+    type: 3}
   animationType: 2
   humanoidOversampling: 2
   additionalBone: 0

Assets/Animation/Characters/Robot/Clips/Stand--Poses_Weapon.anim.fbx.meta

       name: Poses_Weapon
       takeName: Poses_Weapon
       firstFrame: 0
-      lastFrame: 15
+      lastFrame: 33
       wrapMode: 0
       orientationOffsetY: 0
       level: 0

Assets/Animation/Characters/Terraformer/AnimationSets/AnimGraph.asset

   - {fileID: 11400000, guid: c260ed24822c5f24b800a922797f5a12, type: 2}
   - {fileID: 11400000, guid: 3a094c4930077cb419d943ea5246c629, type: 2}
   - {fileID: 11400000, guid: d3804d07c7eee9c4f9810d04d620211e, type: 2}
+  - {fileID: 11400000, guid: 79a0411df1065c546b039c04ea6be882, type: 2}

Assets/Animation/Characters/Terraformer/AnimationSets/AnimStateSelector.asset

     customTransitions: []
   - animationState: 0
     template: {fileID: 11400000, guid: e43b95917e059244c9237c30b49bd781, type: 2}
-    transitionTime: 0.1
+    transitionTime: 0.08
     customTransitions:
     - sourceState: 3
       transtionTime: 0.01

Assets/Animation/Characters/Terraformer/AnimationSets/Run.asset

   m_Name: Run
   m_EditorClassIdentifier: 
   animMovePlaySpeed: 1
-  damping: 0.05
-  maxStep: 12.5
+  damping: 0.08
+  maxStep: 11
   stateResetWindow: 0.15
   animAim: {fileID: 7400000, guid: 33bec584c39351344843e4573342016d, type: 3}
   blendSpaceNodes:
-    weight: 0.004657003
+    weight: 0
-    weight: 0.004657003
+    weight: 0
-    weight: 0.004657003
+    weight: 0.14448382
-    weight: 0.004681062
+    weight: 0.00010684047
-    weight: 0.96737695
+    weight: 0
-    weight: 0.004657003
+    weight: 0
-    weight: 0.004657003
+    weight: 0
-    weight: 0.004657003
+    weight: 0
+    clipLength: 0.6
+  - clip: {fileID: 7400000, guid: c1eaa4525bcff2743ad6d19d3e71bd04, type: 3}
+    position: {x: 0, y: 0}
+    speed: 1
+    weight: 0.8554093
     clipLength: 0.6
   enableIK: 1
   actionAnimations:

Assets/Animation/Characters/Terraformer/AnimationSets/Squash.asset

   m_Name: Squash
   m_EditorClassIdentifier: 
   animSquash: {fileID: 7400000, guid: d90ce836ab069f94d86db85f01defb2a, type: 3}
-  minTimeBetweenSquashing: 0.2
+  dirChangeMinAngle: 35
+  dirChangeTimePenalty: 0.4
-    playSpeed: 1
+    playSpeed: 1.25
+    playSpeed: 1.5
+  changeDir:
+    weight: 0.4
     playSpeed: 1.5
   doubleJump:
     weight: 0.5

Assets/Animation/Characters/Terraformer/Clips/Stand--Grenade_Weapon.anim.fbx.meta

     100042: Slide
     100044: //RootNode
     100046: Trigger
+    100048: Magazine_Goo
     400000: Bullit_Spawn
     400002: Button
     400004: Button_End
     400042: Slide
     400044: //RootNode
     400046: Trigger
+    400048: Magazine_Goo
     7400000: Grenade
     9500000: //RootNode
     11400000: //RootNode
     globalScale: 1
     meshCompression: 0
     addColliders: 0
+    useSRGBMaterialColor: 1
     importVisibility: 1
     importBlendShapes: 1
     importCameras: 1
     normalImportMode: 0
     tangentImportMode: 3
     normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
   importAnimation: 1
   copyAvatar: 1
   humanDescription:
     legStretch: 0.05
     feetSpacing: 0
     rootMotionBoneName: 
-    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
     hasTranslationDoF: 0
     hasExtraRoot: 0
     skeletonHasParents: 1

Assets/Animation/Characters/Terraformer/Clips/Stand--Melee_Weapon.anim.fbx.meta

     100042: Slide
     100044: //RootNode
     100046: Trigger
+    100048: Magazine_Goo
     400000: Bullit_Spawn
     400002: Button
     400004: Button_End
     400042: Slide
     400044: //RootNode
     400046: Trigger
+    400048: Magazine_Goo
     7400000: Melee
     7400002: Melee_Weapon
     9500000: //RootNode
     globalScale: 1
     meshCompression: 0
     addColliders: 0
+    useSRGBMaterialColor: 1
     importVisibility: 1
     importBlendShapes: 1
     importCameras: 1
     normalImportMode: 0
     tangentImportMode: 3
     normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
   importAnimation: 1
   copyAvatar: 1
   humanDescription:
     legStretch: 0.05
     feetSpacing: 0
     rootMotionBoneName: 
-    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
     hasTranslationDoF: 0
     hasExtraRoot: 0
     skeletonHasParents: 1

Assets/Animation/Characters/Terraformer/Clips/Stand--Poses.anim.fbx.meta

       name: Poses
       takeName: Poses
       firstFrame: 0
-      lastFrame: 5
+      lastFrame: 21
       wrapMode: 0
       orientationOffsetY: 0
       level: 0
     hasTranslationDoF: 0
     hasExtraRoot: 0
     skeletonHasParents: 1
-  lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: d8a208e861797f14db629d906d9e98d1, type: 3}
+  lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: d8a208e861797f14db629d906d9e98d1,
+    type: 3}
   animationType: 2
   humanoidOversampling: 2
   additionalBone: 0

Assets/Animation/Characters/Terraformer/Clips/Stand--Poses_Weapon.anim.fbx.meta

       name: Poses_Weapon
       takeName: Poses_Weapon
       firstFrame: 0
-      lastFrame: 5
+      lastFrame: 21
       wrapMode: 0
       orientationOffsetY: 0
       level: 0
     hasTranslationDoF: 0
     hasExtraRoot: 0
     skeletonHasParents: 1
-  lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: d8a208e861797f14db629d906d9e98d1, type: 3}
+  lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: d8a208e861797f14db629d906d9e98d1,
+    type: 3}
   animationType: 2
   humanoidOversampling: 2
   additionalBone: 0

Assets/Animation/Characters/Terraformer/Clips/Stand--Reload_Weapon.anim.fbx.meta

     100044: Grenade_Fuel_Base
     100046: Grenade_Fuel_Rotate
     100048: Grenade_Fuel_Shaper
+    100050: Magazine_Goo
     400000: Bullit_Spawn
     400002: Button
     400004: Button_End
     400044: Grenade_Fuel_Base
     400046: Grenade_Fuel_Rotate
     400048: Grenade_Fuel_Shaper
+    400050: Magazine_Goo
     7400000: Reload
     7400002: Reload_Weapon
     9500000: //RootNode
     globalScale: 1
     meshCompression: 0
     addColliders: 0
+    useSRGBMaterialColor: 1
     importVisibility: 1
     importBlendShapes: 1
     importCameras: 1
     normalImportMode: 0
     tangentImportMode: 3
     normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
   importAnimation: 1
   copyAvatar: 1
   humanDescription:
     legStretch: 0.05
     feetSpacing: 0
     rootMotionBoneName: 
-    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
     hasTranslationDoF: 0
     hasExtraRoot: 0
     skeletonHasParents: 1

Assets/BundledResources/Client.asset

   - {fileID: 11400000, guid: fabf5467f72c26c49bd771f8300e01ed, type: 2}
   - {fileID: 11400000, guid: 878fcd09ebe82334e939f48ebd938d85, type: 2}
   - {fileID: 11400000, guid: a8854d30c0e0a2145bf12b516b087f9d, type: 2}
-  - {fileID: 11400000, guid: 83f91975445706e46b195c68d2cfbdcc, type: 2}
+  - {fileID: 11400000, guid: 6ad58f1ff19cad34584ae6c2999132b9, type: 2}
-  - {fileID: 11400000, guid: 632443c370d1b41428b1807225e62d6c, type: 2}
+  - {fileID: 11400000, guid: e997f5f2cb78a864ebaa0cbafc811a5f, type: 2}

Assets/BundledResources/Server.asset

 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
   serverBuild: 1
   assetRegistries:
-  - {fileID: 11400000, guid: 27afe952dadd60b4e941ec366ba5706b, type: 2}
+  - {fileID: 11400000, guid: fabf5467f72c26c49bd771f8300e01ed, type: 2}
-  - {fileID: 11400000, guid: fb92d69fbdcf41e4690b78740a699920, type: 2}
+  - {fileID: 11400000, guid: 0441bc5c18d2127459f33d13838c03ba, type: 2}
   - {fileID: 11400000, guid: a8854d30c0e0a2145bf12b516b087f9d, type: 2}
   - {fileID: 11400000, guid: 341b16c012e1fa141aa0d13e1a3d35af, type: 2}
   - {fileID: 11400000, guid: 878fcd09ebe82334e939f48ebd938d85, type: 2}

Assets/Effects/Explosions/Explosion_Robot_Rocket_A/Explosion_Robot_Rocket_A.asset

 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  registryId: 1
+  registryId: 0
+  poolSize: 16

Assets/Effects/Explosions/Explosion_Terraformer_Rocket_A/Explosion_Terraformer_Rocket_A.asset

 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  registryId: 2
+  registryId: 1
+  poolSize: 16