Skip to content

Commit

Permalink
升级：Unity版本至2022.3.17。
Browse files Browse the repository at this point in the history
  • Loading branch information
@SaiTingHu
SaiTingHu committed Feb 27, 2024
1 parent 9550dfc commit c4e33a4
Show file tree
Hide file tree
Showing 8 changed files with 119 additions and 106 deletions.
8 changes: 4 additions & 4 deletions Editor/Utility/AssetsMaster/AssetsMaster.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,12 @@ protected override void OnTitleGUI()
_isIncludeUGUI = GUILayout.Toggle(_isIncludeUGUI, "Include UGUI", EditorStyles.toolbarButton);
_isIncludeMonoScript = GUILayout.Toggle(_isIncludeMonoScript, "Include MonoScript", EditorStyles.toolbarButton);
GUILayout.FlexibleSpace();
if (GUILayout.Button("Clear", EditorStyles.toolbarPopup))
if (GUILayout.Button("Clear", EditorStyles.toolbarButton))
{
ClearAssets();
Resources.UnloadUnusedAssets();
}
if (GUILayout.Button("Refresh", EditorStyles.toolbarPopup))
if (GUILayout.Button("Refresh", EditorStyles.toolbarButton))
{
SearchAssetsInOpenedScene();
}
Expand Down Expand Up @@ -208,14 +208,14 @@ private void OnHeaderGUI()
GUILayout.BeginHorizontal();
GUILayout.Label("Search:", GUILayout.Width(60));
_filterName = EditorGUILayout.TextField("", _filterName, EditorGlobalTools.Styles.SearchTextField, GUILayout.Width(300));
if (GUILayout.Button("", _filterName != "" ? EditorGlobalTools.Styles.SearchCancelButton : EditorGlobalTools.Styles.SearchCancelButtonEmpty))
if (GUILayout.Button("", string.IsNullOrEmpty(_filterName) ? EditorGlobalTools.Styles.SearchCancelButtonEmpty : EditorGlobalTools.Styles.SearchCancelButton))
{
_filterName = "";
ApplyFilter();
ApplyIndex();
GUI.FocusControl(null);
}
GUI.enabled = _filterName != "";
GUI.enabled = !string.IsNullOrEmpty(_filterName);
if (GUILayout.Button("Search", EditorStyles.miniButton))
{
ApplyFilter();
Expand Down
6 changes: 3 additions & 3 deletions Editor/Utility/EditorGlobalTools.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1482,9 +1482,9 @@ public static class Styles
public static readonly string SearchTextField = "SearchTextField";
public static readonly string SearchCancelButton = "SearchCancelButton";
public static readonly string SearchCancelButtonEmpty = "SearchCancelButtonEmpty";
public static readonly string ToolbarSeachTextField = "ToolbarSeachTextField";
public static readonly string ToolbarSeachCancelButton = "ToolbarSeachCancelButton";
public static readonly string ToolbarSeachCancelButtonEmpty = "ToolbarSeachCancelButtonEmpty";
public static readonly string ToolbarSearchTextField = "ToolbarSearchTextField";
public static readonly string ToolbarSearchCancelButton = "ToolbarSearchCancelButton";
public static readonly string ToolbarSearchCancelButtonEmpty = "ToolbarSearchCancelButtonEmpty";
}
#endregion
}
Expand Down
4 changes: 2 additions & 2 deletions Editor/Utility/Setter/Setter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ protected override void OnTitleGUI()

GUILayout.FlexibleSpace();

_itemFilter = EditorGUILayout.TextField("", _itemFilter, EditorGlobalTools.Styles.ToolbarSeachTextField);
if (GUILayout.Button("", _itemFilter != "" ? EditorGlobalTools.Styles.ToolbarSeachCancelButton : EditorGlobalTools.Styles.ToolbarSeachCancelButtonEmpty))
_itemFilter = EditorGUILayout.TextField("", _itemFilter, EditorGlobalTools.Styles.ToolbarSearchTextField);
if (GUILayout.Button("", string.IsNullOrEmpty(_itemFilter) ? EditorGlobalTools.Styles.ToolbarSearchCancelButtonEmpty : EditorGlobalTools.Styles.ToolbarSearchCancelButton))
{
_itemFilter = "";
GUI.FocusControl(null);
Expand Down
2 changes: 1 addition & 1 deletion Editor/Utility/System/About.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ private void RefreshLOGOColor()
{
if (_colorPos <= 1)
{
_colorPos += 0.002f;
_colorPos += 0.001f;
}
else
{
Expand Down
10 changes: 3 additions & 7 deletions Editor/Utility/Toolkit/AssemblyViewer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,16 +199,12 @@ private void OnAssemblyGUI()
{
_assemblyFilter = "Assembly-CSharp";
}
if (GUILayout.Button("Assembly-CSharp-Editor", EditorStyles.miniButton))
{
_assemblyFilter = "Assembly-CSharp-Editor";
}
GUILayout.FlexibleSpace();
GUILayout.EndHorizontal();

GUILayout.BeginHorizontal();
_assemblyFilter = EditorGUILayout.TextField("", _assemblyFilter, EditorGlobalTools.Styles.SearchTextField);
if (GUILayout.Button("", _assemblyFilter != "" ? EditorGlobalTools.Styles.SearchCancelButton : EditorGlobalTools.Styles.SearchCancelButtonEmpty))
if (GUILayout.Button("", string.IsNullOrEmpty(_assemblyFilter) ? EditorGlobalTools.Styles.SearchCancelButtonEmpty : EditorGlobalTools.Styles.SearchCancelButton))
{
_assemblyFilter = "";
GUI.FocusControl(null);
Expand Down Expand Up @@ -289,7 +285,7 @@ private void OnTypeGUI()

GUILayout.BeginHorizontal();
_typeFilter = EditorGUILayout.TextField("", _typeFilter, EditorGlobalTools.Styles.SearchTextField);
if (GUILayout.Button("", _typeFilter != "" ? EditorGlobalTools.Styles.SearchCancelButton : EditorGlobalTools.Styles.SearchCancelButtonEmpty))
if (GUILayout.Button("", string.IsNullOrEmpty(_typeFilter) ? EditorGlobalTools.Styles.SearchCancelButtonEmpty : EditorGlobalTools.Styles.SearchCancelButton))
{
_typeFilter = "";
GUI.FocusControl(null);
Expand Down Expand Up @@ -359,7 +355,7 @@ private void OnMemberGUI()

GUILayout.BeginHorizontal();
_memberFilter = EditorGUILayout.TextField("", _memberFilter, EditorGlobalTools.Styles.SearchTextField);
if (GUILayout.Button("", _memberFilter != "" ? EditorGlobalTools.Styles.SearchCancelButton : EditorGlobalTools.Styles.SearchCancelButtonEmpty))
if (GUILayout.Button("", string.IsNullOrEmpty(_memberFilter) ? EditorGlobalTools.Styles.SearchCancelButtonEmpty : EditorGlobalTools.Styles.SearchCancelButton))
{
_memberFilter = "";
GUI.FocusControl(null);
Expand Down
94 changes: 50 additions & 44 deletions Editor/Utility/Toolkit/AssetModificationToolkit.cs
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
using System.Collections.Generic;
using CodiceApp;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using UnityEditor;
using UnityEngine;

namespace HT.Framework
{
/// <summary>
/// 项目资源文件修改监控工具箱
/// </summary>
public sealed class AssetModificationToolkit : UnityEditor.AssetModificationProcessor
public sealed class AssetModificationToolkit : AssetModificationProcessor
{
/// <summary>
/// 新建脚本时默认引用的命名空间
Expand All @@ -26,59 +29,62 @@ public static void AddUsingNamespace(string usingNamespace)

private static void OnWillCreateAsset(string path)
{
path = path.Replace(".meta", "");
if (path.EndsWith(".cs"))
if (path.EndsWith(".meta"))
{
bool isFix = false;
bool isInAwake = false;
List<string> codes = File.ReadAllLines(path).ToList();
for (int i = 0; i < codes.Count; i++)
path = path.Replace(".meta", "");
if (path.EndsWith(".cs"))
{
if (!isFix)
bool isFix = false;
bool isInAwake = false;
List<string> codes = File.ReadAllLines(path).ToList();
for (int i = 0; i < codes.Count; i++)
{
if (codes[i].Contains(" class ") && codes[i].EndsWith(": MonoBehaviour"))
if (!isFix)
{
codes[i] = codes[i].Replace(": MonoBehaviour", ": HTBehaviour");
codes[i] = codes[i] + ", IUpdateFrame";
isFix = true;
continue;
if (codes[i].Contains(" class ") && codes[i].EndsWith(": MonoBehaviour"))
{
codes[i] = codes[i].Replace(": MonoBehaviour", ": HTBehaviour");
codes[i] = codes[i] + ", IUpdateFrame";
isFix = true;
continue;
}
}
if (isFix)
{
if (codes[i].Contains("// Start"))
{
codes[i] = " //初始化操作在 Awake 中完成（必须确保 base.Awake() 的存在）";
}
else if (codes[i].Contains("void Start()"))
{
codes[i] = " protected override void Awake()";
isInAwake = true;
}
else if (isInAwake && codes[i].Contains("{"))
{
codes.Insert(i + 1, " base.Awake();");
isInAwake = false;
}
else if (codes[i].Contains("// Update"))
{
codes[i] = " //等同于 Update 方法，不过当主框架进入暂停状态时，此方法也会停止调用（Main.Current.Pause = true）";
}
else if (codes[i].Contains("void Update()"))
{
codes[i] = " public void OnUpdateFrame()";
}
}
}
if (isFix)
{
if (codes[i].Contains("// Start"))
{
codes[i] = " //初始化操作在 Awake 中完成（必须确保 base.Awake() 的存在）";
}
else if (codes[i].Contains("void Start()"))
{
codes[i] = " protected override void Awake()";
isInAwake = true;
}
else if (isInAwake && codes[i].Contains("{"))
{
codes.Insert(i + 1, " base.Awake();");
isInAwake = false;
}
else if (codes[i].Contains("// Update"))
foreach (var item in UsingNamespaces)
{
codes[i] = " //等同于 Update 方法，不过当主框架进入暂停状态时，此方法也会停止调用（Main.Current.Pause = true）";
codes.Insert(0, $"using {item};");
}
else if (codes[i].Contains("void Update()"))
{
codes[i] = " public void OnUpdateFrame()";
}
}
}
if (isFix)
{
foreach (var item in UsingNamespaces)
{
codes.Insert(0, $"using {item};");
}

File.WriteAllLines(path, codes.ToArray());
AssetDatabase.Refresh();
File.WriteAllLines(path, codes.ToArray());
AssetDatabase.Refresh();
}
}
}
}
Expand Down
Loading

0 comments on commit c4e33a4

Please sign in to comment.