服务合并

2026-03-11 10:15:34 +08:00
parent 945ffe9861
commit c2ec7226c0
68 changed files with 866 additions and 1032 deletions
--- a/Tools/NetworkProtocol/Outer/MapMessage.proto
+++ b/Tools/NetworkProtocol/Outer/MapMessage.proto
@@ -2,13 +2,13 @@ syntax = "proto3";
 package Fantasy.Network.Message;

 /// 请求创建房间
-message C2Map_CreateRoomRequest // ICustomRouteRequest,Map2C_CreateRoomResponse,GameRoute
+message C2Game_CreateRoomRequest // ICustomRouteRequest,Game2C_CreateRoomResponse,GameRoute
 {
    int32 MapId = 1;//地图id
 }

 /// 请求创建房间成功
-message Map2C_CreateRoomResponse // ICustomRouteResponse
+message Game2C_CreateRoomResponse // ICustomRouteResponse
 {
    string RoomCode = 1;                //房间代码
    repeated MapUnitInfo Units = 2;     //房间玩家列表
@@ -47,7 +47,7 @@ message G2C_EnterMapResponse // IResponse


 /// 通知客户端切换地图
-message Map2C_ChangeMap // ICustomRouteMessage,GameRoute
+message Game2C_ChangeMap // ICustomRouteMessage,GameRoute
 {
 	int32 MapId = 1;	//地图id
 	int32 Node = 2;		//站位节点
--- a/Tools/NetworkProtocol/Outer/RoomMessage.proto
+++ b/Tools/NetworkProtocol/Outer/RoomMessage.proto
@@ -4,13 +4,13 @@ package Fantasy.Network.Message;

 //**************          进入 离开         **********************
 ///用户进入地图
-message Map2C_RoleEnterRoomNotify // ICustomRouteMessage,GameRoute
+message Game2C_RoleEnterRoomNotify // ICustomRouteMessage,GameRoute
 {
 	MapUnitInfo Info = 2;
 }

 ///用户离开地图
-message Map2C_RoleExitRoomNotify // ICustomRouteMessage,GameRoute
+message Game2C_RoleExitRoomNotify // ICustomRouteMessage,GameRoute
 {
 	int64 Id = 1;//离开人员
 }
@@ -18,14 +18,14 @@ message Map2C_RoleExitRoomNotify // ICustomRouteMessage,GameRoute
 //**************          物品变化         **********************

 /// 请求拿起物品
-message C2Map_TakeItemRequest // ICustomRouteRequest,Map2C_TakeItemResponse,GameRoute
+message C2Game_TakeItemRequest // ICustomRouteRequest,Game2C_TakeItemResponse,GameRoute
 {
    int32 Id = 1;           //物品id
    bool Task = 2;          //拿起
 }

 /// 请求拿起物品响应
-message Map2C_TakeItemResponse // ICustomRouteResponse
+message Game2C_TakeItemResponse // ICustomRouteResponse
 {
    int32 Id = 1;           //物品id
    bool Task = 2;          //拿起
@@ -33,27 +33,27 @@ message Map2C_TakeItemResponse // ICustomRouteResponse


 //**************          参数变化         **********************
-message C2Map_RolePropertyChange // ICustomRouteMessage,GameRoute
+message C2Game_RolePropertyChange // ICustomRouteMessage,GameRoute
 {
    repeated KeyValueInt64 Propertys = 1;      //变化的属性信息
 }

 ///玩家状态变化同步
-message Map2C_RoleStateNotify // ICustomRouteMessage,GameRoute
+message Game2C_RoleStateNotify // ICustomRouteMessage,GameRoute
 {
    int64 Id = 1;
    UnitStateInfo State = 2;
 }

 ///玩家钓组变化
-message Map2C_RoleGearChangeNotify // ICustomRouteMessage,GameRoute
+message Game2C_RoleGearChangeNotify // ICustomRouteMessage,GameRoute
 {
    int64 Id = 1;
    repeated GearInfo Gears = 2;    //钓组数据
 }

 //玩家属性值变化
-message Map2C_RolePropertyChangeNotify // ICustomRouteMessage,GameRoute
+message Game2C_RolePropertyChangeNotify // ICustomRouteMessage,GameRoute
 {
    int64 Id = 1;
    repeated KeyValueInt64 Propertys = 2;      //变化的属性信息
@@ -64,7 +64,7 @@ message Map2C_RolePropertyChangeNotify // ICustomRouteMessage,GameRoute
 //**************          移动 旋转         **********************

 // 角色移动
-message C2Map_Move // ICustomRouteMessage,GameRoute
+message C2Game_Move // ICustomRouteMessage,GameRoute
 {
    Vector3Info Position = 1;           //当前位置
    Vector3Info Rotation = 2;           //角色方向
@@ -75,14 +75,14 @@ message C2Map_Move // ICustomRouteMessage,GameRoute
 }

 // 角色朝向变化
-message C2Map_Look // ICustomRouteMessage,GameRoute
+message C2Game_Look // ICustomRouteMessage,GameRoute
 {
    Vector3Info Rotation = 1;    //角色方向
    int64 Timestamp = 2;            // 时间点
 }

 ///玩家移动推送
-message Map2C_MoveNotify // ICustomRouteMessage,GameRoute
+message Game2C_MoveNotify // ICustomRouteMessage,GameRoute
 {
    int64 Id = 1;                       // id
    Vector3Info Position = 2;           //当前位置
@@ -94,7 +94,7 @@ message Map2C_MoveNotify // ICustomRouteMessage,GameRoute
 }

 ///玩家旋转推送
-message Map2C_LookeNotify // ICustomRouteMessage,GameRoute
+message Game2C_LookeNotify // ICustomRouteMessage,GameRoute
 {
    int64 Id = 1;                       // id
    Vector3Info Rotation = 2;           //角色方向
--- a/Tools/NetworkProtocol/Outer/SocialMessage.proto
+++ b/Tools/NetworkProtocol/Outer/SocialMessage.proto
@@ -23,19 +23,19 @@ message MailInfo


 ///请求会话列表
-message C2S_GetConversationsRequest // ICustomRouteRequest,S2C_GetConversationsResponse,SocialRoute
+message C2Game_GetConversationsRequest // ICustomRouteRequest,Game2C_GetConversationsResponse,GameRoute
 {

 }

 ///请求会话列表响应
-message S2C_GetConversationsResponse // ICustomRouteResponse
+message Game2C_GetConversationsResponse // ICustomRouteResponse
 {
 	repeated ConversationInfo List = 1;
 }

 ///发送邮件消息
-message C2S_SendMailRequest // ICustomRouteRequest,S2C_SendMailResponse,SocialRoute
+message C2Game_SendMailRequest // ICustomRouteRequest,Game2C_SendMailResponse,GameRoute
 {
 	int64 Target = 1;					//目标id
 	string Content = 2;                 //内容
@@ -43,32 +43,32 @@ message C2S_SendMailRequest // ICustomRouteRequest,S2C_SendMailResponse,SocialRo
 }

 ///发送邮件消息响应
-message S2C_SendMailResponse // ICustomRouteResponse
+message Game2C_SendMailResponse // ICustomRouteResponse
 {
 	
 }

 ///发送删除会话消息
-message C2S_DeleteMailRequest // ICustomRouteRequest,S2C_DeleteMailResponse,SocialRoute
+message C2Game_DeleteMailRequest // ICustomRouteRequest,Game2C_DeleteMailResponse,GameRoute
 {
 	int64 Id = 1;					//会话id
 }

 ///发送删除会话消息响应
-message S2C_DeleteMailResponse // ICustomRouteResponse
+message Game2C_DeleteMailResponse // ICustomRouteResponse
 {
 	int64 Id = 1;					//会话id
 }


 ///新邮件推送
-message S2C_HaveMail // ICustomRouteMessage,SocialRoute
+message Game2C_HaveMail // ICustomRouteMessage,GameRoute
 {
 	MailInfo Mail = 1;
 	string Key = 2;
 }

-message S2C_MailState // ICustomRouteMessage,SocialRoute
+message Game2C_MailState // ICustomRouteMessage,GameRoute
 {
 	int32 MailState = 1;
 	int64 MailId = 2;
@@ -77,17 +77,17 @@ message S2C_MailState // ICustomRouteMessage,SocialRoute
 ////////////// ********  频道聊天 *******/////////////

 /// 发送一个聊天消息给Chat服务器，中间是经过Gate中转的
-message C2Chat_SendMessageRequest // ICustomRouteRequest,Chat2C_SendMessageResponse,SocialRoute
+message C2Game_SendMessageRequest // ICustomRouteRequest,Game2C_SendMessageResponse,GameRoute
 {
 	ChatInfoTree ChatInfoTree = 1;
 }
-message Chat2C_SendMessageResponse // ICustomRouteResponse
+message Game2C_SendMessageResponse // ICustomRouteResponse
 {
 	
 }

 // 该消息是Chat发送给Gate服务器，让Gate服务器自动转发到客户端
-message Chat2C_Message // ICustomRouteMessage,SocialRoute
+message Game2C_Message // ICustomRouteMessage,GameRoute
 {
 	ChatInfoTree ChatInfoTree = 1;
 }
@@ -164,47 +164,47 @@ message ChatMessageInfo
 }

 ///创建频道
-message C2S_CreateChannelRequest // ICustomRouteRequest,S2C_CreateChannelResponse,SocialRoute
+message C2Game_CreateChannelRequest // ICustomRouteRequest,Game2C_CreateChannelResponse,GameRoute
 {
 	string Name = 1; //频道名称
 }

 ///创建频道响应
-message S2C_CreateChannelResponse // ICustomRouteResponse
+message Game2C_CreateChannelResponse // ICustomRouteResponse
 {
 	int64 ChannelId = 1; //创建的频道id
 }

 ///请求进入频道
-message C2S_JoinChannelRequest // ICustomRouteRequest,S2C_JoinChannelResponse,SocialRoute
+message C2Game_JoinChannelRequest // ICustomRouteRequest,Game2C_JoinChannelResponse,GameRoute
 {
 	int64 Target = 1; // 频道id
 }

 ///进入频道响应
-message S2C_JoinChannelResponse // ICustomRouteResponse
+message Game2C_JoinChannelResponse // ICustomRouteResponse
 {
 	
 }

-///发送消息
-message C2S_SendMessageRequest // ICustomRouteRequest,S2C_SendMessageResponse,SocialRoute
-{
-	string Message = 1;
-	int64 Target = 2;					//目标id
-}
+// ///发送消息
+// message C2Game_SendMessageRequest // ICustomRouteRequest,Game2C_SendMessageResponse,GameRoute
+// {
+// 	string Message = 1;
+// 	int64 Target = 2;					//目标id
+// }

-///发送消息响应
-message S2C_SendMessageResponse // ICustomRouteResponse
-{
+// ///发送消息响应
+// message Game2C_SendMessageResponse // ICustomRouteResponse
+// {
 	
-}
+// }

-///推送消息
-message S2C_Message // ICustomRouteMessage,SocialRoute
-{
-	ChatMessageInfo Msg = 1;
-}
+// ///推送消息
+// message Game2C_Message // ICustomRouteMessage,GameRoute
+// {
+// 	ChatMessageInfo Msg = 1;
+// }


 ////////////// ********  工会 *******/////////////
@@ -219,89 +219,89 @@ message ClubInfo
 }

 ///请求创建工会
-message C2S_CreateClubRequest // ICustomRouteRequest,S2C_CreateClubResponse,SocialRoute
+message C2Game_CreateClubRequest // ICustomRouteRequest,Game2C_CreateClubResponse,GameRoute
 {
 	string Name = 1; //工会名称
 }

 ///创建工会响应
-message S2C_CreateClubResponse // ICustomRouteResponse
+message Game2C_CreateClubResponse // ICustomRouteResponse
 {
 	ClubInfo Club = 1; //创建的工会信息
 }

 ///请求工会信息
-message C2S_GetClubInfoRequest // ICustomRouteRequest,S2C_GetClubInfoResponse,SocialRoute
+message C2Game_GetClubInfoRequest // ICustomRouteRequest,Game2C_GetClubInfoResponse,GameRoute
 {
 	int64 ClubId = 1; //工会ID
 }
 ///响应工会信息
-message S2C_GetClubInfoResponse // ICustomRouteResponse
+message Game2C_GetClubInfoResponse // ICustomRouteResponse
 {
 	string Name = 1; //工会名称
 }

 /// 请求工会成员列表
-message C2S_GetMemberListRequest // ICustomRouteRequest,S2C_GetMemberListResponse,SocialRoute
+message C2Game_GetMemberListRequest // ICustomRouteRequest,Game2C_GetMemberListResponse,GameRoute
 {
 	int64 ClubId = 1; //工会ID
 }

 /// 响应工会成员列表
-message S2C_GetMemberListResponse // ICustomRouteResponse
+message Game2C_GetMemberListResponse // ICustomRouteResponse
 {
 	repeated RoleSimpleInfo Members = 1; //工会成员列表
 }

 ///获取工会列表请求
-message C2S_GetClubListRequest // ICustomRouteRequest,S2C_GetClubListResponse,SocialRoute
+message C2Game_GetClubListRequest // ICustomRouteRequest,Game2C_GetClubListResponse,GameRoute
 {

 }
 ///获取工会列表响应
-message S2C_GetClubListResponse // ICustomRouteResponse
+message Game2C_GetClubListResponse // ICustomRouteResponse
 {
 	repeated ClubInfo Clubs = 1; //工会列表
 }

 /// 请求加入工会
-message C2S_JoinClubRequest // ICustomRouteRequest,S2C_JoinClubResponse,SocialRoute
+message C2Game_JoinClubRequest // ICustomRouteRequest,Game2C_JoinClubResponse,GameRoute
 {
 	int64 ClubId = 1; //工会ID
 }

 /// 响应加入工会
-message S2C_JoinClubResponse // ICustomRouteResponse
+message Game2C_JoinClubResponse // ICustomRouteResponse
 {
 	ClubInfo Club = 1; //加入的工会信息
 }

 /// 请求退出工会
-message C2S_LeaveClubRequest // ICustomRouteRequest,S2C_LeaveClubResponse,SocialRoute
+message C2Game_LeaveClubRequest // ICustomRouteRequest,Game2C_LeaveClubResponse,GameRoute
 {
 	int64 ClubId = 1; //工会ID
 }

 /// 响应退出工会
-message S2C_LeaveClubResponse // ICustomRouteResponse
+message Game2C_LeaveClubResponse // ICustomRouteResponse
 {
 	int64 ClubId = 1; //退出的工会ID
 }

 /// 请求解散工会
-message C2S_DissolveClubRequest // ICustomRouteRequest,S2C_DissolveClubResponse,SocialRoute
+message C2Game_DissolveClubRequest // ICustomRouteRequest,Game2C_DissolveClubResponse,GameRoute
 {
 	int64 ClubId = 1; //工会ID
 }

 /// 响应解散工会
-message S2C_DissolveClubResponse // ICustomRouteResponse
+message Game2C_DissolveClubResponse // ICustomRouteResponse
 {
 	int64 ClubId = 1; //解散的工会ID
 }

 /// 请求操作申请
-message C2S_DisposeJoinRequest // ICustomRouteRequest,S2C_DisposeJoinResponse,SocialRoute
+message C2Game_DisposeJoinRequest // ICustomRouteRequest,Game2C_DisposeJoinResponse,GameRoute
 {
    int64 ClubId = 1; //工会ID
    int64 ApplicantId = 2; //申请人ID
@@ -309,7 +309,7 @@ message C2S_DisposeJoinRequest // ICustomRouteRequest,S2C_DisposeJoinResponse,So
 }

 /// 响应操作申请
-message S2C_DisposeJoinResponse // ICustomRouteResponse
+message Game2C_DisposeJoinResponse // ICustomRouteResponse
 {
 	int64 ClubId = 1; //工会ID
 	int64 ApplicantId = 2; //申请人ID
@@ -317,7 +317,7 @@ message S2C_DisposeJoinResponse // ICustomRouteResponse
 }

 ///推送消息
-message S2C_ClubChange // ICustomRouteMessage,SocialRoute
+message Game2C_ClubChange // ICustomRouteMessage,GameRoute
 {
 	ClubInfo Club = 1;
    int32 ChangeType = 2; //变更类型 0.创建 1.解散 2.加入 3.退出 4.申请处理
--- a/Tools/NetworkProtocol/RouteType.Config
+++ b/Tools/NetworkProtocol/RouteType.Config
@@ -1,4 +1,3 @@
 // Route协议定义(需要定义1000以上、因为1000以内的框架预留)
 GateRoute = 1001		// Gate
-SocialRoute = 1002		// Social
-GameRoute = 1003		// Game
+GameRoute = 1002		// Game