43 files changed, 256 insertions, 295 deletions
diff --git a/Assets/ActionTool/Editor/ActionEditorStyles.cs b/Assets/ActionTool/Editor/ActionEditorStyles.cs
index dc68da8d..2a3695b2 100644
--- a/Assets/ActionTool/Editor/ActionEditorStyles.cs
+++ b/Assets/ActionTool/Editor/ActionEditorStyles.cs
@@ -13,8 +13,11 @@ namespace ActionTool
         public GUIStyle boxToggle;
         public GUIStyle keyFrameButton;
 
-        Texture2D m_SelectIcon;
-		Texture2D m_KeyFrameIcon;
+        public Texture2D selectIcon;
+		public Texture2D keyFrameIcon;
+        public Texture2D addFileIcon;
+        public Texture2D saveFileIcon;
+        public Texture2D deleteIcon;
 
         private static ActionEditorStyles s_instance;
         public static ActionEditorStyles Get()
@@ -29,20 +32,23 @@ namespace ActionTool
 
         private ActionEditorStyles()
         {
-            m_SelectIcon = (Texture2D)Resources.Load<Texture2D>("select_white");
-            m_SelectIcon.filterMode = FilterMode.Point;
+            selectIcon = (Texture2D)Resources.Load<Texture2D>("select_white");
+            selectIcon.filterMode = FilterMode.Point;
 
-			m_KeyFrameIcon = EditorGUIUtility.FindTexture("animationkeyframe");
+			keyFrameIcon = EditorGUIUtility.FindTexture("animationkeyframe");
+            addFileIcon = EditorGUIUtility.FindTexture("d_Collab.FileAdded");
+            saveFileIcon = EditorGUIUtility.FindTexture("d_Collab.FileUpdated");
+            deleteIcon = EditorGUIUtility.FindTexture("d_P4_DeletedLocal");
 
-			InitStyle(out textBold, GUI.skin.label, s => {
+            InitStyle(out textBold, GUI.skin.label, s => {
                 s.fontStyle = FontStyle.Bold;
             });
             InitStyle(out selectObj, GUI.skin.button, s => {
-                s.normal.background = m_SelectIcon;
-                s.active.background = m_SelectIcon;
-                s.focused.background = m_SelectIcon;
-                s.hover.background = m_SelectIcon;
-                s.normal.background = m_SelectIcon;
+                s.normal.background = selectIcon;
+                s.active.background = selectIcon;
+                s.focused.background = selectIcon;
+                s.hover.background = selectIcon;
+                s.normal.background = selectIcon;
             });
             InitStyle(out textSmall,  GUI.skin.label, s => {
                 s.fontSize = 8;
diff --git a/Assets/ActionTool/Editor/ActionEditorUI.cs b/Assets/ActionTool/Editor/ActionEditorUI.cs
index 91ff9cad..a1e2ba36 100644
--- a/Assets/ActionTool/Editor/ActionEditorUI.cs
+++ b/Assets/ActionTool/Editor/ActionEditorUI.cs
@@ -72,6 +72,14 @@ namespace ActionTool
 			EditorGUI.DrawRect(rect, color);
 		}
 
+        public void DrawRectFrame(Rect rect, Color col)
+        {
+            DrawHorizontalLineFast(rect.y, rect.x, rect.x + rect.width, col);
+            DrawHorizontalLineFast(rect.y + rect.height, rect.x, rect.x + rect.width, col);
+            DrawVerticalLineFast(rect.x, rect.y, rect.y + rect.height, col);
+            DrawVerticalLineFast(rect.x + rect.width, rect.y, rect.y + rect.height, col);
+        }
+
         public void SelectObject(Object obj)
         {
             Selection.activeObject = obj;
diff --git a/Assets/ActionTool/Editor/ActionPreviewEditor.cs b/Assets/ActionTool/Editor/ActionPreviewEditor.cs
index 8c9d8f05..45048f0e 100644
--- a/Assets/ActionTool/Editor/ActionPreviewEditor.cs
+++ b/Assets/ActionTool/Editor/ActionPreviewEditor.cs
@@ -29,7 +29,8 @@ namespace ActionTool
         const float kToolbarControlMargin = 5;
         const float kToolbarHeight = 50;
         const float kToolbarControlSize = kToolbarHeight - kToolbarControlMargin * 2;
-        const float kTimeLineViewXOffset = 30;
+        const float kTimeLineViewXOffset = 20;
+        const float kTimeLineViewYOffset = 80;
         const float kFrameWidth = 10;
         const float kFrameHeight = 20;
 
@@ -197,12 +198,27 @@ namespace ActionTool
             x += 200;
         }
 
+        Vector2 scrollPos = Vector2.zero;
         void GUI_TimeLineView()
         {
             if (ActionManager.actionData == null)
                 return;
 
-            float y = 80;
+            ActionData action = ActionManager.actionData;
+
+            float y = kTimeLineViewYOffset;
+
+            float contentHeight = ActionManager.eventAndBoxCount * kFrameHeight + 40;
+            Rect content = new Rect(0, 0, action.totalFrame * kFrameWidth + 30, contentHeight);
+            float height = 300;
+            if (position.height - 80 > contentHeight)
+                height = contentHeight + 15;
+            else
+                height = position.height - 80;
+            Rect viewport = new Rect(0, y, position.width, height);
+            scrollPos = GUI.BeginScrollView(viewport, scrollPos, content);
+
+            y = 0;
 
             GUI_FrameText(ref y);
             GUI_Slider(ref y);
@@ -210,6 +226,8 @@ namespace ActionTool
             GUI_Events();
             GUI_Boxes();
             GUI_FrameLine();
+
+            GUI.EndScrollView();
         }
 
         void GUI_FrameText(ref float y)
@@ -434,7 +452,7 @@ namespace ActionTool
         {
             x += kToolbarControlMargin;
             Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize);
-            if (GUI.Button(rect, new GUIContent("New", m_UITextureNewHurtBox)))
+            if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewHurtBox, "New hurt box")))
             {
                 ActionManager.NewHurtBox();
             }
@@ -445,7 +463,7 @@ namespace ActionTool
         {
             x += kToolbarControlMargin;
             Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize);
-            if (GUI.Button(rect, new GUIContent("New", m_UITextureNewHitBox)))
+            if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewHitBox, "New hit box")))
             {
                 ActionManager.NewHitBox();
             }
@@ -457,7 +475,7 @@ namespace ActionTool
             x += kToolbarControlMargin;
             Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize);
             GUI.enabled = ActionManager.colliderData != null;
-            if (GUI.Button(rect, "Delete"))
+            if (GUI.Button(rect, new GUIContent(styles.deleteIcon, "Delete this collider")))
             {
                 ActionManager.DeleteCurBox();
             }
@@ -469,7 +487,7 @@ namespace ActionTool
         {
             x += kToolbarControlMargin;
             Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize);
-            if (GUI.Button(rect, new GUIContent("New")))
+            if (GUI.Button(rect, new GUIContent(styles.addFileIcon, "Add new animation data file")))
             {
                 ActionManager.CreateAnimationData();
             }
@@ -480,7 +498,7 @@ namespace ActionTool
         {
             x += kToolbarControlMargin;
             Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize);
-            if (GUI.Button(rect, new GUIContent("Save")))
+            if (GUI.Button(rect, new GUIContent(styles.saveFileIcon, "Save")))
             {
                 ActionManager.SaveAnimationData();
             }
diff --git a/Assets/ActionTool/Resources/hitbox.png b/Assets/ActionTool/Resources/hitbox.png
index c462dbe5..a2d0ded9 100644
--- a/Assets/ActionTool/Resources/hitbox.png
+++ b/Assets/ActionTool/Resources/hitbox.png
diff --git a/Assets/ActionTool/Resources/hurtbox.png b/Assets/ActionTool/Resources/hurtbox.png
index d990e3d2..eb9613fe 100644
--- a/Assets/ActionTool/Resources/hurtbox.png
+++ b/Assets/ActionTool/Resources/hurtbox.png
diff --git a/Assets/ActionTool/Resources/savefile.png b/Assets/ActionTool/Resources/savefile.png
new file mode 100644
index 00000000..4ec11fe6
--- /dev/null
+++ b/Assets/ActionTool/Resources/savefile.png
diff --git a/Assets/ActionTool/Resources/savefile.png.meta b/Assets/ActionTool/Resources/savefile.png.meta
new file mode 100644
index 00000000..50de496b
--- /dev/null
+++ b/Assets/ActionTool/Resources/savefile.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: eb4f19e4bb0ed1f40bd92086f3c3c8ed
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta
deleted file mode 100644
index 640ede12..00000000
--- a/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 32ad36f78e7f23f46a0ce64fce991723
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta b/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta
deleted file mode 100644
index 4d017390..00000000
--- a/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 93031cff7ea5a314ca110920f817635f
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta
deleted file mode 100644
index 0d171fe4..00000000
--- a/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 69c2852d26b47fa44a688db1349ae258
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta b/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta
index 4627f5df..b76e98a5 100644
--- a/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta
+++ b/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d467e546efed7054c934b1a97a116c5c
+guid: 20381b3eecfbfe34a9d9222868969d29
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta b/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta
index ab214036..41200932 100644
--- a/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta
+++ b/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 063d53dfefca4e3429f5788835b0b4ea
+guid: abff7cb61c760094f8ab9437379e0f2c
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta b/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta
index 20eca756..fa9e76cd 100644
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta
+++ b/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0f14f2cbed5e00a40a3fa94241cf6c27
+guid: e38cb65072bb4a64cbe162792de9bec2
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Data/AnimationData/Erika/Air_Attk_1.asset b/Assets/Data/AnimationData/Erika/Air_Attk_1.asset
index f9a509f4..f4fd6c35 100644
--- a/Assets/Data/AnimationData/Erika/Air_Attk_1.asset
+++ b/Assets/Data/AnimationData/Erika/Air_Attk_1.asset
@@ -15,7 +15,26 @@ MonoBehaviour:
   animationName: Air_Attk_1
   animationPath: Assets/Art/Animations/Erika/Air_Attk_1.anim
   animationEvents: []
-  hurtBoxes: []
+  hurtBoxes:
+  - type: 1
+    pivot: 0
+    frames:
+    - frame: 0
+      active: 1
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 1, y: 1.44, z: 0.5}
+    - frame: 6
+      active: 1
+      position: {x: 0, y: 0.25, z: 0}
+      size: {x: 1, y: 1.18, z: 0.5}
+    - frame: 46
+      active: 1
+      position: {x: 0, y: 0.28, z: 0}
+      size: {x: 1, y: 1.14, z: 0.5}
+    - frame: 51
+      active: 1
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 1, y: 1.43, z: 0.5}
   hitBoxes: []
   throwBoxes: []
   blockBoxes: []
diff --git a/Assets/Data/AnimationData/Erika/Air_Dash.asset b/Assets/Data/AnimationData/Erika/Air_Dash.asset
index c0b73c2f..07ea538e 100644
--- a/Assets/Data/AnimationData/Erika/Air_Dash.asset
+++ b/Assets/Data/AnimationData/Erika/Air_Dash.asset
@@ -27,14 +27,18 @@ MonoBehaviour:
       active: 0
       position: {x: 0, y: 0, z: 0}
       size: {x: 1, y: 0.61, z: 0.5}
-    - frame: 22
-      active: 0
-      position: {x: 0, y: 0, z: 0}
-      size: {x: 1, y: 0.67, z: 0.5}
-    - frame: 37
+    - frame: 14
       active: 1
       position: {x: 0, y: 0, z: 0}
       size: {x: 1, y: 0.59, z: 0.5}
+    - frame: 16
+      active: 1
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 1, y: 0.56, z: 0.5}
+    - frame: 39
+      active: 1
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 1, y: 0.58, z: 0.5}
     - frame: 54
       active: 1
       position: {x: 0, y: 0, z: 0}
diff --git a/Assets/Data/AnimationData/Erika/Idle_Assassin.asset b/Assets/Data/AnimationData/Erika/Idle_Assassin.asset
new file mode 100644
index 00000000..15961a5c
--- /dev/null
+++ b/Assets/Data/AnimationData/Erika/Idle_Assassin.asset
@@ -0,0 +1,33 @@
+%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: cab6406109041434e890f22d6455172f, type: 3}
+  m_Name: Idle_Assassin
+  m_EditorClassIdentifier: 
+  animationName: Idle_Assassin
+  animationPath: Assets/Art/Animations/Erika/Idle_Assassin.anim
+  animationEvents: []
+  hurtBoxes:
+  - type: 1
+    pivot: 0
+    frames:
+    - frame: 0
+      active: 1
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 1, y: 1.21, z: 0.5}
+    - frame: 119
+      active: 1
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 1, y: 1.21, z: 0.5}
+  hitBoxes: []
+  throwBoxes: []
+  blockBoxes: []
+  defendBoxes: []
diff --git a/Assets/Data/AnimationData/Erika/Idle_Assassin.asset.meta b/Assets/Data/AnimationData/Erika/Idle_Assassin.asset.meta
new file mode 100644
index 00000000..0bc8e077
--- /dev/null
+++ b/Assets/Data/AnimationData/Erika/Idle_Assassin.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2a3c79e83a98fb2418e2dbddeee9c0f2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Data/AnimationData/Erika/Take 001.asset b/Assets/Data/AnimationData/Erika/Take 001.asset
index 61f6845a..d5ec6661 100644
--- a/Assets/Data/AnimationData/Erika/Take 001.asset
+++ b/Assets/Data/AnimationData/Erika/Take 001.asset
@@ -107,7 +107,7 @@ MonoBehaviour:
       size: {x: 1, y: 1, z: 0.5}
     - frame: 43
       active: 1
-      position: {x: 0, y: 0.6, z: 1.08}
+      position: {x: 0, y: 0.84, z: 1.08}
       size: {x: 1, y: 1, z: 0.5}
   - type: 0
     pivot: 1
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta b/Assets/Data/UnitData.meta
index ee2ffc5f..d0809213 100644
--- a/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta
+++ b/Assets/Data/UnitData.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b82ae836c84f36049bdbdb08743b98e0
+guid: 5bdb120d934aa114ab2f20e111a3c4d2
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Scenes/Demo/AnimationEditScene.unity b/Assets/Scenes/Demo/AnimationEditScene.unity
index 2fb1f56f..0b4242ee 100644
--- a/Assets/Scenes/Demo/AnimationEditScene.unity
+++ b/Assets/Scenes/Demo/AnimationEditScene.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -179,7 +179,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!1 &861741897
 GameObject:
@@ -263,6 +263,36 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1025833088
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1025833089}
+  m_Layer: 0
+  m_Name: RootActionTool
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1025833089
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1025833088}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1550874705
 GameObject:
   m_ObjectHideFlags: 0
@@ -353,82 +383,5 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &2120036130
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 100036, guid: 9c5d4daae8741034db47dd6cb5e66ba2, type: 3}
-      propertyPath: m_Name
-      value: Frank_Assassin_Skin
-      objectReference: {fileID: 0}
-    - target: {fileID: 100036, guid: 9c5d4daae8741034db47dd6cb5e66ba2, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 100042, guid: 9c5d4daae8741034db47dd6cb5e66ba2, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 100130, guid: 9c5d4daae8741034db47dd6cb5e66ba2, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 100132, guid: 9c5d4daae8741034db47dd6cb5e66ba2, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 100182, guid: 9c5d4daae8741034db47dd6cb5e66ba2, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400036, guid: 9c5d4daae8741034db47dd6cb5e66ba2, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -0.6602914
-      objectReference: {fileID: 0}
-    - target: {fileID: 400036, guid: 9c5d4daae8741034db47dd6cb5e66ba2, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.043
-      objectReference: {fileID: 0}
-    - target: {fileID: 400036, guid: 9c5d4daae8741034db47dd6cb5e66ba2, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -1.04
-      objectReference: {fileID: 0}
-    - target: {fileID: 400036, guid: 9c5d4daae8741034db47dd6cb5e66ba2, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400036, guid: 9c5d4daae8741034db47dd6cb5e66ba2, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400036, guid: 9c5d4daae8741034db47dd6cb5e66ba2, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400036, guid: 9c5d4daae8741034db47dd6cb5e66ba2, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 400036, guid: 9c5d4daae8741034db47dd6cb5e66ba2, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 400036, guid: 9c5d4daae8741034db47dd6cb5e66ba2, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400036, guid: 9c5d4daae8741034db47dd6cb5e66ba2, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400036, guid: 9c5d4daae8741034db47dd6cb5e66ba2, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 9c5d4daae8741034db47dd6cb5e66ba2, type: 3}
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta b/Assets/Scripts/Props.meta
index e0cb5de8..bb96602e 100644
--- a/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta
+++ b/Assets/Scripts/Props.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c219c63d9953ba84b8cbe80444bdbf22
+guid: f299520ed9fcf4a45858ad4ef5a8d5d1
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Scripts/Scene.meta b/Assets/Scripts/Scene.meta
new file mode 100644
index 00000000..eb7a8716
--- /dev/null
+++ b/Assets/Scripts/Scene.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eaee2d0f48cff9b40baf0686a8105600
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Unit/TimelineEvent.cs b/Assets/Scripts/Unit/TimelineEvent.cs
index 1fab5c52..f0a28ec6 100644
--- a/Assets/Scripts/Unit/TimelineEvent.cs
+++ b/Assets/Scripts/Unit/TimelineEvent.cs
@@ -37,4 +37,4 @@ public partial class TimelineEvent: MonoBehaviour
 
     }
 
-}
-\ No newline at end of file
+}   
+\ No newline at end of file
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta
deleted file mode 100644
index fc69e121..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6b4092aee1925294286c91c8b2f0246b
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta
deleted file mode 100644
index 16dceda0..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7f677b222bd908a4eb6e8b6f446f0c95
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta
deleted file mode 100644
index 3feeaa0c..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f65f99730f449cd42b5428ed33579276
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta
deleted file mode 100644
index d2cc8de3..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0d1d19a8d9a9258489a54453cbd409bf
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta
deleted file mode 100644
index 60091bee..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5fa002e3b21354f4b847ab441877ecda
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta
deleted file mode 100644
index c50ca514..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c9c840958f8546c4e9667f0757d8557a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta
deleted file mode 100644
index 35b83bfb..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5e705a58e98ec1a409129eb57fa15477
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta
deleted file mode 100644
index 88f9f501..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c77d30703ebcc5c4bbb57517b133b0f4
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta
deleted file mode 100644
index 4d33dc86..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 142685877fe50f64caba63abfda167a7
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/User.meta b/Assets/ThirdParty/BOXOPHOBIC/User.meta
deleted file mode 100644
index 293c8b38..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/User.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f0aa5379d96b0e14795df45a380643fb
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta
deleted file mode 100644
index a5ee5a64..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4c9d2f06234e7e643b2118057d8e0673
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta
deleted file mode 100644
index 3fdad1c4..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6fcf51a07e84ca941a62046a0b693a19
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta
deleted file mode 100644
index 94757653..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 28d59ef8b8ebe8d48a3a27e990a2d7e9
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta
deleted file mode 100644
index d2c0b7b4..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: edc7fbbe770e693488770a7aaeae2aa6
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta
deleted file mode 100644
index 069be515..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8ed975ceb335a144c93320e22ae1780a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta
deleted file mode 100644
index 7ea21e4b..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5a3babbb69c72f8419243020c0dfb70b
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta
deleted file mode 100644
index f2a1c8a6..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cd6738b410016744eaf6e182174c0b2b
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta
deleted file mode 100644
index 50e68eff..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f32bd65977ebf9049bd5e40e18d1556c
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta
deleted file mode 100644
index 68664862..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 151a76ee3bec1ae449cd56f31d474de5
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta
deleted file mode 100644
index aab2c856..00000000
--- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3ae8613087e217249a69059295113b1c
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: