From c8f842936e2902710bb8af4673a9f9366172011a Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 15 Jan 2021 10:43:22 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=B7=85=E5=B3=B0=E8=B5=9B=EF=BC=8C?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=A4=B4=E5=83=8F=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/MessageTypeProto.proto | 4 ++++ protos/PlayerInfoProto.proto | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 167a89c..dd76ce9 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1118,6 +1118,10 @@ enum MessageType{ DemonsTrialRewardRequest = 303801; DemonsTrialRewardResponse = 303802; + // 使用头像框 + UseHeadFrameRequest = 303901; + UseHeadFrameResponse = 303902; + //800000起为global 协议 GetWorldServerRequest = 800001;//获取世界服ip diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 5fb0a6d..1e44b90 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -779,6 +779,14 @@ import "CommonProto.proto"; optional int32 worldLeve = 1;//世界等级推送 } + // 使用头像框 + message UseHeadFrameRequest{ + optional int32 headFrameId = 1;//头像框id + } + message UseHeadFrameResponse{ + optional int32 validTime = 1;//到期时间 + } + From e7c935eef94d4e32046c5e9bcb74ab18d7870948 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 15 Jan 2021 14:04:41 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E9=81=93=E5=85=B7=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 5e905a6..d7cc317 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -55,6 +55,7 @@ option optimize_for = SPEED; optional int32 itemNum = 2; optional int32 endingTime = 3; optional int32 nextFlushTime = 4; //下次刷新时间 0 不刷新 + optional int32 expirationTime = 5; //道具到期时间，0为永久 } From e1bd3f7daf52711ebf4ed5a326dcf30973d66b2c Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 15 Jan 2021 15:07:00 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=A1=86=E5=88=B0?= =?UTF-8?q?=E6=9C=9F=E6=8E=A8=E9=80=81=EF=BC=8C=E5=92=8C=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 6 ++++-- protos/MessageTypeProto.proto | 1 + protos/PlayerInfoProto.proto | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index d7cc317..45ffa79 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -55,7 +55,6 @@ option optimize_for = SPEED; optional int32 itemNum = 2; optional int32 endingTime = 3; optional int32 nextFlushTime = 4; //下次刷新时间 0 不刷新 - optional int32 expirationTime = 5; //道具到期时间，0为永久 } @@ -64,7 +63,10 @@ option optimize_for = SPEED; optional int32 propertyValue = 2; } - + message HeadFrameList{ + optional int32 headFrameId = 1;//头像框id + optional int32 validTime = 2;//有效时间 + } message Equip{ optional string id = 1; diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index dd76ce9..d717729 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1121,6 +1121,7 @@ enum MessageType{ // 使用头像框 UseHeadFrameRequest = 303901; UseHeadFrameResponse = 303902; + HeadFramePastDueIndication = 30903; //800000起为global 协议 diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 1e44b90..5b10551 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -73,6 +73,7 @@ import "CommonProto.proto"; optional int32 hadAdvanceLuckTime = 33;//高级幸运探宝次数 optional int32 worldLeve = 34;//世界等级 repeated int32 DemonsTrialRewardInfo = 35;//心魔试炼已领取奖励信息 + repeated HeadFrameList headFrameBag = 36;//头像框背包 } @@ -786,7 +787,9 @@ import "CommonProto.proto"; message UseHeadFrameResponse{ optional int32 validTime = 1;//到期时间 } - + message HeadFramePastDueIndication{ + optional int32 headFrameId = 1;//头像框id + } From 28d9f3be73c71581e69c2d23ebd3e6eca573b899 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 15 Jan 2021 18:20:20 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=97=A0=E7=94=A8=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/MessageTypeProto.proto | 1 - protos/PlayerInfoProto.proto | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index d717729..dd76ce9 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1121,7 +1121,6 @@ enum MessageType{ // 使用头像框 UseHeadFrameRequest = 303901; UseHeadFrameResponse = 303902; - HeadFramePastDueIndication = 30903; //800000起为global 协议 diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 5b10551..e5be46c 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -786,13 +786,4 @@ import "CommonProto.proto"; } message UseHeadFrameResponse{ optional int32 validTime = 1;//到期时间 - } - message HeadFramePastDueIndication{ - optional int32 headFrameId = 1;//头像框id - } - - - - - - \ No newline at end of file + } \ No newline at end of file From 35c9ac2b7a6d420a19caed0293185515d14cda8a Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 18 Jan 2021 13:40:34 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E6=A1=86=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/MessageTypeProto.proto | 3 +++ protos/PlayerInfoProto.proto | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index dd76ce9..7abbb80 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1122,6 +1122,9 @@ enum MessageType{ UseHeadFrameRequest = 303901; UseHeadFrameResponse = 303902; + GetHeadFrameListRequest = 303903; + GetHeadFrameListResponse = 303904; + //800000起为global 协议 GetWorldServerRequest = 800001;//获取世界服ip diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index e5be46c..26fbdac 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -786,4 +786,10 @@ import "CommonProto.proto"; } message UseHeadFrameResponse{ optional int32 validTime = 1;//到期时间 + } + // 获取头像框列表 + message GetHeadFrameListRequest{ + } + message GetHeadFrameListResponse{ + optional HeadFrameList headFrameList = 1;//头像框列表 } \ No newline at end of file From 2161a310d3732202fa9d77ff6e0310bbb392c720 Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 18 Jan 2021 13:48:50 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=97=A0=E7=94=A8=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/MessageTypeProto.proto | 4 ---- protos/PlayerInfoProto.proto | 6 ------ 2 files changed, 10 deletions(-) diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 7abbb80..d6ee481 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1122,10 +1122,6 @@ enum MessageType{ UseHeadFrameRequest = 303901; UseHeadFrameResponse = 303902; - GetHeadFrameListRequest = 303903; - GetHeadFrameListResponse = 303904; - - //800000起为global 协议 GetWorldServerRequest = 800001;//获取世界服ip GetWorldServerResponse = 800002; diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 26fbdac..e5be46c 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -786,10 +786,4 @@ import "CommonProto.proto"; } message UseHeadFrameResponse{ optional int32 validTime = 1;//到期时间 - } - // 获取头像框列表 - message GetHeadFrameListRequest{ - } - message GetHeadFrameListResponse{ - optional HeadFrameList headFrameList = 1;//头像框列表 } \ No newline at end of file From 76f1ce345f5b9794e3c16957d5a26005ce1c6f77 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 21 Jan 2021 10:06:39 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=89=AD=E8=BD=AC=E4=B9=BE=E5=9D=A4?= =?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/ActivityProto.proto | 5 +++++ protos/MessageTypeProto.proto | 2 ++ 2 files changed, 7 insertions(+) diff --git a/protos/ActivityProto.proto b/protos/ActivityProto.proto index 24ebb3e..520dd9c 100644 --- a/protos/ActivityProto.proto +++ b/protos/ActivityProto.proto @@ -55,4 +55,9 @@ import "CommonProto.proto"; message UpgradeGodTreeRequest{ } message UpgradeGodTreeResponse{ + } + //扭转乾坤 + message GoodLuckResponse{ + optional int32 index = 1; + optional Drop drop = 2; } \ No newline at end of file diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index d6ee481..0a799c8 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -503,6 +503,8 @@ enum MessageType{ GUILD_CHALLENGE_SEND_MESSAGE_RESPONSE = 16685; //GUILD_CHALLENGE_FIVE_INDICATION = 16686;//公会副本五点刷新 + GOOD_LUCK_REQUEST = 16687//扭转乾坤 + GOOD_LUCK_RESPONSE = 16688; // H 10700 HERO_RAND_REQQUEST = 10701; From 71f82b720604cbcb8fe8d374ad758c5ba0361cc0 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 21 Jan 2021 10:07:50 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/MessageTypeProto.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 0a799c8..b30d55f 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -503,7 +503,7 @@ enum MessageType{ GUILD_CHALLENGE_SEND_MESSAGE_RESPONSE = 16685; //GUILD_CHALLENGE_FIVE_INDICATION = 16686;//公会副本五点刷新 - GOOD_LUCK_REQUEST = 16687//扭转乾坤 + GOOD_LUCK_REQUEST = 16687;//扭转乾坤 GOOD_LUCK_RESPONSE = 16688; // H 10700 From f4e2d373eb9e686ae1128ebf35789bb1e793a1ed Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 21 Jan 2021 10:16:59 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=89=AD=E8=BD=AC=E4=B9=BE=E5=9D=A4?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/ActivityProto.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/protos/ActivityProto.proto b/protos/ActivityProto.proto index 520dd9c..d980dd7 100644 --- a/protos/ActivityProto.proto +++ b/protos/ActivityProto.proto @@ -56,7 +56,12 @@ import "CommonProto.proto"; } message UpgradeGodTreeResponse{ } + //扭转乾坤 + message GoodLuckRequest{ + optional int32 activityId = 1; + } + message GoodLuckResponse{ optional int32 index = 1; optional Drop drop = 2; From be3597224a2292558bcbdc9b3891ebca751c19d5 Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 25 Jan 2021 15:11:17 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=B8=80=E9=94=AE=E9=A2=86=E5=8F=96?= =?UTF-8?q?=E9=82=AE=E4=BB=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/PlayerInfoProto.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index e5be46c..52c2562 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -109,6 +109,7 @@ import "CommonProto.proto"; } message TakeMailResponse{ optional Drop drop = 1; + optional int32 msg = 2;// 1：成功，0：道具为空，2：背包已满 } From b50accb06577a1736e18370a3adbfa87e59fba9c Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 25 Jan 2021 16:08:09 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=B8=80=E9=94=AE=E9=A2=86=E5=8F=96?= =?UTF-8?q?=E9=82=AE=E4=BB=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/PlayerInfoProto.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index e5be46c..52c2562 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -109,6 +109,7 @@ import "CommonProto.proto"; } message TakeMailResponse{ optional Drop drop = 1; + optional int32 msg = 2;// 1：成功，0：道具为空，2：背包已满 }