Bläddra i källkod

router跟http做成package

tanghai 1 år sedan
förälder
incheckning
51f4da20da
21 ändrade filer med 101 tillägg och 8 borttagningar
  1. 5 0
      DotNet/Model/ET.Model.csproj
  2. 0 0
      Unity/Packages/com.et.http/Runtime~/Hotfix/Server/HttpComponentSystem.cs
  3. 0 0
      Unity/Packages/com.et.http/Runtime~/Model/Server/HttpComponent.cs
  4. 0 0
      Unity/Packages/com.et.http/Runtime~/Model/Server/HttpDispatcher.cs
  5. 0 0
      Unity/Packages/com.et.http/Runtime~/Model/Server/HttpHandlerAttribute.cs
  6. 0 0
      Unity/Packages/com.et.http/Runtime~/Model/Server/IHttpHandler.cs
  7. 18 0
      Unity/Packages/com.et.http/package.json
  8. 7 0
      Unity/Packages/com.et.http/package.json.meta
  9. 0 0
      Unity/Packages/com.et.router/Runtime~/Hotfix/Server/FiberInit_Router.cs
  10. 0 0
      Unity/Packages/com.et.router/Runtime~/Hotfix/Server/FiberInit_RouterManager.cs
  11. 1 1
      Unity/Packages/com.et.router/Runtime~/Hotfix/Server/HttpGetRouterHandler.cs
  12. 0 0
      Unity/Packages/com.et.router/Runtime~/Hotfix/Server/RouterComponentSystem.cs
  13. 0 0
      Unity/Packages/com.et.router/Runtime~/Hotfix/Server/RouterNodeSystem.cs
  14. 0 0
      Unity/Packages/com.et.router/Runtime~/Model/Server/RouterComponent.cs
  15. 26 0
      Unity/Packages/com.et.router/Runtime~/Model/Server/RouterConfigSingleton.cs
  16. 0 0
      Unity/Packages/com.et.router/Runtime~/Model/Server/RouterNode.cs
  17. 19 0
      Unity/Packages/com.et.router/package.json
  18. 7 0
      Unity/Packages/com.et.router/package.json.meta
  19. 0 5
      Unity/Packages/com.et.statesync/Runtime~/CodeMode/ClientServer/StartSceneConfig.cs
  20. 2 1
      Unity/Packages/com.et.statesync/package.json
  21. 16 1
      Unity/Packages/packages-lock.json

+ 5 - 0
DotNet/Model/ET.Model.csproj

@@ -63,4 +63,9 @@
         <ProjectReference Include="..\..\Unity\Packages\com.et.dotrecast\DotNet~\ET.DotRecast.csproj" />
         <ProjectReference Include="..\..\Unity\Packages\com.et.mathematics\Runtime~\ET.Mathematics.csproj" />
     </ItemGroup> 
+    <ItemGroup>
+      <Folder Include="..\..\Unity\Packages\com.et.statesync\Runtime~\Model\Server\Module\Http\">
+        <Link>com.et.statesync\Runtime~\Model\Server\Module\Http</Link>
+      </Folder>
+    </ItemGroup> 
 </Project>

+ 0 - 0
Unity/Packages/com.et.statesync/Runtime~/Hotfix/Server/Module/Http/HttpComponentSystem.cs → Unity/Packages/com.et.http/Runtime~/Hotfix/Server/HttpComponentSystem.cs


+ 0 - 0
Unity/Packages/com.et.statesync/Runtime~/Model/Server/Module/Http/HttpComponent.cs → Unity/Packages/com.et.http/Runtime~/Model/Server/HttpComponent.cs


+ 0 - 0
Unity/Packages/com.et.statesync/Runtime~/Model/Server/Module/Http/HttpDispatcher.cs → Unity/Packages/com.et.http/Runtime~/Model/Server/HttpDispatcher.cs


+ 0 - 0
Unity/Packages/com.et.statesync/Runtime~/Model/Server/Module/Http/HttpHandlerAttribute.cs → Unity/Packages/com.et.http/Runtime~/Model/Server/HttpHandlerAttribute.cs


+ 0 - 0
Unity/Packages/com.et.statesync/Runtime~/Model/Server/Module/Http/IHttpHandler.cs → Unity/Packages/com.et.http/Runtime~/Model/Server/IHttpHandler.cs


+ 18 - 0
Unity/Packages/com.et.http/package.json

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

+ 7 - 0
Unity/Packages/com.et.http/package.json.meta

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

+ 0 - 0
Unity/Packages/com.et.statesync/Runtime~/Hotfix/Server/Module/Router/FiberInit_Router.cs → Unity/Packages/com.et.router/Runtime~/Hotfix/Server/FiberInit_Router.cs


+ 0 - 0
Unity/Packages/com.et.statesync/Runtime~/Hotfix/Server/Module/Router/FiberInit_RouterManager.cs → Unity/Packages/com.et.router/Runtime~/Hotfix/Server/FiberInit_RouterManager.cs


+ 1 - 1
Unity/Packages/com.et.statesync/Runtime~/Hotfix/Server/Module/Router/HttpGetRouterHandler.cs → Unity/Packages/com.et.router/Runtime~/Hotfix/Server/HttpGetRouterHandler.cs

@@ -16,7 +16,7 @@ namespace ET.Server
                 // 这里是要用InnerIP,因为云服务器上realm绑定不了OuterIP的,所以realm的内网外网的socket都是监听内网地址
                 response.Realms.Add(startSceneConfig.InnerIPPort.ToString());
             }
-            foreach (StartSceneConfig startSceneConfig in StartSceneConfigCategory.Instance.Routers)
+            foreach (StartSceneConfig startSceneConfig in RouterConfigSingleton.Instance.GetRouters())
             {
                 response.Routers.Add($"{startSceneConfig.StartProcessConfig.OuterIP}:{startSceneConfig.Port}");
             }

+ 0 - 0
Unity/Packages/com.et.statesync/Runtime~/Hotfix/Server/Module/Router/RouterComponentSystem.cs → Unity/Packages/com.et.router/Runtime~/Hotfix/Server/RouterComponentSystem.cs


+ 0 - 0
Unity/Packages/com.et.statesync/Runtime~/Hotfix/Server/Module/Router/RouterNodeSystem.cs → Unity/Packages/com.et.router/Runtime~/Hotfix/Server/RouterNodeSystem.cs


+ 0 - 0
Unity/Packages/com.et.statesync/Runtime~/Model/Server/Module/Router/RouterComponent.cs → Unity/Packages/com.et.router/Runtime~/Model/Server/RouterComponent.cs


+ 26 - 0
Unity/Packages/com.et.router/Runtime~/Model/Server/RouterConfigSingleton.cs

@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+
+namespace ET.Server
+{
+    [ConfigProcess]
+    public class RouterConfigSingleton: Singleton<RouterConfigSingleton>, ISingletonAwake
+    {
+        private readonly List<StartSceneConfig> routers = new();
+        
+        public void Awake()
+        {
+            foreach (StartSceneConfig startSceneConfig in StartSceneConfigCategory.Instance.GetAll().Values)
+            {
+                if (startSceneConfig.Type == SceneType.Router)
+                {
+                    this.routers.Add(startSceneConfig);
+                }
+            }
+        }
+
+        public List<StartSceneConfig> GetRouters()
+        {
+            return this.routers;
+        }
+    }
+}

+ 0 - 0
Unity/Packages/com.et.statesync/Runtime~/Model/Server/Module/Router/RouterNode.cs → Unity/Packages/com.et.router/Runtime~/Model/Server/RouterNode.cs


+ 19 - 0
Unity/Packages/com.et.router/package.json

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

+ 7 - 0
Unity/Packages/com.et.router/package.json.meta

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

+ 0 - 5
Unity/Packages/com.et.statesync/Runtime~/CodeMode/ClientServer/StartSceneConfig.cs

@@ -14,8 +14,6 @@ namespace ET
 
         public List<StartSceneConfig> Realms = new();
         
-        public List<StartSceneConfig> Routers = new();
-        
         public List<StartSceneConfig> Maps = new();
         
         public List<StartSceneConfig> GetByProcess(int process)
@@ -48,9 +46,6 @@ namespace ET
                     case SceneType.Gate:
                         this.Gates.Add(startSceneConfig.Zone, startSceneConfig);
                         break;
-                    case SceneType.Router:
-                        this.Routers.Add(startSceneConfig);
-                        break;
                     case SceneType.Map:
                         this.Maps.Add(startSceneConfig);
                         break;

+ 2 - 1
Unity/Packages/com.et.statesync/package.json

@@ -19,6 +19,7 @@
     "com.et.loader": "",
     "com.et.demores": "",
     "com.et.dotrecast": "",
-    "com.unity.mathematics": "1.2.6"
+    "com.unity.mathematics": "1.2.6",
+    "com.et.router": ""
   }
 }

+ 16 - 1
Unity/Packages/packages-lock.json

@@ -40,6 +40,12 @@
       "source": "embedded",
       "dependencies": {}
     },
+    "com.et.http": {
+      "version": "file:com.et.http",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {}
+    },
     "com.et.loader": {
       "version": "file:com.et.loader",
       "depth": 0,
@@ -57,6 +63,14 @@
         "com.unity.mathematics": "1.2.6"
       }
     },
+    "com.et.router": {
+      "version": "file:com.et.router",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {
+        "com.et.http": ""
+      }
+    },
     "com.et.statesync": {
       "version": "file:com.et.statesync",
       "depth": 0,
@@ -67,7 +81,8 @@
         "com.et.loader": "",
         "com.et.demores": "",
         "com.et.dotrecast": "",
-        "com.unity.mathematics": "1.2.6"
+        "com.unity.mathematics": "1.2.6",
+        "com.et.router": ""
       }
     },
     "com.et.yooassets": {