匹配创建房间流程OK

Config/Excel/cs/StartConfig/LockStep/StartMachineConfigCategory.bytes

@@ -0,0 +1,2 @@
+
+
	127.0.0.1	127.0.0.1"10000

Config/Excel/cs/StartConfig/LockStep/StartProcessConfigCategory.bytes

@@ -0,0 +1,2 @@
+
+

�

Config/Excel/cs/StartConfig/LockStep/StartSceneConfigCategory.bytes

@@ -0,0 +1,16 @@
+
+


"Realm*Realm0²ê

+

"Gate*Gate10³ê

+

"Gate*Gate20´ê

+

"Location*Location
+

"Match*Match
+

"Map*Map1
+

"Map*Map2
+

"Map*Map3
+	

"Map*Map4
+È

"Robot*Robot01
+)¬
"
RouterManager*
RouterManager0Üì

+­
"Router*Router010Ýì

+®
"Router*Router020Þì

+¯
"Router*Router030ßì

+°
"Router*Router040àì

Config/Excel/s/StartConfig/LockStep/StartMachineConfigCategory.bytes

@@ -0,0 +1,2 @@
+
+
	127.0.0.1	127.0.0.1"10000

Config/Excel/s/StartConfig/LockStep/StartProcessConfigCategory.bytes

@@ -0,0 +1,2 @@
+
+

�

Config/Excel/s/StartConfig/LockStep/StartSceneConfigCategory.bytes

@@ -0,0 +1,16 @@
+
+


"Realm*Realm0²ê

+

"Gate*Gate10³ê

+

"Gate*Gate20´ê

+

"Location*Location
+

"Match*Match
+

"Map*Map1
+

"Map*Map2
+

"Map*Map3
+	

"Map*Map4
+È

"Robot*Robot01
+)¬
"
RouterManager*
RouterManager0Üì

+­
"Router*Router010Ýì

+®
"Router*Router020Þì

+¯
"Router*Router030ßì

+°
"Router*Router040àì

Config/Json/cs/StartConfig/LockStep/StartMachineConfig.txt

@@ -0,0 +1,3 @@
+{"list":[
+{"_t":"StartMachineConfig","_id":1,"InnerIP":"127.0.0.1","OuterIP":"127.0.0.1","WatcherPort":"10000"},
+]}

Config/Json/cs/StartConfig/LockStep/StartProcessConfig.txt

@@ -0,0 +1,3 @@
+{"list":[
+{"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101},
+]}

Config/Json/cs/StartConfig/LockStep/StartSceneConfig.txt

@@ -0,0 +1,17 @@
+{"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":"Match","Name":"Match","OuterPort":0},
+{"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","OuterPort":0},
+{"_t":"StartSceneConfig","_id":7,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","OuterPort":0},
+{"_t":"StartSceneConfig","_id":8,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map3","OuterPort":0},
+{"_t":"StartSceneConfig","_id":9,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map4","OuterPort":0},
+{"_t":"StartSceneConfig","_id":200,"Process":1,"Zone":2,"SceneType":"Robot","Name":"Robot01","OuterPort":0},
+{"_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},
+{"_t":"StartSceneConfig","_id":302,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router02","OuterPort":30302},
+{"_t":"StartSceneConfig","_id":303,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router03","OuterPort":30303},
+{"_t":"StartSceneConfig","_id":304,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router04","OuterPort":30304},
+]}

Config/Json/cs/StartConfig/LockStep/StartZoneConfig.txt

@@ -0,0 +1,5 @@
+{"list":[
+{"_t":"StartZoneConfig","_id":1,"DBConnection":"mongodb://127.0.0.1","DBName":"ET1"},
+{"_t":"StartZoneConfig","_id":2,"DBConnection":"","DBName":""},
+{"_t":"StartZoneConfig","_id":3,"DBConnection":"","DBName":""},
+]}

Config/Json/s/StartConfig/LockStep/StartMachineConfig.txt

@@ -0,0 +1,3 @@
+{"list":[
+{"_t":"StartMachineConfig","_id":1,"InnerIP":"127.0.0.1","OuterIP":"127.0.0.1","WatcherPort":"10000"},
+]}

Config/Json/s/StartConfig/LockStep/StartProcessConfig.txt

@@ -0,0 +1,3 @@
+{"list":[
+{"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101},
+]}

Config/Json/s/StartConfig/LockStep/StartSceneConfig.txt

@@ -0,0 +1,17 @@
+{"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":"Match","Name":"Match","OuterPort":0},
+{"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","OuterPort":0},
+{"_t":"StartSceneConfig","_id":7,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","OuterPort":0},
+{"_t":"StartSceneConfig","_id":8,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map3","OuterPort":0},
+{"_t":"StartSceneConfig","_id":9,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map4","OuterPort":0},
+{"_t":"StartSceneConfig","_id":200,"Process":1,"Zone":2,"SceneType":"Robot","Name":"Robot01","OuterPort":0},
+{"_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},
+{"_t":"StartSceneConfig","_id":302,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router02","OuterPort":30302},
+{"_t":"StartSceneConfig","_id":303,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router03","OuterPort":30303},
+{"_t":"StartSceneConfig","_id":304,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router04","OuterPort":30304},
+]}

Config/Json/s/StartConfig/LockStep/StartZoneConfig.txt

@@ -0,0 +1,5 @@
+{"list":[
+{"_t":"StartZoneConfig","_id":1,"DBConnection":"mongodb://127.0.0.1","DBName":"ET1"},
+{"_t":"StartZoneConfig","_id":2,"DBConnection":"","DBName":""},
+{"_t":"StartZoneConfig","_id":3,"DBConnection":"","DBName":""},
+]}

Unity/Assets/Bundles/UI/UILobby.prefab

@@ -29,6 +29,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4771239781044397799}
   m_Father: {fileID: 0}
@@ -121,6 +122,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6091551359588390577}
   m_Father: {fileID: 4771239781044397799}
@@ -241,6 +243,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1109878335635189875}
   m_Father: {fileID: 224438795553994780}
@@ -317,6 +320,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1109878335635189875}
   m_RootOrder: 0
@@ -367,4 +371,4 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Enter
+  m_Text: "\u5339\u914D"

Unity/Assets/Config/Excel/StartConfig/LockStep.meta

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

Unity/Assets/Config/Excel/StartConfig/LockStep/StartMachineConfig@s.xlsx.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 52fbccc1702714111875f35075abd321
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Config/Excel/StartConfig/LockStep/StartProcessConfig@s.xlsx.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8ab846ef3e265443287b3cfff7d60190
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Config/Excel/StartConfig/LockStep/StartSceneConfig@s.xlsx.meta

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

Unity/Assets/Config/Excel/StartConfig/LockStep/StartZoneConfig@s.xlsx.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 89dceea0884f84e6da78685826ca41f8
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Config/Proto/LockStepInner_S_21001.proto

@@ -0,0 +1,44 @@
+syntax = "proto3";
+package ET;
+
+// 请求匹配
+//ResponseType Match2G_Match
+message G2Match_Match // IActorRequest
+{
+	int32 RpcId = 1;
+	
+	int64 Id = 2;
+	
+	int64 InstanceId = 3;
+}
+
+message Match2G_Match // IActorResponse
+{
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
+}
+
+//ResponseType Map2Match_GetRoom
+message Match2Map_GetRoom // IActorRequest
+{
+	int32 RpcId = 1;
+}
+
+message Map2Match_GetRoom // IActorResponse
+{
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
+	
+	// 房间的instanceId
+	int64 InstanceId = 4;
+}
+
+message Match2G_NotifyMatchSuccess // IActorMessage
+{
+	int32 RpcId = 1;
+
+	// 房间的instanceId
+	int64 InstanceId = 2;
+}

Unity/Assets/Config/Proto/LockStepInner_S_21001.proto.meta

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

Unity/Assets/Config/Proto/LockStepOuter_C_11001.proto

@@ -0,0 +1,16 @@
+syntax = "proto3";
+package ET;
+
+//ResponseType G2C_Match
+message C2G_Match // IRequest
+{
+	int32 RpcId = 1;
+}
+
+message G2C_Match // IResponse
+{
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
+}
+

Unity/Assets/Config/Proto/LockStepOuter_C_11001.proto.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 32e6c63b0256f45a19583fba46f5cfab
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Scripts/Codes/Hotfix/Client/Demo/Login/EnterMapHelper.cs

@@ -10,7 +10,6 @@ namespace ET.Client
             try
             {
                 G2C_EnterMap g2CEnterMap = await clientScene.GetComponent<SessionComponent>().Session.Call(new C2G_EnterMap()) as G2C_EnterMap;
-                clientScene.GetComponent<PlayerComponent>().MyId = g2CEnterMap.MyId;
                 
                 // 等待场景切换完成
                 await clientScene.GetComponent<ObjectWait>().Wait<Wait_SceneChangeFinish>();
@@ -22,5 +21,17 @@ namespace ET.Client
                 Log.Error(e);
             }	
         }
+        
+        public static async ETTask Match(Scene clientScene)
+        {
+            try
+            {
+                G2C_Match g2CEnterMap = await clientScene.GetComponent<SessionComponent>().Session.Call(new C2G_Match()) as G2C_Match;
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+            }	
+        }
     }
 }

Unity/Assets/Scripts/Codes/Hotfix/Client/Demo/Login/LoginHelper.cs

@@ -35,6 +35,8 @@ namespace ET.Client
 				
                 G2C_LoginGate g2CLoginGate = (G2C_LoginGate)await gateSession.Call(
                     new C2G_LoginGate() { Key = r2CLogin.Key, GateId = r2CLogin.GateId});
+                
+                clientScene.GetComponent<PlayerComponent>().MyId = g2CLoginGate.PlayerId;
 
                 Log.Debug("登陆gate成功!");
 

Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Helper/SceneFactory.cs

@@ -48,6 +48,11 @@ namespace ET.Server
                 case SceneType.BenchmarkClient:
                     scene.AddComponent<BenchmarkClientComponent>();
                     break;
+                case SceneType.Match:
+                    scene.AddComponent<MatchComponent>();
+                    break;
+                case SceneType.Room:
+                    break;
             }
 
             return scene;

Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Gate/C2G_MatchHandler.cs

@@ -0,0 +1,16 @@
+namespace ET.Server
+{
+	[MessageHandler(SceneType.Gate)]
+	public class C2G_MatchHandler : AMRpcHandler<C2G_Match, G2C_Match>
+	{
+		protected override async ETTask Run(Session session, C2G_Match request, G2C_Match response)
+		{
+			Player player = session.GetComponent<SessionPlayerComponent>().GetMyPlayer();
+
+			StartSceneConfig startSceneConfig = StartSceneConfigCategory.Instance.Match;
+
+			await ActorMessageSenderComponent.Instance.Call(startSceneConfig.InstanceId,
+				new G2Match_Match() { InstanceId = player.InstanceId, Id = player.Id });
+		}
+	}
+}

Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Gate/C2G_MatchHandler.cs.meta

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

Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Gate/Match2G_NotifyMatchSuccessHandler.cs

@@ -0,0 +1,14 @@
+using System;
+
+
+namespace ET.Server
+{
+	[ActorMessageHandler(SceneType.Gate)]
+	public class Match2G_NotifyMatchSuccessHandler : AMActorHandler<Player, Match2G_NotifyMatchSuccess>
+	{
+		protected override async ETTask Run(Player player, Match2G_NotifyMatchSuccess message)
+		{
+			await ETTask.CompletedTask;
+		}
+	}
+}

Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Gate/Match2G_NotifyMatchSuccessHandler.cs.meta

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

Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Map/Room.meta

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

Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Map/Room/Match2Map_GetRoomHandler.cs

@@ -0,0 +1,17 @@
+using System;
+
+
+namespace ET.Server
+{
+	[ActorMessageHandler(SceneType.Map)]
+	public class Match2Map_GetRoomHandler : AMActorRpcHandler<Scene, Match2Map_GetRoom, Map2Match_GetRoom>
+	{
+		protected override async ETTask Run(Scene scene, Match2Map_GetRoom request, Map2Match_GetRoom response)
+		{
+			RoomManagerComponent roomManagerComponent = scene.GetComponent<RoomManagerComponent>();
+			Scene room = await roomManagerComponent.CreateRoom();
+			response.InstanceId = room.InstanceId;
+			await ETTask.CompletedTask;
+		}
+	}
+}

Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Map/Room/Match2Map_GetRoomHandler.cs.meta

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

Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Map/Room/RoomManagerComponentSystem.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace ET.Server
+{
+
+    public static class RoomManagerComponentSystem
+    {
+        public static async ETTask<Scene> CreateRoom(this RoomManagerComponent self)
+        {
+            long instanceId = IdGenerater.Instance.GenerateInstanceId();
+            Scene room = await SceneFactory.CreateServerScene(
+                self, instanceId, instanceId, 
+                self.DomainZone(), "Room", SceneType.Room);
+            return room;
+        }
+    }
+}

Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Map/Room/RoomManagerComponentSystem.cs.meta

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

Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Match.meta

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

Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Match/G2Match_MatchHandler.cs

@@ -0,0 +1,16 @@
+using System;
+
+
+namespace ET.Server
+{
+	[ActorMessageHandler(SceneType.Match)]
+	public class G2Match_MatchHandler : AMActorRpcHandler<Scene, G2Match_Match, Match2G_Match>
+	{
+		protected override async ETTask Run(Scene scene, G2Match_Match request, Match2G_Match response)
+		{
+			MatchComponent matchComponent = scene.GetComponent<MatchComponent>();
+			matchComponent.Match((request.Id, request.InstanceId)).Coroutine();
+			await ETTask.CompletedTask;
+		}
+	}
+}

Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Match/G2Match_MatchHandler.cs.meta

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

Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Match/MatchComponentSystem.cs

@@ -0,0 +1,48 @@
+using System;
+
+namespace ET.Server
+{
+
+    [FriendOf(typeof(MatchComponent))]
+    public static class MatchComponentSystem
+    {
+        [ObjectSystem]
+        public class AwakeSystem: AwakeSystem<MatchComponent>
+        {
+            protected override void Awake(MatchComponent self)
+            {
+                
+            }
+        }
+
+        private const int MatchCount = 1;
+
+        public static async ETTask Match(this MatchComponent self, (long, long) playerInfo)
+        {
+            if (self.waitMatchPlayers.Contains(playerInfo))
+            {
+                return;
+            }
+            
+            self.waitMatchPlayers.Add(playerInfo);
+
+            if (self.waitMatchPlayers.Count < MatchCount)
+            {
+                return;
+            }
+            
+            // 申请一个房间
+            StartSceneConfig startSceneConfig = RandomGenerator.RandomArray(StartSceneConfigCategory.Instance.Robots);
+            Map2Match_GetRoom map2MatchGetRoom = await ActorMessageSenderComponent.Instance.Call(
+                startSceneConfig.InstanceId, new Match2Map_GetRoom()) as Map2Match_GetRoom;
+
+            for (int i = 0; i < MatchCount; ++i)
+            {
+                ActorMessageSenderComponent.Instance.Send(
+                    startSceneConfig.InstanceId, new Match2G_NotifyMatchSuccess() {InstanceId = map2MatchGetRoom.InstanceId});
+                // 等待进入房间的确认消息，如果超时要通知所有玩家退出房间，重新匹配
+            }
+        }
+    }
+
+}

Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Match/MatchComponentSystem.cs.meta

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

Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILobby/UILobbyComponentSystem.cs

@@ -20,8 +20,8 @@ namespace ET.Client
         
         public static async ETTask EnterMap(this UILobbyComponent self)
         {
-            await EnterMapHelper.EnterMapAsync(self.ClientScene());
-            await UIHelper.Remove(self.ClientScene(), UIType.UILobby);
+            await EnterMapHelper.Match(self.ClientScene());
+            //await UIHelper.Remove(self.ClientScene(), UIType.UILobby);
         }
     }
 }

Unity/Assets/Scripts/Codes/Model/Generate/Client/Message/LockStepOuter_C_11001.cs

@@ -0,0 +1,36 @@
+using ET;
+using ProtoBuf;
+using System.Collections.Generic;
+namespace ET
+{
+	[ResponseType(nameof(G2C_Match))]
+	[Message(LockStepOuter.C2G_Match)]
+	[ProtoContract]
+	public partial class C2G_Match: ProtoObject, IRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+	}
+
+	[Message(LockStepOuter.G2C_Match)]
+	[ProtoContract]
+	public partial class G2C_Match: ProtoObject, IResponse
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+	}
+
+	public static class LockStepOuter
+	{
+		 public const ushort C2G_Match = 11002;
+		 public const ushort G2C_Match = 11003;
+	}
+}

Unity/Assets/Scripts/Codes/Model/Generate/Client/Message/LockStepOuter_C_11001.cs.meta

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

Unity/Assets/Scripts/Codes/Model/Generate/ClientServer/ConfigPartial/StartSceneConfig.cs

@@ -19,6 +19,10 @@ namespace ET
         public List<StartSceneConfig> Routers = new List<StartSceneConfig>();
         
         public List<StartSceneConfig> Robots = new List<StartSceneConfig>();
+        
+        public List<StartSceneConfig> Maps = new List<StartSceneConfig>();
+        
+        public StartSceneConfig Match;
 
         public StartSceneConfig BenchmarkServer;
         
@@ -64,6 +68,12 @@ namespace ET
                     case SceneType.BenchmarkServer:
                         this.BenchmarkServer = startSceneConfig;
                         break;
+                    case SceneType.Map:
+                        this.Maps.Add(startSceneConfig);
+                        break;
+                    case SceneType.Match:
+                        this.Match = startSceneConfig;
+                        break;
                 }
             }
         }

Unity/Assets/Scripts/Codes/Model/Generate/ClientServer/Message/LockStepInner_S_21001.cs

@@ -0,0 +1,88 @@
+using ET;
+using ProtoBuf;
+using System.Collections.Generic;
+namespace ET
+{
+// 请求匹配
+	[ResponseType(nameof(Match2G_Match))]
+	[Message(LockStepInner.G2Match_Match)]
+	[ProtoContract]
+	public partial class G2Match_Match: ProtoObject, IActorRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public long Id { get; set; }
+
+		[ProtoMember(3)]
+		public long InstanceId { get; set; }
+
+	}
+
+	[Message(LockStepInner.Match2G_Match)]
+	[ProtoContract]
+	public partial class Match2G_Match: ProtoObject, IActorResponse
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+	}
+
+	[ResponseType(nameof(Map2Match_GetRoom))]
+	[Message(LockStepInner.Match2Map_GetRoom)]
+	[ProtoContract]
+	public partial class Match2Map_GetRoom: ProtoObject, IActorRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+	}
+
+	[Message(LockStepInner.Map2Match_GetRoom)]
+	[ProtoContract]
+	public partial class Map2Match_GetRoom: ProtoObject, IActorResponse
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+// 房间的instanceId
+		[ProtoMember(4)]
+		public long InstanceId { get; set; }
+
+	}
+
+	[Message(LockStepInner.Match2G_NotifyMatchSuccess)]
+	[ProtoContract]
+	public partial class Match2G_NotifyMatchSuccess: ProtoObject, IActorMessage
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+// 房间的instanceId
+		[ProtoMember(2)]
+		public long InstanceId { get; set; }
+
+	}
+
+	public static class LockStepInner
+	{
+		 public const ushort G2Match_Match = 21002;
+		 public const ushort Match2G_Match = 21003;
+		 public const ushort Match2Map_GetRoom = 21004;
+		 public const ushort Map2Match_GetRoom = 21005;
+		 public const ushort Match2G_NotifyMatchSuccess = 21006;
+	}
+}

Unity/Assets/Scripts/Codes/Model/Generate/ClientServer/Message/LockStepInner_S_21001.cs.meta

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

Unity/Assets/Scripts/Codes/Model/Generate/ClientServer/Message/LockStepOuter_C_11001.cs

@@ -0,0 +1,36 @@
+using ET;
+using ProtoBuf;
+using System.Collections.Generic;
+namespace ET
+{
+	[ResponseType(nameof(G2C_Match))]
+	[Message(LockStepOuter.C2G_Match)]
+	[ProtoContract]
+	public partial class C2G_Match: ProtoObject, IRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+	}
+
+	[Message(LockStepOuter.G2C_Match)]
+	[ProtoContract]
+	public partial class G2C_Match: ProtoObject, IResponse
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+	}
+
+	public static class LockStepOuter
+	{
+		 public const ushort C2G_Match = 11002;
+		 public const ushort G2C_Match = 11003;
+	}
+}

Unity/Assets/Scripts/Codes/Model/Generate/ClientServer/Message/LockStepOuter_C_11001.cs.meta

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

Unity/Assets/Scripts/Codes/Model/Generate/Server/ConfigPartial/StartSceneConfig.cs

@@ -19,8 +19,12 @@ namespace ET
         public List<StartSceneConfig> Routers = new List<StartSceneConfig>();
         
         public List<StartSceneConfig> Robots = new List<StartSceneConfig>();
+        
+        public List<StartSceneConfig> Maps = new List<StartSceneConfig>();
 
         public StartSceneConfig BenchmarkServer;
+
+        public StartSceneConfig Match;
         
         public List<StartSceneConfig> GetByProcess(int process)
         {
@@ -64,6 +68,12 @@ namespace ET
                     case SceneType.BenchmarkServer:
                         this.BenchmarkServer = startSceneConfig;
                         break;
+                    case SceneType.Map:
+                        this.Maps.Add(startSceneConfig);
+                        break;
+                    case SceneType.Match:
+                        this.Match = startSceneConfig;
+                        break;
                 }
             }
         }

Unity/Assets/Scripts/Codes/Model/Generate/Server/Message/LockStepInner_S_21001.cs

@@ -0,0 +1,88 @@
+using ET;
+using ProtoBuf;
+using System.Collections.Generic;
+namespace ET
+{
+// 请求匹配
+	[ResponseType(nameof(Match2G_Match))]
+	[Message(LockStepInner.G2Match_Match)]
+	[ProtoContract]
+	public partial class G2Match_Match: ProtoObject, IActorRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public long Id { get; set; }
+
+		[ProtoMember(3)]
+		public long InstanceId { get; set; }
+
+	}
+
+	[Message(LockStepInner.Match2G_Match)]
+	[ProtoContract]
+	public partial class Match2G_Match: ProtoObject, IActorResponse
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+	}
+
+	[ResponseType(nameof(Map2Match_GetRoom))]
+	[Message(LockStepInner.Match2Map_GetRoom)]
+	[ProtoContract]
+	public partial class Match2Map_GetRoom: ProtoObject, IActorRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+	}
+
+	[Message(LockStepInner.Map2Match_GetRoom)]
+	[ProtoContract]
+	public partial class Map2Match_GetRoom: ProtoObject, IActorResponse
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+// 房间的instanceId
+		[ProtoMember(4)]
+		public long InstanceId { get; set; }
+
+	}
+
+	[Message(LockStepInner.Match2G_NotifyMatchSuccess)]
+	[ProtoContract]
+	public partial class Match2G_NotifyMatchSuccess: ProtoObject, IActorMessage
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+// 房间的instanceId
+		[ProtoMember(2)]
+		public long InstanceId { get; set; }
+
+	}
+
+	public static class LockStepInner
+	{
+		 public const ushort G2Match_Match = 21002;
+		 public const ushort Match2G_Match = 21003;
+		 public const ushort Match2Map_GetRoom = 21004;
+		 public const ushort Map2Match_GetRoom = 21005;
+		 public const ushort Match2G_NotifyMatchSuccess = 21006;
+	}
+}

Unity/Assets/Scripts/Codes/Model/Generate/Server/Message/LockStepInner_S_21001.cs.meta

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

Unity/Assets/Scripts/Codes/Model/Generate/Server/Message/LockStepOuter_C_11001.cs

@@ -0,0 +1,36 @@
+using ET;
+using ProtoBuf;
+using System.Collections.Generic;
+namespace ET
+{
+	[ResponseType(nameof(G2C_Match))]
+	[Message(LockStepOuter.C2G_Match)]
+	[ProtoContract]
+	public partial class C2G_Match: ProtoObject, IRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+	}
+
+	[Message(LockStepOuter.G2C_Match)]
+	[ProtoContract]
+	public partial class G2C_Match: ProtoObject, IResponse
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+	}
+
+	public static class LockStepOuter
+	{
+		 public const ushort C2G_Match = 11002;
+		 public const ushort G2C_Match = 11003;
+	}
+}

Unity/Assets/Scripts/Codes/Model/Generate/Server/Message/LockStepOuter_C_11001.cs.meta

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

Unity/Assets/Scripts/Codes/Model/Server/Demo/Map/Room.meta

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

Unity/Assets/Scripts/Codes/Model/Server/Demo/Map/Room/RoomManagerComponent.cs

@@ -0,0 +1,8 @@
+namespace ET.Server
+{
+    [ComponentOf(typeof(Scene))]
+    public class RoomManagerComponent: Entity
+    {
+
+    }
+}

Unity/Assets/Scripts/Codes/Model/Server/Demo/Map/Room/RoomManagerComponent.cs.meta

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

Unity/Assets/Scripts/Codes/Model/Server/Demo/Match.meta

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

Unity/Assets/Scripts/Codes/Model/Server/Demo/Match/MatchComponent.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace ET.Server
+{
+    [ComponentOf(typeof(Scene))]
+    public class MatchComponent: Entity, IAwake
+    {
+        public List<(long, long)> waitMatchPlayers = new List<(long, long)>();
+    }
+
+}

Unity/Assets/Scripts/Codes/Model/Server/Demo/Match/MatchComponent.cs.meta

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

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

@@ -19,10 +19,14 @@ namespace ET
 		BenchmarkClient = 1 << 11,
 		BenchmarkServer = 1 << 12,
 		Benchmark = 1 << 13,
+		Match = 1 << 14,
+		Room = 1 << 15,
 
 		// 客户端Model层
 		Client = 1 << 30,
 		Current = 1ul << 31,
+		
+		
 		All = ulong.MaxValue,
 	}
 }

Unity/Assets/Scripts/Loader/MonoBehaviour/Init.cs

@@ -23,6 +23,7 @@ namespace ET
 			Parser.Default.ParseArguments<Options>(args)
 				.WithNotParsed(error => throw new Exception($"命令行格式错误! {error}"))
 				.WithParsed(Game.AddSingleton);
+			Options.Instance.StartConfig = "StartConfig/LockStep";
 			
 			Game.AddSingleton<TimeInfo>();
 			Game.AddSingleton<Logger>().ILog = new UnityLogger();