调整Gate服为Game服

Config/GenFromExcel/cs/StartConfig/Localhost/StartSceneConfigCategory.bytes

@@ -1,9 +1,5 @@
 
 


"Realm*Realm0²ê

-

"Gate*Gate10³ê

-

"Gate*Gate20´ê

-

"Location*Location
-

"Map*Map1
-

"Map*Map2
+‘N

"Game*Game10³ê

 )¬
"
RouterManager*
RouterManager0Üì

 ­
"Router*Router010Ýì

Config/GenFromExcel/s/StartConfig/Localhost/StartSceneConfigCategory.bytes

@@ -1,9 +1,5 @@
 
 


"Realm*Realm0²ê

-

"Gate*Gate10³ê

-

"Gate*Gate20´ê

-

"Location*Location
-

"Map*Map1
-

"Map*Map2
+‘N

"Game*Game10³ê

 )¬
"
RouterManager*
RouterManager0Üì

 ­
"Router*Router010Ýì

Config/GenJson/cs/StartConfig/Localhost/StartSceneConfig.txt

@@ -1,10 +1,6 @@
 {"list":[
 {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30002},
-{"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":30003},
-{"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":30004},
-{"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","OuterPort":0},
-{"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","OuterPort":0},
-{"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","OuterPort":0},
+{"_t":"StartSceneConfig","_id":10001,"Process":1,"Zone":1,"SceneType":"Game","Name":"Game1","OuterPort":30003},
 {"_t":"StartSceneConfig","_id":300,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":30300},
 {"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":30301},
 ]}

Config/GenJson/s/StartConfig/Localhost/StartSceneConfig.txt

@@ -1,10 +1,6 @@
 {"list":[
 {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30002},
-{"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":30003},
-{"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":30004},
-{"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","OuterPort":0},
-{"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","OuterPort":0},
-{"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","OuterPort":0},
+{"_t":"StartSceneConfig","_id":10001,"Process":1,"Zone":1,"SceneType":"Game","Name":"Game1","OuterPort":30003},
 {"_t":"StartSceneConfig","_id":300,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":30300},
 {"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":30301},
 ]}

DotNet/Hotfix/Helper/SceneFactory.cs

@@ -24,15 +24,15 @@ namespace ET.Server
                     break;
                 case SceneType.RouterManager: // 正式发布请用CDN代替RouterManager
                     // 云服务器在防火墙那里做端口映射
-                    scene.AddComponent<HttpComponent, string>($"http://*:{startSceneConfig.OuterPort}/");
+                    scene.AddComponent<HttpComponent, string>($"http://+:{startSceneConfig.OuterPort}/");
                     break;
                 case SceneType.Realm:
                     scene.AddComponent<NetServerComponent, IPEndPoint>(startSceneConfig.InnerIPOutPort);
                     break;
-                case SceneType.Gate:
+                case SceneType.Game:
                     scene.AddComponent<NetServerComponent, IPEndPoint>(startSceneConfig.InnerIPOutPort);
                     scene.AddComponent<PlayerComponent>();
-                    scene.AddComponent<GateSessionKeyComponent>();
+                    scene.AddComponent<GameSessionKeyComponent>();
                     break;
                 case SceneType.Map:
                     scene.AddComponent<UnitComponent>();

DotNet/Hotfix/Scenes/EntryEvent2_InitServer.cs

@@ -33,7 +33,6 @@ namespace ET.Server
                         await SceneFactory.CreateServerScene(ServerSceneManagerComponent.Instance, startConfig.Id, startConfig.InstanceId, startConfig.Zone, startConfig.Name,
                             startConfig.Type, startConfig);
                     }
-
                     break;
                 }
                 case AppType.Watcher:

DotNet/Hotfix/Scenes/Gate/GateSessionKeyComponentSystem.cs → DotNet/Hotfix/Scenes/Game/GameSessionKeyComponentSystem.cs

@@ -1,27 +1,27 @@
 namespace ET.Server
 {
-    [FriendOf(typeof(GateSessionKeyComponent))]
-    public static class GateSessionKeyComponentSystem
+    [FriendOf(typeof(GameSessionKeyComponent))]
+    public static class GameSessionKeyComponentSystem
     {
-        public static void Add(this GateSessionKeyComponent self, long key, string account)
+        public static void Add(this GameSessionKeyComponent self, long key, string account)
         {
             self.sessionKey.Add(key, account);
             self.TimeoutRemoveKey(key).Coroutine();
         }
 
-        public static string Get(this GateSessionKeyComponent self, long key)
+        public static string Get(this GameSessionKeyComponent self, long key)
         {
             string account = null;
             self.sessionKey.TryGetValue(key, out account);
             return account;
         }
 
-        public static void Remove(this GateSessionKeyComponent self, long key)
+        public static void Remove(this GameSessionKeyComponent self, long key)
         {
             self.sessionKey.Remove(key);
         }
 
-        private static async ETTask TimeoutRemoveKey(this GateSessionKeyComponent self, long key)
+        private static async ETTask TimeoutRemoveKey(this GameSessionKeyComponent self, long key)
         {
             await TimerComponent.Instance.WaitAsync(20000);
             self.sessionKey.Remove(key);

DotNet/Hotfix/Scenes/Gate/C2G_EnterMapHandler.cs → DotNet/Hotfix/Scenes/Game/Handler/C2G_EnterMapHandler.cs

@@ -1,14 +1,14 @@
 namespace ET.Server
 {
-	[MessageHandler(SceneType.Gate)]
+	[MessageHandler(SceneType.Game)]
 	public class C2G_EnterMapHandler : AMRpcHandler<C2G_EnterMap, G2C_EnterMap>
 	{
 		protected override async ETTask Run(Session session, C2G_EnterMap request, G2C_EnterMap response)
 		{
 			Player player = session.GetComponent<SessionPlayerComponent>().GetMyPlayer();
 
-			// 在Gate上动态创建一个Map Scene，把Unit从DB中加载放进来，然后传送到真正的Map中，这样登陆跟传送的逻辑就完全一样了
-			GateMapComponent gateMapComponent = player.AddComponent<GateMapComponent>();
+			// 在Game上动态创建一个Map Scene，把Unit从DB中加载放进来，然后传送到真正的Map中，这样登陆跟传送的逻辑就完全一样了
+			GameMapComponent gateMapComponent = player.AddComponent<GameMapComponent>();
 			gateMapComponent.Scene = await SceneFactory.CreateServerScene(gateMapComponent, player.Id, IdGenerater.Instance.GenerateInstanceId(), gateMapComponent.DomainZone(), "GateMap", SceneType.Map);
 
 			Scene scene = gateMapComponent.Scene;

DotNet/Hotfix/Scenes/Gate/C2G_LoginGateHandler.cs → DotNet/Hotfix/Scenes/Game/Handler/C2G_LoginGameHandler.cs

@@ -1,19 +1,18 @@
 using System;
 
-
 namespace ET.Server
 {
-	[MessageHandler(SceneType.Gate)]
-	public class C2G_LoginGateHandler : AMRpcHandler<C2G_LoginGate, G2C_LoginGate>
+	[MessageHandler(SceneType.Game)]
+	public class C2G_LoginGameHandler : AMRpcHandler<C2G_LoginGate, G2C_LoginGate>
 	{
 		protected override async ETTask Run(Session session, C2G_LoginGate request, G2C_LoginGate response)
 		{
 			Scene scene = session.DomainScene();
-			string account = scene.GetComponent<GateSessionKeyComponent>().Get(request.Key);
+			string account = scene.GetComponent<GameSessionKeyComponent>().Get(request.Key);
 			if (account == null)
 			{
 				response.Error = ErrorCore.ERR_ConnectGateKeyError;
-				response.Message = "Gate key验证失败!";
+				response.Message = "Game key验证失败!";
 				return;
 			}
 			

DotNet/Hotfix/Scenes/Gate/C2G_PingHandler.cs → DotNet/Hotfix/Scenes/Game/Handler/C2G_PingHandler.cs

@@ -5,7 +5,7 @@ namespace ET.Server
 	/// <summary>
 	/// 心跳消息
 	/// </summary>
-	[MessageHandler(SceneType.Gate)]
+	[MessageHandler(SceneType.Game)]
 	public class C2G_PingHandler : AMRpcHandler<C2G_Ping, G2C_Ping>
 	{
 		protected override async ETTask Run(Session session, C2G_Ping request, G2C_Ping response)

DotNet/Hotfix/Scenes/Gate/R2G_GetLoginKeyHandler.cs → DotNet/Hotfix/Scenes/Game/Handler/R2G_GetLoginKeyHandler.cs

@@ -3,13 +3,13 @@
 
 namespace ET.Server
 {
-	[ActorMessageHandler(SceneType.Gate)]
+	[ActorMessageHandler(SceneType.Game)]
 	public class R2G_GetLoginKeyHandler : AMActorRpcHandler<Scene, R2G_GetLoginKey, G2R_GetLoginKey>
 	{
 		protected override async ETTask Run(Scene scene, R2G_GetLoginKey request, G2R_GetLoginKey response)
 		{
 			long key = RandomGenerator.RandInt64();
-			scene.GetComponent<GateSessionKeyComponent>().Add(key, request.Account);
+			scene.GetComponent<GameSessionKeyComponent>().Add(key, request.Account);
 			response.Key = key;
 			response.GateId = scene.Id;
 			await ETTask.CompletedTask;

DotNet/Hotfix/Scenes/Realm/C2R_LoginHandler.cs → DotNet/Hotfix/Scenes/Realm/Handler/C2R_LoginHandler.cs

@@ -9,8 +9,8 @@ namespace ET.Server
 	{
 		protected override async ETTask Run(Session session, C2R_Login request, R2C_Login response)
 		{
-			// 随机分配一个Gate
-			StartSceneConfig config = RealmGateAddressHelper.GetGate(session.DomainZone());
+			// 随机分配一个Game
+			StartSceneConfig config = RealmGameAddressHelper.GetGame(session.DomainZone());
 			Log.Debug($"gate address: {MongoHelper.ToJson(config)}");
 			
 			// 向gate请求一个key,客户端可以拿着这个key连接gate

DotNet/Hotfix/Scenes/Realm/RealmGateAddressHelper.cs → DotNet/Hotfix/Scenes/Realm/RealmGameAddressHelper.cs

@@ -3,11 +3,11 @@
 
 namespace ET.Server
 {
-	public static class RealmGateAddressHelper
+	public static class RealmGameAddressHelper
 	{
-		public static StartSceneConfig GetGate(int zone)
+		public static StartSceneConfig GetGame(int zone)
 		{
-			List<StartSceneConfig> zoneGates = StartSceneConfigCategory.Instance.Gates[zone];
+			List<StartSceneConfig> zoneGates = StartSceneConfigCategory.Instance.Games[zone];
 			
 			int n = RandomGenerator.RandomNumber(0, zoneGates.Count);
 

DotNet/Model/Generate/ConfigPartial/StartSceneConfig.cs

@@ -6,7 +6,7 @@ namespace ET
 {
     public partial class StartSceneConfigCategory
     {
-        public MultiMap<int, StartSceneConfig> Gates = new MultiMap<int, StartSceneConfig>();
+        public MultiMap<int, StartSceneConfig> Games = new MultiMap<int, StartSceneConfig>();
         
         public MultiMap<int, StartSceneConfig> ProcessScenes = new MultiMap<int, StartSceneConfig>();
         
@@ -49,8 +49,8 @@ namespace ET
                     case SceneType.Realm:
                         this.Realms.Add(startSceneConfig);
                         break;
-                    case SceneType.Gate:
-                        this.Gates.Add(startSceneConfig.Zone, startSceneConfig);
+                    case SceneType.Game:
+                        this.Games.Add(startSceneConfig.Zone, startSceneConfig);
                         break;
                     case SceneType.Location:
                         this.LocationConfig = startSceneConfig;

DotNet/Model/Scenes/Gate/GateMapComponent.cs → DotNet/Model/Scenes/Game/GameMapComponent.cs

@@ -1,7 +1,7 @@
 namespace ET.Server
 {
     [ComponentOf(typeof(Player))]
-    public class GateMapComponent: Entity, IAwake
+    public class GameMapComponent: Entity, IAwake
     {
         public Scene Scene { get; set; }
     }

DotNet/Model/Scenes/Gate/GateSessionKeyComponent.cs → DotNet/Model/Scenes/Game/GameSessionKeyComponent.cs

@@ -3,7 +3,7 @@
 namespace ET.Server
 {
     [ComponentOf(typeof(Scene))]
-    public class GateSessionKeyComponent : Entity, IAwake
+    public class GameSessionKeyComponent : Entity, IAwake
     {
         public readonly Dictionary<long, string> sessionKey = new Dictionary<long, string>();
     }

Unity/Assets/Scripts/Core/Module/Entity/SceneType.cs

@@ -6,7 +6,7 @@
 		Process = 0,
 		Manager = 1,
 		Realm = 2,
-		Gate = 3,
+		Game = 3,
 		Http = 4,
 		Location = 5,
 		Map = 6,