调整协议,每个玩法单独一个协议文件

Config/Proto/CommonProto_CS_10001.proto

@@ -45,25 +45,25 @@ message PlayerInfo
 	int64 exp = 4;
 	int32 level = 5;
 	int32 vip = 6;
-	int32 pos = 7;		// 玩家位置(0东 1南 2西 3北)
-	int32 state = 8;	// 玩家状态(0未准备 1已准备 2游戏中 3结束)
-	bool isAuto = 9;	// 是否托管
+	int32 pos = 7;				// 玩家位置(0东 1南 2西 3北)
+	int32 state = 8;			// 玩家状态(0未准备 1已准备 2游戏中 3结束)
+	bool isAuto = 9;			// 是否托管
 	CardInfo cardInfo = 10;	// 玩家牌信息
 }
 
 message RoomInfo
 {
-	int32 RoomId = 1;					// 房间号
-	int32 Type = 2;						// 房间玩法类型 1:黄冈晃晃
-	int64 OwnerId = 3;					// 房主playerId
-	int32 State = 4;					// 房间状态(0等待 1开局 2进行中 3已结束)
-	int32 Time = 5;						// 倒计时
-	int32 Rand1 = 6;					// 骰子1
-	int32 Rand2 = 7;					// 骰子2
-	int32 CardNum = 8;					// 牌库剩余数量
-	int64 OpId = 9;						// 当前操作玩家id
-	int32 OpPos = 10;					// 当前操作玩家位置
-	int32 CurDisCard = 11;				// 当前出牌玩家打出的牌
+	int32 RoomId = 1;						// 房间号
+	int32 Type = 2;							// 房间玩法类型 1:黄冈晃晃
+	int64 OwnerId = 3;						// 房主playerId
+	int32 State = 4;						// 房间状态(0等待 1开局 2进行中 3已结束)
+	int32 Time = 5;							// 倒计时
+	int32 Rand1 = 6;						// 骰子1
+	int32 Rand2 = 7;						// 骰子2
+	int32 CardNum = 8;						// 牌库剩余数量
+	int64 OpId = 9;							// 当前操作玩家id
+	int32 OpPos = 10;						// 当前操作玩家位置
+	int32 CurDisCard = 11;					// 当前出牌玩家打出的牌
 	PlayerInfo MyInfo = 12;				// 自己数据
 	repeated PlayerInfo OtherInfo = 13;	// 其他玩家数据
 }

Config/Proto/HGHHMessage_C_40001.proto

@@ -0,0 +1,104 @@
+syntax = "proto3";
+package ET;
+import 'Common.proto';
+
+// 黄冈晃晃 玩家准备
+//ResponseType G2C_HGHHReady
+message C2G_HGHHReady // IRequest
+{
+	int32 RpcId = 1;
+}
+
+message G2C_HGHHReady // IResponse
+{
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
+	bool IsReady = 4;
+}
+
+message G2C_HGHHReadyPush  // IActorMessage
+{
+	RoomInfo info = 1;	// 房间信息
+}
+
+// 黄冈晃晃 踢出房间
+//ResponseType G2C_HGHHKick
+message C2G_HGHHKick // IRequest
+{
+	int32 RpcId = 1;
+	int32 RoomId = 2;	// 房间号
+	int64 PlayerId = 3;	// 玩家id
+}
+
+message G2C_HGHHKick // IResponse
+{
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
+}
+
+message G2C_HGHHKickPush  // IActorMessage
+{
+	RoomInfo info = 1;	// 房间信息(给其他3个玩家推送信息)
+}
+
+// 黄冈晃晃 准备开始推送
+message G2C_HGHHReadyStartPush // IActorMessage
+{
+	int64 ReadyStartTime = 1;	// x秒倒计时动画
+}
+
+// 黄冈晃晃 牌局开始推送
+message G2C_HGHHStartPush // IActorMessage
+{
+	RoomInfo info = 1;	// 房间信息
+}
+
+// 黄冈晃晃 摸牌推送
+message G2C_HGHHDrawCardPush // IActorMessage
+{
+	RoomInfo info = 1;	// 房间信息
+}
+
+// 黄冈晃晃 玩家出牌
+//ResponseType G2C_HGHHDisCard
+message C2G_HGHHDisCard // IRequest
+{
+	int32 RpcId = 1;
+	int32 Card = 2;		// 出的牌
+}
+
+message G2C_HGHHDisCard // IResponse
+{
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
+}
+
+message G2C_HGHHDisCardPush // IActorMessage
+{
+	RoomInfo info = 1;	// 房间信息(给其他3个玩家推送xx出牌信息)
+}
+
+// 黄冈晃晃 玩家操作吃 碰 杠 胡 过
+//ResponseType G2C_HGHHOperation
+message C2G_HGHHOperation // IRequest
+{
+	int32 RpcId = 1;
+	int32 OpType = 2;	// 1吃 2碰 3杠 4胡 5过
+	int32 Card = 3;    // 杠:想杠的牌 吃:顺子第一张
+}
+
+message G2C_HGHHOperation // IResponse
+{
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
+}
+
+message G2C_HGHHOperationPush // IActorMessage
+{
+	RoomInfo info = 1;	// 房间信息
+	int32 OpType = 2;	// 操作类型 1吃 2碰 3杠 4胡 5过
+}

Config/Proto/OuterMessage_C_30001.proto

@@ -124,8 +124,9 @@ message M2C_Reload // IResponse
 message C2R_Login // IRequest
 {
 	int32 RpcId = 1;
-	string  Account = 2;  // 帐号
-	string  Password = 3;  // 密码
+	string  Account = 2;	// 帐号
+	string  Password = 3;	// 密码
+	int32	Channel = 4;	// 渠道号
 }
 
 message R2C_Login // IResponse
@@ -155,131 +156,53 @@ message G2C_LoginGame // IResponse
 	PlayerInfo Player = 5;
 }
 
-//ResponseType G2C_CreatRoom
-message C2G_CreatRoom // IRequest
-{
-	int32 RpcId = 1;
-}
-
-message G2C_CreatRoom // IResponse
-{
-	int32 RpcId = 1;
-	int32 Error = 2;
-	string Message = 3;
-	RoomInfo Info = 4;	// 房间信息
-}
-
-//ResponseType G2C_JoinRoom
-message C2G_JoinRoom // IRequest
-{
-	int32 RpcId = 1;
-	int32 RoomId = 2;	// 请求进入的房间号
-}
-
-message G2C_JoinRoom // IResponse
+//ResponseType G2C_GetGameplayList
+message C2G_GetGameplayList // IRequest
 {
 	int32 RpcId = 1;
-	int32 Error = 2;
-	string Message = 3;
-}
-
-message G2C_JoinRoomPush  // IActorMessage
-{
-	RoomInfo info = 1;	// 房间信息
 }
 
-//ResponseType G2C_Ready
-message C2G_Ready // IRequest
-{
-	int32 RpcId = 1;
-}
-
-message G2C_Ready // IResponse
+message G2C_GetGameplayList // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
 	string Message = 3;
-	bool IsReady = 4;
 }
 
-message G2C_ReadyPush  // IActorMessage
-{
-	RoomInfo info = 1;	// 房间信息
-}
-
-//ResponseType G2C_Kick
-message C2G_Kick // IRequest
-{
-	int32 RpcId = 1;
-	int32 RoomId = 2;	// 房间号
-	int64 PlayerId = 3;	// 玩家id
-}
-
-message G2C_Kick // IResponse
-{
-	int32 RpcId = 1;
-	int32 Error = 2;
-	string Message = 3;
-}
-
-message G2C_KickPush  // IActorMessage
-{
-	RoomInfo info = 1;	// 房间信息
-}
-
-message G2C_ReadyStartPush // IActorMessage
-{
-	int64 ReadyStartTime = 1;	// x秒倒计时动画
-}
-
-message G2C_StartPush // IActorMessage
-{
-	RoomInfo info = 1;	// 房间信息
-}
-
-message G2C_DrawCardPush // IActorMessage
-{
-	RoomInfo info = 1;	// 房间信息
-}
-
-//ResponseType G2C_DisCard
-message C2G_DisCard // IRequest
+// 创建房间
+//ResponseType G2C_CreatRoom
+message C2G_CreatRoom // IRequest
 {
 	int32 RpcId = 1;
-	int32 Card = 2;		// 出的牌
+	int32 Type = 2;		// 房间玩法类型 1:黄冈晃晃
 }
 
-message G2C_DisCard // IResponse
+message G2C_CreatRoom // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
 	string Message = 3;
+	RoomInfo Info = 4;	// 房间信息
 }
 
-message G2C_DisCardPush // IActorMessage
-{
-	RoomInfo info = 1;	// 房间信息
-}
-
-//ResponseType G2C_Operation
-message C2G_Operation // IRequest
+// 加入房间
+//ResponseType G2C_JoinRoom
+message C2G_JoinRoom // IRequest
 {
 	int32 RpcId = 1;
-	int32 OpType = 2;	// 1吃 2碰 3杠 4胡 5过
-	int32 Card = 3;    // 杠:想杠的牌 吃:顺子第一张
+	int32 RoomId = 2;	// 请求进入的房间号
 }
 
-message G2C_Operation // IResponse
+message G2C_JoinRoom // IResponse
 {
 	int32 RpcId = 1;
 	int32 Error = 2;
 	string Message = 3;
 }
 
-message G2C_OperationPush // IActorMessage
+message G2C_JoinRoomPush  // IActorMessage
 {
 	RoomInfo info = 1;	// 房间信息
-	int32 OpType = 2;	// 操作类型 1吃 2碰 3杠 4胡 5过
 }
 
 message G2C_TestHotfixMessage // IMessage

DotNet/Hotfix/Scenes/Game/Handler/C2G_DisCardHandler.cs → DotNet/Hotfix/Scenes/Game/Handler/HGHH/C2G_HGHHDisCardHandler.cs

@@ -5,12 +5,12 @@ using System.Linq;
 namespace ET.Server
 {
     /// <summary>
-    /// 出牌
+    /// 黄冈晃晃 出牌
     /// </summary>
     [MessageHandler(SceneType.Game)]
-    public class C2G_DisCardHandler : AMRpcHandler<C2G_DisCard, G2C_DisCard>
+    public class C2G_HGHHDisCardHandler : AMRpcHandler<C2G_HGHHDisCard, G2C_HGHHDisCard>
     {
-        protected override async ETTask Run(Session session, C2G_DisCard request, G2C_DisCard response, Action reply)
+        protected override async ETTask Run(Session session, C2G_HGHHDisCard request, G2C_HGHHDisCard response, Action reply)
         {
             Player player = session.GetComponent<SessionPlayerComponent>().GetMyPlayer();
             if (player == null)

DotNet/Hotfix/Scenes/Game/Handler/C2G_KickHandler.cs → DotNet/Hotfix/Scenes/Game/Handler/HGHH/C2G_HGHHKickHandler.cs

@@ -3,12 +3,12 @@
 namespace ET.Server
 {
 	/// <summary>
-	/// 踢人
+	/// 黄冈晃晃 踢人
 	/// </summary>
 	[MessageHandler(SceneType.Game)]
-	public class C2G_KickHandler : AMRpcHandler<C2G_Kick, G2C_Kick>
+	public class C2G_HGHHKickHandler : AMRpcHandler<C2G_HGHHKick, G2C_HGHHKick>
 	{
-		protected override async ETTask Run(Session session, C2G_Kick request, G2C_Kick response, Action reply)
+		protected override async ETTask Run(Session session, C2G_HGHHKick request, G2C_HGHHKick response, Action reply)
 		{
 			Player player = session.GetComponent<SessionPlayerComponent>().GetMyPlayer();
 			if (player == null)

DotNet/Hotfix/Scenes/Game/Handler/C2G_OperationHandler.cs → DotNet/Hotfix/Scenes/Game/Handler/HGHH/C2G_HGHHOperationHandler.cs

@@ -5,12 +5,12 @@ using System.Linq;
 namespace ET.Server
 {
     /// <summary>
-    /// 玩家操作动作吃、碰、杠、胡、过
+    /// 黄冈晃晃 玩家操作动作吃、碰、杠、胡、过
     /// </summary>
     [MessageHandler(SceneType.Game)]
-    public class C2G_OperationHandler : AMRpcHandler<C2G_Operation, G2C_Operation>
+    public class C2G_HGHHOperationHandler : AMRpcHandler<C2G_HGHHOperation, G2C_HGHHOperation>
     {
-        protected override async ETTask Run(Session session, C2G_Operation request, G2C_Operation response, Action reply)
+        protected override async ETTask Run(Session session, C2G_HGHHOperation request, G2C_HGHHOperation response, Action reply)
         {
             Player player = session.GetComponent<SessionPlayerComponent>().GetMyPlayer();
             if (player == null)

DotNet/Hotfix/Scenes/Game/Handler/C2G_ReadyHandler.cs → DotNet/Hotfix/Scenes/Game/Handler/HGHH/C2G_HGHHReadyHandler.cs

@@ -4,12 +4,12 @@ using System.Collections.Generic;
 namespace ET.Server
 {
     /// <summary>
-    /// 准备
+    /// 黄冈晃晃 准备
     /// </summary>
     [MessageHandler(SceneType.Game)]
-    public class C2G_ReadyHandler : AMRpcHandler<C2G_Ready, G2C_Ready>
+    public class C2G_HGHHReadyHandler : AMRpcHandler<C2G_HGHHReady, G2C_HGHHReady>
     {
-        protected override async ETTask Run(Session session, C2G_Ready request, G2C_Ready response, Action reply)
+        protected override async ETTask Run(Session session, C2G_HGHHReady request, G2C_HGHHReady response, Action reply)
         {
             Player player = session.GetComponent<SessionPlayerComponent>().GetMyPlayer();
             if (player == null)
@@ -60,7 +60,7 @@ namespace ET.Server
             {
                 if (p != null)
                 {
-                    MessageHelper.SendToClient(p, new G2C_ReadyPush(){info = ProtoHelper.RoomToProto(room, p, null)});
+                    MessageHelper.SendToClient(p, new G2C_HGHHReadyPush(){info = ProtoHelper.RoomToProto(room, p, null)});
                 }
             }
             

DotNet/Hotfix/Scenes/Game/Room/HGHuangHuangComponentSystem.cs

@@ -203,7 +203,7 @@ namespace ET.Server
             // 通知客户端3秒倒计时
             foreach (Player player in room.GetAllPlayers().Values.Where(player => player != null))
             {
-                MessageHelper.SendToClient(player, new G2C_ReadyStartPush(){ReadyStartTime = 3});
+                MessageHelper.SendToClient(player, new G2C_HGHHReadyStartPush(){ReadyStartTime = 3});
             }
 
             return true;
@@ -254,7 +254,7 @@ namespace ET.Server
             {
                 player.State = 2;
                     
-                MessageHelper.SendToClient(player, new G2C_StartPush(){info = ProtoHelper.RoomToProto(room, player, null)});
+                MessageHelper.SendToClient(player, new G2C_HGHHStartPush(){info = ProtoHelper.RoomToProto(room, player, null)});
                     
                 Log.Info($"游戏开局, 房间id={room.RoomId}, 玩家id={player.Id}, 玩家={player.Name}, 手牌信息={player.RemainCards}");
             }
@@ -325,7 +325,7 @@ namespace ET.Server
             // 推送摸牌广播
             foreach (Player player in room.GetAllPlayers().Values.Where(player => player != null))
             {
-                MessageHelper.SendToClient(player, new G2C_DrawCardPush(){info = ProtoHelper.RoomToProto(room, player, drawCardPlayer)});
+                MessageHelper.SendToClient(player, new G2C_HGHHDrawCardPush(){info = ProtoHelper.RoomToProto(room, player, drawCardPlayer)});
                     
                 Log.Info($"摸牌... 玩家ID:{player.Id}, 位置:{player.Pos}, 摸牌玩家:{player.Id == drawCardPlayer.Id}, 手牌大小:{player.RemainCards.Length}, 手牌信息:{string.Join(", ", player.RemainCards)}, 摸的牌:{card}");
             }
@@ -386,7 +386,7 @@ namespace ET.Server
                     self.PengPlayer = null;
                     
                     // 给出牌人广播
-                    MessageHelper.SendToClient(player, new G2C_DisCardPush(){info = ProtoHelper.RoomToProto(room, player, player)});
+                    MessageHelper.SendToClient(player, new G2C_HGHHDisCardPush(){info = ProtoHelper.RoomToProto(room, player, player)});
                     
                     self.CanHuIds.Clear();
                     self.ClickHuIds.Clear();
@@ -479,7 +479,7 @@ namespace ET.Server
                             }
                             
                             // 广播其它三家
-                            MessageHelper.SendToClient(otherPlayer, new G2C_DisCardPush(){info = ProtoHelper.RoomToProto(room, otherPlayer, player)});
+                            MessageHelper.SendToClient(otherPlayer, new G2C_HGHHDisCardPush(){info = ProtoHelper.RoomToProto(room, otherPlayer, player)});
                         }
                     }
 
@@ -635,7 +635,7 @@ namespace ET.Server
             {
                 RoomInfo info = ProtoHelper.RoomToProto(room, p, player);
                 info.Time = 15;
-                MessageHelper.SendToClient(p, new G2C_OperationPush(){info = info, OpType = 1});
+                MessageHelper.SendToClient(p, new G2C_HGHHOperationPush(){info = info, OpType = 1});
             }
         }
 
@@ -716,7 +716,7 @@ namespace ET.Server
             {
                 RoomInfo info = ProtoHelper.RoomToProto(room, p, player);
                 info.Time = 15;
-                MessageHelper.SendToClient(p, new G2C_OperationPush(){info = info, OpType = 2});
+                MessageHelper.SendToClient(p, new G2C_HGHHOperationPush(){info = info, OpType = 2});
             }
         }
 
@@ -896,7 +896,7 @@ namespace ET.Server
                     {
                         RoomInfo info = ProtoHelper.RoomToProto(room, p, player);
                         info.Time = 15;
-                        MessageHelper.SendToClient(p, new G2C_OperationPush(){info = info, OpType = 3});
+                        MessageHelper.SendToClient(p, new G2C_HGHHOperationPush(){info = info, OpType = 3});
                     }
                 }
             }
@@ -928,7 +928,7 @@ namespace ET.Server
                     {
                         RoomInfo info = ProtoHelper.RoomToProto(room, p, player);
                         info.Time = 15;
-                        MessageHelper.SendToClient(p, new G2C_OperationPush(){info = info, OpType = 4});
+                        MessageHelper.SendToClient(p, new G2C_HGHHOperationPush(){info = info, OpType = 4});
                     }
                     
                     // 自摸胡牌结算
@@ -987,7 +987,7 @@ namespace ET.Server
             {
                 RoomInfo info = ProtoHelper.RoomToProto(room, p, player);
                 info.Time = 15;
-                MessageHelper.SendToClient(p, new G2C_OperationPush(){info = info, OpType = 4});
+                MessageHelper.SendToClient(p, new G2C_HGHHOperationPush(){info = info, OpType = 4});
             }
         }
 
@@ -1113,7 +1113,7 @@ namespace ET.Server
                             {
                                 RoomInfo info = ProtoHelper.RoomToProto(room, p, player);
                                 info.Time = 15;
-                                MessageHelper.SendToClient(p, new G2C_OperationPush(){info = info, OpType = 5});
+                                MessageHelper.SendToClient(p, new G2C_HGHHOperationPush(){info = info, OpType = 5});
                             }
                         }
                     }
@@ -1175,7 +1175,7 @@ namespace ET.Server
                             {
                                 RoomInfo info = ProtoHelper.RoomToProto(room, p, player);
                                 info.Time = 15;
-                                MessageHelper.SendToClient(p, new G2C_OperationPush(){info = info, OpType = 5});
+                                MessageHelper.SendToClient(p, new G2C_HGHHOperationPush(){info = info, OpType = 5});
                             }
                         }
                     }

DotNet/Model/Generate/Message/HGHHMessage_C_40001.cs

@@ -0,0 +1,215 @@
+using ET;
+using ProtoBuf;
+using System.Collections.Generic;
+namespace ET
+{
+// 黄冈晃晃 玩家准备
+	[ResponseType(nameof(G2C_HGHHReady))]
+	[Message(HGHHMessage.C2G_HGHHReady)]
+	[ProtoContract]
+	public partial class C2G_HGHHReady: ProtoObject, IRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+	}
+
+	[Message(HGHHMessage.G2C_HGHHReady)]
+	[ProtoContract]
+	public partial class G2C_HGHHReady: ProtoObject, IResponse
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+		[ProtoMember(4)]
+		public bool IsReady { get; set; }
+
+	}
+
+	[Message(HGHHMessage.G2C_HGHHReadyPush)]
+	[ProtoContract]
+	public partial class G2C_HGHHReadyPush: ProtoObject, IActorMessage
+	{
+		[ProtoMember(1)]
+		public RoomInfo info { get; set; }
+
+	}
+
+// 黄冈晃晃 踢出房间
+	[ResponseType(nameof(G2C_HGHHKick))]
+	[Message(HGHHMessage.C2G_HGHHKick)]
+	[ProtoContract]
+	public partial class C2G_HGHHKick: ProtoObject, IRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int RoomId { get; set; }
+
+		[ProtoMember(3)]
+		public long PlayerId { get; set; }
+
+	}
+
+	[Message(HGHHMessage.G2C_HGHHKick)]
+	[ProtoContract]
+	public partial class G2C_HGHHKick: ProtoObject, IResponse
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+	}
+
+	[Message(HGHHMessage.G2C_HGHHKickPush)]
+	[ProtoContract]
+	public partial class G2C_HGHHKickPush: ProtoObject, IActorMessage
+	{
+		[ProtoMember(1)]
+		public RoomInfo info { get; set; }
+
+	}
+
+// 黄冈晃晃 准备开始推送
+	[Message(HGHHMessage.G2C_HGHHReadyStartPush)]
+	[ProtoContract]
+	public partial class G2C_HGHHReadyStartPush: ProtoObject, IActorMessage
+	{
+		[ProtoMember(1)]
+		public long ReadyStartTime { get; set; }
+
+	}
+
+// 黄冈晃晃 牌局开始推送
+	[Message(HGHHMessage.G2C_HGHHStartPush)]
+	[ProtoContract]
+	public partial class G2C_HGHHStartPush: ProtoObject, IActorMessage
+	{
+		[ProtoMember(1)]
+		public RoomInfo info { get; set; }
+
+	}
+
+// 黄冈晃晃 摸牌推送
+	[Message(HGHHMessage.G2C_HGHHDrawCardPush)]
+	[ProtoContract]
+	public partial class G2C_HGHHDrawCardPush: ProtoObject, IActorMessage
+	{
+		[ProtoMember(1)]
+		public RoomInfo info { get; set; }
+
+	}
+
+// 黄冈晃晃 玩家出牌
+	[ResponseType(nameof(G2C_HGHHDisCard))]
+	[Message(HGHHMessage.C2G_HGHHDisCard)]
+	[ProtoContract]
+	public partial class C2G_HGHHDisCard: ProtoObject, IRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Card { get; set; }
+
+	}
+
+	[Message(HGHHMessage.G2C_HGHHDisCard)]
+	[ProtoContract]
+	public partial class G2C_HGHHDisCard: ProtoObject, IResponse
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+	}
+
+	[Message(HGHHMessage.G2C_HGHHDisCardPush)]
+	[ProtoContract]
+	public partial class G2C_HGHHDisCardPush: ProtoObject, IActorMessage
+	{
+		[ProtoMember(1)]
+		public RoomInfo info { get; set; }
+
+	}
+
+// 黄冈晃晃 玩家操作吃 碰 杠 胡 过
+	[ResponseType(nameof(G2C_HGHHOperation))]
+	[Message(HGHHMessage.C2G_HGHHOperation)]
+	[ProtoContract]
+	public partial class C2G_HGHHOperation: ProtoObject, IRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int OpType { get; set; }
+
+		[ProtoMember(3)]
+		public int Card { get; set; }
+
+	}
+
+	[Message(HGHHMessage.G2C_HGHHOperation)]
+	[ProtoContract]
+	public partial class G2C_HGHHOperation: ProtoObject, IResponse
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+	}
+
+	[Message(HGHHMessage.G2C_HGHHOperationPush)]
+	[ProtoContract]
+	public partial class G2C_HGHHOperationPush: ProtoObject, IActorMessage
+	{
+		[ProtoMember(1)]
+		public RoomInfo info { get; set; }
+
+		[ProtoMember(2)]
+		public int OpType { get; set; }
+
+	}
+
+	public static class HGHHMessage
+	{
+		 public const ushort C2G_HGHHReady = 40002;
+		 public const ushort G2C_HGHHReady = 40003;
+		 public const ushort G2C_HGHHReadyPush = 40004;
+		 public const ushort C2G_HGHHKick = 40005;
+		 public const ushort G2C_HGHHKick = 40006;
+		 public const ushort G2C_HGHHKickPush = 40007;
+		 public const ushort G2C_HGHHReadyStartPush = 40008;
+		 public const ushort G2C_HGHHStartPush = 40009;
+		 public const ushort G2C_HGHHDrawCardPush = 40010;
+		 public const ushort C2G_HGHHDisCard = 40011;
+		 public const ushort G2C_HGHHDisCard = 40012;
+		 public const ushort G2C_HGHHDisCardPush = 40013;
+		 public const ushort C2G_HGHHOperation = 40014;
+		 public const ushort G2C_HGHHOperation = 40015;
+		 public const ushort G2C_HGHHOperationPush = 40016;
+	}
+}

DotNet/Model/Generate/Message/OuterMessage_C_30001.cs

@@ -251,6 +251,9 @@ namespace ET
 		[ProtoMember(3)]
 		public string Password { get; set; }
 
+		[ProtoMember(4)]
+		public int Channel { get; set; }
+
 	}
 
 	[Message(OuterMessage.R2C_Login)]
@@ -314,19 +317,19 @@ namespace ET
 
 	}
 
-	[ResponseType(nameof(G2C_CreatRoom))]
-	[Message(OuterMessage.C2G_CreatRoom)]
+	[ResponseType(nameof(G2C_GetGameplayList))]
+	[Message(OuterMessage.C2G_GetGameplayList)]
 	[ProtoContract]
-	public partial class C2G_CreatRoom: ProtoObject, IRequest
+	public partial class C2G_GetGameplayList: ProtoObject, IRequest
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 	}
 
-	[Message(OuterMessage.G2C_CreatRoom)]
+	[Message(OuterMessage.G2C_GetGameplayList)]
 	[ProtoContract]
-	public partial class G2C_CreatRoom: ProtoObject, IResponse
+	public partial class G2C_GetGameplayList: ProtoObject, IResponse
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -337,61 +340,25 @@ namespace ET
 		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(4)]
-		public RoomInfo Info { get; set; }
-
-	}
-
-	[ResponseType(nameof(G2C_JoinRoom))]
-	[Message(OuterMessage.C2G_JoinRoom)]
-	[ProtoContract]
-	public partial class C2G_JoinRoom: ProtoObject, IRequest
-	{
-		[ProtoMember(1)]
-		public int RpcId { get; set; }
-
-		[ProtoMember(2)]
-		public int RoomId { get; set; }
-
 	}
 
-	[Message(OuterMessage.G2C_JoinRoom)]
+// 创建房间
+	[ResponseType(nameof(G2C_CreatRoom))]
+	[Message(OuterMessage.C2G_CreatRoom)]
 	[ProtoContract]
-	public partial class G2C_JoinRoom: ProtoObject, IResponse
+	public partial class C2G_CreatRoom: ProtoObject, IRequest
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 		[ProtoMember(2)]
-		public int Error { get; set; }
-
-		[ProtoMember(3)]
-		public string Message { get; set; }
+		public int Type { get; set; }
 
 	}
 
-	[Message(OuterMessage.G2C_JoinRoomPush)]
-	[ProtoContract]
-	public partial class G2C_JoinRoomPush: ProtoObject, IActorMessage
-	{
-		[ProtoMember(1)]
-		public RoomInfo info { get; set; }
-
-	}
-
-	[ResponseType(nameof(G2C_Ready))]
-	[Message(OuterMessage.C2G_Ready)]
-	[ProtoContract]
-	public partial class C2G_Ready: ProtoObject, IRequest
-	{
-		[ProtoMember(1)]
-		public int RpcId { get; set; }
-
-	}
-
-	[Message(OuterMessage.G2C_Ready)]
+	[Message(OuterMessage.G2C_CreatRoom)]
 	[ProtoContract]
-	public partial class G2C_Ready: ProtoObject, IResponse
+	public partial class G2C_CreatRoom: ProtoObject, IResponse
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -403,23 +370,15 @@ namespace ET
 		public string Message { get; set; }
 
 		[ProtoMember(4)]
-		public bool IsReady { get; set; }
-
-	}
-
-	[Message(OuterMessage.G2C_ReadyPush)]
-	[ProtoContract]
-	public partial class G2C_ReadyPush: ProtoObject, IActorMessage
-	{
-		[ProtoMember(1)]
-		public RoomInfo info { get; set; }
+		public RoomInfo Info { get; set; }
 
 	}
 
-	[ResponseType(nameof(G2C_Kick))]
-	[Message(OuterMessage.C2G_Kick)]
+// 加入房间
+	[ResponseType(nameof(G2C_JoinRoom))]
+	[Message(OuterMessage.C2G_JoinRoom)]
 	[ProtoContract]
-	public partial class C2G_Kick: ProtoObject, IRequest
+	public partial class C2G_JoinRoom: ProtoObject, IRequest
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -427,118 +386,11 @@ namespace ET
 		[ProtoMember(2)]
 		public int RoomId { get; set; }
 
-		[ProtoMember(3)]
-		public long PlayerId { get; set; }
-
 	}
 
-	[Message(OuterMessage.G2C_Kick)]
-	[ProtoContract]
-	public partial class G2C_Kick: ProtoObject, IResponse
-	{
-		[ProtoMember(1)]
-		public int RpcId { get; set; }
-
-		[ProtoMember(2)]
-		public int Error { get; set; }
-
-		[ProtoMember(3)]
-		public string Message { get; set; }
-
-	}
-
-	[Message(OuterMessage.G2C_KickPush)]
-	[ProtoContract]
-	public partial class G2C_KickPush: ProtoObject, IActorMessage
-	{
-		[ProtoMember(1)]
-		public RoomInfo info { get; set; }
-
-	}
-
-	[Message(OuterMessage.G2C_ReadyStartPush)]
-	[ProtoContract]
-	public partial class G2C_ReadyStartPush: ProtoObject, IActorMessage
-	{
-		[ProtoMember(1)]
-		public long ReadyStartTime { get; set; }
-
-	}
-
-	[Message(OuterMessage.G2C_StartPush)]
-	[ProtoContract]
-	public partial class G2C_StartPush: ProtoObject, IActorMessage
-	{
-		[ProtoMember(1)]
-		public RoomInfo info { get; set; }
-
-	}
-
-	[Message(OuterMessage.G2C_DrawCardPush)]
-	[ProtoContract]
-	public partial class G2C_DrawCardPush: ProtoObject, IActorMessage
-	{
-		[ProtoMember(1)]
-		public RoomInfo info { get; set; }
-
-	}
-
-	[ResponseType(nameof(G2C_DisCard))]
-	[Message(OuterMessage.C2G_DisCard)]
-	[ProtoContract]
-	public partial class C2G_DisCard: ProtoObject, IRequest
-	{
-		[ProtoMember(1)]
-		public int RpcId { get; set; }
-
-		[ProtoMember(2)]
-		public int Card { get; set; }
-
-	}
-
-	[Message(OuterMessage.G2C_DisCard)]
-	[ProtoContract]
-	public partial class G2C_DisCard: ProtoObject, IResponse
-	{
-		[ProtoMember(1)]
-		public int RpcId { get; set; }
-
-		[ProtoMember(2)]
-		public int Error { get; set; }
-
-		[ProtoMember(3)]
-		public string Message { get; set; }
-
-	}
-
-	[Message(OuterMessage.G2C_DisCardPush)]
-	[ProtoContract]
-	public partial class G2C_DisCardPush: ProtoObject, IActorMessage
-	{
-		[ProtoMember(1)]
-		public RoomInfo info { get; set; }
-
-	}
-
-	[ResponseType(nameof(G2C_Operation))]
-	[Message(OuterMessage.C2G_Operation)]
-	[ProtoContract]
-	public partial class C2G_Operation: ProtoObject, IRequest
-	{
-		[ProtoMember(1)]
-		public int RpcId { get; set; }
-
-		[ProtoMember(2)]
-		public int OpType { get; set; }
-
-		[ProtoMember(3)]
-		public int Card { get; set; }
-
-	}
-
-	[Message(OuterMessage.G2C_Operation)]
+	[Message(OuterMessage.G2C_JoinRoom)]
 	[ProtoContract]
-	public partial class G2C_Operation: ProtoObject, IResponse
+	public partial class G2C_JoinRoom: ProtoObject, IResponse
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -551,16 +403,13 @@ namespace ET
 
 	}
 
-	[Message(OuterMessage.G2C_OperationPush)]
+	[Message(OuterMessage.G2C_JoinRoomPush)]
 	[ProtoContract]
-	public partial class G2C_OperationPush: ProtoObject, IActorMessage
+	public partial class G2C_JoinRoomPush: ProtoObject, IActorMessage
 	{
 		[ProtoMember(1)]
 		public RoomInfo info { get; set; }
 
-		[ProtoMember(2)]
-		public int OpType { get; set; }
-
 	}
 
 	[Message(OuterMessage.G2C_TestHotfixMessage)]
@@ -646,30 +495,17 @@ namespace ET
 		 public const ushort R2C_Login = 30021;
 		 public const ushort C2G_LoginGame = 30022;
 		 public const ushort G2C_LoginGame = 30023;
-		 public const ushort C2G_CreatRoom = 30024;
-		 public const ushort G2C_CreatRoom = 30025;
-		 public const ushort C2G_JoinRoom = 30026;
-		 public const ushort G2C_JoinRoom = 30027;
-		 public const ushort G2C_JoinRoomPush = 30028;
-		 public const ushort C2G_Ready = 30029;
-		 public const ushort G2C_Ready = 30030;
-		 public const ushort G2C_ReadyPush = 30031;
-		 public const ushort C2G_Kick = 30032;
-		 public const ushort G2C_Kick = 30033;
-		 public const ushort G2C_KickPush = 30034;
-		 public const ushort G2C_ReadyStartPush = 30035;
-		 public const ushort G2C_StartPush = 30036;
-		 public const ushort G2C_DrawCardPush = 30037;
-		 public const ushort C2G_DisCard = 30038;
-		 public const ushort G2C_DisCard = 30039;
-		 public const ushort G2C_DisCardPush = 30040;
-		 public const ushort C2G_Operation = 30041;
-		 public const ushort G2C_Operation = 30042;
-		 public const ushort G2C_OperationPush = 30043;
-		 public const ushort G2C_TestHotfixMessage = 30044;
-		 public const ushort C2M_TransferMap = 30045;
-		 public const ushort M2C_TransferMap = 30046;
-		 public const ushort C2G_Benchmark = 30047;
-		 public const ushort G2C_Benchmark = 30048;
+		 public const ushort C2G_GetGameplayList = 30024;
+		 public const ushort G2C_GetGameplayList = 30025;
+		 public const ushort C2G_CreatRoom = 30026;
+		 public const ushort G2C_CreatRoom = 30027;
+		 public const ushort C2G_JoinRoom = 30028;
+		 public const ushort G2C_JoinRoom = 30029;
+		 public const ushort G2C_JoinRoomPush = 30030;
+		 public const ushort G2C_TestHotfixMessage = 30031;
+		 public const ushort C2M_TransferMap = 30032;
+		 public const ushort M2C_TransferMap = 30033;
+		 public const ushort C2G_Benchmark = 30034;
+		 public const ushort G2C_Benchmark = 30035;
 	}
 }

DotNet/Model/Share/ConstGame.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace ET.Server
+{
+    /// <summary>
+    /// 游戏服静态常量
+    /// </summary>
+    public static class ConstGame
+    {
+        [StaticField]
+        public static int GameServerId;
+
+        [StaticField]
+        public static string GameServerUUID = System.Guid.NewGuid().ToString();
+    }
+
+    /// <summary>
+    /// 房间玩法类型
+    /// </summary>
+    public enum RoomType
+    {
+        /** 黄冈晃晃 **/
+        HGHH = 1,
+        /** 鄂州麻将 **/
+        EzhouMahjong = 2,
+    }
+}

Unity/Assets/Debugger/Component/DebuggerComponent.QualityInformationWindow.cs

@@ -22,7 +22,7 @@ namespace UnityGameFramework.Runtime
                     DrawItem("Desired Color Space:", QualitySettings.desiredColorSpace.ToString());
                     DrawItem("Max Queued Frames:", QualitySettings.maxQueuedFrames.ToString());
                     DrawItem("Pixel Light Count:", QualitySettings.pixelLightCount.ToString());
-                    DrawItem("Master Texture Limit:", QualitySettings.masterTextureLimit.ToString());
+                    DrawItem("Master Texture Limit:", QualitySettings.globalTextureMipmapLimit.ToString());
                     DrawItem("Anisotropic Filtering:", QualitySettings.anisotropicFiltering.ToString());
                     DrawItem("Anti Aliasing:", QualitySettings.antiAliasing.ToString());
                     DrawItem("Realtime Reflection Probes:", QualitySettings.realtimeReflectionProbes.ToString());

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

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

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

@@ -0,0 +1,215 @@
+using ET;
+using ProtoBuf;
+using System.Collections.Generic;
+namespace ET
+{
+// 黄冈晃晃 玩家准备
+	[ResponseType(nameof(G2C_HGHHReady))]
+	[Message(HGHHMessage.C2G_HGHHReady)]
+	[ProtoContract]
+	public partial class C2G_HGHHReady: ProtoObject, IRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+	}
+
+	[Message(HGHHMessage.G2C_HGHHReady)]
+	[ProtoContract]
+	public partial class G2C_HGHHReady: ProtoObject, IResponse
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+		[ProtoMember(4)]
+		public bool IsReady { get; set; }
+
+	}
+
+	[Message(HGHHMessage.G2C_HGHHReadyPush)]
+	[ProtoContract]
+	public partial class G2C_HGHHReadyPush: ProtoObject, IActorMessage
+	{
+		[ProtoMember(1)]
+		public RoomInfo info { get; set; }
+
+	}
+
+// 黄冈晃晃 踢出房间
+	[ResponseType(nameof(G2C_HGHHKick))]
+	[Message(HGHHMessage.C2G_HGHHKick)]
+	[ProtoContract]
+	public partial class C2G_HGHHKick: ProtoObject, IRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int RoomId { get; set; }
+
+		[ProtoMember(3)]
+		public long PlayerId { get; set; }
+
+	}
+
+	[Message(HGHHMessage.G2C_HGHHKick)]
+	[ProtoContract]
+	public partial class G2C_HGHHKick: ProtoObject, IResponse
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+	}
+
+	[Message(HGHHMessage.G2C_HGHHKickPush)]
+	[ProtoContract]
+	public partial class G2C_HGHHKickPush: ProtoObject, IActorMessage
+	{
+		[ProtoMember(1)]
+		public RoomInfo info { get; set; }
+
+	}
+
+// 黄冈晃晃 准备开始推送
+	[Message(HGHHMessage.G2C_HGHHReadyStartPush)]
+	[ProtoContract]
+	public partial class G2C_HGHHReadyStartPush: ProtoObject, IActorMessage
+	{
+		[ProtoMember(1)]
+		public long ReadyStartTime { get; set; }
+
+	}
+
+// 黄冈晃晃 牌局开始推送
+	[Message(HGHHMessage.G2C_HGHHStartPush)]
+	[ProtoContract]
+	public partial class G2C_HGHHStartPush: ProtoObject, IActorMessage
+	{
+		[ProtoMember(1)]
+		public RoomInfo info { get; set; }
+
+	}
+
+// 黄冈晃晃 摸牌推送
+	[Message(HGHHMessage.G2C_HGHHDrawCardPush)]
+	[ProtoContract]
+	public partial class G2C_HGHHDrawCardPush: ProtoObject, IActorMessage
+	{
+		[ProtoMember(1)]
+		public RoomInfo info { get; set; }
+
+	}
+
+// 黄冈晃晃 玩家出牌
+	[ResponseType(nameof(G2C_HGHHDisCard))]
+	[Message(HGHHMessage.C2G_HGHHDisCard)]
+	[ProtoContract]
+	public partial class C2G_HGHHDisCard: ProtoObject, IRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Card { get; set; }
+
+	}
+
+	[Message(HGHHMessage.G2C_HGHHDisCard)]
+	[ProtoContract]
+	public partial class G2C_HGHHDisCard: ProtoObject, IResponse
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+	}
+
+	[Message(HGHHMessage.G2C_HGHHDisCardPush)]
+	[ProtoContract]
+	public partial class G2C_HGHHDisCardPush: ProtoObject, IActorMessage
+	{
+		[ProtoMember(1)]
+		public RoomInfo info { get; set; }
+
+	}
+
+// 黄冈晃晃 玩家操作吃 碰 杠 胡 过
+	[ResponseType(nameof(G2C_HGHHOperation))]
+	[Message(HGHHMessage.C2G_HGHHOperation)]
+	[ProtoContract]
+	public partial class C2G_HGHHOperation: ProtoObject, IRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int OpType { get; set; }
+
+		[ProtoMember(3)]
+		public int Card { get; set; }
+
+	}
+
+	[Message(HGHHMessage.G2C_HGHHOperation)]
+	[ProtoContract]
+	public partial class G2C_HGHHOperation: ProtoObject, IResponse
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+	}
+
+	[Message(HGHHMessage.G2C_HGHHOperationPush)]
+	[ProtoContract]
+	public partial class G2C_HGHHOperationPush: ProtoObject, IActorMessage
+	{
+		[ProtoMember(1)]
+		public RoomInfo info { get; set; }
+
+		[ProtoMember(2)]
+		public int OpType { get; set; }
+
+	}
+
+	public static class HGHHMessage
+	{
+		 public const ushort C2G_HGHHReady = 40002;
+		 public const ushort G2C_HGHHReady = 40003;
+		 public const ushort G2C_HGHHReadyPush = 40004;
+		 public const ushort C2G_HGHHKick = 40005;
+		 public const ushort G2C_HGHHKick = 40006;
+		 public const ushort G2C_HGHHKickPush = 40007;
+		 public const ushort G2C_HGHHReadyStartPush = 40008;
+		 public const ushort G2C_HGHHStartPush = 40009;
+		 public const ushort G2C_HGHHDrawCardPush = 40010;
+		 public const ushort C2G_HGHHDisCard = 40011;
+		 public const ushort G2C_HGHHDisCard = 40012;
+		 public const ushort G2C_HGHHDisCardPush = 40013;
+		 public const ushort C2G_HGHHOperation = 40014;
+		 public const ushort G2C_HGHHOperation = 40015;
+		 public const ushort G2C_HGHHOperationPush = 40016;
+	}
+}

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

@@ -251,6 +251,9 @@ namespace ET
 		[ProtoMember(3)]
 		public string Password { get; set; }
 
+		[ProtoMember(4)]
+		public int Channel { get; set; }
+
 	}
 
 	[Message(OuterMessage.R2C_Login)]
@@ -314,19 +317,19 @@ namespace ET
 
 	}
 
-	[ResponseType(nameof(G2C_CreatRoom))]
-	[Message(OuterMessage.C2G_CreatRoom)]
+	[ResponseType(nameof(G2C_GetGameplayList))]
+	[Message(OuterMessage.C2G_GetGameplayList)]
 	[ProtoContract]
-	public partial class C2G_CreatRoom: ProtoObject, IRequest
+	public partial class C2G_GetGameplayList: ProtoObject, IRequest
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 	}
 
-	[Message(OuterMessage.G2C_CreatRoom)]
+	[Message(OuterMessage.G2C_GetGameplayList)]
 	[ProtoContract]
-	public partial class G2C_CreatRoom: ProtoObject, IResponse
+	public partial class G2C_GetGameplayList: ProtoObject, IResponse
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -337,61 +340,25 @@ namespace ET
 		[ProtoMember(3)]
 		public string Message { get; set; }
 
-		[ProtoMember(4)]
-		public RoomInfo Info { get; set; }
-
-	}
-
-	[ResponseType(nameof(G2C_JoinRoom))]
-	[Message(OuterMessage.C2G_JoinRoom)]
-	[ProtoContract]
-	public partial class C2G_JoinRoom: ProtoObject, IRequest
-	{
-		[ProtoMember(1)]
-		public int RpcId { get; set; }
-
-		[ProtoMember(2)]
-		public int RoomId { get; set; }
-
 	}
 
-	[Message(OuterMessage.G2C_JoinRoom)]
+// 创建房间
+	[ResponseType(nameof(G2C_CreatRoom))]
+	[Message(OuterMessage.C2G_CreatRoom)]
 	[ProtoContract]
-	public partial class G2C_JoinRoom: ProtoObject, IResponse
+	public partial class C2G_CreatRoom: ProtoObject, IRequest
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 		[ProtoMember(2)]
-		public int Error { get; set; }
-
-		[ProtoMember(3)]
-		public string Message { get; set; }
+		public int Type { get; set; }
 
 	}
 
-	[Message(OuterMessage.G2C_JoinRoomPush)]
-	[ProtoContract]
-	public partial class G2C_JoinRoomPush: ProtoObject, IActorMessage
-	{
-		[ProtoMember(1)]
-		public RoomInfo info { get; set; }
-
-	}
-
-	[ResponseType(nameof(G2C_Ready))]
-	[Message(OuterMessage.C2G_Ready)]
-	[ProtoContract]
-	public partial class C2G_Ready: ProtoObject, IRequest
-	{
-		[ProtoMember(1)]
-		public int RpcId { get; set; }
-
-	}
-
-	[Message(OuterMessage.G2C_Ready)]
+	[Message(OuterMessage.G2C_CreatRoom)]
 	[ProtoContract]
-	public partial class G2C_Ready: ProtoObject, IResponse
+	public partial class G2C_CreatRoom: ProtoObject, IResponse
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -403,23 +370,15 @@ namespace ET
 		public string Message { get; set; }
 
 		[ProtoMember(4)]
-		public bool IsReady { get; set; }
-
-	}
-
-	[Message(OuterMessage.G2C_ReadyPush)]
-	[ProtoContract]
-	public partial class G2C_ReadyPush: ProtoObject, IActorMessage
-	{
-		[ProtoMember(1)]
-		public RoomInfo info { get; set; }
+		public RoomInfo Info { get; set; }
 
 	}
 
-	[ResponseType(nameof(G2C_Kick))]
-	[Message(OuterMessage.C2G_Kick)]
+// 加入房间
+	[ResponseType(nameof(G2C_JoinRoom))]
+	[Message(OuterMessage.C2G_JoinRoom)]
 	[ProtoContract]
-	public partial class C2G_Kick: ProtoObject, IRequest
+	public partial class C2G_JoinRoom: ProtoObject, IRequest
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -427,118 +386,11 @@ namespace ET
 		[ProtoMember(2)]
 		public int RoomId { get; set; }
 
-		[ProtoMember(3)]
-		public long PlayerId { get; set; }
-
 	}
 
-	[Message(OuterMessage.G2C_Kick)]
-	[ProtoContract]
-	public partial class G2C_Kick: ProtoObject, IResponse
-	{
-		[ProtoMember(1)]
-		public int RpcId { get; set; }
-
-		[ProtoMember(2)]
-		public int Error { get; set; }
-
-		[ProtoMember(3)]
-		public string Message { get; set; }
-
-	}
-
-	[Message(OuterMessage.G2C_KickPush)]
-	[ProtoContract]
-	public partial class G2C_KickPush: ProtoObject, IActorMessage
-	{
-		[ProtoMember(1)]
-		public RoomInfo info { get; set; }
-
-	}
-
-	[Message(OuterMessage.G2C_ReadyStartPush)]
-	[ProtoContract]
-	public partial class G2C_ReadyStartPush: ProtoObject, IActorMessage
-	{
-		[ProtoMember(1)]
-		public long ReadyStartTime { get; set; }
-
-	}
-
-	[Message(OuterMessage.G2C_StartPush)]
-	[ProtoContract]
-	public partial class G2C_StartPush: ProtoObject, IActorMessage
-	{
-		[ProtoMember(1)]
-		public RoomInfo info { get; set; }
-
-	}
-
-	[Message(OuterMessage.G2C_DrawCardPush)]
-	[ProtoContract]
-	public partial class G2C_DrawCardPush: ProtoObject, IActorMessage
-	{
-		[ProtoMember(1)]
-		public RoomInfo info { get; set; }
-
-	}
-
-	[ResponseType(nameof(G2C_DisCard))]
-	[Message(OuterMessage.C2G_DisCard)]
-	[ProtoContract]
-	public partial class C2G_DisCard: ProtoObject, IRequest
-	{
-		[ProtoMember(1)]
-		public int RpcId { get; set; }
-
-		[ProtoMember(2)]
-		public int Card { get; set; }
-
-	}
-
-	[Message(OuterMessage.G2C_DisCard)]
-	[ProtoContract]
-	public partial class G2C_DisCard: ProtoObject, IResponse
-	{
-		[ProtoMember(1)]
-		public int RpcId { get; set; }
-
-		[ProtoMember(2)]
-		public int Error { get; set; }
-
-		[ProtoMember(3)]
-		public string Message { get; set; }
-
-	}
-
-	[Message(OuterMessage.G2C_DisCardPush)]
-	[ProtoContract]
-	public partial class G2C_DisCardPush: ProtoObject, IActorMessage
-	{
-		[ProtoMember(1)]
-		public RoomInfo info { get; set; }
-
-	}
-
-	[ResponseType(nameof(G2C_Operation))]
-	[Message(OuterMessage.C2G_Operation)]
-	[ProtoContract]
-	public partial class C2G_Operation: ProtoObject, IRequest
-	{
-		[ProtoMember(1)]
-		public int RpcId { get; set; }
-
-		[ProtoMember(2)]
-		public int OpType { get; set; }
-
-		[ProtoMember(3)]
-		public int Card { get; set; }
-
-	}
-
-	[Message(OuterMessage.G2C_Operation)]
+	[Message(OuterMessage.G2C_JoinRoom)]
 	[ProtoContract]
-	public partial class G2C_Operation: ProtoObject, IResponse
+	public partial class G2C_JoinRoom: ProtoObject, IResponse
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -551,16 +403,13 @@ namespace ET
 
 	}
 
-	[Message(OuterMessage.G2C_OperationPush)]
+	[Message(OuterMessage.G2C_JoinRoomPush)]
 	[ProtoContract]
-	public partial class G2C_OperationPush: ProtoObject, IActorMessage
+	public partial class G2C_JoinRoomPush: ProtoObject, IActorMessage
 	{
 		[ProtoMember(1)]
 		public RoomInfo info { get; set; }
 
-		[ProtoMember(2)]
-		public int OpType { get; set; }
-
 	}
 
 	[Message(OuterMessage.G2C_TestHotfixMessage)]
@@ -646,30 +495,17 @@ namespace ET
 		 public const ushort R2C_Login = 30021;
 		 public const ushort C2G_LoginGame = 30022;
 		 public const ushort G2C_LoginGame = 30023;
-		 public const ushort C2G_CreatRoom = 30024;
-		 public const ushort G2C_CreatRoom = 30025;
-		 public const ushort C2G_JoinRoom = 30026;
-		 public const ushort G2C_JoinRoom = 30027;
-		 public const ushort G2C_JoinRoomPush = 30028;
-		 public const ushort C2G_Ready = 30029;
-		 public const ushort G2C_Ready = 30030;
-		 public const ushort G2C_ReadyPush = 30031;
-		 public const ushort C2G_Kick = 30032;
-		 public const ushort G2C_Kick = 30033;
-		 public const ushort G2C_KickPush = 30034;
-		 public const ushort G2C_ReadyStartPush = 30035;
-		 public const ushort G2C_StartPush = 30036;
-		 public const ushort G2C_DrawCardPush = 30037;
-		 public const ushort C2G_DisCard = 30038;
-		 public const ushort G2C_DisCard = 30039;
-		 public const ushort G2C_DisCardPush = 30040;
-		 public const ushort C2G_Operation = 30041;
-		 public const ushort G2C_Operation = 30042;
-		 public const ushort G2C_OperationPush = 30043;
-		 public const ushort G2C_TestHotfixMessage = 30044;
-		 public const ushort C2M_TransferMap = 30045;
-		 public const ushort M2C_TransferMap = 30046;
-		 public const ushort C2G_Benchmark = 30047;
-		 public const ushort G2C_Benchmark = 30048;
+		 public const ushort C2G_GetGameplayList = 30024;
+		 public const ushort G2C_GetGameplayList = 30025;
+		 public const ushort C2G_CreatRoom = 30026;
+		 public const ushort G2C_CreatRoom = 30027;
+		 public const ushort C2G_JoinRoom = 30028;
+		 public const ushort G2C_JoinRoom = 30029;
+		 public const ushort G2C_JoinRoomPush = 30030;
+		 public const ushort G2C_TestHotfixMessage = 30031;
+		 public const ushort C2M_TransferMap = 30032;
+		 public const ushort M2C_TransferMap = 30033;
+		 public const ushort C2G_Benchmark = 30034;
+		 public const ushort G2C_Benchmark = 30035;
 	}
 }

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

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