UI跟ReferenceCollector做成Package

DotNet/Hotfix/ET.Hotfix.csproj

@@ -33,6 +33,10 @@
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
+        <Compile Include="..\..\Unity\Library\PackageCache\com.et.*\Runtime~\CodeMode\Server\Hotfix\**\*.cs">
+            <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
+        </Compile>
+
         <Compile Include="..\..\Unity\Packages\com.et.*\Runtime~\Hotfix\Share\**\*.cs">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
@@ -40,6 +44,10 @@
         <Compile Include="..\..\Unity\Packages\com.et.*\Runtime~\Hotfix\Server\**\*.cs">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
+
+        <Compile Include="..\..\Unity\Packages\com.et.*\Runtime~\CodeMode\Server\Hotfix\**\*.cs">
+            <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
+        </Compile>
         
     </ItemGroup>
     <ItemGroup>

DotNet/Model/ET.Model.csproj

@@ -35,7 +35,7 @@
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Unity\Library\PackageCache\com.et.*\Runtime~\CodeMode\Server\**\*.cs">
+        <Compile Include="..\..\Unity\Library\PackageCache\com.et.*\Runtime~\Model\CodeMode\Server\**\*.cs">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
@@ -47,11 +47,11 @@
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Unity\Packages\com.et.*\Runtime~\CodeMode\Server\**\*.cs">
+        <Compile Include="..\..\Unity\Packages\com.et.*\Runtime~\Model\CodeMode\Server\**\*.cs">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Generate\*\Server\**\*.cs">
+        <Compile Include="..\..\Generate\*\Model\Server\**\*.cs">
             <Link>Generate\%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
         

ET.sln

@@ -49,6 +49,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Loader", "Unity\Packages
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.DotRecast", "Unity\Packages\com.et.dotrecast\DotNet~\ET.DotRecast.csproj", "{10F05479-5561-4711-BF62-C3951551B51D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.UI", "Unity\ET.UI.csproj", "{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.ReferenceCollector", "Unity\ET.ReferenceCollector.csproj", "{C55BBBD3-5A75-B928-B610-9A305A10F7AD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.ReferenceCollector.Editor", "Unity\ET.ReferenceCollector.Editor.csproj", "{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -299,6 +305,42 @@ Global
 		{10F05479-5561-4711-BF62-C3951551B51D}.Release|x64.Build.0 = Release|Any CPU
 		{10F05479-5561-4711-BF62-C3951551B51D}.Release|x86.ActiveCfg = Release|Any CPU
 		{10F05479-5561-4711-BF62-C3951551B51D}.Release|x86.Build.0 = Release|Any CPU
+		{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB}.Debug|x64.Build.0 = Debug|Any CPU
+		{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB}.Debug|x86.Build.0 = Debug|Any CPU
+		{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB}.Release|x64.ActiveCfg = Debug|Any CPU
+		{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB}.Release|x64.Build.0 = Debug|Any CPU
+		{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB}.Release|x86.ActiveCfg = Debug|Any CPU
+		{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB}.Release|x86.Build.0 = Debug|Any CPU
+		{C55BBBD3-5A75-B928-B610-9A305A10F7AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C55BBBD3-5A75-B928-B610-9A305A10F7AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C55BBBD3-5A75-B928-B610-9A305A10F7AD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C55BBBD3-5A75-B928-B610-9A305A10F7AD}.Debug|x64.Build.0 = Debug|Any CPU
+		{C55BBBD3-5A75-B928-B610-9A305A10F7AD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C55BBBD3-5A75-B928-B610-9A305A10F7AD}.Debug|x86.Build.0 = Debug|Any CPU
+		{C55BBBD3-5A75-B928-B610-9A305A10F7AD}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{C55BBBD3-5A75-B928-B610-9A305A10F7AD}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{C55BBBD3-5A75-B928-B610-9A305A10F7AD}.Release|x64.ActiveCfg = Debug|Any CPU
+		{C55BBBD3-5A75-B928-B610-9A305A10F7AD}.Release|x64.Build.0 = Debug|Any CPU
+		{C55BBBD3-5A75-B928-B610-9A305A10F7AD}.Release|x86.ActiveCfg = Debug|Any CPU
+		{C55BBBD3-5A75-B928-B610-9A305A10F7AD}.Release|x86.Build.0 = Debug|Any CPU
+		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC}.Debug|x64.Build.0 = Debug|Any CPU
+		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC}.Debug|x86.Build.0 = Debug|Any CPU
+		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC}.Release|x64.ActiveCfg = Debug|Any CPU
+		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC}.Release|x64.Build.0 = Debug|Any CPU
+		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC}.Release|x86.ActiveCfg = Debug|Any CPU
+		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC}.Release|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -324,6 +366,9 @@ Global
 		{20C76912-A132-476D-95BA-BBB5955A819C} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{93979EBC-A9EC-41B8-A440-156F23775084} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{10F05479-5561-4711-BF62-C3951551B51D} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
+		{B5F5F7F6-679A-22FB-FE49-1AB12C8CCACB} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{C55BBBD3-5A75-B928-B610-9A305A10F7AD} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

Unity/Assets/Scripts/HotfixView/ET.HotfixView.asmdef

@@ -10,7 +10,9 @@
         "ET.Hotfix",
         "ET.ModelView",
         "YooAsset",
-        "ET.YooAssets"
+        "ET.YooAssets",
+        "ET.UI",
+        "ET.ReferenceCollector"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Unity/Assets/Scripts/Model/ET.Model.asmdef

@@ -5,8 +5,7 @@
         "ET.Core",
         "Unity.Mathematics",
         "MemoryPack",
-        "ET.DotRecast",
-        "YooAsset"
+        "ET.DotRecast"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Unity/Assets/Scripts/ModelView/ET.ModelView.asmdef

@@ -6,7 +6,8 @@
         "Unity.Mathematics",
         "ET.Loader",
         "ET.Model",
-        "YooAsset"
+        "YooAsset",
+        "ET.UI"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Unity/Packages/com.et.loader/Editor/AssetPostProcessor/OnGenerateCSProjectProcessor.cs

@@ -111,15 +111,13 @@ namespace ET
                 switch (dllName)
                 {
                     case "Model":
-                        links += "<Compile Include=\"../Generate/*/" + codeMode + "/**/*.cs\"><Link>Generate/%(RecursiveDir)%(FileName)%(Extension)</Link></Compile>";
-                        links += "<Compile Include=\"Packages/com.et.*/Runtime~/CodeMode/" + codeMode + "/**/*.cs\"><Link>%(RecursiveDir)%(FileName)%(Extension)</Link></Compile>";
-                        break;
                     case "Hotfix":
-                        break;
                     case "HotfixView":
-                        break;
                     case "ModelView":
+                        links += "<Compile Include=\"../Generate/*/" + dllName + "/"  + codeMode + "/**/*.cs\"><Link>Generate/%(RecursiveDir)%(FileName)%(Extension)</Link></Compile>";
+                        links += "<Compile Include=\"Packages/com.et.*/Runtime~/" + dllName + "/CodeMode/" + codeMode  + "/**/*.cs\"><Link>%(RecursiveDir)%(FileName)%(Extension)</Link></Compile>";
                         break;
+
                     default:
                         links = null;
                         break;

Unity/Packages/com.et.loader/Resources/GlobalConfig.asset

@@ -13,7 +13,5 @@ MonoBehaviour:
   m_Name: GlobalConfig
   m_EditorClassIdentifier: 
   CodeMode: 3
-  EnableDll: 1
   BuildType: 0
   SceneName: StateSync
-  EPlayMode: 0

Unity/Packages/com.et.loader/Runtime/ConfigLoaderInvoker.cs.meta

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

Unity/Packages/com.et.loader/Runtime/GlobalComponent.cs.meta

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

Unity/Packages/com.et.loader/Runtime/MonoBehaviour/GizmosDebug.cs

@@ -1,29 +0,0 @@
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace ET
-{
-    public class GizmosDebug: MonoBehaviour
-    {
-        public static GizmosDebug Instance { get; private set; }
-
-        public List<Vector3> Path;
-
-        private void Awake()
-        {
-            Instance = this;
-        }
-
-        private void OnDrawGizmos()
-        {
-            if (this.Path.Count < 2)
-            {
-                return;
-            }
-            for (int i = 0; i < Path.Count - 1; ++i)
-            {
-                Gizmos.DrawLine(Path[i], Path[i + 1]);
-            }
-        }
-    }
-}

Unity/Packages/com.et.loader/Runtime/MonoBehaviour/GizmosDebug.cs.meta

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

Unity/Packages/com.et.loader/Editor/ReferenceCollectorEditor.meta → Unity/Packages/com.et.referencecollector/Editor.meta

@@ -1,9 +1,8 @@
 fileFormatVersion: 2
-guid: e185caf77a9b68b49a0b8c0a9d4687cb
+guid: 42426489e7bf42f4e89fe70163aa56ee
 folderAsset: yes
-timeCreated: 1463827014
-licenseType: Pro
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Unity/Packages/com.et.referencecollector/Editor/ET.ReferenceCollector.Editor.asmdef

@@ -0,0 +1,20 @@
+{
+    "name": "ET.ReferenceCollector.Editor",
+    "rootNamespace": "ET",
+    "references": [
+        "ET.ReferenceCollector"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": true,
+    "overrideReferences": false,
+    "precompiledReferences": [
+        ""
+    ],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Unity/Packages/com.et.referencecollector/Editor/ET.ReferenceCollector.Editor.asmdef.meta

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

Unity/Packages/com.et.referencecollector/Runtime.meta

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

Unity/Packages/com.et.referencecollector/Runtime/ET.ReferenceCollector.asmdef

@@ -0,0 +1,16 @@
+{
+    "name": "ET.ReferenceCollector",
+    "rootNamespace": "ET",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": true,
+    "overrideReferences": false,
+    "precompiledReferences": [
+        ""
+    ],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Unity/Packages/com.et.referencecollector/Runtime/ET.ReferenceCollector.asmdef.meta

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

Unity/Packages/com.et.referencecollector/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "com.et.referencecollector",
+  "displayName": "ET.ReferenceCollector",
+  "version": "0.0.1",
+  "unity": "2022.3",
+  "description": "et ReferenceCollector",
+  "author": {
+    "name": "tanghai",
+    "url": "https://github.com/egametang/ET"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/egametang/ET"
+  },
+  "relatedPackages": {},
+  "dependencies": {
+    "com.et.core": ""
+  }
+}

Unity/Packages/com.et.referencecollector/package.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d67a5d662a3413341b21a2f7c92ab5dd
+PackageManifestImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Packages/com.et.loader/DotNet~/ConfigLoaderInvoker.cs → Unity/Packages/com.et.statesync/Runtime~/Hotfix/Server/ConfigLoaderInvoker.cs

@@ -1,3 +1,4 @@
+#if DOTNET
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -46,4 +47,5 @@ namespace ET
             return configBytes;
         }
     }
-}
+}
+#endif

Unity/Packages/com.et.statesync/Runtime~/HotfixView/ET.HotfixView.asmdef

@@ -8,6 +8,8 @@
         "ET.Hotfix",
         "ET.ModelView",
         "ET.YooAssets",
-        "YooAsset"
+        "YooAsset",
+        "ET.UI",
+        "ET.ReferenceCollector"
     ]
 }

Unity/Packages/com.et.loader/Runtime/GlobalComponent.cs → Unity/Packages/com.et.statesync/Runtime~/ModelView/Client/GlobalComponent.cs

@@ -2,7 +2,7 @@ using UnityEngine;
 
 namespace ET
 {
-    [FriendOf(typeof(GlobalComponent))]
+    [EntitySystemOf(typeof(GlobalComponent))]
     public static partial class GlobalComponentSystem
     {
         [EntitySystem]

Unity/Packages/com.et.statesync/Runtime~/ModelView/ET.ModelView.asmdef

@@ -4,6 +4,7 @@
         "Unity.Mathematics",
         "ET.Loader",
         "ET.Model",
-        "YooAsset"
+        "YooAsset",
+        "ET.UI"
     ]
 }

Unity/Packages/com.et.statesync/package.json

@@ -29,6 +29,8 @@
     "com.et.move": "",
     "com.et.watcher": "",
     "com.et.db": "",
-    "com.et.aoi": ""
+    "com.et.aoi": "",
+    "com.et.ui": "",
+    "com.et.referencecollector": ""
   }
 }

Unity/Packages/com.et.ui/Runtime.meta

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

Unity/Packages/com.et.ui/Runtime/ET.UI.asmdef

@@ -0,0 +1,18 @@
+{
+    "name": "ET.UI",
+    "rootNamespace": "ET",
+    "references": [
+        "ET.Core"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": true,
+    "overrideReferences": false,
+    "precompiledReferences": [
+        ""
+    ],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Unity/Packages/com.et.ui/Runtime/ET.UI.asmdef.meta

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