Procházet zdrojové kódy

机器人也是server的一部分

tanghai před 3 roky
rodič
revize
59ecbd3f44

+ 1 - 1
Apps/Hotfix/Robot/Case/RobotCase_FirstCase.cs → Apps/Hotfix/Server/Robot/Case/RobotCase_FirstCase.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ET
+namespace ET.Server
 {
     [RobotCase(RobotCaseType.FirstCase)]
     public class RobotCase_FirstCase: IRobotCase

+ 1 - 1
Apps/Hotfix/Robot/Console/CreateRobotConsoleHandler.cs → Apps/Hotfix/Server/Robot/Console/CreateRobotConsoleHandler.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using CommandLine;
 using NLog;
 
-namespace ET
+namespace ET.Server
 {
     [ConsoleHandler(ConsoleMode.CreateRobot)]
     public class CreateRobotConsoleHandler: IConsoleHandler

+ 1 - 1
Apps/Hotfix/Robot/RobotCaseSystem.cs → Apps/Hotfix/Server/Robot/RobotCaseSystem.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ET
+namespace ET.Server
 {
     public static class RobotCaseSystem
     {

+ 1 - 1
Apps/Hotfix/Robot/RobotConsoleHandler.cs → Apps/Hotfix/Server/Robot/RobotConsoleHandler.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Reflection;
 
-namespace ET
+namespace ET.Server
 {
     [ConsoleHandler(ConsoleMode.Robot)]
     public class RobotConsoleHandler: IConsoleHandler

+ 1 - 1
Apps/Hotfix/Robot/RobotManagerComponentSystem.cs → Apps/Hotfix/Server/Robot/RobotManagerComponentSystem.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 
-namespace ET
+namespace ET.Server
 {
     public static class RobotManagerComponentSystem
     {

+ 1 - 1
Apps/Hotfix/Robot/Scene/RobotSceneFactory.cs → Apps/Hotfix/Server/Robot/Scene/RobotSceneFactory.cs

@@ -1,4 +1,4 @@
-namespace ET
+namespace ET.Server
 {
     public static class RobotSceneFactory
     {

+ 1 - 1
Apps/Model/Robot/Console/CreateRobotArgs.cs → Apps/Model/Server/Robot/Console/CreateRobotArgs.cs

@@ -1,6 +1,6 @@
 using CommandLine;
 
-namespace ET
+namespace ET.Server
 {
     public class CreateRobotArgs
     {

+ 1 - 1
Apps/Model/Robot/RobotCaseType.cs → Apps/Model/Server/Robot/RobotCaseType.cs

@@ -1,4 +1,4 @@
-namespace ET
+namespace ET.Server
 {
     public static class RobotCaseType
     {

+ 1 - 1
Apps/Model/Robot/RobotManagerComponent.cs → Apps/Model/Server/Robot/RobotManagerComponent.cs

@@ -1,4 +1,4 @@
-namespace ET
+namespace ET.Server
 {
     public class RobotManagerComponent: Entity, IAwake
     {

+ 1 - 1
Unity/Codes/Hotfix/Client/Scene/SceneFactory.cs

@@ -4,7 +4,7 @@ namespace ET.Client
     {
         public static Scene CreateZoneScene(int zone, string name, Entity parent)
         {
-            Scene zoneScene = EntitySceneFactory.CreateScene(Game.IdGenerater.GenerateInstanceId(), zone, SceneType.Zone, name, parent);
+            Scene zoneScene = EntitySceneFactory.CreateScene(zone, SceneType.Zone, name, parent);
             zoneScene.AddComponent<ZoneSceneFlagComponent>();
             zoneScene.AddComponent<NetKcpComponent, int>(SessionStreamDispatcherType.SessionStreamDispatcherClientOuter);
 			zoneScene.AddComponent<CurrentScenesComponent>();

+ 0 - 6
Unity/Codes/Model/Core/Entity/EntitySceneFactory.cs

@@ -9,12 +9,6 @@
             return scene;
         }
 
-        public static Scene CreateScene(long instanceId, int zone, SceneType sceneType, string name, Entity parent = null)
-        {
-            Scene scene = new Scene(instanceId, zone, sceneType, name, parent);
-            return scene;
-        }
-
         public static Scene CreateScene(int zone, SceneType sceneType, string name, Entity parent = null)
         {
             long instanceId = IdGenerater.Instance.GenerateInstanceId();

+ 1 - 1
Unity/Codes/Model/Core/Entity/Game.cs

@@ -20,7 +20,7 @@ namespace ET
                 {
                     return scene;
                 }
-                scene = EntitySceneFactory.CreateScene(IdGenerater.Instance.GenerateInstanceId(), 0, SceneType.Process, "Process");
+                scene = EntitySceneFactory.CreateScene(0, SceneType.Process, "Process");
                 return scene;
             }
         }