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

diff --git a/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/RootMotion/Air_Attack02.asset b/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/RootMotion/Air_Attack02.asset
new file mode 100644
index 00000000..49460135
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/RootMotion/Air_Attack02.asset
@@ -0,0 +1,67 @@
+%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_Attack02
+  m_EditorClassIdentifier: 
+  animationName: Air_Attack02
+  frameCount: 48
+  positionList:
+  - {x: 0, y: 0, z: 0}
+  - {x: 0, y: -0.009211302, z: -0.0900129}
+  - {x: 0, y: -0.000500679, z: -0.1575613}
+  - {x: 0, y: 0.02204752, z: -0.20762943}
+  - {x: 0, y: 0.032994986, z: -0.18201244}
+  - {x: 0, y: 0.03599024, z: -0.12879825}
+  - {x: 0, y: 0.026728153, z: -0.006618578}
+  - {x: 0, y: 0.004099846, z: 0.12822425}
+  - {x: 0, y: 0.0033130646, z: 0.16250458}
+  - {x: 0, y: 0.0136199, z: 0.18104547}
+  - {x: 0, y: 0.019565582, z: 0.18309382}
+  - {x: 0, y: 0.021165371, z: 0.18210562}
+  - {x: 0, y: 0.022312403, z: 0.18087617}
+  - {x: 0, y: 0.022913218, z: 0.18098532}
+  - {x: 0, y: 0.023331404, z: 0.181153}
+  - {x: 0, y: 0.023647785, z: 0.18146041}
+  - {x: 0, y: 0.02367878, z: 0.18176965}
+  - {x: 0, y: 0.023567677, z: 0.18209586}
+  - {x: 0, y: 0.02323556, z: 0.18249959}
+  - {x: 0, y: 0.022833109, z: 0.18276551}
+  - {x: 0, y: 0.022329092, z: 0.18300222}
+  - {x: 0, y: 0.02153039, z: 0.18327506}
+  - {x: 0, y: 0.020831108, z: 0.18343882}
+  - {x: 0, y: 0.020070791, z: 0.18357025}
+  - {x: 0, y: 0.018987417, z: 0.18369843}
+  - {x: 0, y: 0.018128157, z: 0.18374968}
+  - {x: 0, y: 0.017248154, z: 0.18376553}
+  - {x: 0, y: 0.01606226, z: 0.18373528}
+  - {x: 0, y: 0.015179157, z: 0.18366371}
+  - {x: 0, y: 0.014315844, z: 0.18355368}
+  - {x: 0, y: 0.013210058, z: 0.18333757}
+  - {x: 0, y: 0.012439489, z: 0.18309076}
+  - {x: 0, y: 0.011729717, z: 0.18261626}
+  - {x: 0, y: 0.010885477, z: 0.18135728}
+  - {x: 0, y: 0.0103645325, z: 0.17964765}
+  - {x: 0, y: 0.009944439, z: 0.17720498}
+  - {x: 0, y: 0.009544134, z: 0.17276466}
+  - {x: 0, y: 0.0074965954, z: 0.16759907}
+  - {x: 0, y: 0.0030708313, z: 0.14969026}
+  - {x: 0, y: -0.0045313835, z: 0.11901362}
+  - {x: 0, y: -0.010101318, z: 0.09271661}
+  - {x: 0, y: -0.014046192, z: 0.06919133}
+  - {x: 0, y: -0.015334606, z: 0.042226978}
+  - {x: 0, y: -0.013508797, z: 0.029270327}
+  - {x: 0, y: -0.011440992, z: 0.02111411}
+  - {x: 0, y: -0.0081243515, z: 0.013984023}
+  - {x: 0, y: -0.0048971176, z: 0.008931096}
+  - {x: 0, y: -0.00090813637, z: 0.0016719152}
+  animationLength: 1.5666667
+  fps: 30