Merge branch 'master' of warmcat.org:/home/git-repo/Erika

# Conflicts:
#	Assets/Art/Models/Characters/Robots_Prowler.meta
#	Assets/Art/Models/Characters/Robots_Prowler/Materials.meta
#	Assets/Art/Models/Characters/Robots_Prowler/prefab.meta

1 files changed, 63 insertions, 6 deletions

diff --git a/Assets/Scenes/Demo/FightDemoScene.unity b/Assets/Scenes/Demo/FightDemoScene.unity
index 65d17ae3..fc99694e 100644
--- a/Assets/Scenes/Demo/FightDemoScene.unity
+++ b/Assets/Scenes/Demo/FightDemoScene.unity
@@ -143,7 +143,7 @@ Transform:
   - {fileID: 1984679655}
   - {fileID: 400483142}
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &5686688
 MonoBehaviour:
@@ -283,7 +283,7 @@ Transform:
   - {fileID: 705651394}
   - {fileID: 1737075742}
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &170076733
 GameObject:
@@ -815,7 +815,7 @@ Transform:
   - {fileID: 1418006278}
   - {fileID: 1156861647}
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &476164677
 MonoBehaviour:
@@ -6427,7 +6427,7 @@ Transform:
   - {fileID: 2018047305}
   - {fileID: 1488695564}
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &902182889 stripped
 GameObject:
@@ -11601,7 +11601,7 @@ Transform:
   - {fileID: 2106396715}
   - {fileID: 906348741}
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1239221725
 PrefabInstance:
@@ -12062,6 +12062,63 @@ Transform:
   m_Father: {fileID: 167449966}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1548478431
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 100050, guid: d4f74614089221c46afa91592b748ae1, type: 3}
+      propertyPath: m_Name
+      value: Robots_Prowler
+      objectReference: {fileID: 0}
+    - target: {fileID: 400050, guid: d4f74614089221c46afa91592b748ae1, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 9.28
+      objectReference: {fileID: 0}
+    - target: {fileID: 400050, guid: d4f74614089221c46afa91592b748ae1, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.082050264
+      objectReference: {fileID: 0}
+    - target: {fileID: 400050, guid: d4f74614089221c46afa91592b748ae1, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.19
+      objectReference: {fileID: 0}
+    - target: {fileID: 400050, guid: d4f74614089221c46afa91592b748ae1, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400050, guid: d4f74614089221c46afa91592b748ae1, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.7377608
+      objectReference: {fileID: 0}
+    - target: {fileID: 400050, guid: d4f74614089221c46afa91592b748ae1, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400050, guid: d4f74614089221c46afa91592b748ae1, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.67506224
+      objectReference: {fileID: 0}
+    - target: {fileID: 400050, guid: d4f74614089221c46afa91592b748ae1, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 400050, guid: d4f74614089221c46afa91592b748ae1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400050, guid: d4f74614089221c46afa91592b748ae1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -95.082
+      objectReference: {fileID: 0}
+    - target: {fileID: 400050, guid: d4f74614089221c46afa91592b748ae1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d4f74614089221c46afa91592b748ae1, type: 3}
 --- !u!1001 &1612155626
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -12428,7 +12485,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &1844171094 stripped
 Transform: