Skip to content

Commit

Permalink
Add UEvent Project Setting
Browse files Browse the repository at this point in the history
  • Loading branch information
ls9512 committed Jul 27, 2023
1 parent 916e16e commit c8d5bb2
Show file tree
Hide file tree
Showing 20 changed files with 103 additions and 22 deletions.
9 changes: 9 additions & 0 deletions CSharp/Script/UEvent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ namespace Aya.Events
{
public static partial class UEvent
{
#region Register

public static void Register(Type objType)
{
EventListener.Register(objType);
}

#endregion

#region Listen Action

public static void Listen<T>(Action action, object group = null, int priority = 0, bool interrupt = false)
Expand Down
8 changes: 8 additions & 0 deletions Unity/Editor/Script/Monitor.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public string Log
if (string.IsNullOrEmpty(_log))
{
var stringBuilder = new StringBuilder();
stringBuilder.Append(DateTime.ToString(EventEditorSetting.Ins.DateFormat));
stringBuilder.Append(DateTime.ToString(UEventEditorSetting.Ins.DateFormat));
stringBuilder.Append("\t");
stringBuilder.Append(EventType);
stringBuilder.Append("\t");
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#if UNITY_EDITOR
using System;
using System.Collections.Generic;
using System.Reflection;
using UnityEditor;
using UnityEngine;

Expand All @@ -21,7 +20,6 @@ public class EventMonitor : EditorWindow

public static EventMonitor Instance;

[MenuItem("Tools/Aya Game/UEvent/Event Monitor", false, 0)]
public static void ShowWindow()
{
if (Instance == null)
Expand Down Expand Up @@ -182,17 +180,17 @@ private Color GetRowColor(EventHandler eventHandler)
var rowColor = GUI.backgroundColor;
if (eventHandler.IsInvokeSuccess)
{
rowColor = Color.Lerp(EventEditorSetting.Ins.MonitorStyle.TipSuccessColor, GUI.backgroundColor, eventHandler.InvokeSuccessProgress);
rowColor = Color.Lerp(UEventEditorSetting.Ins.MonitorStyle.TipSuccessColor, GUI.backgroundColor, eventHandler.InvokeSuccessProgress);
}

if (eventHandler.IsInvokeFail)
{
rowColor = Color.Lerp(EventEditorSetting.Ins.MonitorStyle.TipFailColor, GUI.backgroundColor, eventHandler.InvokeFailProgress);
rowColor = Color.Lerp(UEventEditorSetting.Ins.MonitorStyle.TipFailColor, GUI.backgroundColor, eventHandler.InvokeFailProgress);
}

if (eventHandler.IsListening)
{
rowColor = Color.Lerp(EventEditorSetting.Ins.MonitorStyle.TipListenColor, GUI.backgroundColor, eventHandler.ListeningProgress);
rowColor = Color.Lerp(UEventEditorSetting.Ins.MonitorStyle.TipListenColor, GUI.backgroundColor, eventHandler.ListeningProgress);
}

return rowColor;
Expand Down Expand Up @@ -349,7 +347,7 @@ public void DrawCellLastTime(int index, float width, EventHandler eventHandler)
{
if (eventHandler.DispatchCounter > 0)
{
GUILayout.Label(eventHandler.LastInvokeDateTime.ToString(EventEditorSetting.Ins.MonitorStyle.DateFormat));
GUILayout.Label(eventHandler.LastInvokeDateTime.ToString(UEventEditorSetting.Ins.MonitorStyle.DateFormat));
}
else
{
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public static GUIStyle LinkActiveStyle
},
normal = new GUIStyleState()
{
textColor = EventEditorSetting.Ins.MonitorStyle.ActiveUrlColor
textColor = UEventEditorSetting.Ins.MonitorStyle.ActiveUrlColor
},
alignment = TextAnchor.MiddleLeft,
richText = false
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
//
// Script : EventEditorSetting.cs
// Script : UEventEditorSetting.cs
// Info : 事件编辑器配置类
// Author : ls9512 2021
// E-mail : [email protected]
Expand All @@ -12,25 +12,25 @@

namespace Aya.Events
{
[CreateAssetMenu(menuName = "UEvent/Event Editor Setting", fileName = "EventEditorSetting")]
public class EventEditorSetting : ScriptableObject
[CreateAssetMenu(menuName = "UEvent/Event Editor Setting", fileName = "UEventEditorSetting")]
public class UEventEditorSetting : ScriptableObject
{
#region Instance

public static EventEditorSetting Ins
public static UEventEditorSetting Ins
{
get
{
if (Instance == null)
{
Instance = FindAsset<EventEditorSetting>();
Instance = FindAsset<UEventEditorSetting>();
}

return Instance;
}
}

protected static EventEditorSetting Instance;
protected static UEventEditorSetting Instance;

internal static T FindAsset<T>() where T : Object
{
Expand Down
21 changes: 21 additions & 0 deletions Unity/Editor/Script/UEventEditorMenu.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#if UNITY_EDITOR
using UnityEditor;

namespace Aya.Events
{
public partial class UEventEditorMenu
{
[MenuItem("Tools/Aya Game/UEvent/Event Monitor", false, 0)]
public static void OpenEventMonitor()
{
EventMonitor.ShowWindow();
}

[MenuItem("Tools/Aya Game/UEvent/Editor Setting", false, 1000)]
public static void OpenRuntimeSetting()
{
SettingsService.OpenProjectSettings("Aya Game/UEvent Editor");
}
}
}
#endif
11 changes: 11 additions & 0 deletions Unity/Editor/Script/UEventEditorMenu.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions Unity/Editor/Script/UEventEditorSettingProvider.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#if UNITY_EDITOR
using Aya.Events;
using UnityEditor;

namespace Aya.TweenPro
{
public static class UEventEditorSettingProvider
{
#region Project Setting

[SettingsProvider]
public static SettingsProvider GetEditorSetting()
{
var provider = AssetSettingsProvider.CreateProviderFromObject("Aya Game/UEvent Editor", UEventEditorSetting.Ins);
provider.keywords = SettingsProvider.GetSearchKeywordsFromSerializedObject(new SerializedObject(UEventEditorSetting.Ins));
return provider;
}

#endregion
}
}

#endif
11 changes: 11 additions & 0 deletions Unity/Editor/Script/UEventEditorSettingProvider.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions Unity/Runtime/Script/Handler/EventHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ internal static void CacheLog(EventHandler eventHandler, object eventType, objec
log.Parameters += "]";
Logs.Add(log);

if (Logs.Count > EventEditorSetting.Ins.CacheLogCount)
if (Logs.Count > UEventEditorSetting.Ins.CacheLogCount)
{
Logs.RemoveAt(0);
}
Expand Down Expand Up @@ -166,7 +166,7 @@ private string GetSignature(MethodInfo methodInfo, bool richText)

var stringBuilder = new StringBuilder();

if (richText) stringBuilder.Append(GetColorMarkupStart(EventEditorSetting.Ins.MonitorStyle.CodeKeyWordColor));
if (richText) stringBuilder.Append(GetColorMarkupStart(UEventEditorSetting.Ins.MonitorStyle.CodeKeyWordColor));
if (methodInfo.IsPrivate)
{
stringBuilder.Append("private ");
Expand Down Expand Up @@ -204,26 +204,26 @@ private string GetSignature(MethodInfo methodInfo, bool richText)

if (richText) stringBuilder.Append(GetColorMarkupEnd());

if (richText) stringBuilder.Append(GetColorMarkupStart(EventEditorSetting.Ins.MonitorStyle.CodeParameterColor));
if (richText) stringBuilder.Append(GetColorMarkupStart(UEventEditorSetting.Ins.MonitorStyle.CodeParameterColor));
stringBuilder.Append(methodInfo.ReturnType.Name);
if (richText) stringBuilder.Append(GetColorMarkupEnd());
stringBuilder.Append(" ");

if (richText) stringBuilder.Append(GetColorMarkupStart(EventEditorSetting.Ins.MonitorStyle.CodeMethodColor));
if (richText) stringBuilder.Append(GetColorMarkupStart(UEventEditorSetting.Ins.MonitorStyle.CodeMethodColor));
stringBuilder.Append(methodInfo.Name);
if (richText) stringBuilder.Append(GetColorMarkupEnd());
if (richText) stringBuilder.Append(GetColorMarkupStart(EventEditorSetting.Ins.MonitorStyle.CodeNormalColor));
if (richText) stringBuilder.Append(GetColorMarkupStart(UEventEditorSetting.Ins.MonitorStyle.CodeNormalColor));
stringBuilder.Append("(");
if (richText) stringBuilder.Append(GetColorMarkupEnd());
var parameters = methodInfo.GetParameters();
for (var i = 0; i < parameters.Length; i++)
{
var parameter = parameters[i];
if (richText) stringBuilder.Append(GetColorMarkupStart(EventEditorSetting.Ins.MonitorStyle.CodeParameterColor));
if (richText) stringBuilder.Append(GetColorMarkupStart(UEventEditorSetting.Ins.MonitorStyle.CodeParameterColor));
stringBuilder.Append(parameter.ParameterType.Name);
if (richText) stringBuilder.Append(GetColorMarkupEnd());
stringBuilder.Append(" ");
if (richText) stringBuilder.Append(GetColorMarkupStart(EventEditorSetting.Ins.MonitorStyle.CodeNormalColor));
if (richText) stringBuilder.Append(GetColorMarkupStart(UEventEditorSetting.Ins.MonitorStyle.CodeNormalColor));
stringBuilder.Append(parameter.Name);
if (i < parameters.Length - 1)
{
Expand All @@ -233,7 +233,7 @@ private string GetSignature(MethodInfo methodInfo, bool richText)
if (richText) stringBuilder.Append(GetColorMarkupEnd());
}

if (richText) stringBuilder.Append(GetColorMarkupStart(EventEditorSetting.Ins.MonitorStyle.CodeNormalColor));
if (richText) stringBuilder.Append(GetColorMarkupStart(UEventEditorSetting.Ins.MonitorStyle.CodeNormalColor));
stringBuilder.Append(")");
if (richText) stringBuilder.Append(GetColorMarkupEnd());
return stringBuilder.ToString();
Expand Down

0 comments on commit c8d5bb2

Please sign in to comment.