提交修改

Tools/NetworkProtocol/Inner/InnerMessage.proto

@@ -98,3 +98,14 @@ message Other2Chat_ChatMessage // IAddressMessage
 	ChatInfoTree ChatInfoTree = 1;
 }
 
+////////////// ********  邮件 *******/////////////
+/// 其他服务器发送邮件
+// Protocol Bson
+message Other2Mail_SendMailRequest // IAddressRequest,Mail2Other_SendMailResponse
+{
+	MailBox MailBox = 1;
+}
+message Mail2Other_SendMailResponse // IAddressResponse
+{
+
+}

Tools/NetworkProtocol/Outer/MailMessage.proto

@@ -0,0 +1,102 @@
+syntax = "proto3";
+package Fantasy.Network.Message;
+
+/// 测试Mail自定义Route协议
+message C2Mail_TestRequest // ICustomRouteRequest,Mail2C_TestResponse,GameRoute
+{
+	string Tag = 1;
+}
+message Mail2C_TestResponse // ICustomRouteResponse
+{
+	string Tag = 1;
+}
+/// 一个邮件的完整信息
+message MailInfo
+{
+	int64 MailId = 1;
+	int64 OwnerId = 2;
+	string Title = 3;
+	string Content = 4;
+	int64 CreateTime = 5;
+	int64 ExpireTime = 6;
+	int32 Money = 7;
+	int32 MailState = 8;
+	int32 MailType = 9;
+	repeated ItemInfo Items = 10;
+}
+/// 一个邮件的简单版消息
+message MailSimplifyInfo
+{
+	int64 MailId = 1;
+	int64 OwnerId = 2;
+	string Title = 3;
+	string Content = 4;
+	int64 CreateTime = 5;
+	int64 ExpireTime = 6;
+	int32 MailState = 7;
+	int32 MailType = 8;
+
+}
+/// Mail通知客户端有新的邮件
+message Mail2C_HaveMail // ICustomRouteMessage,GameRoute
+{
+	MailSimplifyInfo Mail = 1;
+}
+/// Mail通知客户端邮件状态变化
+message Mail2C_MailState // ICustomRouteMessage,GameRoute
+{
+	int32 MailState = 1;
+	int64 MailId = 2;
+}
+/// 客户端获取档期所有邮件的信息
+message C2Mail_GetHaveMailRequest // ICustomRouteRequest,Mail2C_GetHaveMailResposne,GameRoute
+{
+
+}
+message Mail2C_GetHaveMailResposne // ICustomRouteResponse
+{
+	repeated MailSimplifyInfo Mails = 1;
+}
+/// 客户端发开一个邮件
+message C2Mail_OpenMailRequest // ICustomRouteRequest,Mail2C_OpenMailResposne,GameRoute
+{
+	int64 MailId = 1;
+	bool ReturnMailInfo = 2;
+}
+message Mail2C_OpenMailResposne // ICustomRouteResponse
+{
+	MailInfo MailInfo = 1;
+}
+/// 客户端领取邮件的附件
+message C2Mail_ReceiveMailRequest // ICustomRouteRequest,Mail2C_ReceiveMailResponse,GameRoute
+{
+	int64 MailId = 1;
+	bool Money = 2;
+	repeated int64 ItemId = 3;
+}
+message Mail2C_ReceiveMailResponse // ICustomRouteResponse
+{
+
+}
+/// 客户端通知服务器删除一个邮件
+message C2Mail_RemoveMailRequest // ICustomRouteRequest,Mail2C_RemoveMailResponse,GameRoute
+{
+	int64 MailId = 1;
+}
+message Mail2C_RemoveMailResponse // ICustomRouteResponse
+{
+
+}
+/// 客户端玩家发送邮件到另外一个玩家
+message C2Mail_SendMailRequest // ICustomRouteRequest,Mail2C_SendMailResponse,GameRoute
+{
+	int64 UserId = 1;
+	string Title = 2;
+	string Content = 3;
+	int32 Money = 4;
+	repeated int64 ItemId = 5;
+}
+message Mail2C_SendMailResponse // ICustomRouteResponse
+{
+	
+}

Tools/NetworkProtocol/Outer/SocialMessage.proto

@@ -1,79 +1,6 @@
 syntax = "proto3";
 package Fantasy.Network.Message;
 
-////////////// ********  私聊/邮件 *******/////////////
-
-/// 会话信息
-message ConversationInfo
-{
-	RoleSimpleInfo RoleInfo = 1; //对方信息
-	repeated MailInfo List = 2;//对话列表
-}
-
-message MailInfo
-{
-    int64 Id = 1;                       //邮件id
-	int64 Sender = 2; 					//发送者
-    string Content = 3;                 //内容
-    int64 CreateTime = 4;               //发送时间
-    int32 MailType = 5;                 //邮件类型
-    int32 MailState = 6;                //邮件状态
-    repeated AwardInfo Items = 7;       //附件列表
-}
-
-
-///请求会话列表
-message C2Game_GetConversationsRequest // ICustomRouteRequest,Game2C_GetConversationsResponse,GameRoute
-{
-
-}
-
-///请求会话列表响应
-message Game2C_GetConversationsResponse // ICustomRouteResponse
-{
-	repeated ConversationInfo List = 1;
-}
-
-///发送邮件消息
-message C2Game_SendMailRequest // ICustomRouteRequest,Game2C_SendMailResponse,GameRoute
-{
-	int64 Target = 1;					//目标id
-	string Content = 2;                 //内容
-	repeated AwardInfo Items = 3;       //附件列表
-}
-
-///发送邮件消息响应
-message Game2C_SendMailResponse // ICustomRouteResponse
-{
-	
-}
-
-///发送删除会话消息
-message C2Game_DeleteMailRequest // ICustomRouteRequest,Game2C_DeleteMailResponse,GameRoute
-{
-	int64 Id = 1;					//会话id
-}
-
-///发送删除会话消息响应
-message Game2C_DeleteMailResponse // ICustomRouteResponse
-{
-	int64 Id = 1;					//会话id
-}
-
-
-///新邮件推送
-message Game2C_HaveMail // ICustomRouteMessage,GameRoute
-{
-	MailInfo Mail = 1;
-	string Key = 2;
-}
-
-message Game2C_MailState // ICustomRouteMessage,GameRoute
-{
-	int32 MailState = 1;
-	int64 MailId = 2;
-}
-
 ////////////// ********  频道聊天 *******/////////////
 
 /// 发送一个聊天消息给Chat服务器，中间是经过Gate中转的