From f50326c223546e862f6800f643490e13616960e0 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 19 Aug 2021 19:42:26 +0800 Subject: *misc --- Assets/ActionTool/ActionTool Settings.asset | 4 +++ Assets/ActionTool/Editor/ActionColliderEditor.cs | 41 ++++++++++++++++++++-- Assets/ActionTool/Editor/ActionEditorStyles.cs | 5 +++ Assets/ActionTool/Editor/ActionEventEditor.cs | 40 +++++++++++++++++++++ Assets/ActionTool/Editor/ActionPreviewEditor.cs | 4 +-- .../Unit/PC/Erika/AnimationData/Take 001.asset | 25 +++++++++++-- Assets/Scripts/Unit/Collider/ColliderBox.cs | 10 ++++-- Assets/Scripts/Unit/Component/UnitCollider.cs | 1 + Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs | 19 ++++++++++ .../Scripts/Unit/Events/EventMesh_FadeIn.cs.meta | 11 ++++++ Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs | 8 +++++ .../Scripts/Unit/Events/EventMesh_FadeOut.cs.meta | 11 ++++++ 12 files changed, 170 insertions(+), 9 deletions(-) create mode 100644 Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs create mode 100644 Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs.meta create mode 100644 Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs create mode 100644 Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs.meta (limited to 'Assets') diff --git a/Assets/ActionTool/ActionTool Settings.asset b/Assets/ActionTool/ActionTool Settings.asset index f1247575..a49f5e71 100644 --- a/Assets/ActionTool/ActionTool Settings.asset +++ b/Assets/ActionTool/ActionTool Settings.asset @@ -28,6 +28,8 @@ MonoBehaviour: - EventEffect - EventSound - EventBulletTime + - EventMesh_FadeIn + - EventMesh_FadeOut eventColors: - {r: 0, g: 0, b: 0, a: 1} - {r: 0, g: 0, b: 0, a: 1} @@ -44,3 +46,5 @@ MonoBehaviour: - {r: 1, g: 0, b: 0.9345741, a: 1} - {r: 0, g: 0, b: 0, a: 1} - {r: 0, g: 0, b: 0, a: 1} + - {r: 0.3773585, g: 0.21537913, b: 0.21537913, a: 1} + - {r: 0.16981131, g: 0.16981131, b: 0.16981131, a: 1} diff --git a/Assets/ActionTool/Editor/ActionColliderEditor.cs b/Assets/ActionTool/Editor/ActionColliderEditor.cs index 9bb77515..85e29c6d 100644 --- a/Assets/ActionTool/Editor/ActionColliderEditor.cs +++ b/Assets/ActionTool/Editor/ActionColliderEditor.cs @@ -132,9 +132,21 @@ namespace ActionTool { field.SetValue(collider, GUI_Bool((bool)field.GetValue(collider))); } - else + else if (field.FieldType == typeof(AnimationCurve)) { - GUI_Enum(field.GetValue(collider).ToString()); + field.SetValue(collider, GUI_Curve(field.GetValue(collider) as AnimationCurve)); + } + else if (field.FieldType.IsEnum) + { + field.SetValue(collider, GUI_Enum((Enum)field.GetValue(collider))); + } + else if (field.FieldType == typeof(float)) + { + field.SetValue(collider, GUI_Float((float)field.GetValue(collider))); + } + else if (field.FieldType == typeof(int)) + { + field.SetValue(collider, GUI_Int((int)field.GetValue(collider))); } GUI.enabled = true; GUILayout.Space(5); @@ -173,5 +185,30 @@ namespace ActionTool GUI.Label(rect, value); } + float GUI_Float(float value) + { + Rect rect = EditorGUILayout.GetControlRect(); + return EditorGUI.FloatField(rect, "", value); + } + + int GUI_Int(int value) + { + Rect rect = EditorGUILayout.GetControlRect(); + return EditorGUI.IntField(rect, "", value); + } + + AnimationCurve GUI_Curve(AnimationCurve curve) + { + Rect rect = EditorGUILayout.GetControlRect(); + return EditorGUI.CurveField(rect, "", curve); + } + + Enum GUI_Enum(Enum enumValue) + { + Rect rect = EditorGUILayout.GetControlRect(); + return EditorGUI.EnumPopup(rect, "", enumValue); + } + + } } \ No newline at end of file diff --git a/Assets/ActionTool/Editor/ActionEditorStyles.cs b/Assets/ActionTool/Editor/ActionEditorStyles.cs index cc806bf7..51b46035 100644 --- a/Assets/ActionTool/Editor/ActionEditorStyles.cs +++ b/Assets/ActionTool/Editor/ActionEditorStyles.cs @@ -8,6 +8,7 @@ namespace ActionTool internal class ActionEditorStyles { public GUIStyle textBoldBig; + public GUIStyle textBoldSmall; public GUIStyle textBold; public GUIStyle selectObj; public GUIStyle textSmall; @@ -56,6 +57,10 @@ namespace ActionTool InitStyle(out textBold, GUI.skin.label, s => { s.fontStyle = FontStyle.Bold; }); + InitStyle(out textBoldSmall, GUI.skin.label, s => { + s.fontSize = 9; + s.fontStyle = FontStyle.Bold; + }); InitStyle(out selectObj, GUI.skin.button, s => { s.normal.background = selectIcon; s.active.background = selectIcon; diff --git a/Assets/ActionTool/Editor/ActionEventEditor.cs b/Assets/ActionTool/Editor/ActionEventEditor.cs index 8edcd1c2..fc5d248d 100644 --- a/Assets/ActionTool/Editor/ActionEventEditor.cs +++ b/Assets/ActionTool/Editor/ActionEventEditor.cs @@ -120,6 +120,22 @@ namespace ActionTool { field.SetValue(animEvent, GUI_Bool((bool)field.GetValue(animEvent))); } + else if(field.FieldType == typeof(AnimationCurve)) + { + field.SetValue(animEvent, GUI_Curve(field.GetValue(animEvent) as AnimationCurve)); + } + else if(field.FieldType.IsEnum) + { + field.SetValue(animEvent, GUI_Enum((Enum)field.GetValue(animEvent))); + } + else if(field.FieldType == typeof(float)) + { + field.SetValue(animEvent, GUI_Float((float)field.GetValue(animEvent))); + } + else if (field.FieldType == typeof(int)) + { + field.SetValue(animEvent, GUI_Int((int)field.GetValue(animEvent))); + } GUILayout.Space(5); } } @@ -127,6 +143,30 @@ namespace ActionTool EditorGUILayout.EndScrollView(); } + float GUI_Float(float value) + { + Rect rect = EditorGUILayout.GetControlRect(); + return EditorGUI.FloatField(rect, "", value); + } + + int GUI_Int(int value) + { + Rect rect = EditorGUILayout.GetControlRect(); + return EditorGUI.IntField(rect, "", value); + } + + AnimationCurve GUI_Curve(AnimationCurve curve) + { + Rect rect = EditorGUILayout.GetControlRect(); + return EditorGUI.CurveField(rect, "", curve); + } + + Enum GUI_Enum(Enum enumValue) + { + Rect rect = EditorGUILayout.GetControlRect(); + return EditorGUI.EnumPopup(rect, "", enumValue); + } + Vector3 GUI_Vector3(Vector3 value) { Rect rect = EditorGUILayout.GetControlRect(); diff --git a/Assets/ActionTool/Editor/ActionPreviewEditor.cs b/Assets/ActionTool/Editor/ActionPreviewEditor.cs index 3ed3513b..6ff60ed5 100644 --- a/Assets/ActionTool/Editor/ActionPreviewEditor.cs +++ b/Assets/ActionTool/Editor/ActionPreviewEditor.cs @@ -833,10 +833,10 @@ namespace ActionTool bool frameSelect = GUI.Toggle(frameRect, isSelect, new GUIContent("", animEvent.Name), styles.keyFrameButton); GUI.backgroundColor = prevColor; - Rect labelRect = new Rect(pos.x - 1, pos.y + 2, kFrameWidth, kFrameHeight); + Rect labelRect = new Rect(pos.x, pos.y + 2, kFrameWidth, kFrameHeight); Color col = GUI.color; GUI.color = Color.yellow; - GUI.Label(labelRect, animEvent.shortName, styles.textBold); + GUI.Label(labelRect, animEvent.shortName, styles.textBoldSmall); GUI.color = col; if (!isSelect && frameSelect) diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset index 7288f2aa..49df97d0 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3} - m_Name: Take 001 + m_Name: Take 001(Clone) m_EditorClassIdentifier: animationName: Take 001 animationPath: Assets/Art/Animations/Erika/Take 001.anim @@ -20,6 +20,7 @@ MonoBehaviour: - {fileID: 114793878721939902} - {fileID: 114750047321414068} - {fileID: 114541332933305096} + - {fileID: 114103326931789898} hurtBoxes: - collider: type: 1 @@ -28,6 +29,7 @@ MonoBehaviour: hitBack: {x: 0, y: 0, z: 0} multiHit: 0 sparkPath: + sparkOffset: {x: 0, y: 0, z: 0} multiple: 0 frames: - frame: 0 @@ -94,6 +96,7 @@ MonoBehaviour: hitBack: {x: 0, y: 0, z: 0} multiHit: 0 sparkPath: + sparkOffset: {x: 0, y: 0, z: 0} multiple: 0 frames: - frame: 11 @@ -111,6 +114,7 @@ MonoBehaviour: hitBack: {x: 0, y: 0, z: 0} multiHit: 0 sparkPath: + sparkOffset: {x: 0, y: 0, z: 0} multiple: 0 frames: - frame: 24 @@ -128,6 +132,7 @@ MonoBehaviour: hitBack: {x: 0, y: 0, z: 0} multiHit: 0 sparkPath: + sparkOffset: {x: 0, y: 0, z: 0} multiple: 0 frames: - frame: 40 @@ -145,6 +150,7 @@ MonoBehaviour: hitBack: {x: 0, y: 0, z: 0} multiHit: 0 sparkPath: + sparkOffset: {x: 0, y: 0, z: 0} multiple: 0 frames: - frame: 44 @@ -162,6 +168,7 @@ MonoBehaviour: hitBack: {x: 0, y: 0, z: 0} multiHit: 0 sparkPath: + sparkOffset: {x: 0, y: 0, z: 0} multiple: 0 frames: - frame: 48 @@ -242,7 +249,7 @@ MonoBehaviour: m_keys: m_values: [] parameters: - m_keys: [] + m_keys: m_values: [] --- !u!114 &114097288536488508 MonoBehaviour: @@ -263,6 +270,20 @@ MonoBehaviour: position: {x: 0, y: 0, z: 0} rotation: {x: 0, y: 0, z: 0} scale: {x: 0, y: 0, z: 0} +--- !u!114 &114103326931789898 +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: 155962a945650e440806af7a4346f155, type: 3} + m_Name: EventMesh_FadeIn + m_EditorClassIdentifier: + startFrame: 3 + mode: 1 --- !u!114 &114105868209784942 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Unit/Collider/ColliderBox.cs b/Assets/Scripts/Unit/Collider/ColliderBox.cs index 9c6e14e8..1163c888 100644 --- a/Assets/Scripts/Unit/Collider/ColliderBox.cs +++ b/Assets/Scripts/Unit/Collider/ColliderBox.cs @@ -49,10 +49,14 @@ public class ColliderBox public string sparkPath; [ColliderType(EColliderType.HitBox), Tooltip("击中后的粒子效果")] public Vector3 sparkOffset; - #endregion + [ColliderType(EColliderType.HitBox), Tooltip("自身钝帧")] + public float freezeFramesSelf; + [ColliderType(EColliderType.HitBox), Tooltip("对方钝帧")] + public float freezeFramesOther; + #endregion - #region ThrowBox - [ColliderType(EColliderType.ThrowBox), Tooltip("是否允许抓取多个")] + #region ThrowBox + [ColliderType(EColliderType.ThrowBox), Tooltip("是否允许抓取多个")] public bool multiple; #endregion diff --git a/Assets/Scripts/Unit/Component/UnitCollider.cs b/Assets/Scripts/Unit/Component/UnitCollider.cs index 3d6bca70..4f2c5ef3 100644 --- a/Assets/Scripts/Unit/Component/UnitCollider.cs +++ b/Assets/Scripts/Unit/Component/UnitCollider.cs @@ -60,6 +60,7 @@ public class UnitCollider : UnitComponent #if UNITY_EDITOR + // 绘制collider调试 public void OnDrawGizmos() { if (!showGizmos) diff --git a/Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs b/Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs new file mode 100644 index 00000000..29d1adde --- /dev/null +++ b/Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs @@ -0,0 +1,19 @@ +using UnityEngine; + +public class EventMesh_FadeIn : AnimationEventBase +{ + public enum EFadeInMode + { + Linear = 0, + Curve = 1, + } + + public override TimelineEventProxy.EEventType type { get { return TimelineEventProxy.EEventType.EventMesh_FadeIn; } } + public override string shortName { get { return "I"; } } + + public EFadeInMode mode; + + [Tooltip("Duration in frame")] + public float duration; + +} \ No newline at end of file diff --git a/Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs.meta b/Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs.meta new file mode 100644 index 00000000..5c943a7d --- /dev/null +++ b/Assets/Scripts/Unit/Events/EventMesh_FadeIn.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 155962a945650e440806af7a4346f155 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs b/Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs new file mode 100644 index 00000000..209810b2 --- /dev/null +++ b/Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs @@ -0,0 +1,8 @@ +using UnityEngine; + +public class EventMesh_FadeOut : AnimationEventBase +{ + public override TimelineEventProxy.EEventType type { get { return TimelineEventProxy.EEventType.EventMesh_FadeOut; } } + public override string shortName { get { return "O"; } } + +} diff --git a/Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs.meta b/Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs.meta new file mode 100644 index 00000000..7abb9b33 --- /dev/null +++ b/Assets/Scripts/Unit/Events/EventMesh_FadeOut.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3ed55d0137f7de849918ade75357e60b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: -- cgit v1.1-26-g67d0