From 668bb6af12ca9f8c3e19d7155d6016ad5c976e8c Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 29 Jun 2021 11:08:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BF=83=E6=84=BF=E6=8A=BD=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 7 +++++++ protos/HeroInfoProto.proto | 21 +++++++++++++++++++++ protos/MessageTypeProto.proto | 15 +++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 84358cd..77929dc 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -990,3 +990,10 @@ option optimize_for = SPEED; optional int32 key = 1; optional int32 val = 2; } + + // 心愿抽卡 + message wishDrawCardInfo{ + optional int32 id = 1;//序列id + optional int32 heroTid = 2;//英雄模板id + optional int32 status = 3;//状态 0:未锁 1:锁定 + } \ No newline at end of file diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index 9517527..b069fd8 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -383,4 +383,25 @@ import "CommonProto.proto"; repeated PurpleMansionSeal sealList = 1; } + + // 心愿抽卡 + message wishDrawCardInfoRequest{ + } + + message wishDrawCardInfoResponse{ + repeated wishDrawCardInfo infoList = 1; + } + + message wishDrawCardIndication{ + repeated wishDrawCardInfo infoList = 1; + } + + message choiceWishHeroRequest{ + repeated wishDrawCardInfo infoList = 1;//不用status + } + + message choiceWishHeroResponse{ + repeated wishDrawCardInfo infoList = 1; + + } \ No newline at end of file diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index c8ab3bc..a563b70 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1229,6 +1229,21 @@ enum MessageType{ choiceDrawCardRequest = 3040108; choiceDrawCardResponse = 3040109; + // 心愿抽卡 + wishDrawCardInfoRequest = 3040120; + + wishDrawCardInfoResponse = 3040121; + + wishDrawCardIndication = 3040123; + + choiceWishHeroRequest = 3040124; + + choiceWishHeroResponse = 3040125; + + + + + //800000起为global 协议 GetWorldServerRequest = 800001;//获取世界服ip GetWorldServerResponse = 800002; From 7507ed50ab18eebce50f1bf29b23ee223fb2fc8e Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 29 Jun 2021 15:23:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BF=83=E6=84=BF=E6=8A=BD=E5=8D=A1,?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/HeroInfoProto.proto | 7 ------- protos/MessageTypeProto.proto | 5 ----- 2 files changed, 12 deletions(-) diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index b069fd8..089d607 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -385,13 +385,6 @@ import "CommonProto.proto"; // 心愿抽卡 - message wishDrawCardInfoRequest{ - } - - message wishDrawCardInfoResponse{ - repeated wishDrawCardInfo infoList = 1; - } - message wishDrawCardIndication{ repeated wishDrawCardInfo infoList = 1; } diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index a563b70..60a5d7b 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1230,16 +1230,11 @@ enum MessageType{ choiceDrawCardResponse = 3040109; // 心愿抽卡 - wishDrawCardInfoRequest = 3040120; - - wishDrawCardInfoResponse = 3040121; - wishDrawCardIndication = 3040123; choiceWishHeroRequest = 3040124; choiceWishHeroResponse = 3040125; - From eec110ad3008ad14ab05344900394883834a88b4 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 30 Jun 2021 10:04:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=92=BB=E7=9F=B3=E6=8A=BD=E6=80=BB?= =?UTF-8?q?=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/PlayerInfoProto.proto | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 88844d0..0eda088 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -49,7 +49,7 @@ import "CommonProto.proto"; repeated int32 vipLeveTake = 7; optional int32 userCreateTime = 8; // 玩家创角时间 repeated int32 redType = 9;// 红点信息 - optional int32 randCount = 10;//已招募次数 + optional int32 randCount = 10;//已招募次数(废弃) repeated EveryHeroHandBook heroHandBook = 11;//英雄图鉴 repeated int32 equipHandBook = 12;//装备图鉴 repeated int32 towerReceivedReward = 13;//试炼已领取奖励层数 @@ -82,6 +82,7 @@ import "CommonProto.proto"; optional int32 practiceLevel = 41;//修行等级 repeated PurpleMansionSeal sealList = 42;//神印列表 optional int32 randomCount = 43;//抽卡剩余必出 + optional int32 drawTimes = 44;//钻石抽总次数 } From 53ed787c69c07bd8fb92111418ad1dba6b867d4f Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 30 Jun 2021 10:22:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=8A=BD=E5=8D=A1?= =?UTF-8?q?=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 6 ++++++ protos/HeroInfoProto.proto | 2 +- protos/PlayerInfoProto.proto | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 77929dc..62bfcbf 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -996,4 +996,10 @@ option optimize_for = SPEED; optional int32 id = 1;//序列id optional int32 heroTid = 2;//英雄模板id optional int32 status = 3;//状态 0:未锁 1:锁定 + } + + // 抽卡类型次数 + message randomTypeNum{ + optional int32 type = 1;//招募类型 + optional int32 num = 2;//数量 } \ No newline at end of file diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index 089d607..d15a5f2 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -41,7 +41,7 @@ import "CommonProto.proto"; optional Drop drop =1 ; optional Drop extraBox = 2 ;//宝箱奖励 optional int32 mustCount = 3;//剩余必出次数 - + repeated randomTypeNum drawTimes = 4;//类型抽卡次数 } message TeamposSaveRequest{ diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 0eda088..cbe004c 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -82,7 +82,7 @@ import "CommonProto.proto"; optional int32 practiceLevel = 41;//修行等级 repeated PurpleMansionSeal sealList = 42;//神印列表 optional int32 randomCount = 43;//抽卡剩余必出 - optional int32 drawTimes = 44;//钻石抽总次数 + repeated randomTypeNum drawTimes = 44;//类型抽卡总次数 }