From cb893e1e5e4820cb800836cf6b8a79a1cd986cdc Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Thu, 22 Jul 2021 18:34:47 +0800
Subject: *misc

---
 Assets/Scripts/Unit/Events/AnimationEventBase.cs       |  8 +++++---
 Assets/Scripts/Unit/Events/EventAfterImage.cs          | 16 ----------------
 Assets/Scripts/Unit/Events/EventAfterImage.cs.meta     | 11 -----------
 Assets/Scripts/Unit/Events/EventBulletTime.cs          |  9 ---------
 Assets/Scripts/Unit/Events/EventBulletTime.cs.meta     | 11 -----------
 Assets/Scripts/Unit/Events/EventCameraBlur.cs          | 18 ------------------
 Assets/Scripts/Unit/Events/EventCameraBlur.cs.meta     | 11 -----------
 Assets/Scripts/Unit/Events/EventCameraShake.cs         | 18 ------------------
 Assets/Scripts/Unit/Events/EventCameraShake.cs.meta    | 11 -----------
 Assets/Scripts/Unit/Events/EventCameraWhiteOut.cs      | 18 ------------------
 Assets/Scripts/Unit/Events/EventCameraWhiteOut.cs.meta | 11 -----------
 Assets/Scripts/Unit/Events/EventCameraZoom.cs          | 18 ------------------
 Assets/Scripts/Unit/Events/EventCameraZoom.cs.meta     | 11 -----------
 Assets/Scripts/Unit/Events/EventEffect.cs              | 17 +++++++++++++++--
 Assets/Scripts/Unit/Events/EventMeshFade.cs            |  8 --------
 Assets/Scripts/Unit/Events/EventMeshFade.cs.meta       | 11 -----------
 16 files changed, 20 insertions(+), 187 deletions(-)
 delete mode 100644 Assets/Scripts/Unit/Events/EventAfterImage.cs
 delete mode 100644 Assets/Scripts/Unit/Events/EventAfterImage.cs.meta
 delete mode 100644 Assets/Scripts/Unit/Events/EventBulletTime.cs
 delete mode 100644 Assets/Scripts/Unit/Events/EventBulletTime.cs.meta
 delete mode 100644 Assets/Scripts/Unit/Events/EventCameraBlur.cs
 delete mode 100644 Assets/Scripts/Unit/Events/EventCameraBlur.cs.meta
 delete mode 100644 Assets/Scripts/Unit/Events/EventCameraShake.cs
 delete mode 100644 Assets/Scripts/Unit/Events/EventCameraShake.cs.meta
 delete mode 100644 Assets/Scripts/Unit/Events/EventCameraWhiteOut.cs
 delete mode 100644 Assets/Scripts/Unit/Events/EventCameraWhiteOut.cs.meta
 delete mode 100644 Assets/Scripts/Unit/Events/EventCameraZoom.cs
 delete mode 100644 Assets/Scripts/Unit/Events/EventCameraZoom.cs.meta
 delete mode 100644 Assets/Scripts/Unit/Events/EventMeshFade.cs
 delete mode 100644 Assets/Scripts/Unit/Events/EventMeshFade.cs.meta

(limited to 'Assets/Scripts/Unit/Events')

diff --git a/Assets/Scripts/Unit/Events/AnimationEventBase.cs b/Assets/Scripts/Unit/Events/AnimationEventBase.cs
index bcaf9eae..774f7b38 100644
--- a/Assets/Scripts/Unit/Events/AnimationEventBase.cs
+++ b/Assets/Scripts/Unit/Events/AnimationEventBase.cs
@@ -1,9 +1,11 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class AnimationEventBase : ScriptableObject
+public abstract class AnimationEventBase : ScriptableObject
 {
     public int startFrame;
-    public TimelineEvent.EEventType type;
+    
+    public abstract TimelineEvent.EEventType type { get; }
 }
diff --git a/Assets/Scripts/Unit/Events/EventAfterImage.cs b/Assets/Scripts/Unit/Events/EventAfterImage.cs
deleted file mode 100644
index 9c0ea5ac..00000000
--- a/Assets/Scripts/Unit/Events/EventAfterImage.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class EventAfterImage : AnimationEventBase
-{
-    public enum EAfterImageType
-    {
-        None = 0,
-        BlackWhite,
-        Golden,
-    }
-
-    public EAfterImageType afterType;
-
-}
diff --git a/Assets/Scripts/Unit/Events/EventAfterImage.cs.meta b/Assets/Scripts/Unit/Events/EventAfterImage.cs.meta
deleted file mode 100644
index 9985730b..00000000
--- a/Assets/Scripts/Unit/Events/EventAfterImage.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: d07ec6150f55c1844a54dbc664e0c95d
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Unit/Events/EventBulletTime.cs b/Assets/Scripts/Unit/Events/EventBulletTime.cs
deleted file mode 100644
index 22c2b83f..00000000
--- a/Assets/Scripts/Unit/Events/EventBulletTime.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class EventBulletTime : AnimationEventBase
-{
-
-
-}
diff --git a/Assets/Scripts/Unit/Events/EventBulletTime.cs.meta b/Assets/Scripts/Unit/Events/EventBulletTime.cs.meta
deleted file mode 100644
index 1d2e22dc..00000000
--- a/Assets/Scripts/Unit/Events/EventBulletTime.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 554b381d61ce5494b9b4e60b72521a6b
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Unit/Events/EventCameraBlur.cs b/Assets/Scripts/Unit/Events/EventCameraBlur.cs
deleted file mode 100644
index bab672fa..00000000
--- a/Assets/Scripts/Unit/Events/EventCameraBlur.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class EventCameraBlur : MonoBehaviour
-{
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}
diff --git a/Assets/Scripts/Unit/Events/EventCameraBlur.cs.meta b/Assets/Scripts/Unit/Events/EventCameraBlur.cs.meta
deleted file mode 100644
index 816be65b..00000000
--- a/Assets/Scripts/Unit/Events/EventCameraBlur.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 6f064336a95165d4fa6af02fadb70bc0
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Unit/Events/EventCameraShake.cs b/Assets/Scripts/Unit/Events/EventCameraShake.cs
deleted file mode 100644
index f352f415..00000000
--- a/Assets/Scripts/Unit/Events/EventCameraShake.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class EventCameraShake : MonoBehaviour
-{
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}
diff --git a/Assets/Scripts/Unit/Events/EventCameraShake.cs.meta b/Assets/Scripts/Unit/Events/EventCameraShake.cs.meta
deleted file mode 100644
index 7e19dd10..00000000
--- a/Assets/Scripts/Unit/Events/EventCameraShake.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: c9aeba330898fc54fb170f0689e5460c
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Unit/Events/EventCameraWhiteOut.cs b/Assets/Scripts/Unit/Events/EventCameraWhiteOut.cs
deleted file mode 100644
index b9cb1a2e..00000000
--- a/Assets/Scripts/Unit/Events/EventCameraWhiteOut.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class EventCameraWhiteOut : MonoBehaviour
-{
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}
diff --git a/Assets/Scripts/Unit/Events/EventCameraWhiteOut.cs.meta b/Assets/Scripts/Unit/Events/EventCameraWhiteOut.cs.meta
deleted file mode 100644
index 2c73556e..00000000
--- a/Assets/Scripts/Unit/Events/EventCameraWhiteOut.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: f4a27077d030aa54ebbb7c192ca59979
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Unit/Events/EventCameraZoom.cs b/Assets/Scripts/Unit/Events/EventCameraZoom.cs
deleted file mode 100644
index 8efac028..00000000
--- a/Assets/Scripts/Unit/Events/EventCameraZoom.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class EventCameraZoom : MonoBehaviour
-{
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}
diff --git a/Assets/Scripts/Unit/Events/EventCameraZoom.cs.meta b/Assets/Scripts/Unit/Events/EventCameraZoom.cs.meta
deleted file mode 100644
index 9fb41c39..00000000
--- a/Assets/Scripts/Unit/Events/EventCameraZoom.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 5214828735209264c83cf0e3b1c12efe
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Unit/Events/EventEffect.cs b/Assets/Scripts/Unit/Events/EventEffect.cs
index 65479cb7..449b1e23 100644
--- a/Assets/Scripts/Unit/Events/EventEffect.cs
+++ b/Assets/Scripts/Unit/Events/EventEffect.cs
@@ -4,10 +4,23 @@ using UnityEngine;
 
 public class EventEffect : AnimationEventBase
 {
-    public string effectName;
+    public override TimelineEvent.EEventType type { get { return TimelineEvent.EEventType.EventEffect; } }
+
+    [Tooltip("Effect path")]
+    public string effectPath;
+
+    [Tooltip("Is attached to a bone")]
     public bool attached;
+
+    [Tooltip("Bone path attach to")]
     public string bone;
+
+    [Tooltip("Position offset")]
     public Vector3 position;
-    public Quaternion rotation;
+
+    [Tooltip("Rotation in euler")]
+    public Vector3 rotation;
+
+    [Tooltip("Scale")]
     public Vector3 scale;
 }
diff --git a/Assets/Scripts/Unit/Events/EventMeshFade.cs b/Assets/Scripts/Unit/Events/EventMeshFade.cs
deleted file mode 100644
index ee256b0f..00000000
--- a/Assets/Scripts/Unit/Events/EventMeshFade.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class EventMeshFade : AnimationEventBase
-{
-
-}
diff --git a/Assets/Scripts/Unit/Events/EventMeshFade.cs.meta b/Assets/Scripts/Unit/Events/EventMeshFade.cs.meta
deleted file mode 100644
index 5ab8c0bf..00000000
--- a/Assets/Scripts/Unit/Events/EventMeshFade.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 761dbef185f094f439b2710ed7e5fcd1
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-- 
cgit v1.1-26-g67d0