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, 72 insertions, 0 deletions

diff --git a/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/RootMotion/Air_Attack04.asset b/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/RootMotion/Air_Attack04.asset
new file mode 100644
index 00000000..af152d87
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/RootMotion/Air_Attack04.asset
@@ -0,0 +1,72 @@
+%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: Air_Attack04
+  m_EditorClassIdentifier: 
+  animationName: Air_Attack04
+  frameCount: 53
+  positionList:
+  - {x: 0, y: 0, z: 0}
+  - {x: 0, y: 0.004567623, z: -0.031010184}
+  - {x: 0, y: 0.014434338, z: -0.07190126}
+  - {x: 0, y: 0.032583475, z: -0.1340761}
+  - {x: 0, y: 0.047502756, z: -0.1884522}
+  - {x: 0, y: 0.061453342, z: -0.23522776}
+  - {x: 0, y: 0.075297356, z: -0.25850514}
+  - {x: 0, y: 0.0796752, z: -0.24586384}
+  - {x: 0, y: 0.07681656, z: -0.16611932}
+  - {x: 0, y: 0.06342101, z: 0.026642624}
+  - {x: 0, y: 0.051429033, z: 0.1537871}
+  - {x: 0, y: 0.039101124, z: 0.14821759}
+  - {x: 0, y: 0.024047136, z: 0.11807803}
+  - {x: 0, y: 0.0152237415, z: 0.11908156}
+  - {x: 0, y: 0.0097408295, z: 0.12087946}
+  - {x: 0, y: 0.0065386295, z: 0.11922677}
+  - {x: 0, y: 0.0044977665, z: 0.115980044}
+  - {x: 0, y: 0.002683401, z: 0.113227725}
+  - {x: 0, y: 0.0005970001, z: 0.11102567}
+  - {x: 0, y: -0.00073361397, z: 0.11027521}
+  - {x: 0, y: -0.0018761158, z: 0.109760426}
+  - {x: 0, y: -0.003127575, z: 0.10934207}
+  - {x: 0, y: -0.0038774014, z: 0.109209165}
+  - {x: 0, y: -0.004478216, z: 0.10915385}
+  - {x: 0, y: -0.0050680637, z: 0.10912413}
+  - {x: 0, y: -0.005366802, z: 0.10907522}
+  - {x: 0, y: -0.005555868, z: 0.109019004}
+  - {x: 0, y: -0.0056569576, z: 0.109001406}
+  - {x: 0, y: -0.0056347847, z: 0.10904723}
+  - {x: 0, y: -0.0055418015, z: 0.10915625}
+  - {x: 0, y: -0.005327463, z: 0.10940786}
+  - {x: 0, y: -0.005114317, z: 0.10968583}
+  - {x: 0, y: -0.0048692226, z: 0.110020414}
+  - {x: 0, y: -0.004512787, z: 0.11053423}
+  - {x: 0, y: -0.004238367, z: 0.11096952}
+  - {x: 0, y: -0.0039708614, z: 0.111431465}
+  - {x: 0, y: -0.00364542, z: 0.11207266}
+  - {x: 0, y: -0.0034396648, z: 0.112564184}
+  - {x: 0, y: -0.0032799244, z: 0.11305241}
+  - {x: 0, y: -0.003158331, z: 0.113686204}
+  - {x: 0, y: -0.0031511784, z: 0.114132866}
+  - {x: 0, y: -0.0032920837, z: 0.11455695}
+  - {x: 0, y: -0.003789425, z: 0.115362674}
+  - {x: 0, y: -0.0043046474, z: 0.10475468}
+  - {x: 0, y: -0.0048639774, z: 0.09185117}
+  - {x: 0, y: -0.005556345, z: 0.07291052}
+  - {x: 0, y: -0.0059449673, z: 0.060215946}
+  - {x: 0, y: -0.0061433315, z: 0.050495014}
+  - {x: 0, y: -0.005990505, z: 0.039699905}
+  - {x: 0, y: -0.005471945, z: 0.032170378}
+  - {x: 0, y: -0.0045289993, z: 0.024459295}
+  - {x: 0, y: -0.0024905205, z: 0.012887672}
+  - {x: 0, y: -0.00028443336, z: 0.0012883726}
+  animationLength: 1.7333335
+  fps: 30