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

# Conflicts:
#	Erika/Assets/Bundle/Materials/Unit/Effect.meta
#	Erika/Assets/Bundle/Shaders/Include.meta
#	Erika/Assets/Bundle/Shaders/Unit/Effect.meta
#	Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta
#	Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta
#	Erika/Assets/Bundle/Unit/NPC.meta
#	Erika/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta
#	Erika/Assets/Bundle/Unit/PC/Erika/Models.meta
#	Erika/Assets/Bundle/Unit/PC/Erika/UnitData.meta
#	Erika/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta
#	Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta
#	Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta
#	Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta
#	Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta
#	Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta
#	Erika/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta
#	Erika/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta
#	Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta
#	Erika/Assets/Bundle/Unit/Prop.meta
#	Erika/Assets/Scripts/Managers/ResourceManager.cs
#	Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs
#	Erika/Assets/Scripts/Utils/LogHelper.cs
#	Erika/Assets/Scripts/Utils/LogTag.cs
#	Erika/Assets/Scripts/Utils/LogTag.cs.meta

1 files changed, 58 insertions, 0 deletions

diff --git a/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/RootMotion/Dead_Dead3.asset b/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/RootMotion/Dead_Dead3.asset
new file mode 100644
index 00000000..5ecb34a4
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/RootMotion/Dead_Dead3.asset
@@ -0,0 +1,58 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b3a20e0c1a718a24f8d14eed06ad5bad, type: 3}
+  m_Name: Dead_Dead3
+  m_EditorClassIdentifier: 
+  animationName: Dead_Dead3
+  frameCount: 39
+  positionList:
+  - {x: 0, y: 0, z: 0}
+  - {x: 0, y: -0.11963029, z: 1.430342}
+  - {x: 0, y: -0.17718282, z: 1.4163373}
+  - {x: 0, y: -0.18711005, z: 1.4493812}
+  - {x: 0, y: -0.1570858, z: 1.5063008}
+  - {x: 0, y: -0.11549849, z: 1.5102}
+  - {x: 0, y: -0.052544486, z: 1.4855521}
+  - {x: 0, y: -0.009285127, z: 1.4532912}
+  - {x: 0, y: 0.020992462, z: 1.4252446}
+  - {x: 0, y: 0.04191916, z: 1.3885671}
+  - {x: 0, y: 0.04602133, z: 1.3503492}
+  - {x: 0, y: 0.043398388, z: 1.3047973}
+  - {x: 0, y: 0.031967856, z: 1.2386322}
+  - {x: 0, y: 0.013617981, z: 1.1904529}
+  - {x: 0, y: -0.021661319, z: 1.1480348}
+  - {x: 0, y: -0.1038654, z: 1.1020823}
+  - {x: 0, y: -0.20020646, z: 1.0829074}
+  - {x: 0, y: -0.27147904, z: 1.0683999}
+  - {x: 0, y: -0.3386639, z: 1.0457474}
+  - {x: 0, y: -0.37906736, z: 1.027041}
+  - {x: 0, y: -0.41974035, z: 1.0063071}
+  - {x: 0, y: -0.47181845, z: 0.97377324}
+  - {x: 0, y: -0.5099058, z: 0.9437507}
+  - {x: 0, y: -0.5486108, z: 0.90821004}
+  - {x: 0, y: -0.60533065, z: 0.8461727}
+  - {x: 0, y: -0.6631676, z: 0.79096353}
+  - {x: 0, y: -0.7374975, z: 0.7401168}
+  - {x: 0, y: -0.84217465, z: 0.6971527}
+  - {x: 0, y: -0.9122572, z: 0.68764484}
+  - {x: 0, y: -0.9736341, z: 0.6851614}
+  - {x: 0, y: -1.0229025, z: 0.6721552}
+  - {x: 0, y: -1.0101067, z: 0.65192914}
+  - {x: 0, y: -1.0211562, z: 0.62827826}
+  - {x: 0, y: -1.0327628, z: 0.6025571}
+  - {x: 0, y: -1.0353003, z: 0.59289825}
+  - {x: 0, y: -1.0366049, z: 0.58884054}
+  - {x: 0, y: -1.0384812, z: 0.58690697}
+  - {x: 0, y: -1.039642, z: 0.58711827}
+  - {x: 0, y: -1.0407715, z: 0.58715296}
+  animationLength: 1.2666668
+  fps: 30