*misc

56 files changed, 275 insertions, 228 deletions

diff --git a/Assets/ActionTool/Editor/ActionColliderEditor.cs b/Assets/ActionTool/Editor/ActionColliderEditor.cs
index 9aa9b788..a883bd46 100644
--- a/Assets/ActionTool/Editor/ActionColliderEditor.cs
+++ b/Assets/ActionTool/Editor/ActionColliderEditor.cs
@@ -18,6 +18,8 @@ namespace ActionTool
 

         Dictionary<string, bool> m_Foldout = new Dictionary<string, bool> ();

 

+		int indent = 0;

+

         private void OnEnable()

         {

             titleContent = new GUIContent("Collider Editor");

@@ -175,6 +177,7 @@ namespace ActionTool
                                     m_Foldout.Add(foldout.title, false);

                                 m_Foldout[foldout.title] = EditorGUILayout.Foldout(m_Foldout[foldout.title], foldout.title);

                                 foldoutElementCount = 0;

+								indent = 13;

                             }

                         }

                     }

@@ -185,19 +188,21 @@ namespace ActionTool
                     if(foldout != null && (++foldoutElementCount) <= foldout.count)

                     {

                         skip |= !m_Foldout[foldout.title];

-                        if (foldoutElementCount == foldout.count)

-                        {

-                            foldout = null;

-                            foldoutElementCount = 0;

-                        }

-                    }

+					}

                     if (skip)

                     {

-                        GUI.enabled = true;

+						if (foldout != null && foldoutElementCount == foldout.count)

+						{

+							foldout = null;

+							foldoutElementCount = 0;

+							indent = 0;

+						}

+						GUI.enabled = true;

                         continue;

                     }

 

-                    EditorGUILayout.LabelField(new GUIContent(name, tooltip), styles.textBold);

+					GUI_Label(new GUIContent(name, tooltip), styles.textBold);

+

                     if (field.FieldType == typeof(Vector3))

                     {

                         field.SetValue(collider, GUI_Vector3((Vector3)field.GetValue(collider)));

@@ -206,7 +211,11 @@ namespace ActionTool
                     {

                         field.SetValue(collider, GUI_Vector2((Vector2)field.GetValue(collider)));

                     }

-                    else if (field.FieldType == typeof(string))

+					else if(field.FieldType == typeof(Color))

+					{

+						field.SetValue(collider, GUI_Color((Color)field.GetValue(collider)));

+					}

+					else if (field.FieldType == typeof(string))

                     {

                         field.SetValue(collider, GUI_String((string)field.GetValue(collider)));

                     }

@@ -232,65 +241,91 @@ namespace ActionTool
                     }

                     GUI.enabled = true;

                     GUILayout.Space(5);

-                }

-            }

+

+					if (foldout != null && foldoutElementCount == foldout.count)

+					{

+						foldout = null;

+						foldoutElementCount = 0;

+						indent = 0;

+					}

+				}

+			}

             EditorGUILayout.EndScrollView();

         }

 

+		Rect GetControlRect()

+		{

+			Rect rect = EditorGUILayout.GetControlRect();

+			rect.x += indent;

+			rect.width -= indent;

+			return rect;

+		}

+

+		void GUI_Label(GUIContent label, GUIStyle style)

+		{

+			Rect rect = GetControlRect();

+			EditorGUI.LabelField(rect, label, style);

+		}

+

         Vector3 GUI_Vector3(Vector3 value)

         {

-            Rect rect = EditorGUILayout.GetControlRect();

+            Rect rect = GetControlRect();

             return EditorGUI.Vector3Field(rect, "", value);

         }

 

         Vector2 GUI_Vector2(Vector2 value)

         {

-            Rect rect = EditorGUILayout.GetControlRect();

+            Rect rect = GetControlRect();

             return EditorGUI.Vector2Field(rect, "", value);

         }

 

         string GUI_String(string value)

         {

-            Rect rect = EditorGUILayout.GetControlRect();

+            Rect rect = GetControlRect();

             return EditorGUI.TextField(rect, "", value);

         }

 

         bool GUI_Bool(bool value)

         {

-            Rect rect = EditorGUILayout.GetControlRect();

+            Rect rect = GetControlRect();

             return GUI.Toggle(rect, value, "Check");

         }

 

         void GUI_Enum(string value)

         {

-            Rect rect = EditorGUILayout.GetControlRect();

+            Rect rect = GetControlRect();

             GUI.Label(rect, value);

         }

 

         float GUI_Float(float value)

         {

-            Rect rect = EditorGUILayout.GetControlRect();

+            Rect rect = GetControlRect();

             return EditorGUI.FloatField(rect, "", value);

         }

 

         int GUI_Int(int value)

         {

-            Rect rect = EditorGUILayout.GetControlRect();

+            Rect rect = GetControlRect();

             return EditorGUI.IntField(rect, "", value);

         }

 

         AnimationCurve GUI_Curve(AnimationCurve curve)

         {

-            Rect rect = EditorGUILayout.GetControlRect();

+            Rect rect = GetControlRect();

             return EditorGUI.CurveField(rect, "", curve);

         }

 

         Enum GUI_Enum(Enum enumValue)

         {

-            Rect rect = EditorGUILayout.GetControlRect();

+            Rect rect = GetControlRect();

             return EditorGUI.EnumPopup(rect, "", enumValue);

         }

 

+		Color GUI_Color(Color col)

+		{

+			Rect rect = GetControlRect();

+			return EditorGUI.ColorField(rect, col);

+		}

 

-    }

+	}

 }
\ No newline at end of file
diff --git a/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta
index b76e98a5..4627f5df 100644
--- a/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 20381b3eecfbfe34a9d9222868969d29
+guid: d467e546efed7054c934b1a97a116c5c
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta b/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta
index 41200932..ab214036 100644
--- a/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: abff7cb61c760094f8ab9437379e0f2c
+guid: 063d53dfefca4e3429f5788835b0b4ea
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Bundle/Material.meta b/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta
index 85215e86..ee2ffc5f 100644
--- a/Assets/Bundle/Material.meta
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8641bb4d4eee8b1419a1c8316ff9aee5
+guid: b82ae836c84f36049bdbdb08743b98e0
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta
new file mode 100644
index 00000000..e0cb5de8
--- /dev/null
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c219c63d9953ba84b8cbe80444bdbf22
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta
new file mode 100644
index 00000000..640ede12
--- /dev/null
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..4d017390
--- /dev/null
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..0d171fe4
--- /dev/null
+++ b/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 69c2852d26b47fa44a688db1349ae258
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Bundle/Projectile.meta b/Assets/Bundle/Projectile.meta
deleted file mode 100644
index b01252f1..00000000
--- a/Assets/Bundle/Projectile.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 370f39b2edf043241a00acd3f6844aa6
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Shader.meta b/Assets/Bundle/Shader.meta
deleted file mode 100644
index 92ded933..00000000
--- a/Assets/Bundle/Shader.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5a8ba4f43d9a7b24d855cadccb986b60
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/UI.meta b/Assets/Bundle/UI.meta
deleted file mode 100644
index 0914914c..00000000
--- a/Assets/Bundle/UI.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4392471259b05a74a82a4bc72b510eb1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/Monster.meta b/Assets/Bundle/Unit/Monster.meta
deleted file mode 100644
index 51d19a1d..00000000
--- a/Assets/Bundle/Unit/Monster.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 98c6b7d15b8909e4b911c42ea72b9930
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/NPC.meta b/Assets/Bundle/Unit/NPC.meta
deleted file mode 100644
index eeea13e1..00000000
--- a/Assets/Bundle/Unit/NPC.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8ced034d375cdfa488814663ea17a79b
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta
deleted file mode 100644
index 1d22d5d2..00000000
--- a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e777b7b5be18d4e4092e116011158c68
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta b/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta
deleted file mode 100644
index 8c41a6b2..00000000
--- a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5dc1b71affc68b54594096a1b96a5c00
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/Erika/Models.meta b/Assets/Bundle/Unit/PC/Erika/Models.meta
deleted file mode 100644
index 11148d17..00000000
--- a/Assets/Bundle/Unit/PC/Erika/Models.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0d712421d808a43438a43d8a5d34effe
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/Erika/UnitData.meta b/Assets/Bundle/Unit/PC/Erika/UnitData.meta
deleted file mode 100644
index 7d4b13eb..00000000
--- a/Assets/Bundle/Unit/PC/Erika/UnitData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 922befa8a94692845b88500a23229d7f
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta
new file mode 100644
index 00000000..be6badd6
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2c46a5a23283c7d428ae8bb13663ab6a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta
deleted file mode 100644
index f5434a00..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 07c3b2bf6cb8cc2498422bbb105cbad8
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta
deleted file mode 100644
index 4ed2c938..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 827d77abe87680a47ae2d71a9e953a18
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta
deleted file mode 100644
index 43a52cd1..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7a2b72fbb41383047ac45e6c22ea9663
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta
deleted file mode 100644
index 85d58a8c..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b2b0838fb0603964e99904eefe81ad7f
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta
deleted file mode 100644
index dd867045..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1c8a678ea9e801f439a1003d04f33cf5
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta
deleted file mode 100644
index dc530723..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ebf636c7cf7b1934b885298ce1f5f42e
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta
deleted file mode 100644
index b28b6f04..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2022e8298d3a8624992143eb57c0f8ac
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta
deleted file mode 100644
index eeca0d3b..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f6aa859c834c51f498ef0b3c3b83a0f5
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta
deleted file mode 100644
index 7f91da28..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: df69962f5b01e444a8bea87e31c7d0a4
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/Prop.meta b/Assets/Bundle/Unit/Prop.meta
deleted file mode 100644
index affd6eed..00000000
--- a/Assets/Bundle/Unit/Prop.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: dafc173db1ebeab4c80641cc3d4fa528
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Data/ActionData.meta b/Assets/Data/ActionData.meta
deleted file mode 100644
index 48dd5af5..00000000
--- a/Assets/Data/ActionData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4e712aac7b9add047ab7a8691dd1a17a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Data/AnimationData/Erika.meta b/Assets/Data/AnimationData/Erika.meta
deleted file mode 100644
index 10bf1fb1..00000000
--- a/Assets/Data/AnimationData/Erika.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 02289cc4b0fe1c34988c293ff6dbca02
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Data/RootMotionData/Erika.meta b/Assets/Data/RootMotionData/Erika.meta
deleted file mode 100644
index 57b03e09..00000000
--- a/Assets/Data/RootMotionData/Erika.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2c4e05f9eb0abc949a472e82070dfef1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Data/UnitData.meta b/Assets/Data/UnitData.meta
deleted file mode 100644
index d0809213..00000000
--- a/Assets/Data/UnitData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5bdb120d934aa114ab2f20e111a3c4d2
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Props.meta b/Assets/Scripts/Props.meta
deleted file mode 100644
index bb96602e..00000000
--- a/Assets/Scripts/Props.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f299520ed9fcf4a45858ad4ef5a8d5d1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Scene.meta b/Assets/Scripts/Scene.meta
deleted file mode 100644
index eb7a8716..00000000
--- a/Assets/Scripts/Scene.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: eaee2d0f48cff9b40baf0686a8105600
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs b/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs
index a6f3730f..72bca7f8 100644
--- a/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs
+++ b/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs
@@ -14,6 +14,13 @@ public partial class ColliderBox
 		All = 2,
 	}
 
+	public enum EBlurMode : int

+	{

+		None = 0,

+		Gauß = 1,

+		Radial = 2,

+	}
+
 	public enum ESparkAnchor : int
 	{
 		CenterOfIntersection = 0, // hitbox和hurtbox相交的矩形中心
@@ -36,9 +43,9 @@ public partial class ColliderBox
 	[Tooltip("允许多次击中")]
 	public bool multiHit;

 

-    [Tooltip("自身钝帧")]

+    [Tooltip("自身顿帧")]

     public float freezeFramesSelf;

-    [Tooltip("对方钝帧")]

+    [Tooltip("对方顿帧")]

     public float freezeFramesOther;

 

     [Foldout("粒子效果", 3)]

@@ -63,8 +70,13 @@ public partial class ColliderBox
 	[If("shakeScreen"), Tooltip("震屏力度")]
 	public float shakeStrength;

 

-    [Foldout("屏幕效果", 1)]
+    [Foldout("屏幕效果", 2)]
     [Tooltip("颜色漂移效果")]

     public EColorDriftMode colorDrift;
+	public EBlurMode blur;

+

+	[Foldout("音效", 1)]

+	[Tooltip("音效")]

+	public string soundPath;
 
 }
\ 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
new file mode 100644
index 00000000..fc69e121
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..16dceda0
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..3feeaa0c
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..d2cc8de3
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..60091bee
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..c50ca514
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c9c840958f8546c4e9667f0757d8557a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta
index fa9e76cd..20eca756 100644
--- a/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e38cb65072bb4a64cbe162792de9bec2
+guid: 0f14f2cbed5e00a40a3fa94241cf6c27
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta
new file mode 100644
index 00000000..35b83bfb
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..88f9f501
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..4d33dc86
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..293c8b38
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/User.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..a5ee5a64
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..3fdad1c4
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..94757653
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..d2c0b7b4
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..069be515
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..7ea21e4b
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..f2a1c8a6
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..50e68eff
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..68664862
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..aab2c856
--- /dev/null
+++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3ae8613087e217249a69059295113b1c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: