From c57563a1a6ed6f67048a150065d700633d4bf16d Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 2 Dec 2021 15:10:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/ActivityProto.proto | 9 +++++++++ protos/MessageTypeProto.proto | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/protos/ActivityProto.proto b/protos/ActivityProto.proto index 43a2145..dca9dd3 100644 --- a/protos/ActivityProto.proto +++ b/protos/ActivityProto.proto @@ -192,4 +192,13 @@ import "CommonProto.proto"; repeated int32 selectIds = 1; } + + // 妖晶购买道具 + message BuyGoodsToItemRequest{ + optional int32 goodId = 1; + optional int32 goodsNum = 2; + } + message BuyGoodsToItemResponse{ + optional Drop drop = 1; + } \ No newline at end of file diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 88f1522..d5d3fb2 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1360,6 +1360,11 @@ enum MessageType{ UpOrDownTransformationRequest = 3050022; + + // 购买道具礼包(妖晶) + BuyGoodsToItemRequest = 3050023; + BuyGoodsToItemResponse = 3050024; + //周卡 WeekCardInfoRequest = 3050030; From ff332c08871d6b13188e45a73ca4b78125f03f71 Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 6 Dec 2021 15:29:38 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A4=A7=E9=97=B9=E5=A4=A9=E5=AE=AB?= =?UTF-8?q?=EF=BC=8C=E6=80=AA=E7=89=A9=E5=8A=A0=E7=A5=9E=E9=AD=82=E7=AD=89?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 47711b8..4b86de5 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -835,13 +835,14 @@ option optimize_for = SPEED; message ExpeditionSimpleBossInfo{ optional int32 heroTid = 1;//英雄模板id optional int32 star = 2; - optional int32 level =3; - optional double remainHp =4;//剩余血量 + optional int32 level = 3; + optional double remainHp = 4;//剩余血量 optional int32 position = 5; //位置 1 2 3 4 一次从左到右 + optional int32 godSoulLev = 6;//神魂等级 } message ExpeditionTeamInfo{ - repeated ExpeditionSimpleBossInfo hero =1; + repeated ExpeditionSimpleBossInfo hero =1; repeated int32 PokemonInfos = 2; optional int32 totalForce=3; optional int32 teamInfo=4;//节点属性 招募试炼节点为怪物组id From c444d70ecd62fdc1cb38a545eef158ac6784ddb6 Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 6 Dec 2021 17:35:16 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 4b86de5..cc8699d 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -838,7 +838,7 @@ option optimize_for = SPEED; optional int32 level = 3; optional double remainHp = 4;//剩余血量 optional int32 position = 5; //位置 1 2 3 4 一次从左到右 - optional int32 godSoulLev = 6;//神魂等级 + optional int32 godSoulLv = 6;//神魂等级 } message ExpeditionTeamInfo{ From 7f2c87c3051f5b155bd74ae455ac0e6c13feae42 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 10 Dec 2021 16:44:26 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=85=AC=E4=BC=9Aboss=E4=BC=A4=E5=AE=B3?= =?UTF-8?q?=E8=B6=85=E4=B8=8A=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/Family.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/Family.proto b/protos/Family.proto index bdb3725..2794f2e 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -569,7 +569,7 @@ import "CommonProto.proto"; optional int32 canSweep = 3;//是否能扫荡,今天是否挑战过这个boss optional int32 buffCount = 4;//当前buff到多少索引 optional int32 buffTime = 5;//buff结束时间 - optional int32 sweepDamage = 6;//上次挑战或扫荡的伤害 + optional int64 sweepDamage = 6;//上次挑战或扫荡的伤害 repeated int32 refreshedBoss = 7;//已经使用过刷新的boss,打死后不再刷新次数 optional int32 isRefresh = 8;//本次请求是否有刷新,刷新1,不刷新0 } From b1516efe6b6b07f19a477b5704406f58fcc04ef8 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 10 Dec 2021 18:27:37 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=85=AC=E4=BC=9Aboss=E4=BC=A4=E5=AE=B3?= =?UTF-8?q?=E8=B6=85=E4=B8=8A=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/Family.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/Family.proto b/protos/Family.proto index 2794f2e..5b6babb 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -581,7 +581,7 @@ import "CommonProto.proto"; optional int32 kill = 1;//本次是否击杀boss optional Drop drop = 2; optional FightData fightData = 3;//战斗 - optional int32 damage = 4;//伤害值 + optional int64 damage = 4;//伤害值 } message GuildChallengeIndication{ optional int32 curBoss = 1;//当前bossId