Эх сурвалжийг харах

大量Init代码放到Loader中去,Init包中只负责包的下载

tanghai 1 жил өмнө
parent
commit
b709aa0738
40 өөрчлөгдсөн 2 нэмэгдсэн , 1017 устгасан
  1. 0 67
      Packages/com.etetet.init/Editor/EditorResHelper.cs
  2. 0 3
      Packages/com.etetet.init/Editor/EditorResHelper.cs.meta
  3. 0 107
      Packages/com.etetet.init/Editor/FileHelper.cs
  4. 0 3
      Packages/com.etetet.init/Editor/FileHelper.cs.meta
  5. 0 8
      Packages/com.etetet.init/Editor/GlobalConfigEditor.meta
  6. 0 52
      Packages/com.etetet.init/Editor/GlobalConfigEditor/GlobalConfigEditor.cs
  7. 0 11
      Packages/com.etetet.init/Editor/GlobalConfigEditor/GlobalConfigEditor.cs.meta
  8. 0 8
      Packages/com.etetet.init/Editor/LogRedirection.meta
  9. 0 101
      Packages/com.etetet.init/Editor/LogRedirection/LogRedirection.cs
  10. 0 11
      Packages/com.etetet.init/Editor/LogRedirection/LogRedirection.cs.meta
  11. 0 3
      Packages/com.etetet.init/Editor/PackagesEditor.meta
  12. 0 121
      Packages/com.etetet.init/Editor/PackagesEditor/CodeModeChangeHelper.cs
  13. 0 3
      Packages/com.etetet.init/Editor/PackagesEditor/CodeModeChangeHelper.cs.meta
  14. 0 40
      Packages/com.etetet.init/Editor/PackagesEditor/DefineHelper.cs
  15. 0 3
      Packages/com.etetet.init/Editor/PackagesEditor/DefineHelper.cs.meta
  16. 0 61
      Packages/com.etetet.init/Editor/PackagesEditor/InitHelper.cs
  17. 0 3
      Packages/com.etetet.init/Editor/PackagesEditor/InitHelper.cs.meta
  18. 0 21
      Packages/com.etetet.init/Editor/PackagesEditor/InitScriptHelper.cs
  19. 0 3
      Packages/com.etetet.init/Editor/PackagesEditor/InitScriptHelper.cs.meta
  20. 0 32
      Packages/com.etetet.init/Editor/PackagesEditor/LinkSlnHelper.cs
  21. 0 3
      Packages/com.etetet.init/Editor/PackagesEditor/LinkSlnHelper.cs.meta
  22. 0 33
      Packages/com.etetet.init/Editor/PackagesEditor/SceneNameSetHelper.cs
  23. 0 3
      Packages/com.etetet.init/Editor/PackagesEditor/SceneNameSetHelper.cs.meta
  24. 0 96
      Packages/com.etetet.init/Editor/PackagesEditor/ScriptsReferencesHelper.cs
  25. 0 11
      Packages/com.etetet.init/Editor/PackagesEditor/ScriptsReferencesHelper.cs.meta
  26. 0 66
      Packages/com.etetet.init/Editor/ProcessHelper.cs
  27. 0 3
      Packages/com.etetet.init/Editor/ProcessHelper.cs.meta
  28. 0 8
      Packages/com.etetet.init/Editor/ToolEditor.meta
  29. 0 34
      Packages/com.etetet.init/Editor/ToolEditor/ToolsEditor.cs
  30. 0 11
      Packages/com.etetet.init/Editor/ToolEditor/ToolsEditor.cs.meta
  31. 1 1
      Packages/com.etetet.init/Plugins.meta
  32. 0 5
      Packages/com.etetet.init/Resources.meta
  33. 0 17
      Packages/com.etetet.init/Resources/GlobalConfig.asset
  34. 0 8
      Packages/com.etetet.init/Resources/GlobalConfig.asset.meta
  35. 0 8
      Packages/com.etetet.init/Runtime.meta
  36. 0 3
      Packages/com.etetet.init/Runtime/ET.Init.asmdef
  37. 0 7
      Packages/com.etetet.init/Runtime/ET.Init.asmdef.meta
  38. 0 27
      Packages/com.etetet.init/Runtime/GlobalConfig.cs
  39. 0 11
      Packages/com.etetet.init/Runtime/GlobalConfig.cs.meta
  40. 1 1
      ProjectSettings/ProjectSettings.asset

+ 0 - 67
Packages/com.etetet.init/Editor/EditorResHelper.cs

@@ -1,67 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using UnityEditor;
-
-namespace ET
-{
-    public class EditorResHelper
-    {
-        public static void SaveAssets(UnityEngine.Object asset)
-        {
-            EditorUtility.SetDirty(asset);
-            AssetDatabase.SaveAssets();
-            AssetDatabase.Refresh();
-        }
-        
-        /// <summary>
-        /// 获取文件夹内所有的预制跟场景路径
-        /// </summary>
-        /// <param name="srcPath">源文件夹</param>
-        /// <param name="subDire">是否获取子文件夹</param>
-        /// <returns></returns>
-        public static List<string> GetPrefabsAndScenes(string srcPath)
-        {
-            List<string> paths = new List<string>();
-            FileHelper.GetAllFiles(paths, srcPath);
-            
-            List<string> files = new List<string>();
-            foreach (string str in paths)
-            {
-                if (str.EndsWith(".prefab") || str.EndsWith(".unity"))
-                {
-                    files.Add(str);
-                }
-            }
-            return files;
-        }
-        
-        /// <summary>
-        /// 获取文件夹内所有资源路径
-        /// </summary>
-        /// <param name="srcPath">源文件夹</param>
-        /// <param name="subDire">是否获取子文件夹</param>
-        /// <returns></returns>
-        public static List<string> GetAllResourcePath(string srcPath, bool subDire)
-        {
-            List<string> paths = new List<string>();
-            string[] files = Directory.GetFiles(srcPath);
-            foreach (string str in files)
-            {
-                if (str.EndsWith(".meta"))
-                {
-                    continue;
-                }
-                paths.Add(str);
-            }
-            if (subDire)
-            {
-                foreach (string subPath in Directory.GetDirectories(srcPath))
-                {
-                    List<string> subFiles = GetAllResourcePath(subPath, true);
-                    paths.AddRange(subFiles);
-                }
-            }
-            return paths;
-        }
-    }
-}

+ 0 - 3
Packages/com.etetet.init/Editor/EditorResHelper.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 534eee73ca004cb58dcde9e3536b8b74
-timeCreated: 1507865453

+ 0 - 107
Packages/com.etetet.init/Editor/FileHelper.cs

@@ -1,107 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-namespace ET
-{
-	public static class FileHelper
-	{
-		public static List<string> GetAllFiles(string dir, string searchPattern = "*")
-		{
-			List<string> list = new List<string>();
-			GetAllFiles(list, dir, searchPattern);
-			return list;
-		}
-		
-		public static void GetAllFiles(List<string> files, string dir, string searchPattern = "*")
-		{
-			string[] fls = Directory.GetFiles(dir, searchPattern);
-			foreach (string fl in fls)
-			{
-				files.Add(fl);
-			}
-
-			string[] subDirs = Directory.GetDirectories(dir);
-			foreach (string subDir in subDirs)
-			{
-				GetAllFiles(files, subDir, searchPattern);
-			}
-		}
-		
-		public static void CleanDirectory(string dir)
-		{
-			if (!Directory.Exists(dir))
-			{
-				return;
-			}
-			foreach (string subdir in Directory.GetDirectories(dir))
-			{
-				Directory.Delete(subdir, true);		
-			}
-
-			foreach (string subFile in Directory.GetFiles(dir))
-			{
-				File.Delete(subFile);
-			}
-		}
-
-		public static void CopyDirectory(string srcDir, string tgtDir)
-		{
-			DirectoryInfo source = new DirectoryInfo(srcDir);
-			DirectoryInfo target = new DirectoryInfo(tgtDir);
-	
-			if (target.FullName.StartsWith(source.FullName, StringComparison.CurrentCultureIgnoreCase))
-			{
-				throw new Exception("父目录不能拷贝到子目录!");
-			}
-	
-			if (!source.Exists)
-			{
-				return;
-			}
-	
-			if (!target.Exists)
-			{
-				target.Create();
-			}
-	
-			FileInfo[] files = source.GetFiles();
-	
-			for (int i = 0; i < files.Length; i++)
-			{
-				File.Copy(files[i].FullName, Path.Combine(target.FullName, files[i].Name), true);
-			}
-	
-			DirectoryInfo[] dirs = source.GetDirectories();
-	
-			for (int j = 0; j < dirs.Length; j++)
-			{
-				CopyDirectory(dirs[j].FullName, Path.Combine(target.FullName, dirs[j].Name));
-			}
-		}
-		
-		public static void ReplaceExtensionName(string srcDir, string extensionName, string newExtensionName)
-		{
-			if (Directory.Exists(srcDir))
-			{
-				string[] fls = Directory.GetFiles(srcDir);
-
-				foreach (string fl in fls)
-				{
-					if (fl.EndsWith(extensionName))
-					{
-						File.Move(fl, fl.Substring(0, fl.IndexOf(extensionName)) + newExtensionName);
-						File.Delete(fl);
-					}
-				}
-
-				string[] subDirs = Directory.GetDirectories(srcDir);
-
-				foreach (string subDir in subDirs)
-				{
-					ReplaceExtensionName(subDir, extensionName, newExtensionName);
-				}
-			}
-		}
-	}
-}

+ 0 - 3
Packages/com.etetet.init/Editor/FileHelper.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 3fe9c71a958f4dacb500e378e05fc316
-timeCreated: 1718078770

+ 0 - 8
Packages/com.etetet.init/Editor/GlobalConfigEditor.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 10ce5e5130790b9468addf1a602cf8f0
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 52
Packages/com.etetet.init/Editor/GlobalConfigEditor/GlobalConfigEditor.cs

@@ -1,52 +0,0 @@
-using System;
-using System.Linq;
-using UnityEditor;
-using UnityEngine;
-
-namespace ET
-{
-    [CustomEditor(typeof(GlobalConfig))]
-    public class GlobalConfigEditor : Editor
-    {
-        private void OnEnable()
-        {
-            GlobalConfig globalConfig = (GlobalConfig)this.target;
-            //globalConfig.BuildType = EditorUserBuildSettings.development ? BuildType.Debug : BuildType.Release;
-            EditorResHelper.SaveAssets(globalConfig);
-        }
-
-        public override void OnInspectorGUI()
-        {
-            GlobalConfig globalConfig = (GlobalConfig)this.target;
-            CodeMode codeMode = (CodeMode)EditorGUILayout.EnumPopup("CodeMode", globalConfig.CodeMode);
-            if (codeMode != globalConfig.CodeMode)
-            {
-                globalConfig.CodeMode = codeMode;
-                
-                EditorResHelper.SaveAssets(globalConfig);
-                
-                CodeModeChangeHelper.ChangeToCodeMode(codeMode);
-                
-                AssetDatabase.Refresh();
-                InitHelper.ReGenerateProjectFiles();
-            }
-            
-            string sceneName = EditorGUILayout.TextField($"SceneName", globalConfig.SceneName);
-            if (sceneName != globalConfig.SceneName)
-            {
-                globalConfig.SceneName = sceneName;
-                EditorResHelper.SaveAssets(globalConfig);
-                AssetDatabase.Refresh();
-            }
-            
-            string address = EditorGUILayout.TextField($"Address", globalConfig.Address);
-            if (address != globalConfig.Address)
-            {
-                globalConfig.Address = address;
-                EditorResHelper.SaveAssets(globalConfig);
-                AssetDatabase.Refresh();
-            }
-            
-        }
-    }
-}

+ 0 - 11
Packages/com.etetet.init/Editor/GlobalConfigEditor/GlobalConfigEditor.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 4ee994acc7f02fb42b82587aa7dc42bc
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
Packages/com.etetet.init/Editor/LogRedirection.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3be1c35d4fd53dd479a81cadf627f263
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 101
Packages/com.etetet.init/Editor/LogRedirection/LogRedirection.cs

@@ -1,101 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using UnityEditor;
-using UnityEditor.Callbacks;
-using UnityEditorInternal;
-
-namespace ET
-{
-    /// <summary>
-    /// 日志重定向相关的实用函数。
-    /// </summary>
-    internal static class LogRedirection
-    {
-        [OnOpenAsset(0)]
-        private static bool OnOpenAsset(int instanceID, int line)
-        {
-            if (line <= 0)
-            {
-                return false;
-            }
-
-            Regex logFileRegex = new(@"((Log\.cs)|(UnityLogger\.cs)|(YooLogger\.cs))");
-            string codePath = AssetDatabase.GetAssetPath(instanceID);
-            if (logFileRegex.IsMatch(codePath))
-            {
-                var content = GetStackTrace();
-                // 如果有手动输入的地址,就跳过
-                var hrefMath = Regex.Match(content, @"<a href=""(.*?)"" line=""(\w+)\"">.*?</a>");
-                if (hrefMath.Success)
-                {
-                    OpenIDE(hrefMath.Groups[1].Value, int.Parse(hrefMath.Groups[2].Value));
-                    return true;
-                }
-                
-                Match stackLineMatch = Regex.Match(content, @"\(at (.+):([0-9]+)\)");
-                while (stackLineMatch.Success)
-                {
-                    codePath = stackLineMatch.Groups[1].Value;
-                    if (!logFileRegex.IsMatch(codePath))
-                    {
-                        int matchLine = int.Parse(stackLineMatch.Groups[2].Value);
-                        OpenIDE(codePath, matchLine);
-                        return true;
-                    }
-                    stackLineMatch = stackLineMatch.NextMatch();
-                }
-            }
-            
-            return false;
-        }
-
-        private static void OpenIDE(string path, int line, int column = 0)
-        {
-            if (!Path.IsPathFullyQualified(path))
-            {
-                path = Path.GetFullPath(path);
-            }
-            // 跳转到目标代码的特定行
-            InternalEditorUtility.OpenFileAtLineExternal(path, line, column);
-        }
-
-        /// <summary>
-        /// 获取当前日志窗口选中的日志的堆栈信息。
-        /// </summary>
-        /// <returns>选中日志的堆栈信息实例。</returns>
-        private static string GetStackTrace()
-        {
-            // 通过反射获取ConsoleWindow类
-            var consoleWindowType = typeof(EditorWindow).Assembly.GetType("UnityEditor.ConsoleWindow");
-            // 获取窗口实例
-            var fieldInfo = consoleWindowType.GetField("ms_ConsoleWindow",
-                BindingFlags.Static |
-                BindingFlags.NonPublic);
-            if (fieldInfo != null)
-            {
-                var consoleInstance = fieldInfo.GetValue(null);
-                if (consoleInstance != null)
-                {
-                    if (EditorWindow.focusedWindow == (EditorWindow)consoleInstance)
-                    {
-                        // 获取m_ActiveText成员
-                        fieldInfo = consoleWindowType.GetField("m_ActiveText",
-                            BindingFlags.Instance |
-                            BindingFlags.NonPublic);
-                        // 获取m_ActiveText的值
-                        if (fieldInfo != null)
-                        {
-                            var activeText = fieldInfo.GetValue(consoleInstance).ToString();
-                            return activeText;
-                        }
-                    }
-                }
-            }
-
-            return null;
-        }
-    }
-}

+ 0 - 11
Packages/com.etetet.init/Editor/LogRedirection/LogRedirection.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: bb9b30528175c8b408a16abac17d4eb6
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 3
Packages/com.etetet.init/Editor/PackagesEditor.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 4d36ef9a20ff4d63bce1cd2054921184
-timeCreated: 1718595727

+ 0 - 121
Packages/com.etetet.init/Editor/PackagesEditor/CodeModeChangeHelper.cs

@@ -1,121 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-namespace ET
-{
-    public static class CodeModeChangeHelper
-    {
-        private static readonly string[] moduleDirs = { "Packages", "Library/PackageCache" };
-
-        private static readonly string[] scriptDirs = { "Scripts", "CodeMode" };
-        
-        private static readonly string[] modelDirs = {"Model", "Hotfix", "ModelView", "HotfixView"};
-
-        private static readonly string[] serverDirs = { "Server", "Client", "Share", "ClientServer" };
-
-        private static readonly HashSet<string> v = new()
-        {
-            "Client/Scripts/Model/Client",
-            "Client/Scripts/Model/Share",
-            "Client/CodeMode/Model/Client",
-            "Client/Scripts/ModelView/Client",
-            "Client/Scripts/ModelView/Share",
-            "Client/CodeMode/ModelView/Client",
-            "Client/Scripts/Hotfix/Client",
-            "Client/Scripts/Hotfix/Share",
-            "Client/CodeMode/Hotfix/Client",
-            "Client/Scripts/HotfixView/Client",
-            "Client/Scripts/HotfixView/Share",
-            "Client/CodeMode/HotfixView/Client",
-
-            "Server/Scripts/Model/Server",
-            "Server/Scripts/Model/Share",
-            "Server/CodeMode/Model/Server",
-            "Server/Scripts/Hotfix/Server",
-            "Server/Scripts/Hotfix/Share",
-            "Server/CodeMode/Hotfix/Server",
-
-            "ClientServer/Scripts/Model/Client",
-            "ClientServer/Scripts/Model/Server",
-            "ClientServer/Scripts/Model/Share",
-            "ClientServer/CodeMode/Model/ClientServer",
-            "ClientServer/Scripts/ModelView/Client",
-            "ClientServer/Scripts/ModelView/Server",
-            "ClientServer/Scripts/ModelView/Share",
-            "ClientServer/CodeMode/ModelView/ClientServer",
-            "ClientServer/Scripts/Hotfix/Client",
-            "ClientServer/Scripts/Hotfix/Server",
-            "ClientServer/Scripts/Hotfix/Share",
-            "ClientServer/CodeMode/Hotfix/ClientServer",
-            "ClientServer/Scripts/HotfixView/Client",
-            "ClientServer/Scripts/HotfixView/Server",
-            "ClientServer/Scripts/HotfixView/Share",
-            "ClientServer/CodeMode/HotfixView/ClientServer"
-        };
-        
-        public static void ChangeToCodeMode(CodeMode codeMode)
-        {
-            foreach (string a in moduleDirs)
-            {
-                foreach (string moduleDir in Directory.GetDirectories(a, "cn.etetet.*"))
-                {
-                    foreach (string scriptDir in scriptDirs)
-                    {
-                        string p = Path.Combine(moduleDir, scriptDir);
-                        if (!Directory.Exists(p))
-                        {
-                            continue;
-                        }
-
-                        foreach (string modelDir in modelDirs)
-                        {
-                            string c = Path.Combine(p, modelDir);
-                            if (!Directory.Exists(c))
-                            {
-                                continue;
-                            }
-
-                            foreach (string serverDir in serverDirs)
-                            {
-                                string e = Path.Combine(c, serverDir);
-                                if (!Directory.Exists(e))
-                                {
-                                    continue;
-                                }
-
-                                HandleAssemblyReferenceFile(codeMode, moduleDir, scriptDir, modelDir, serverDir);
-                            }
-                        }
-                    }
-                }
-            }
-
-            
-        }
-
-        private static void HandleAssemblyReferenceFile(CodeMode codeMode, string moduleDir, string scriptDir, string modelDir, string serverDir)
-        {
-            string path = $"{codeMode}/{scriptDir}/{modelDir}/{serverDir}";
-            string filePath = Path.Combine(moduleDir, scriptDir, modelDir, serverDir, "AssemblyReference.asmref");
-            DeleteAssemblyReference(filePath);
-            if (v.Contains(path))
-            {
-                CreateAssemblyReference(filePath, modelDir);
-            }
-        }
-
-        private static void DeleteAssemblyReference(string path)
-        {
-            if (File.Exists(path))
-            {
-                File.Delete(path);
-            }
-        }
-        
-        private static void CreateAssemblyReference(string path, string modelDir)
-        {
-            File.WriteAllText(path, $"{{ \"reference\": \"ET.{modelDir}\" }}");
-        }
-    }
-}

+ 0 - 3
Packages/com.etetet.init/Editor/PackagesEditor/CodeModeChangeHelper.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 77fe248dbd0142fda0f318d1cb0cdef8
-timeCreated: 1715699302

+ 0 - 40
Packages/com.etetet.init/Editor/PackagesEditor/DefineHelper.cs

@@ -1,40 +0,0 @@
-using System.Linq;
-using UnityEditor;
-using UnityEngine;
-
-namespace ET
-{
-    public static class DefineHelper
-    {
-        public static void EnableDefineSymbols(string symbols, bool enable)
-        {
-            Debug.Log($"EnableDefineSymbols {symbols} {enable}");
-            string defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup);
-            var ss = defines.Split(';').ToList();
-            if (enable)
-            {
-                if (ss.Contains(symbols))
-                {
-                    return;
-                }
-
-                ss.Add(symbols);
-            }
-            else
-            {
-                if (!ss.Contains(symbols))
-                {
-                    return;
-                }
-
-                ss.Remove(symbols);
-            }
-
-            Debug.Log($"EnableDefineSymbols {symbols} {enable}");
-            defines = string.Join(";", ss);
-            PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, defines);
-            AssetDatabase.SaveAssets();
-            AssetDatabase.Refresh();
-        }
-    }
-}

+ 0 - 3
Packages/com.etetet.init/Editor/PackagesEditor/DefineHelper.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: a21c7c9ff599480d843b8e391f49536a
-timeCreated: 1719927499

+ 0 - 61
Packages/com.etetet.init/Editor/PackagesEditor/InitHelper.cs

@@ -1,61 +0,0 @@
-using UnityEditor;
-using UnityEngine;
-
-namespace ET
-{
-    public static class InitHelper
-    {
-        [InitializeOnLoadMethod]
-        [MenuItem("ET/ReGenerateProjectFiles")]
-        public static void ReGenerateProjectFiles()
-        {
-            Unity.CodeEditor.CodeEditor.CurrentEditor.SyncAll();
-
-            foreach (string s in FileHelper.GetAllFiles(".", "Ignore.ET*.csproj"))
-            {
-                System.IO.File.Delete(s);
-            }
-
-            Debug.Log("regenerate csproj");
-        }
-
-        [MenuItem("ET/Init")]
-        public static void Init()
-        {
-            LinkSlnHelper.Run();
-            
-            ToolsEditor.ExcelExporter();
-            
-            ToolsEditor.Proto2CS();
-            
-            // 刷新4个程序集的asmdef引用
-            ScriptsReferencesHelper.Run();
-            
-            GlobalConfig globalConfig = AssetDatabase.LoadAssetAtPath<GlobalConfig>("Packages/com.etetet.init/Resources/GlobalConfig.asset");
-            CodeModeChangeHelper.ChangeToCodeMode(globalConfig.CodeMode);
-            
-            // 设置GlobalConfig中的SceneName字段
-            SceneNameSetHelper.Run();
-            
-            InitScriptHelper.Run();
-            
-            DefineHelper.EnableDefineSymbols("INITED", true);
-            
-            AssetDatabase.Refresh();
-            
-            Debug.Log("Init finish!");
-        }
-
-        [MenuItem("ET/Refresh")]
-        public static void Refresh()
-        {
-            ScriptsReferencesHelper.Run();
-            
-            GlobalConfig globalConfig = AssetDatabase.LoadAssetAtPath<GlobalConfig>("Packages/com.etetet.init/Resources/GlobalConfig.asset");
-            CodeModeChangeHelper.ChangeToCodeMode(globalConfig.CodeMode);
-            
-            AssetDatabase.Refresh();
-            Debug.Log("packages refresh finish!");
-        }
-    }
-}

+ 0 - 3
Packages/com.etetet.init/Editor/PackagesEditor/InitHelper.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 54b3d57b779745868a98d8b2fe2358cf
-timeCreated: 1718079258

+ 0 - 21
Packages/com.etetet.init/Editor/PackagesEditor/InitScriptHelper.cs

@@ -1,21 +0,0 @@
-using System.Diagnostics;
-using System.IO;
-
-namespace ET
-{
-    public static class InitScriptHelper
-    {
-        public static void Run()
-        {
-            foreach (string directory in Directory.GetDirectories("Packages", "cn.etetet.*"))
-            {
-                string initScriptPath = Path.Combine(directory, "Init.ps1");
-
-                UnityEngine.Debug.Log($"run init script start: {initScriptPath}");
-                Process process = ProcessHelper.PowerShell($"-NoExit -ExecutionPolicy Bypass -File {initScriptPath}", waitExit: true);
-                UnityEngine.Debug.Log(process.StandardOutput.ReadToEnd());
-                UnityEngine.Debug.Log($"run init script finish: {initScriptPath}");
-            }
-        }
-    }
-}

+ 0 - 3
Packages/com.etetet.init/Editor/PackagesEditor/InitScriptHelper.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: b407aed3d49448959c96a6c7a01861f2
-timeCreated: 1720098183

+ 0 - 32
Packages/com.etetet.init/Editor/PackagesEditor/LinkSlnHelper.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using UnityEditor;
-
-namespace ET
-{
-    public static class LinkSlnHelper
-    {
-        //[MenuItem("ET/Init/LinkSln")]
-        public static void Run()
-        {
-            string etslnPath = Path.Combine(Directory.GetCurrentDirectory(), "ET.sln");
-            if (File.Exists(etslnPath))
-            {
-                File.Delete(etslnPath);
-            }
-            
-            List<string> slns = new List<string>();
-            FileHelper.GetAllFiles(slns, "./Packages", "ET.sln");
-
-            if (slns.Count == 0)
-            {
-                throw new Exception("not found ET.sln in et packages!");
-            }
-            
-            Process process = ProcessHelper.PowerShell($"-c New-Item -ItemType HardLink -Target {slns[0]} ./ET.sln", waitExit: true);
-            UnityEngine.Debug.Log(process.StandardOutput.ReadToEnd());
-        }
-    }
-}

+ 0 - 3
Packages/com.etetet.init/Editor/PackagesEditor/LinkSlnHelper.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 36c031aed09f48cc9094dd617fe6ffbd
-timeCreated: 1719990868

+ 0 - 33
Packages/com.etetet.init/Editor/PackagesEditor/SceneNameSetHelper.cs

@@ -1,33 +0,0 @@
-using System;
-using System.IO;
-using UnityEditor;
-
-namespace ET
-{
-    public static class SceneNameSetHelper
-    {
-        public static void Run()
-        {
-            PackageGit packageGit = null;
-            foreach (string directory in Directory.GetDirectories("./Packages"))
-            {
-                if (!File.Exists(Path.Combine(directory, "ET.sln")))
-                {
-                    continue;
-                }
-
-                packageGit = PackageGitHelper.Load(Path.Combine(directory, "packagegit.json"));
-                break;
-            }
-
-            if (packageGit == null)
-            {
-                throw new Exception("not found demo et.sln");
-            }
-            
-            GlobalConfig globalConfig = AssetDatabase.LoadAssetAtPath<GlobalConfig>("Packages/com.etetet.init/Resources/GlobalConfig.asset");
-            globalConfig.SceneName = packageGit.Name;
-            AssetDatabase.SaveAssets();
-        }
-    }
-}

+ 0 - 3
Packages/com.etetet.init/Editor/PackagesEditor/SceneNameSetHelper.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: b4069d5e86ae40059b3e63a5ec31bcc5
-timeCreated: 1720264653

+ 0 - 96
Packages/com.etetet.init/Editor/PackagesEditor/ScriptsReferencesHelper.cs

@@ -1,96 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using UnityEditor;
-using UnityEngine;
-
-namespace ET
-{
-    public class AssemblyDefinitionAsset
-    {
-        public string name;
-        public string rootNamespace;
-        public string[] references;
-        public string[] includePlatforms;
-        public string[] excludePlatforms;
-        public bool allowUnsafeCode;
-        public bool overrideReferences;
-        public string[] precompiledReferences;
-        public bool autoReferenced;
-        public string[] defineConstraints;
-        public string[] versionDefines;
-        public bool noEngineReferences;
-        public string[] optionalUnityReferences;
-        public string[] additionalReferences;
-        public string compilerOptions;
-    }
-    
-    public static class ScriptsReferencesHelper
-    {
-        public static readonly string[] AssNames = { "Model", "ModelView", "Hotfix", "HotfixView" };
-        public static readonly string[] PackagePaths = { "Packages", "Library/PackageCache" };
-        
-        // 自动把各个包中的引用加到Assets对应的包中去,后面搞个编辑器来编辑每个包的引用
-        //[MenuItem("ET/UpdateScriptsReferences")]
-        public static void Run()
-        {
-            Dictionary<string, HashSet<string>> refs = new ()
-            {
-                {"Model", new HashSet<string>()}, 
-                {"Hotfix", new HashSet<string>()},
-                {"ModelView", new HashSet<string>()}, 
-                {"HotfixView", new HashSet<string>()}
-            }; 
-            foreach (string directory in Directory.GetDirectories("Packages", "cn.etetet.*"))
-            {
-                PackageGit packageGit = PackageGitHelper.Load(Path.Combine(directory, "packagegit.json"));
-                if (packageGit.ScriptsReferences == null)
-                {
-                    continue;
-                }
-                foreach ((string assName, string[] references) in packageGit.ScriptsReferences)
-                {
-                    foreach (string s in references)
-                    {
-                        refs[assName].Add(s);
-                    }
-                }
-            }
-
-            string fourAssemblyDir = null;
-            foreach (string directory in Directory.GetDirectories("Packages", "cn.etetet.*"))
-            {
-                if (File.Exists(Path.Combine(directory, "Runtime/Model/ET.Model.asmdef")))
-                {
-                    fourAssemblyDir = directory;
-                    break;
-                }
-            }
-            
-            List<string> findRet = new List<string>();
-            foreach ((string assName, HashSet<string> refAss) in refs)
-            {
-                findRet.Clear();
-                FileHelper.GetAllFiles(findRet, fourAssemblyDir, $"ET.{assName}.asmdef");
-                string p = findRet[0];
-                if (!File.Exists(p))
-                {
-                    throw new Exception($"not found: {p}");
-                }
-
-                string json = File.ReadAllText(p);
-                AssemblyDefinitionAsset assemblyDefinitionAsset = JsonUtility.FromJson<AssemblyDefinitionAsset>(json);
-
-                List<string> list = refAss.ToList();
-                list.Sort();
-                assemblyDefinitionAsset.references = list.ToArray();
-
-                File.WriteAllText(p, JsonUtility.ToJson(assemblyDefinitionAsset, true));
-            }
-            
-            AssetDatabase.SaveAssets();
-            AssetDatabase.Refresh();
-        }
-    }
-}

+ 0 - 11
Packages/com.etetet.init/Editor/PackagesEditor/ScriptsReferencesHelper.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 18bfe6d021de1174f8a5de372e9ea6ad
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 66
Packages/com.etetet.init/Editor/ProcessHelper.cs

@@ -1,66 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-using Debug = UnityEngine.Debug;
-using Path = System.IO.Path;
-
-namespace ET
-{
-    public static class ProcessHelper
-    {
-        public static System.Diagnostics.Process PowerShell(string arguments, string workingDirectory = ".", bool waitExit = false)
-        {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                return Run("powershell.exe", arguments, workingDirectory, waitExit);
-            }
-            else
-            {
-                return Run("/usr/local/bin/pwsh", arguments, workingDirectory, waitExit);
-            }
-        }
-
-        public static System.Diagnostics.Process Run(string exe, string arguments, string workingDirectory = ".", bool waitExit = false)
-        {
-            //Log.Debug($"Process Run exe:{exe} ,arguments:{arguments} ,workingDirectory:{workingDirectory}");
-            try
-            {
-                bool redirectStandardOutput = false;
-                bool redirectStandardError = false;
-                bool useShellExecute = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-                
-                if (waitExit)
-                {
-                    redirectStandardOutput = true;
-                    redirectStandardError = true;
-                    useShellExecute = false;
-                }
-                
-                ProcessStartInfo info = new ProcessStartInfo
-                {
-                    FileName = exe,
-                    Arguments = arguments,
-                    CreateNoWindow = true,
-                    UseShellExecute = useShellExecute,
-                    WorkingDirectory = workingDirectory,
-                    RedirectStandardOutput = redirectStandardOutput,
-                    RedirectStandardError = redirectStandardError,
-                };
-
-                System.Diagnostics.Process process = System.Diagnostics.Process.Start(info);
-
-                if (waitExit)
-                {
-                    process.WaitForExit();
-                }
-
-                return process;
-            }
-            catch (Exception e)
-            {
-                throw new Exception($"dir: {Path.GetFullPath(workingDirectory)}, command: {exe} {arguments}", e);
-            }
-        }
-    }
-}

+ 0 - 3
Packages/com.etetet.init/Editor/ProcessHelper.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: ccaaea073a3b40a2846475a3370549cf
-timeCreated: 1718016690

+ 0 - 8
Packages/com.etetet.init/Editor/ToolEditor.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c9f874225c3c8497c80a4cb6b07cd8df
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 34
Packages/com.etetet.init/Editor/ToolEditor/ToolsEditor.cs

@@ -1,34 +0,0 @@
-using UnityEditor;
-using System.Diagnostics;
-
-namespace ET
-{
-    public static class ToolsEditor
-    {
-        [MenuItem("ET/ExcelExporter")]
-        public static void ExcelExporter()
-        {
-#if UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX
-            const string tools = "/usr/local/bin/dotnet";
-#else
-            const string tools = "dotnet.exe";
-#endif
-            Process process = ProcessHelper.Run($"{tools}", "./Packages/cn.etetet.excel/DotNet~/Exe/ET.ExcelExporter.dll", "./", true);
-
-            UnityEngine.Debug.Log(process.StandardOutput.ReadToEnd());
-        }
-        
-        [MenuItem("ET/Proto2CS")]
-        public static void Proto2CS()
-        {
-#if UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX
-            const string tools = "/usr/local/bin/dotnet";
-#else
-            const string tools = "dotnet.exe";
-#endif
-            Process process = ProcessHelper.Run($"{tools}", "./Packages/cn.etetet.proto/DotNet~/Exe/ET.Proto2CS.dll", "./", true);
-
-            UnityEngine.Debug.Log(process.StandardOutput.ReadToEnd());
-        }
-    }
-}

+ 0 - 11
Packages/com.etetet.init/Editor/ToolEditor/ToolsEditor.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 88c74536b8a114539ae8692d663b5c31
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 1 - 1
Packages/com.etetet.init/Plugins.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ca5eab0a79b11984aa0b33ef8e8db2e3
+guid: cfc13919d8b071d458f99014dca6462c
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 0 - 5
Packages/com.etetet.init/Resources.meta

@@ -1,5 +0,0 @@
-fileFormatVersion: 2
-guid: 5bc88e9029901a240abad149b39bbf6b
-folderAsset: yes
-DefaultImporter:
-  userData: 

+ 0 - 17
Packages/com.etetet.init/Resources/GlobalConfig.asset

@@ -1,17 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-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: 36527db572638af47b03c805671cba75, type: 3}
-  m_Name: GlobalConfig
-  m_EditorClassIdentifier: 
-  CodeMode: 3
-  SceneName: StateSync
-  Address: 127.0.0.1:10101

+ 0 - 8
Packages/com.etetet.init/Resources/GlobalConfig.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a60778dce43da574aa447ab3fcf5d9f7
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
Packages/com.etetet.init/Runtime.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 38f833201603c444cb0ba3a7c1020719
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 3
Packages/com.etetet.init/Runtime/ET.Init.asmdef

@@ -1,3 +0,0 @@
-{
-	"name": "ET.Init"
-}

+ 0 - 7
Packages/com.etetet.init/Runtime/ET.Init.asmdef.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 5cb915e4a012f304abe5d93deb24007d
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 27
Packages/com.etetet.init/Runtime/GlobalConfig.cs

@@ -1,27 +0,0 @@
-using UnityEngine;
-
-namespace ET
-{
-    public enum CodeMode
-    {
-        Client = 1,
-        Server = 2,
-        ClientServer = 3,
-    }
-    
-    public enum BuildType
-    {
-        Debug,
-        Release,
-    }
-    
-    [CreateAssetMenu(menuName = "ET/CreateGlobalConfig", fileName = "GlobalConfig", order = 0)]
-    public class GlobalConfig: ScriptableObject
-    {
-        public CodeMode CodeMode;
-
-        public string SceneName;
-
-        public string Address;
-    }
-}

+ 0 - 11
Packages/com.etetet.init/Runtime/GlobalConfig.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 36527db572638af47b03c805671cba75
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -861,7 +861,7 @@ PlayerSettings:
   scriptingDefineSymbols:
     Android: UNITY;ENABLE_VIEW
     Server: UNITY;ENABLE_VIEW
-    Standalone: UNITY;ENABLE_VIEW
+    Standalone: UNITY;ENABLE_VIEW;INITED
     WebGL: UNITY;ENABLE_VIEW
     iPhone: UNITY;ENABLE_VIEW
   additionalCompilerArguments: {}