From 3a71eb54456519256f573a6542b46f9c29443b22 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Mon, 23 Aug 2021 21:48:45 +0800
Subject: *misc

---
 Assets/Scripts/Props.meta                          |  8 --------
 Assets/Scripts/Scene.meta                          |  8 --------
 Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs | 18 +++++++++++++++---
 3 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100644 Assets/Scripts/Props.meta
 delete mode 100644 Assets/Scripts/Scene.meta

(limited to 'Assets/Scripts')

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
-- 
cgit v1.1-26-g67d0