Przeglądaj źródła

增加hardlink脚本,自动把代码链接到Hotfix Model ModelView HotfixView

tanghai 1 rok temu
rodzic
commit
68e201ce7a
64 zmienionych plików z 143 dodań i 1447 usunięć
  1. 1 18
      DotNet/Loader/Init.cs
  2. 12 0
      Unity/Assets/Scripts/.gitignore
  3. 1 1
      Unity/Assets/Scripts/Hotfix/Server.meta
  4. 1 1
      Unity/Assets/Scripts/Model/Server.meta
  5. 1 1
      Unity/Assets/Scripts/Model/Share.meta
  6. 71 0
      Unity/CodeLinker.ps1
  7. 36 0
      Unity/Packages/com.et.core/Scripts/Core/Entry.cs
  8. 1 1
      Unity/Packages/com.et.core/Scripts/Core/Entry.cs.meta
  9. 14 12
      Unity/Packages/com.et.core/Scripts/Core/FiberInit_Main.cs
  10. 1 1
      Unity/Packages/com.et.core/Scripts/Core/FiberInit_Main.cs.meta
  11. 0 0
      Unity/Packages/com.et.core/Scripts/HotfixView~/Empty.cs
  12. 0 11
      Unity/Packages/com.et.core/Scripts/HotfixView~/Empty.cs.meta
  13. 0 26
      Unity/Packages/com.et.core/Scripts/HotfixView~/Unity.HotfixView.asmdef
  14. 0 7
      Unity/Packages/com.et.core/Scripts/HotfixView~/Unity.HotfixView.asmdef.meta
  15. 0 0
      Unity/Packages/com.et.core/Scripts/Hotfix~/Empty.cs
  16. 0 11
      Unity/Packages/com.et.core/Scripts/Hotfix~/Empty.cs.meta
  17. 0 22
      Unity/Packages/com.et.core/Scripts/Hotfix~/Unity.Hotfix.asmdef
  18. 0 7
      Unity/Packages/com.et.core/Scripts/Hotfix~/Unity.Hotfix.asmdef.meta
  19. 0 0
      Unity/Packages/com.et.core/Scripts/ModelView~/Empty.cs
  20. 0 11
      Unity/Packages/com.et.core/Scripts/ModelView~/Empty.cs.meta
  21. 0 23
      Unity/Packages/com.et.core/Scripts/ModelView~/Unity.ModelView.asmdef
  22. 0 7
      Unity/Packages/com.et.core/Scripts/ModelView~/Unity.ModelView.asmdef.meta
  23. 0 16
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Client/Ignore.asmdef
  24. 0 7
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Client/Ignore.asmdef.meta
  25. 0 92
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Client/Message/ClientMessage_C_1000.cs
  26. 0 11
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Client/Message/ClientMessage_C_1000.cs.meta
  27. 0 8
      Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer.meta
  28. 0 8
      Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Config.meta
  29. 0 72
      Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Config/StartMachineConfig.cs
  30. 0 11
      Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Config/StartMachineConfig.cs.meta
  31. 0 70
      Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Config/StartProcessConfig.cs
  32. 0 11
      Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Config/StartProcessConfig.cs.meta
  33. 0 76
      Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Config/StartSceneConfig.cs
  34. 0 11
      Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Config/StartSceneConfig.cs.meta
  35. 0 70
      Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Config/StartZoneConfig.cs
  36. 0 11
      Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Config/StartZoneConfig.cs.meta
  37. 0 8
      Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/ConfigPartial.meta
  38. 0 33
      Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/ConfigPartial/StartProcessConfig.cs
  39. 0 11
      Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/ConfigPartial/StartProcessConfig.cs.meta
  40. 0 8
      Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Message.meta
  41. 0 92
      Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Message/ClientMessage_C_1000.cs
  42. 0 11
      Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Message/ClientMessage_C_1000.cs.meta
  43. 0 8
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Config.meta
  44. 0 72
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Config/StartMachineConfig.cs
  45. 0 11
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Config/StartMachineConfig.cs.meta
  46. 0 70
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Config/StartProcessConfig.cs
  47. 0 11
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Config/StartProcessConfig.cs.meta
  48. 0 76
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Config/StartSceneConfig.cs
  49. 0 11
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Config/StartSceneConfig.cs.meta
  50. 0 70
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Config/StartZoneConfig.cs
  51. 0 11
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Config/StartZoneConfig.cs.meta
  52. 0 8
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/ConfigPartial.meta
  53. 0 33
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/ConfigPartial/StartProcessConfig.cs
  54. 0 11
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/ConfigPartial/StartProcessConfig.cs.meta
  55. 0 16
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Ignore.asmdef
  56. 0 7
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Ignore.asmdef.meta
  57. 0 8
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Message.meta
  58. 0 92
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Message/ClientMessage_C_1000.cs
  59. 0 11
      Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Message/ClientMessage_C_1000.cs.meta
  60. 0 57
      Unity/Packages/com.et.core/Scripts/Model~/Share/Entry.cs
  61. 0 21
      Unity/Packages/com.et.core/Scripts/Model~/Unity.Model.asmdef
  62. 0 7
      Unity/Packages/com.et.core/Scripts/Model~/Unity.Model.asmdef.meta
  63. 1 36
      Unity/Packages/com.et.loader/Scripts/Loader/MonoBehaviour/Init.cs
  64. 3 3
      Unity/Packages/packages-lock.json

+ 1 - 18
DotNet/Loader/Init.cs

@@ -1,5 +1,4 @@
 using System;
-using CommandLine;
 
 namespace ET
 {
@@ -9,23 +8,7 @@ namespace ET
 		{
 			try
 			{
-				AppDomain.CurrentDomain.UnhandledException += (sender, e) =>
-				{
-					Log.Error(e.ExceptionObject.ToString());
-				};
-				
-				// 命令行参数
-				Parser.Default.ParseArguments<Options>(System.Environment.GetCommandLineArgs())
-						.WithNotParsed(error => throw new Exception($"命令行格式错误! {error}"))
-						.WithParsed((o)=>World.Instance.AddSingleton(o));
-				
-				World.Instance.AddSingleton<Logger>().Log = new NLogger(Options.Instance.SceneName, Options.Instance.Process, 0);
-				
-				ETTask.ExceptionHandler += Log.Error;
-				World.Instance.AddSingleton<TimeInfo>();
-				World.Instance.AddSingleton<FiberManager>();
-
-				World.Instance.AddSingleton<CodeLoader>();
+				Entry.Start();
 			}
 			catch (Exception e)
 			{

+ 12 - 0
Unity/Assets/Scripts/.gitignore

@@ -0,0 +1,12 @@
+Model/Server
+Model/Client
+Model/Share
+Hotfix/Server
+Hotfix/Client
+Hotfix/Share
+ModelView/Server
+ModelView/Client
+ModelView/Share
+HotfixView/Server
+HotfixView/Client
+HotfixView/Share

+ 1 - 1
Unity/Packages/com.et.core/Scripts/Model~/Generate/Server.meta → Unity/Assets/Scripts/Hotfix/Server.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 24ce03f1b7723bc47bca791671a977d2
+guid: 4de2920d40637e64bbf60a4166b82b5f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 1 - 1
Unity/Packages/com.et.core/Scripts/Model~/Generate/Client.meta → Unity/Assets/Scripts/Model/Server.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 67d21a80f9f5d4a45823f7d0d16eb933
+guid: c978be66d7808f9438f2c8cbd7a5ccfe
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 1 - 1
Unity/Packages/com.et.core/Scripts/Model~/Generate/Client/Message.meta → Unity/Assets/Scripts/Model/Share.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 39784f35f926de34b866f949b0e4d8ce
+guid: 3b0871f1e2b4248408dba0b28965c04a
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 71 - 0
Unity/CodeLinker.ps1

@@ -0,0 +1,71 @@
+$packages = ("Packages", "Library\PackageCache")
+$dirs = ("Model~", "Hotfix~", "ModelView~", "HotfixView~")
+$client_server_dir = ("Client", "Server", "Share")
+
+
+function Link($targetPath, $linker, $subPath, $moudle)
+{
+    $path = $linker + $subPath
+    foreach($c in Get-ChildItem $path)
+    {
+        if ($c -is [System.IO.FileInfo])
+        {
+            $to = $targetPath + "/" + $moudle + $subPath + $c.Name
+
+            Write-Host "link:", $to, $c.FullName
+
+            New-Item -ItemType HardLink -Path $to -Value $c.FullName -Force
+            continue
+        }
+        elseif ($c -is [System.IO.DirectoryInfo])
+        {
+            $newSubPath = $subPath + $c.Name + "/"
+            Link $targetPath $linker $newSubPath $moudle
+        }
+    }
+}
+
+
+foreach($package in $packages)
+{
+    foreach($a in Get-ChildItem $package) 
+    {
+        # name = core
+        $name = $a.Name
+        if (!$name.StartsWith("com.et.")) 
+        {
+            continue
+        }
+        $name = $name.Substring(7, $name.Length - 7);
+
+        $newDir = $a.FullName + "/Scripts"
+
+        # $b model~ dir
+        foreach($b in Get-ChildItem $newDir)
+        {
+            $name2 = $b.Name
+            if (!$dirs.Contains($name2))
+            {
+                continue
+            }
+
+            $path = $b.FullName
+
+            # name3  Hotfix  name2 Hotfix~
+            $name3 = $name2.Substring(0, $name2.Length - 1)
+
+            foreach($c in Get-ChildItem $path)
+            {
+                $name4 = $c.Name
+                if (!$client_server_dir.Contains($name4))
+                {
+                    continue
+                }
+
+                # Assets/Scripts/Hotfix/Client/
+                $targetPath = "Assets/Scripts/$name3/$name4"
+                Link $targetPath $c.FullName "/" $name
+            }
+        }
+    }
+}

+ 36 - 0
Unity/Packages/com.et.core/Scripts/Core/Entry.cs

@@ -0,0 +1,36 @@
+using System;
+using CommandLine;
+
+namespace ET
+{
+    public static class Entry
+    {
+        public static void Start()
+        {
+            AppDomain.CurrentDomain.UnhandledException += (sender, e) =>
+            {
+                Log.Error(e.ExceptionObject.ToString());
+            };
+
+            // 命令行参数
+            Parser.Default.ParseArguments<Options>(System.Environment.GetCommandLineArgs())
+                    .WithNotParsed(error => throw new Exception($"命令行格式错误! {error}"))
+                    .WithParsed((o)=>World.Instance.AddSingleton(o));
+         
+            ETTask.ExceptionHandler += Log.Error;
+			
+            World.Instance.AddSingleton<TimeInfo>();
+            World.Instance.AddSingleton<FiberManager>();
+            
+            World.Instance.AddSingleton<ObjectPool>();
+            World.Instance.AddSingleton<IdGenerater>();
+            World.Instance.AddSingleton<OpcodeType>();
+            World.Instance.AddSingleton<MessageQueue>();
+            World.Instance.AddSingleton<NetServices>();
+            World.Instance.AddSingleton<LogMsg>();
+
+            // 创建Main Fiber
+            FiberManager.Instance.Create(SchedulerType.Main, 1, 0, 1, "Main").Coroutine();
+        }
+    }
+}

+ 1 - 1
Unity/Packages/com.et.core/Scripts/Model~/Share/Entry.cs.meta → Unity/Packages/com.et.core/Scripts/Core/Entry.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 28ee985a41787a24a8ea3bf87277e7e3
+guid: b11159c8aff38614cbbb3393d469d3cf
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 14 - 12
Unity/Packages/com.et.core/Scripts/Model~/Share/FiberInit_Main.cs → Unity/Packages/com.et.core/Scripts/Core/FiberInit_Main.cs

@@ -1,24 +1,26 @@
-using System.Collections.Generic;
-using MemoryPack;
-
-namespace ET
+namespace ET
 {
-    [Invoke(SceneType.Main)]
+    public struct EntryEvent1
+    {
+    }
+    
+    public struct EntryEvent2
+    {
+    }
+    
+    public struct EntryEvent3
+    {
+    }
+
+    [Invoke(1)]
     public class FiberInit_Main: AInvokeHandler<FiberInit, ETTask>
     {
         public override async ETTask Handle(FiberInit fiberInit)
         {
-            // 注册序列化
-            MongoRegister.Init();
-            MemoryPackRegister.Init();
-            
             Scene root = fiberInit.Fiber.Root;
-           
             await EventSystem.Instance.PublishAsync(root, new EntryEvent1());
             await EventSystem.Instance.PublishAsync(root, new EntryEvent2());
             await EventSystem.Instance.PublishAsync(root, new EntryEvent3());
-            
-            Log.Debug($"run success!");
         }
     }
 }

+ 1 - 1
Unity/Packages/com.et.core/Scripts/Model~/Share/FiberInit_Main.cs.meta → Unity/Packages/com.et.core/Scripts/Core/FiberInit_Main.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 62d95081b9d849642bd346348b28c3ee
+guid: 526dab8b6a03f0140a8eb3fc6393255a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 0
Unity/Packages/com.et.core/Scripts/HotfixView~/Empty.cs


+ 0 - 11
Unity/Packages/com.et.core/Scripts/HotfixView~/Empty.cs.meta

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

+ 0 - 26
Unity/Packages/com.et.core/Scripts/HotfixView~/Unity.HotfixView.asmdef

@@ -1,26 +0,0 @@
-{
-    "name": "Unity.HotfixView",
-    "rootNamespace": "ET",
-    "references": [
-        "Unity.ThirdParty",
-        "Unity.Core",
-        "Unity.Mathematics",
-        "Unity.Loader",
-        "MemoryPack",
-        "Unity.Model",
-        "Unity.Hotfix",
-        "Unity.ModelView",
-        "YooAsset"
-    ],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": true,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [
-        "UNITY_COMPILE || UNITY_EDITOR"
-    ],
-    "versionDefines": [],
-    "noEngineReferences": false
-}

+ 0 - 7
Unity/Packages/com.et.core/Scripts/HotfixView~/Unity.HotfixView.asmdef.meta

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

+ 0 - 0
Unity/Packages/com.et.core/Scripts/Hotfix~/Empty.cs


+ 0 - 11
Unity/Packages/com.et.core/Scripts/Hotfix~/Empty.cs.meta

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

+ 0 - 22
Unity/Packages/com.et.core/Scripts/Hotfix~/Unity.Hotfix.asmdef

@@ -1,22 +0,0 @@
-{
-    "name": "Unity.Hotfix",
-    "rootNamespace": "ET",
-    "references": [
-        "Unity.ThirdParty",
-        "Unity.Core",
-        "Unity.Mathematics",
-        "MemoryPack",
-        "Unity.Model"
-    ],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": true,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [
-        "UNITY_COMPILE || UNITY_EDITOR"
-    ],
-    "versionDefines": [],
-    "noEngineReferences": true
-}

+ 0 - 7
Unity/Packages/com.et.core/Scripts/Hotfix~/Unity.Hotfix.asmdef.meta

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

+ 0 - 0
Unity/Packages/com.et.core/Scripts/ModelView~/Empty.cs


+ 0 - 11
Unity/Packages/com.et.core/Scripts/ModelView~/Empty.cs.meta

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

+ 0 - 23
Unity/Packages/com.et.core/Scripts/ModelView~/Unity.ModelView.asmdef

@@ -1,23 +0,0 @@
-{
-    "name": "Unity.ModelView",
-    "rootNamespace": "ET",
-    "references": [
-        "Unity.ThirdParty",
-        "Unity.Core",
-        "Unity.Mathematics",
-        "Unity.Loader",
-        "Unity.Model",
-        "YooAsset"
-    ],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": true,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [
-        "UNITY_COMPILE || UNITY_EDITOR"
-    ],
-    "versionDefines": [],
-    "noEngineReferences": false
-}

+ 0 - 7
Unity/Packages/com.et.core/Scripts/ModelView~/Unity.ModelView.asmdef.meta

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

+ 0 - 16
Unity/Packages/com.et.core/Scripts/Model~/Generate/Client/Ignore.asmdef

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

+ 0 - 7
Unity/Packages/com.et.core/Scripts/Model~/Generate/Client/Ignore.asmdef.meta

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

+ 0 - 92
Unity/Packages/com.et.core/Scripts/Model~/Generate/Client/Message/ClientMessage_C_1000.cs

@@ -1,92 +0,0 @@
-using MemoryPack;
-using System.Collections.Generic;
-
-namespace ET
-{
-    [MemoryPackable]
-    [Message(ClientMessage.Main2NetClient_Login)]
-    [ResponseType(nameof(NetClient2Main_Login))]
-    public partial class Main2NetClient_Login : MessageObject, IRequest
-    {
-        public static Main2NetClient_Login Create(bool isFromPool = false)
-        {
-            return ObjectPool.Fetch<Main2NetClient_Login>(isFromPool);
-        }
-
-        [MemoryPackOrder(0)]
-        public int RpcId { get; set; }
-
-        [MemoryPackOrder(1)]
-        public int OwnerFiberId { get; set; }
-
-        /// <summary>
-        /// 账号
-        /// </summary>
-        [MemoryPackOrder(2)]
-        public string Account { get; set; }
-
-        /// <summary>
-        /// 密码
-        /// </summary>
-        [MemoryPackOrder(3)]
-        public string Password { get; set; }
-
-        public override void Dispose()
-        {
-            if (!this.IsFromPool)
-            {
-                return;
-            }
-
-            this.RpcId = default;
-            this.OwnerFiberId = default;
-            this.Account = default;
-            this.Password = default;
-
-            ObjectPool.Recycle(this);
-        }
-    }
-
-    [MemoryPackable]
-    [Message(ClientMessage.NetClient2Main_Login)]
-    public partial class NetClient2Main_Login : MessageObject, IResponse
-    {
-        public static NetClient2Main_Login Create(bool isFromPool = false)
-        {
-            return ObjectPool.Fetch<NetClient2Main_Login>(isFromPool);
-        }
-
-        [MemoryPackOrder(0)]
-        public int RpcId { get; set; }
-
-        [MemoryPackOrder(1)]
-        public int Error { get; set; }
-
-        [MemoryPackOrder(2)]
-        public string Message { get; set; }
-
-        [MemoryPackOrder(3)]
-        public long PlayerId { get; set; }
-
-        public override void Dispose()
-        {
-            if (!this.IsFromPool)
-            {
-                return;
-            }
-
-            this.RpcId = default;
-            this.Error = default;
-            this.Message = default;
-            this.PlayerId = default;
-
-            ObjectPool.Recycle(this);
-        }
-    }
-
-    public static class ClientMessage
-    {
-        public const ushort Main2NetClient_Login = 1001;
-        public const ushort NetClient2Main_Login = 1002;
-    }
-}

+ 0 - 11
Unity/Packages/com.et.core/Scripts/Model~/Generate/Client/Message/ClientMessage_C_1000.cs.meta

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

+ 0 - 8
Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer.meta

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

+ 0 - 8
Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Config.meta

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

+ 0 - 72
Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Config/StartMachineConfig.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-using MongoDB.Bson.Serialization.Attributes;
-using MongoDB.Bson.Serialization.Options;
-using System.ComponentModel;
-
-namespace ET
-{
-    [Config]
-    public partial class StartMachineConfigCategory : Singleton<StartMachineConfigCategory>, IMerge
-    {
-        [BsonElement]
-        [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, StartMachineConfig> dict = new();
-		
-        public void Merge(object o)
-        {
-            StartMachineConfigCategory s = o as StartMachineConfigCategory;
-            foreach (var kv in s.dict)
-            {
-                this.dict.Add(kv.Key, kv.Value);
-            }
-        }
-		
-        public StartMachineConfig Get(int id)
-        {
-            this.dict.TryGetValue(id, out StartMachineConfig item);
-
-            if (item == null)
-            {
-                throw new Exception($"配置找不到,配置表名: {nameof (StartMachineConfig)},配置id: {id}");
-            }
-
-            return item;
-        }
-		
-        public bool Contain(int id)
-        {
-            return this.dict.ContainsKey(id);
-        }
-
-        public Dictionary<int, StartMachineConfig> GetAll()
-        {
-            return this.dict;
-        }
-
-        public StartMachineConfig GetOne()
-        {
-            if (this.dict == null || this.dict.Count <= 0)
-            {
-                return null;
-            }
-            
-            var enumerator = this.dict.Values.GetEnumerator();
-            enumerator.MoveNext();
-            return enumerator.Current; 
-        }
-    }
-
-	public partial class StartMachineConfig: ProtoObject, IConfig
-	{
-		/// <summary>Id</summary>
-		public int Id { get; set; }
-		/// <summary>内网地址</summary>
-		public string InnerIP { get; set; }
-		/// <summary>外网地址</summary>
-		public string OuterIP { get; set; }
-		/// <summary>守护进程端口</summary>
-		public string WatcherPort { get; set; }
-
-	}
-}

+ 0 - 11
Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Config/StartMachineConfig.cs.meta

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

+ 0 - 70
Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Config/StartProcessConfig.cs

@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using MongoDB.Bson.Serialization.Attributes;
-using MongoDB.Bson.Serialization.Options;
-using System.ComponentModel;
-
-namespace ET
-{
-    [Config]
-    public partial class StartProcessConfigCategory : Singleton<StartProcessConfigCategory>, IMerge
-    {
-        [BsonElement]
-        [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, StartProcessConfig> dict = new();
-		
-        public void Merge(object o)
-        {
-            StartProcessConfigCategory s = o as StartProcessConfigCategory;
-            foreach (var kv in s.dict)
-            {
-                this.dict.Add(kv.Key, kv.Value);
-            }
-        }
-		
-        public StartProcessConfig Get(int id)
-        {
-            this.dict.TryGetValue(id, out StartProcessConfig item);
-
-            if (item == null)
-            {
-                throw new Exception($"配置找不到,配置表名: {nameof (StartProcessConfig)},配置id: {id}");
-            }
-
-            return item;
-        }
-		
-        public bool Contain(int id)
-        {
-            return this.dict.ContainsKey(id);
-        }
-
-        public Dictionary<int, StartProcessConfig> GetAll()
-        {
-            return this.dict;
-        }
-
-        public StartProcessConfig GetOne()
-        {
-            if (this.dict == null || this.dict.Count <= 0)
-            {
-                return null;
-            }
-            
-            var enumerator = this.dict.Values.GetEnumerator();
-            enumerator.MoveNext();
-            return enumerator.Current; 
-        }
-    }
-
-	public partial class StartProcessConfig: ProtoObject, IConfig
-	{
-		/// <summary>Id</summary>
-		public int Id { get; set; }
-		/// <summary>所属机器</summary>
-		public int MachineId { get; set; }
-		/// <summary>外网端口</summary>
-		public int Port { get; set; }
-
-	}
-}

+ 0 - 11
Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Config/StartProcessConfig.cs.meta

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

+ 0 - 76
Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Config/StartSceneConfig.cs

@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-using MongoDB.Bson.Serialization.Attributes;
-using MongoDB.Bson.Serialization.Options;
-using System.ComponentModel;
-
-namespace ET
-{
-    [Config]
-    public partial class StartSceneConfigCategory : Singleton<StartSceneConfigCategory>, IMerge
-    {
-        [BsonElement]
-        [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, StartSceneConfig> dict = new();
-		
-        public void Merge(object o)
-        {
-            StartSceneConfigCategory s = o as StartSceneConfigCategory;
-            foreach (var kv in s.dict)
-            {
-                this.dict.Add(kv.Key, kv.Value);
-            }
-        }
-		
-        public StartSceneConfig Get(int id)
-        {
-            this.dict.TryGetValue(id, out StartSceneConfig item);
-
-            if (item == null)
-            {
-                throw new Exception($"配置找不到,配置表名: {nameof (StartSceneConfig)},配置id: {id}");
-            }
-
-            return item;
-        }
-		
-        public bool Contain(int id)
-        {
-            return this.dict.ContainsKey(id);
-        }
-
-        public Dictionary<int, StartSceneConfig> GetAll()
-        {
-            return this.dict;
-        }
-
-        public StartSceneConfig GetOne()
-        {
-            if (this.dict == null || this.dict.Count <= 0)
-            {
-                return null;
-            }
-            
-            var enumerator = this.dict.Values.GetEnumerator();
-            enumerator.MoveNext();
-            return enumerator.Current; 
-        }
-    }
-
-	public partial class StartSceneConfig: ProtoObject, IConfig
-	{
-		/// <summary>Id</summary>
-		public int Id { get; set; }
-		/// <summary>所属进程</summary>
-		public int Process { get; set; }
-		/// <summary>所属区</summary>
-		public int Zone { get; set; }
-		/// <summary>类型</summary>
-		public string SceneType { get; set; }
-		/// <summary>名字</summary>
-		public string Name { get; set; }
-		/// <summary>外网端口</summary>
-		public int Port { get; set; }
-
-	}
-}

+ 0 - 11
Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Config/StartSceneConfig.cs.meta

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

+ 0 - 70
Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Config/StartZoneConfig.cs

@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using MongoDB.Bson.Serialization.Attributes;
-using MongoDB.Bson.Serialization.Options;
-using System.ComponentModel;
-
-namespace ET
-{
-    [Config]
-    public partial class StartZoneConfigCategory : Singleton<StartZoneConfigCategory>, IMerge
-    {
-        [BsonElement]
-        [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, StartZoneConfig> dict = new();
-		
-        public void Merge(object o)
-        {
-            StartZoneConfigCategory s = o as StartZoneConfigCategory;
-            foreach (var kv in s.dict)
-            {
-                this.dict.Add(kv.Key, kv.Value);
-            }
-        }
-		
-        public StartZoneConfig Get(int id)
-        {
-            this.dict.TryGetValue(id, out StartZoneConfig item);
-
-            if (item == null)
-            {
-                throw new Exception($"配置找不到,配置表名: {nameof (StartZoneConfig)},配置id: {id}");
-            }
-
-            return item;
-        }
-		
-        public bool Contain(int id)
-        {
-            return this.dict.ContainsKey(id);
-        }
-
-        public Dictionary<int, StartZoneConfig> GetAll()
-        {
-            return this.dict;
-        }
-
-        public StartZoneConfig GetOne()
-        {
-            if (this.dict == null || this.dict.Count <= 0)
-            {
-                return null;
-            }
-            
-            var enumerator = this.dict.Values.GetEnumerator();
-            enumerator.MoveNext();
-            return enumerator.Current; 
-        }
-    }
-
-	public partial class StartZoneConfig: ProtoObject, IConfig
-	{
-		/// <summary>Id</summary>
-		public int Id { get; set; }
-		/// <summary>数据库地址</summary>
-		public string DBConnection { get; set; }
-		/// <summary>数据库名</summary>
-		public string DBName { get; set; }
-
-	}
-}

+ 0 - 11
Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Config/StartZoneConfig.cs.meta

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

+ 0 - 8
Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/ConfigPartial.meta

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

+ 0 - 33
Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/ConfigPartial/StartProcessConfig.cs

@@ -1,33 +0,0 @@
-using System.Net;
-
-namespace ET
-{
-    public partial class StartProcessConfig
-    {
-        public string InnerIP => this.StartMachineConfig.InnerIP;
-
-        public string OuterIP => this.StartMachineConfig.OuterIP;
-        
-        // 内网地址外网端口,通过防火墙映射端口过来
-        private IPEndPoint ipEndPoint;
-
-        public IPEndPoint IPEndPoint
-        {
-            get
-            {
-                if (ipEndPoint == null)
-                {
-                    this.ipEndPoint = NetworkHelper.ToIPEndPoint(this.InnerIP, this.Port);
-                }
-
-                return this.ipEndPoint;
-            }
-        }
-
-        public StartMachineConfig StartMachineConfig => StartMachineConfigCategory.Instance.Get(this.MachineId);
-
-        public override void EndInit()
-        {
-        }
-    }
-}

+ 0 - 11
Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/ConfigPartial/StartProcessConfig.cs.meta

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

+ 0 - 8
Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Message.meta

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

+ 0 - 92
Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Message/ClientMessage_C_1000.cs

@@ -1,92 +0,0 @@
-using MemoryPack;
-using System.Collections.Generic;
-
-namespace ET
-{
-    [MemoryPackable]
-    [Message(ClientMessage.Main2NetClient_Login)]
-    [ResponseType(nameof(NetClient2Main_Login))]
-    public partial class Main2NetClient_Login : MessageObject, IRequest
-    {
-        public static Main2NetClient_Login Create(bool isFromPool = false)
-        {
-            return ObjectPool.Fetch<Main2NetClient_Login>(isFromPool);
-        }
-
-        [MemoryPackOrder(0)]
-        public int RpcId { get; set; }
-
-        [MemoryPackOrder(1)]
-        public int OwnerFiberId { get; set; }
-
-        /// <summary>
-        /// 账号
-        /// </summary>
-        [MemoryPackOrder(2)]
-        public string Account { get; set; }
-
-        /// <summary>
-        /// 密码
-        /// </summary>
-        [MemoryPackOrder(3)]
-        public string Password { get; set; }
-
-        public override void Dispose()
-        {
-            if (!this.IsFromPool)
-            {
-                return;
-            }
-
-            this.RpcId = default;
-            this.OwnerFiberId = default;
-            this.Account = default;
-            this.Password = default;
-
-            ObjectPool.Recycle(this);
-        }
-    }
-
-    [MemoryPackable]
-    [Message(ClientMessage.NetClient2Main_Login)]
-    public partial class NetClient2Main_Login : MessageObject, IResponse
-    {
-        public static NetClient2Main_Login Create(bool isFromPool = false)
-        {
-            return ObjectPool.Fetch<NetClient2Main_Login>(isFromPool);
-        }
-
-        [MemoryPackOrder(0)]
-        public int RpcId { get; set; }
-
-        [MemoryPackOrder(1)]
-        public int Error { get; set; }
-
-        [MemoryPackOrder(2)]
-        public string Message { get; set; }
-
-        [MemoryPackOrder(3)]
-        public long PlayerId { get; set; }
-
-        public override void Dispose()
-        {
-            if (!this.IsFromPool)
-            {
-                return;
-            }
-
-            this.RpcId = default;
-            this.Error = default;
-            this.Message = default;
-            this.PlayerId = default;
-
-            ObjectPool.Recycle(this);
-        }
-    }
-
-    public static class ClientMessage
-    {
-        public const ushort Main2NetClient_Login = 1001;
-        public const ushort NetClient2Main_Login = 1002;
-    }
-}

+ 0 - 11
Unity/Packages/com.et.core/Scripts/Model~/Generate/ClientServer/Message/ClientMessage_C_1000.cs.meta

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

+ 0 - 8
Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Config.meta

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

+ 0 - 72
Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Config/StartMachineConfig.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-using MongoDB.Bson.Serialization.Attributes;
-using MongoDB.Bson.Serialization.Options;
-using System.ComponentModel;
-
-namespace ET
-{
-    [Config]
-    public partial class StartMachineConfigCategory : Singleton<StartMachineConfigCategory>, IMerge
-    {
-        [BsonElement]
-        [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, StartMachineConfig> dict = new();
-		
-        public void Merge(object o)
-        {
-            StartMachineConfigCategory s = o as StartMachineConfigCategory;
-            foreach (var kv in s.dict)
-            {
-                this.dict.Add(kv.Key, kv.Value);
-            }
-        }
-		
-        public StartMachineConfig Get(int id)
-        {
-            this.dict.TryGetValue(id, out StartMachineConfig item);
-
-            if (item == null)
-            {
-                throw new Exception($"配置找不到,配置表名: {nameof (StartMachineConfig)},配置id: {id}");
-            }
-
-            return item;
-        }
-		
-        public bool Contain(int id)
-        {
-            return this.dict.ContainsKey(id);
-        }
-
-        public Dictionary<int, StartMachineConfig> GetAll()
-        {
-            return this.dict;
-        }
-
-        public StartMachineConfig GetOne()
-        {
-            if (this.dict == null || this.dict.Count <= 0)
-            {
-                return null;
-            }
-            
-            var enumerator = this.dict.Values.GetEnumerator();
-            enumerator.MoveNext();
-            return enumerator.Current; 
-        }
-    }
-
-	public partial class StartMachineConfig: ProtoObject, IConfig
-	{
-		/// <summary>Id</summary>
-		public int Id { get; set; }
-		/// <summary>内网地址</summary>
-		public string InnerIP { get; set; }
-		/// <summary>外网地址</summary>
-		public string OuterIP { get; set; }
-		/// <summary>守护进程端口</summary>
-		public string WatcherPort { get; set; }
-
-	}
-}

+ 0 - 11
Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Config/StartMachineConfig.cs.meta

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

+ 0 - 70
Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Config/StartProcessConfig.cs

@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using MongoDB.Bson.Serialization.Attributes;
-using MongoDB.Bson.Serialization.Options;
-using System.ComponentModel;
-
-namespace ET
-{
-    [Config]
-    public partial class StartProcessConfigCategory : Singleton<StartProcessConfigCategory>, IMerge
-    {
-        [BsonElement]
-        [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, StartProcessConfig> dict = new();
-		
-        public void Merge(object o)
-        {
-            StartProcessConfigCategory s = o as StartProcessConfigCategory;
-            foreach (var kv in s.dict)
-            {
-                this.dict.Add(kv.Key, kv.Value);
-            }
-        }
-		
-        public StartProcessConfig Get(int id)
-        {
-            this.dict.TryGetValue(id, out StartProcessConfig item);
-
-            if (item == null)
-            {
-                throw new Exception($"配置找不到,配置表名: {nameof (StartProcessConfig)},配置id: {id}");
-            }
-
-            return item;
-        }
-		
-        public bool Contain(int id)
-        {
-            return this.dict.ContainsKey(id);
-        }
-
-        public Dictionary<int, StartProcessConfig> GetAll()
-        {
-            return this.dict;
-        }
-
-        public StartProcessConfig GetOne()
-        {
-            if (this.dict == null || this.dict.Count <= 0)
-            {
-                return null;
-            }
-            
-            var enumerator = this.dict.Values.GetEnumerator();
-            enumerator.MoveNext();
-            return enumerator.Current; 
-        }
-    }
-
-	public partial class StartProcessConfig: ProtoObject, IConfig
-	{
-		/// <summary>Id</summary>
-		public int Id { get; set; }
-		/// <summary>所属机器</summary>
-		public int MachineId { get; set; }
-		/// <summary>外网端口</summary>
-		public int Port { get; set; }
-
-	}
-}

+ 0 - 11
Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Config/StartProcessConfig.cs.meta

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

+ 0 - 76
Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Config/StartSceneConfig.cs

@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-using MongoDB.Bson.Serialization.Attributes;
-using MongoDB.Bson.Serialization.Options;
-using System.ComponentModel;
-
-namespace ET
-{
-    [Config]
-    public partial class StartSceneConfigCategory : Singleton<StartSceneConfigCategory>, IMerge
-    {
-        [BsonElement]
-        [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, StartSceneConfig> dict = new();
-		
-        public void Merge(object o)
-        {
-            StartSceneConfigCategory s = o as StartSceneConfigCategory;
-            foreach (var kv in s.dict)
-            {
-                this.dict.Add(kv.Key, kv.Value);
-            }
-        }
-		
-        public StartSceneConfig Get(int id)
-        {
-            this.dict.TryGetValue(id, out StartSceneConfig item);
-
-            if (item == null)
-            {
-                throw new Exception($"配置找不到,配置表名: {nameof (StartSceneConfig)},配置id: {id}");
-            }
-
-            return item;
-        }
-		
-        public bool Contain(int id)
-        {
-            return this.dict.ContainsKey(id);
-        }
-
-        public Dictionary<int, StartSceneConfig> GetAll()
-        {
-            return this.dict;
-        }
-
-        public StartSceneConfig GetOne()
-        {
-            if (this.dict == null || this.dict.Count <= 0)
-            {
-                return null;
-            }
-            
-            var enumerator = this.dict.Values.GetEnumerator();
-            enumerator.MoveNext();
-            return enumerator.Current; 
-        }
-    }
-
-	public partial class StartSceneConfig: ProtoObject, IConfig
-	{
-		/// <summary>Id</summary>
-		public int Id { get; set; }
-		/// <summary>所属进程</summary>
-		public int Process { get; set; }
-		/// <summary>所属区</summary>
-		public int Zone { get; set; }
-		/// <summary>类型</summary>
-		public string SceneType { get; set; }
-		/// <summary>名字</summary>
-		public string Name { get; set; }
-		/// <summary>外网端口</summary>
-		public int Port { get; set; }
-
-	}
-}

+ 0 - 11
Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Config/StartSceneConfig.cs.meta

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

+ 0 - 70
Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Config/StartZoneConfig.cs

@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using MongoDB.Bson.Serialization.Attributes;
-using MongoDB.Bson.Serialization.Options;
-using System.ComponentModel;
-
-namespace ET
-{
-    [Config]
-    public partial class StartZoneConfigCategory : Singleton<StartZoneConfigCategory>, IMerge
-    {
-        [BsonElement]
-        [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, StartZoneConfig> dict = new();
-		
-        public void Merge(object o)
-        {
-            StartZoneConfigCategory s = o as StartZoneConfigCategory;
-            foreach (var kv in s.dict)
-            {
-                this.dict.Add(kv.Key, kv.Value);
-            }
-        }
-		
-        public StartZoneConfig Get(int id)
-        {
-            this.dict.TryGetValue(id, out StartZoneConfig item);
-
-            if (item == null)
-            {
-                throw new Exception($"配置找不到,配置表名: {nameof (StartZoneConfig)},配置id: {id}");
-            }
-
-            return item;
-        }
-		
-        public bool Contain(int id)
-        {
-            return this.dict.ContainsKey(id);
-        }
-
-        public Dictionary<int, StartZoneConfig> GetAll()
-        {
-            return this.dict;
-        }
-
-        public StartZoneConfig GetOne()
-        {
-            if (this.dict == null || this.dict.Count <= 0)
-            {
-                return null;
-            }
-            
-            var enumerator = this.dict.Values.GetEnumerator();
-            enumerator.MoveNext();
-            return enumerator.Current; 
-        }
-    }
-
-	public partial class StartZoneConfig: ProtoObject, IConfig
-	{
-		/// <summary>Id</summary>
-		public int Id { get; set; }
-		/// <summary>数据库地址</summary>
-		public string DBConnection { get; set; }
-		/// <summary>数据库名</summary>
-		public string DBName { get; set; }
-
-	}
-}

+ 0 - 11
Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Config/StartZoneConfig.cs.meta

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

+ 0 - 8
Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/ConfigPartial.meta

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

+ 0 - 33
Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/ConfigPartial/StartProcessConfig.cs

@@ -1,33 +0,0 @@
- using System.Net;
-
-namespace ET
-{
-    public partial class StartProcessConfig
-    {
-        public string InnerIP => this.StartMachineConfig.InnerIP;
-
-        public string OuterIP => this.StartMachineConfig.OuterIP;
-        
-        // 内网地址外网端口,通过防火墙映射端口过来
-        private IPEndPoint ipEndPoint;
-
-        public IPEndPoint IPEndPoint
-        {
-            get
-            {
-                if (ipEndPoint == null)
-                {
-                    this.ipEndPoint = NetworkHelper.ToIPEndPoint(this.InnerIP, this.Port);
-                }
-
-                return this.ipEndPoint;
-            }
-        }
-
-        public StartMachineConfig StartMachineConfig => StartMachineConfigCategory.Instance.Get(this.MachineId);
-
-        public override void EndInit()
-        {
-        }
-    }
-}

+ 0 - 11
Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/ConfigPartial/StartProcessConfig.cs.meta

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

+ 0 - 16
Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Ignore.asmdef

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

+ 0 - 7
Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Ignore.asmdef.meta

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

+ 0 - 8
Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Message.meta

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

+ 0 - 92
Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Message/ClientMessage_C_1000.cs

@@ -1,92 +0,0 @@
-using MemoryPack;
-using System.Collections.Generic;
-
-namespace ET
-{
-    [MemoryPackable]
-    [Message(ClientMessage.Main2NetClient_Login)]
-    [ResponseType(nameof(NetClient2Main_Login))]
-    public partial class Main2NetClient_Login : MessageObject, IRequest
-    {
-        public static Main2NetClient_Login Create(bool isFromPool = false)
-        {
-            return ObjectPool.Fetch<Main2NetClient_Login>(isFromPool);
-        }
-
-        [MemoryPackOrder(0)]
-        public int RpcId { get; set; }
-
-        [MemoryPackOrder(1)]
-        public int OwnerFiberId { get; set; }
-
-        /// <summary>
-        /// 账号
-        /// </summary>
-        [MemoryPackOrder(2)]
-        public string Account { get; set; }
-
-        /// <summary>
-        /// 密码
-        /// </summary>
-        [MemoryPackOrder(3)]
-        public string Password { get; set; }
-
-        public override void Dispose()
-        {
-            if (!this.IsFromPool)
-            {
-                return;
-            }
-
-            this.RpcId = default;
-            this.OwnerFiberId = default;
-            this.Account = default;
-            this.Password = default;
-
-            ObjectPool.Recycle(this);
-        }
-    }
-
-    [MemoryPackable]
-    [Message(ClientMessage.NetClient2Main_Login)]
-    public partial class NetClient2Main_Login : MessageObject, IResponse
-    {
-        public static NetClient2Main_Login Create(bool isFromPool = false)
-        {
-            return ObjectPool.Fetch<NetClient2Main_Login>(isFromPool);
-        }
-
-        [MemoryPackOrder(0)]
-        public int RpcId { get; set; }
-
-        [MemoryPackOrder(1)]
-        public int Error { get; set; }
-
-        [MemoryPackOrder(2)]
-        public string Message { get; set; }
-
-        [MemoryPackOrder(3)]
-        public long PlayerId { get; set; }
-
-        public override void Dispose()
-        {
-            if (!this.IsFromPool)
-            {
-                return;
-            }
-
-            this.RpcId = default;
-            this.Error = default;
-            this.Message = default;
-            this.PlayerId = default;
-
-            ObjectPool.Recycle(this);
-        }
-    }
-
-    public static class ClientMessage
-    {
-        public const ushort Main2NetClient_Login = 1001;
-        public const ushort NetClient2Main_Login = 1002;
-    }
-}

+ 0 - 11
Unity/Packages/com.et.core/Scripts/Model~/Generate/Server/Message/ClientMessage_C_1000.cs.meta

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

+ 0 - 57
Unity/Packages/com.et.core/Scripts/Model~/Share/Entry.cs

@@ -1,57 +0,0 @@
-using System;
-
-namespace ET
-{
-    public struct EntryEvent1
-    {
-    }   
-    
-    public struct EntryEvent2
-    {
-    } 
-    
-    public struct EntryEvent3
-    {
-    }
-    
-    public static class Entry
-    {
-        public static void Init()
-        {
-            
-        }
-        
-        public static void Start()
-        {
-            StartAsync().Coroutine();
-        }
-        
-        private static async ETTask StartAsync()
-        {
-            WinPeriod.Init();
-
-            // 注册Mongo type
-            MongoRegister.Init();
-            
-            MemoryPackRegister.Init();
-            
-            // 注册Entity序列化器
-            EntitySerializeRegister.Init();
-
-            World.Instance.AddSingleton<SceneTypeSingleton, Type>(typeof(SceneType));
-            World.Instance.AddSingleton<ObjectPool>();
-            World.Instance.AddSingleton<IdGenerater>();
-            World.Instance.AddSingleton<OpcodeType>();
-            World.Instance.AddSingleton<MessageQueue>();
-            World.Instance.AddSingleton<NetServices>();
-            World.Instance.AddSingleton<LogMsg>();
-            
-            // 创建需要reload的code singleton
-            CodeTypes.Instance.CreateCode();
-            
-            await World.Instance.AddSingleton<ConfigLoader>().LoadAsync();
-
-            await FiberManager.Instance.Create(SchedulerType.Main, SceneType.Main, 0, SceneType.Main, "");
-        }
-    }
-}

+ 0 - 21
Unity/Packages/com.et.core/Scripts/Model~/Unity.Model.asmdef

@@ -1,21 +0,0 @@
-{
-    "name": "Unity.Model",
-    "rootNamespace": "ET",
-    "references": [
-        "Unity.ThirdParty",
-        "Unity.Core",
-        "Unity.Mathematics",
-        "MemoryPack"
-    ],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": true,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [
-        "UNITY_COMPILE || UNITY_EDITOR"
-    ],
-    "versionDefines": [],
-    "noEngineReferences": true
-}

+ 0 - 7
Unity/Packages/com.et.core/Scripts/Model~/Unity.Model.asmdef.meta

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

+ 1 - 36
Unity/Packages/com.et.loader/Scripts/Loader/MonoBehaviour/Init.cs

@@ -7,47 +7,12 @@ namespace ET
 	public class Init: MonoBehaviour
 	{
 		private void Start()
-		{
-			this.StartAsync().Coroutine();
-		}
-		
-		private async ETTask StartAsync()
 		{
 			DontDestroyOnLoad(gameObject);
-			
-			AppDomain.CurrentDomain.UnhandledException += (sender, e) =>
-			{
-				Log.Error(e.ExceptionObject.ToString());
-			};
 
-			// 命令行参数
-			string[] args = "".Split(" ");
-			Parser.Default.ParseArguments<Options>(args)
-				.WithNotParsed(error => throw new Exception($"命令行格式错误! {error}"))
-				.WithParsed((o)=>World.Instance.AddSingleton(o));
-			Options.Instance.StartConfig = $"StartConfig/Localhost";
-			
 			World.Instance.AddSingleton<Logger>().Log = new UnityLogger();
-			ETTask.ExceptionHandler += Log.Error;
 			
-			World.Instance.AddSingleton<TimeInfo>();
-			World.Instance.AddSingleton<FiberManager>();
-            
-			World.Instance.AddSingleton<ObjectPool>();
-			World.Instance.AddSingleton<IdGenerater>();
-			World.Instance.AddSingleton<OpcodeType>();
-			World.Instance.AddSingleton<MessageQueue>();
-			World.Instance.AddSingleton<NetServices>();
-			World.Instance.AddSingleton<LogMsg>();
-
-			await World.Instance.AddSingleton<ResourcesComponent>().CreatePackageAsync("DefaultPackage", true);
-			
-			World.Instance.AddSingleton<CodeLoader>();
-
-			await LoadCodeHelper.LoadDlls();
-
-			// 创建Main Fiber
-			await FiberManager.Instance.Create(SchedulerType.Main, 1, 0, 1, "Main");
+			Entry.Start();
 		}
 
 		private void Update()

+ 3 - 3
Unity/Packages/packages-lock.json

@@ -15,19 +15,19 @@
       "hash": "2554e81f0315ddf835026940ccc4ba8175edfda3"
     },
     "com.et.core": {
-      "version": "file:com.et.core",
+      "version": "file:com.et.Core",
       "depth": 0,
       "source": "embedded",
       "dependencies": {}
     },
     "com.et.loader": {
-      "version": "file:com.et.loader",
+      "version": "file:com.et.Loader",
       "depth": 0,
       "source": "embedded",
       "dependencies": {}
     },
     "com.et.thirdparty": {
-      "version": "file:com.et.thirdparty",
+      "version": "file:com.et.Thirdparty",
       "depth": 0,
       "source": "embedded",
       "dependencies": {}