From c5574291a52e2665c00f3cc9c0f36d096122200d Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Tue, 23 Mar 2021 10:09:49 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E7=9A=AE=E8=82=A4?= =?UTF-8?q?=EF=BC=8C=E7=A7=B0=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 11 ++++++++++- protos/MessageTypeProto.proto | 8 ++++++++ protos/PlayerInfoProto.proto | 16 ++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 45ffa79..753bb23 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -874,6 +874,15 @@ option optimize_for = SPEED; optional int32 skinId = 1; optional int32 overTime = 2; } - + //玩家皮肤信息 + message UserSkinInfo{ + optional int32 skinId = 1; + optional int32 overTime = 2; + } + //玩家称号信息 + message UserTitleInfo{ + optional int32 titleId = 1; + optional int32 overTime = 2; + } \ No newline at end of file diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 44bc52a..ccce4d6 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1146,6 +1146,14 @@ enum MessageType{ // 使用头像框 UseHeadFrameRequest = 303901; UseHeadFrameResponse = 303902; + + // 手动激活玩家皮肤 + ActiveUserSkinRequest = 303903; + ActiveUserSkinResponse = 303904; + + // 手动激活玩家称号 + ActiveUserTitleRequest = 303905; + ActiveUserTitleResponse = 303906; //800000起为global 协议 GetWorldServerRequest = 800001;//获取世界服ip diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 36e1a10..93e1eb7 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -75,6 +75,8 @@ import "CommonProto.proto"; optional int32 worldLeve = 34;//世界等级 repeated int32 DemonsTrialRewardInfo = 35;//心魔试炼已领取奖励信息 repeated HeadFrameList headFrameBag = 36;//头像框背包 + repeated UserSkinInfo userSkinList = 37;//玩家皮肤信息 + repeated UserTitleInfo userTitleList = 38;//玩家称号信息 } @@ -793,4 +795,18 @@ import "CommonProto.proto"; optional int32 validTime = 1;//到期时间 } message LoginConfirmRequest{ + } + // 手动激活玩家皮肤 + message ActiveUserSkinRequest{ + optional int32 skinId = 1;//玩家皮肤id + } + message ActiveUserSkinResponse{ + optional int32 validTime = 1;//到期时间 + } + // 手动激活玩家称号 + message ActiveUserTitleRequest{ + optional int32 titleId = 1;//玩家皮肤id + } + message ActiveUserTitleResponse{ + optional int32 validTime = 1;//到期时间 } \ No newline at end of file From 91c5398fb6e9edcf999adf240e4cd32fed34bcf6 Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Tue, 23 Mar 2021 15:35:32 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E7=A7=B0=E5=8F=B7=E7=9A=AE=E8=82=A4?= =?UTF-8?q?=E5=9D=90=E9=AA=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 30 +++++++++++++++++++++++++++++- protos/PlayerInfoProto.proto | 8 ++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 753bb23..264e3cc 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -309,6 +309,9 @@ option optimize_for = SPEED; optional int32 headFrame = 8; optional string servername = 9;//服务器名称 optional int32 gender = 10;//性别 + optional int32 userSkin = 11; + optional int32 userTitle = 12; + optional int32 userMount = 13; } @@ -371,6 +374,9 @@ option optimize_for = SPEED; optional int32 rank =5; //排名 optional int32 headFrame = 6; // 头像框 optional int32 uid = 7; + optional int32 userSkin = 8; + optional int32 userTitle = 9; + optional int32 userMount = 10; } message AdventureBossInfo{ @@ -465,6 +471,9 @@ option optimize_for = SPEED; optional int32 guildSign = 9 ;//公会图腾 optional int32 sex = 10;//性别 optional string serverName = 11;//所在区服 + optional int32 userSkin = 12; + optional int32 userTitle = 13; + optional int32 userMount = 14; } @@ -587,6 +596,9 @@ option optimize_for = SPEED; optional int32 head =5; optional int32 headFrame =6; optional int32 uid = 7; + optional int32 userSkin = 8; + optional int32 userTitle = 9; + optional int32 userMount = 10; } //无尽副本标志信息 @@ -605,6 +617,9 @@ option optimize_for = SPEED; optional int32 level =4; optional int32 head =5; optional int32 headFrame =6; + optional int32 userSkin = 7; + optional int32 userTitle = 8; + optional int32 userMount = 9; } message SignInInfo{ @@ -648,6 +663,9 @@ option optimize_for = SPEED; optional int32 head =5; optional int32 headFrame =6; optional int32 uid = 7; + optional int32 userSkin = 8; + optional int32 userTitle = 9; + optional int32 userMount = 10; } //英雄血量信息 message HeroBloodInfo{ @@ -692,6 +710,9 @@ option optimize_for = SPEED; optional int32 level = 6; optional int32 rank = 7; optional int32 score = 8; + optional int32 userSkin = 9; + optional int32 userTitle = 10; + optional int32 userMount = 11; } message LuckWheelRewardPosInfo{ @@ -714,6 +735,9 @@ option optimize_for = SPEED; optional int32 rank =6; //排名 optional int32 totalForce =7; optional int32 headFrame = 8; + optional int32 userSkin = 9; + optional int32 userTitle = 10; + optional int32 userMount = 11; } @@ -884,5 +908,9 @@ option optimize_for = SPEED; optional int32 titleId = 1; optional int32 overTime = 2; } - + //玩家坐骑信息 + message UserMountInfo{ + optional int32 mountId = 1; + optional int32 overTime = 2; + } \ No newline at end of file diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 93e1eb7..77a7df9 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -77,6 +77,7 @@ import "CommonProto.proto"; repeated HeadFrameList headFrameBag = 36;//头像框背包 repeated UserSkinInfo userSkinList = 37;//玩家皮肤信息 repeated UserTitleInfo userTitleList = 38;//玩家称号信息 + repeated UserMountInfo userMountList = 39;//玩家坐骑信息 } @@ -809,4 +810,11 @@ import "CommonProto.proto"; } message ActiveUserTitleResponse{ optional int32 validTime = 1;//到期时间 + } + // 手动激活玩家坐骑 + message ActiveUserMountRequest{ + optional int32 mountId = 1;//玩家坐骑id + } + message ActiveUserMountResponse{ + optional int32 validTime = 1;//到期时间 } \ No newline at end of file From 0ee19464e06ddf4c5de9f08596874df722237079 Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Wed, 24 Mar 2021 20:45:14 +0800 Subject: [PATCH 3/9] mount update --- protos/MessageTypeProto.proto | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index ccce4d6..2183880 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1154,6 +1154,10 @@ enum MessageType{ // 手动激活玩家称号 ActiveUserTitleRequest = 303905; ActiveUserTitleResponse = 303906; + + // 手动激活玩家坐骑 + ActiveUserMountRequest = 303907; + ActiveUserMountResponse = 303908; //800000起为global 协议 GetWorldServerRequest = 800001;//获取世界服ip From 9197d78bf7264dff022360e33302625831cebb75 Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Fri, 26 Mar 2021 11:57:31 +0800 Subject: [PATCH 4/9] mount update --- protos/CommonProto.proto | 4 +++- protos/Family.proto | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 264e3cc..27be3f9 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -419,7 +419,9 @@ option optimize_for = SPEED; optional int32 head = 12; // 新头像 optional int32 frame = 13; // 头像框 optional int32 soulVal = 14; // 战斗力 - + optional int32 userSkin = 15; + optional int32 userTitle = 16; + optional int32 userMount = 17; } message GiftGoodsInfo{ optional int32 goodsId =1;//商品id diff --git a/protos/Family.proto b/protos/Family.proto index e5360af..db437ed 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -24,6 +24,9 @@ import "CommonProto.proto"; optional bool isTakeGuildHelpReward = 17; //是否领取公会奖励 repeated GuildHelpInfo guildHelpInfo = 18;//求援信息 每日清除 5点推送 optional int32 lastHelpSendTime =19 ; // 求援信息发送时间 + optional int32 userSkin = 20; + optional int32 userTitle = 21; + optional int32 userMount = 22; } From 5c36a326230429e63ca990e9aa6216a74ae05dce Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 29 Mar 2021 11:45:32 +0800 Subject: [PATCH 5/9] Revert "mount update" This reverts commit 9197d78bf7264dff022360e33302625831cebb75. --- protos/CommonProto.proto | 4 +--- protos/Family.proto | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 27be3f9..264e3cc 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -419,9 +419,7 @@ option optimize_for = SPEED; optional int32 head = 12; // 新头像 optional int32 frame = 13; // 头像框 optional int32 soulVal = 14; // 战斗力 - optional int32 userSkin = 15; - optional int32 userTitle = 16; - optional int32 userMount = 17; + } message GiftGoodsInfo{ optional int32 goodsId =1;//商品id diff --git a/protos/Family.proto b/protos/Family.proto index db437ed..e5360af 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -24,9 +24,6 @@ import "CommonProto.proto"; optional bool isTakeGuildHelpReward = 17; //是否领取公会奖励 repeated GuildHelpInfo guildHelpInfo = 18;//求援信息 每日清除 5点推送 optional int32 lastHelpSendTime =19 ; // 求援信息发送时间 - optional int32 userSkin = 20; - optional int32 userTitle = 21; - optional int32 userMount = 22; } From 8f7c157431ace21fe168468b63dcd3b4d20927c3 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 29 Mar 2021 11:45:44 +0800 Subject: [PATCH 6/9] Revert "mount update" This reverts commit 0ee19464e06ddf4c5de9f08596874df722237079. --- protos/MessageTypeProto.proto | 4 ---- 1 file changed, 4 deletions(-) diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 2183880..ccce4d6 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1154,10 +1154,6 @@ enum MessageType{ // 手动激活玩家称号 ActiveUserTitleRequest = 303905; ActiveUserTitleResponse = 303906; - - // 手动激活玩家坐骑 - ActiveUserMountRequest = 303907; - ActiveUserMountResponse = 303908; //800000起为global 协议 GetWorldServerRequest = 800001;//获取世界服ip From 495437ed6579a9f30e5e1030394eff67b89e0064 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 29 Mar 2021 11:45:51 +0800 Subject: [PATCH 7/9] =?UTF-8?q?Revert=20"=E7=A7=B0=E5=8F=B7=E7=9A=AE?= =?UTF-8?q?=E8=82=A4=E5=9D=90=E9=AA=91"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 91c5398fb6e9edcf999adf240e4cd32fed34bcf6. --- protos/CommonProto.proto | 30 +----------------------------- protos/PlayerInfoProto.proto | 8 -------- 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 264e3cc..753bb23 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -309,9 +309,6 @@ option optimize_for = SPEED; optional int32 headFrame = 8; optional string servername = 9;//服务器名称 optional int32 gender = 10;//性别 - optional int32 userSkin = 11; - optional int32 userTitle = 12; - optional int32 userMount = 13; } @@ -374,9 +371,6 @@ option optimize_for = SPEED; optional int32 rank =5; //排名 optional int32 headFrame = 6; // 头像框 optional int32 uid = 7; - optional int32 userSkin = 8; - optional int32 userTitle = 9; - optional int32 userMount = 10; } message AdventureBossInfo{ @@ -471,9 +465,6 @@ option optimize_for = SPEED; optional int32 guildSign = 9 ;//公会图腾 optional int32 sex = 10;//性别 optional string serverName = 11;//所在区服 - optional int32 userSkin = 12; - optional int32 userTitle = 13; - optional int32 userMount = 14; } @@ -596,9 +587,6 @@ option optimize_for = SPEED; optional int32 head =5; optional int32 headFrame =6; optional int32 uid = 7; - optional int32 userSkin = 8; - optional int32 userTitle = 9; - optional int32 userMount = 10; } //无尽副本标志信息 @@ -617,9 +605,6 @@ option optimize_for = SPEED; optional int32 level =4; optional int32 head =5; optional int32 headFrame =6; - optional int32 userSkin = 7; - optional int32 userTitle = 8; - optional int32 userMount = 9; } message SignInInfo{ @@ -663,9 +648,6 @@ option optimize_for = SPEED; optional int32 head =5; optional int32 headFrame =6; optional int32 uid = 7; - optional int32 userSkin = 8; - optional int32 userTitle = 9; - optional int32 userMount = 10; } //英雄血量信息 message HeroBloodInfo{ @@ -710,9 +692,6 @@ option optimize_for = SPEED; optional int32 level = 6; optional int32 rank = 7; optional int32 score = 8; - optional int32 userSkin = 9; - optional int32 userTitle = 10; - optional int32 userMount = 11; } message LuckWheelRewardPosInfo{ @@ -735,9 +714,6 @@ option optimize_for = SPEED; optional int32 rank =6; //排名 optional int32 totalForce =7; optional int32 headFrame = 8; - optional int32 userSkin = 9; - optional int32 userTitle = 10; - optional int32 userMount = 11; } @@ -908,9 +884,5 @@ option optimize_for = SPEED; optional int32 titleId = 1; optional int32 overTime = 2; } - //玩家坐骑信息 - message UserMountInfo{ - optional int32 mountId = 1; - optional int32 overTime = 2; - } + \ No newline at end of file diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 77a7df9..93e1eb7 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -77,7 +77,6 @@ import "CommonProto.proto"; repeated HeadFrameList headFrameBag = 36;//头像框背包 repeated UserSkinInfo userSkinList = 37;//玩家皮肤信息 repeated UserTitleInfo userTitleList = 38;//玩家称号信息 - repeated UserMountInfo userMountList = 39;//玩家坐骑信息 } @@ -810,11 +809,4 @@ import "CommonProto.proto"; } message ActiveUserTitleResponse{ optional int32 validTime = 1;//到期时间 - } - // 手动激活玩家坐骑 - message ActiveUserMountRequest{ - optional int32 mountId = 1;//玩家坐骑id - } - message ActiveUserMountResponse{ - optional int32 validTime = 1;//到期时间 } \ No newline at end of file From b9f9263ef3d2216ddf7c8834af167acf34c6217d Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 29 Mar 2021 11:46:00 +0800 Subject: [PATCH 8/9] =?UTF-8?q?Revert=20"=E7=8E=A9=E5=AE=B6=E7=9A=AE?= =?UTF-8?q?=E8=82=A4=EF=BC=8C=E7=A7=B0=E5=8F=B7"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c5574291a52e2665c00f3cc9c0f36d096122200d. --- protos/CommonProto.proto | 11 +---------- protos/MessageTypeProto.proto | 8 -------- protos/PlayerInfoProto.proto | 16 ---------------- 3 files changed, 1 insertion(+), 34 deletions(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 753bb23..45ffa79 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -874,15 +874,6 @@ option optimize_for = SPEED; optional int32 skinId = 1; optional int32 overTime = 2; } - //玩家皮肤信息 - message UserSkinInfo{ - optional int32 skinId = 1; - optional int32 overTime = 2; - } - //玩家称号信息 - message UserTitleInfo{ - optional int32 titleId = 1; - optional int32 overTime = 2; - } + \ No newline at end of file diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index ccce4d6..44bc52a 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1146,14 +1146,6 @@ enum MessageType{ // 使用头像框 UseHeadFrameRequest = 303901; UseHeadFrameResponse = 303902; - - // 手动激活玩家皮肤 - ActiveUserSkinRequest = 303903; - ActiveUserSkinResponse = 303904; - - // 手动激活玩家称号 - ActiveUserTitleRequest = 303905; - ActiveUserTitleResponse = 303906; //800000起为global 协议 GetWorldServerRequest = 800001;//获取世界服ip diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 93e1eb7..36e1a10 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -75,8 +75,6 @@ import "CommonProto.proto"; optional int32 worldLeve = 34;//世界等级 repeated int32 DemonsTrialRewardInfo = 35;//心魔试炼已领取奖励信息 repeated HeadFrameList headFrameBag = 36;//头像框背包 - repeated UserSkinInfo userSkinList = 37;//玩家皮肤信息 - repeated UserTitleInfo userTitleList = 38;//玩家称号信息 } @@ -795,18 +793,4 @@ import "CommonProto.proto"; optional int32 validTime = 1;//到期时间 } message LoginConfirmRequest{ - } - // 手动激活玩家皮肤 - message ActiveUserSkinRequest{ - optional int32 skinId = 1;//玩家皮肤id - } - message ActiveUserSkinResponse{ - optional int32 validTime = 1;//到期时间 - } - // 手动激活玩家称号 - message ActiveUserTitleRequest{ - optional int32 titleId = 1;//玩家皮肤id - } - message ActiveUserTitleResponse{ - optional int32 validTime = 1;//到期时间 } \ No newline at end of file From 7b1da884cfc003b5b79da401cc334b4254657f6b Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 12 Apr 2021 21:59:56 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E8=AF=BB=E5=8F=96=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/PlayerInfoProto.proto | 3 +++ 1 file changed, 3 insertions(+) diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 1409478..fb87255 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -108,6 +108,9 @@ import "CommonProto.proto"; message MailReadRequest{ optional string mailId = 1; } + message MailReadResponse{ + optional Mail mailInfo= 1; + } message TakeMailRequest{ repeated string mailIds = 1; }