* changes

38 files changed, 229 insertions, 46 deletions

diff --git a/Erika/Assets/Bundle/Materials/Unit/Common.meta b/Erika/Assets/Art/Models/Characters/Default.meta
index 7b37a6e8..43499fc7 100644
--- a/Erika/Assets/Bundle/Materials/Unit/Common.meta
+++ b/Erika/Assets/Art/Models/Characters/Default.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5b7ecc44a82c14749b382be1ed15c799
+guid: e8a40298dd4efd14c9f90a63734ca39b
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Erika/Assets/Data/RootMotionData.meta b/Erika/Assets/Art/Models/Characters/Erika2.meta
index 02bc35e7..fd7369d9 100644
--- a/Erika/Assets/Data/RootMotionData.meta
+++ b/Erika/Assets/Art/Models/Characters/Erika2.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 31452f76e5d76ac4185b44ec316c4433
+guid: 077f81003f9fc564791cce182048c2b0
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Erika/Assets/ProBuilder Data.meta b/Erika/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta
index 8424bd32..b76e98a5 100644
--- a/Erika/Assets/ProBuilder Data.meta
+++ b/Erika/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 62b452114e207404bacccba32c7da124
+guid: 20381b3eecfbfe34a9d9222868969d29
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Erika/Assets/Resources.meta b/Erika/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta
index 3783a737..41200932 100644
--- a/Erika/Assets/Resources.meta
+++ b/Erika/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8d38694a49e1da4409cc08520b04f3c7
+guid: abff7cb61c760094f8ab9437379e0f2c
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Erika/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta b/Erika/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta
new file mode 100644
index 00000000..fa9e76cd
--- /dev/null
+++ b/Erika/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e38cb65072bb4a64cbe162792de9bec2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Materials/Unit/Effect.meta b/Erika/Assets/Bundle/Materials/Unit/Effect.meta
new file mode 100644
index 00000000..fdf8c1db
--- /dev/null
+++ b/Erika/Assets/Bundle/Materials/Unit/Effect.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0525fec1eb7cc94458170e9e106955d5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Shaders/Include.meta b/Erika/Assets/Bundle/Shaders/Include.meta
new file mode 100644
index 00000000..2666365a
--- /dev/null
+++ b/Erika/Assets/Bundle/Shaders/Include.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dc32af12c5122994d8791378227adeb6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Shaders/Unit/Effect.meta b/Erika/Assets/Bundle/Shaders/Unit/Effect.meta
new file mode 100644
index 00000000..7df9a033
--- /dev/null
+++ b/Erika/Assets/Bundle/Shaders/Unit/Effect.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9cc4684b9f432f149b16a51f148c9490
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta b/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta
new file mode 100644
index 00000000..ca7266b0
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a1d7b6e0d8fb1a642a65011fb6cd7d89
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta b/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta
new file mode 100644
index 00000000..142f5872
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6ad7401709700f34db2b795830937d76
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Unit/NPC.meta b/Erika/Assets/Bundle/Unit/NPC.meta
new file mode 100644
index 00000000..eeea13e1
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/NPC.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8ced034d375cdfa488814663ea17a79b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta b/Erika/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta
new file mode 100644
index 00000000..8c41a6b2
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5dc1b71affc68b54594096a1b96a5c00
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/Models.meta b/Erika/Assets/Bundle/Unit/PC/Erika/Models.meta
new file mode 100644
index 00000000..11148d17
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/PC/Erika/Models.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0d712421d808a43438a43d8a5d34effe
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/UnitData.meta b/Erika/Assets/Bundle/Unit/PC/Erika/UnitData.meta
new file mode 100644
index 00000000..7d4b13eb
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/PC/Erika/UnitData.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 922befa8a94692845b88500a23229d7f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta
new file mode 100644
index 00000000..f5434a00
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 07c3b2bf6cb8cc2498422bbb105cbad8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta
new file mode 100644
index 00000000..4ed2c938
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 827d77abe87680a47ae2d71a9e953a18
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta
new file mode 100644
index 00000000..43a52cd1
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7a2b72fbb41383047ac45e6c22ea9663
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta
new file mode 100644
index 00000000..85d58a8c
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b2b0838fb0603964e99904eefe81ad7f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta
new file mode 100644
index 00000000..dd867045
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1c8a678ea9e801f439a1003d04f33cf5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta
new file mode 100644
index 00000000..dc530723
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ebf636c7cf7b1934b885298ce1f5f42e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta
new file mode 100644
index 00000000..b28b6f04
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2022e8298d3a8624992143eb57c0f8ac
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta
new file mode 100644
index 00000000..eeca0d3b
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f6aa859c834c51f498ef0b3c3b83a0f5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta
new file mode 100644
index 00000000..7f91da28
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: df69962f5b01e444a8bea87e31c7d0a4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Bundle/Unit/Prop.meta b/Erika/Assets/Bundle/Unit/Prop.meta
new file mode 100644
index 00000000..affd6eed
--- /dev/null
+++ b/Erika/Assets/Bundle/Unit/Prop.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dafc173db1ebeab4c80641cc3d4fa528
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Resources/effects.meta b/Erika/Assets/Resources/effects.meta
deleted file mode 100644
index 0dc955d6..00000000
--- a/Erika/Assets/Resources/effects.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a5006e4ef2b844b489fbd83fb454a154
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Erika/Assets/Resources/prefabs.meta b/Erika/Assets/Resources/prefabs.meta
deleted file mode 100644
index b9636e1e..00000000
--- a/Erika/Assets/Resources/prefabs.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c6be3bc1f6e8bbe43b6e5ec429b9c199
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Erika/Assets/Resources/prefabs/ui.meta b/Erika/Assets/Resources/prefabs/ui.meta
deleted file mode 100644
index 396594ea..00000000
--- a/Erika/Assets/Resources/prefabs/ui.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 30914a6917746dc4dbcdb09c1eaba4bd
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Erika/Assets/Resources/unit.meta b/Erika/Assets/Resources/unit.meta
deleted file mode 100644
index 4a9985d4..00000000
--- a/Erika/Assets/Resources/unit.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4eb81d15d0561f04a95c69a410136edb
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Erika/Assets/Scripts/Curve3D.meta b/Erika/Assets/Scripts/Curve3D.meta
new file mode 100644
index 00000000..fef1c5e7
--- /dev/null
+++ b/Erika/Assets/Scripts/Curve3D.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ad8b718b6b700d8419838dad07158567
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Scripts/Drone.meta b/Erika/Assets/Scripts/Drone.meta
new file mode 100644
index 00000000..694cff70
--- /dev/null
+++ b/Erika/Assets/Scripts/Drone.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ec3412151f8a72a41b2ed21316763399
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Scripts/Managers/Physics.meta b/Erika/Assets/Scripts/Managers/Physics.meta
new file mode 100644
index 00000000..2296b3f8
--- /dev/null
+++ b/Erika/Assets/Scripts/Managers/Physics.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 603d4624aaedd794cb89497954a83f4a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Scripts/Props.meta b/Erika/Assets/Scripts/Props.meta
new file mode 100644
index 00000000..bb96602e
--- /dev/null
+++ b/Erika/Assets/Scripts/Props.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f299520ed9fcf4a45858ad4ef5a8d5d1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Scripts/Robot.meta b/Erika/Assets/Scripts/Robot.meta
new file mode 100644
index 00000000..0b5a087e
--- /dev/null
+++ b/Erika/Assets/Scripts/Robot.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7c09ca1609552d24bbe697d1516f8aa9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Scripts/Unit/AI/Actions.meta b/Erika/Assets/Scripts/Unit/AI/Actions.meta
new file mode 100644
index 00000000..9b4ad463
--- /dev/null
+++ b/Erika/Assets/Scripts/Unit/AI/Actions.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 971e9d55b8bc0894eb6a110fb962000b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Scripts/Unit/AI/Conditionals.meta b/Erika/Assets/Scripts/Unit/AI/Conditionals.meta
new file mode 100644
index 00000000..70a86da5
--- /dev/null
+++ b/Erika/Assets/Scripts/Unit/AI/Conditionals.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 85b7e0c7ed1d12f42a5178bfbf3d934c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs
index 1d407fc2..da16b947 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs
+++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs
@@ -258,6 +258,14 @@ public class UnitAnimation : UnitComponent
         get { return layers[0]; }

     }
 
+    public AnimatorLayerInfo layer
+    {
+        get

+        {

+            return baseLayer;

+        }
+    }
+
     public bool isInTransition
     {
         get
diff --git a/Erika/Assets/ThirdParty/UMotion/UMotionExamples/Example Scene.meta b/Erika/Assets/ThirdParty/UMotion/UMotionExamples/Example Scene.meta
deleted file mode 100644
index b1295250..00000000
--- a/Erika/Assets/ThirdParty/UMotion/UMotionExamples/Example Scene.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 13ba4d2ee6e74bf4b9aea7f330df39c2
-folderAsset: yes
-timeCreated: 1502460453
-licenseType: Store
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Erika/ProjectSettings/ProjectSettings.asset b/Erika/ProjectSettings/ProjectSettings.asset
index 83b2bb2c..b9b00a88 100644
--- a/Erika/ProjectSettings/ProjectSettings.asset
+++ b/Erika/ProjectSettings/ProjectSettings.asset
@@ -296,7 +296,7 @@ PlayerSettings:
     m_APIs: 0b000000
     m_Automatic: 1
   - m_BuildTarget: WindowsStandaloneSupport
-    m_APIs: 020000000b00000011000000
+    m_APIs: 11000000020000000b000000
     m_Automatic: 0
   m_BuildTargetVRSettings:
   - m_BuildTarget: Standalone