From 206549e7c57a26b03d68c6cc3d71415c9d0f0330 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Tue, 7 Dec 2021 09:34:32 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=91=BD=E6=A0=BC=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 6 ++++++ protos/HeroInfoProto.proto | 18 ++++++++++++++++++ protos/MessageTypeProto.proto | 9 ++++++++- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 47711b8..0871662 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -1206,3 +1206,9 @@ option optimize_for = SPEED; optional string defServerName = 7;//对方服务器名字 } + + //消耗命石数据 + message LifeStoneInfo{ + optional int32 itemId = 1;//命石id + optional int32 costNum = 2;//消耗数量 + } diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index e50da92..0e91945 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -499,4 +499,22 @@ import "CommonProto.proto"; optional int32 id = 1;//变身卡id optional int32 index = 2;//位置 } + + //命石合成升级 + message LifeStoneUpRequest{ + optional int32 type = 1;//操作类型 1:批量合成 2:一键合成 3:命石单个合成 4:快速合成 + optional int32 gridId = 2;//当前选择命格id 这个值大于0说明在命格界面操作 否则是在背包操作 + optional int32 gridIndex = 3;//当前命格内索引 + optional int32 curGemId = 4;//当前选择命石id + repeated LifeStoneInfo costStoneList = 5;//消耗命石列表 + } + + + //命格穿戴/卸下 + message LifeGridChangeRequest{ + optional int32 type = 1;//操作类型 1:穿戴 2:卸下 + optional int32 position = 2;//命格id + optional int32 index = 3;//命格里格子索引 + optional int32 lifeStoneId = 4;//当前选择命石道具id + } \ No newline at end of file diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 88f1522..8e4eba2 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1131,8 +1131,15 @@ enum MessageType{ TRUMP_GACHA_SELECT_ITEM_REQUEST = 20215;//天地洪炉活动选择道具协议 TRUMP_GACHA_SELECT_ITEM_RESPONSE = 20216; - GET_TRUMP_SELECT_ITEM_REQUEST = 20217;//获取天地洪炉活动选择up道具协议 + GET_TRUMP_SELECT_ITEM_REQUEST = 20217;//获取天地洪炉抽奖选择up道具协议 GET_TRUMP_SELECT_ITEM_RESPONSE = 20218; + + LIFE_STONE_UP_REQUEST = 20219;//命石合成协议 + LIFE_STONE_UP_RESPONSE = 20220; + + LIFE_GRID_CHANGE_REQUEST = 20221;//命格穿戴/卸下协议 + LIFE_GRID_CHANGE_RESPONSE = 20222; + //30000以后 新增协议号使用协议名定义 协议号自动映射 From f2e3e22856b0c3c03bf0fe4cf7535eacda7ef6ce Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Tue, 7 Dec 2021 10:38:45 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=91=BD=E6=A0=BC=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=8D=8F=E8=AE=AE=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 7 +++++++ protos/PlayerInfoProto.proto | 1 + 2 files changed, 8 insertions(+) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 0871662..f846be0 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -1212,3 +1212,10 @@ option optimize_for = SPEED; optional int32 itemId = 1;//命石id optional int32 costNum = 2;//消耗数量 } + + //初始化命格数据 + message LifeGridInfo{ + optional int32 gridId = 1;//命格id + optional int32 gridIndex = 2;//命格索引 + optional int32 itemId = 3;//命石id + } diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 7fe9e8a..ebae37f 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -89,6 +89,7 @@ import "CommonProto.proto"; optional int32 xiuweiLevel = 48; // 主角修为等级 repeated PracticeSkillInfo practiceSkillInfos = 49;//修行技能数据 repeated FaBaoSoulInfo FaBaoSoulInfos = 50;//法宝之魂数据 + repeated LifeGridInfo lifeGridInfos = 51;//命格数据 } From 6801b91f83a0e1fa7911e64e41917815b5a43072 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Tue, 7 Dec 2021 13:08:06 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=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 f846be0..f09b17b 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -1213,7 +1213,7 @@ option optimize_for = SPEED; optional int32 costNum = 2;//消耗数量 } - //初始化命格数据 + //命格数据 message LifeGridInfo{ optional int32 gridId = 1;//命格id optional int32 gridIndex = 2;//命格索引 From eee8bcedd512a56b59aa176f39b2f5620badde94 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Tue, 7 Dec 2021 13:18:46 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=91=BD=E6=A0=BC=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/HeroInfoProto.proto | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index 0e91945..b48d1b8 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -509,6 +509,12 @@ import "CommonProto.proto"; repeated LifeStoneInfo costStoneList = 5;//消耗命石列表 } + //当前命石已装备的情况返回命格数据 + message LifeStoneUpResponse{ + optional int32 gridId = 1;//命格id + optional int32 gridIndex = 2;//命格索引 + optional int32 itemId = 3;//命石id + } //命格穿戴/卸下 message LifeGridChangeRequest{ @@ -517,4 +523,13 @@ import "CommonProto.proto"; optional int32 index = 3;//命格里格子索引 optional int32 lifeStoneId = 4;//当前选择命石道具id } + + //返回命格数据 + message LifeGridChangeResponse{ + optional int32 gridId = 1;//命格id + optional int32 gridIndex = 2;//命格索引 + optional int32 itemId = 3;//命石id + } + + \ No newline at end of file From e11cdac2721362214fcd83feb1dd315392c6c34d Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Tue, 7 Dec 2021 14:33:38 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=91=BD=E6=A0=BC=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/HeroInfoProto.proto | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index b48d1b8..7f7a519 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -511,9 +511,7 @@ import "CommonProto.proto"; //当前命石已装备的情况返回命格数据 message LifeStoneUpResponse{ - optional int32 gridId = 1;//命格id - optional int32 gridIndex = 2;//命格索引 - optional int32 itemId = 3;//命石id + optional LifeGridInfo lifeGridInfo = 1;//命格信息 } //命格穿戴/卸下 @@ -526,9 +524,7 @@ import "CommonProto.proto"; //返回命格数据 message LifeGridChangeResponse{ - optional int32 gridId = 1;//命格id - optional int32 gridIndex = 2;//命格索引 - optional int32 itemId = 3;//命石id + optional LifeGridInfo lifeGridInfo = 1;//命格信息 } From 3bf9f47ac4593004c70e615f74ed2549488c0912 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Tue, 7 Dec 2021 15:53:17 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/HeroInfoProto.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index 7f7a519..1d882fd 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -506,7 +506,7 @@ import "CommonProto.proto"; optional int32 gridId = 2;//当前选择命格id 这个值大于0说明在命格界面操作 否则是在背包操作 optional int32 gridIndex = 3;//当前命格内索引 optional int32 curGemId = 4;//当前选择命石id - repeated LifeStoneInfo costStoneList = 5;//消耗命石列表 + optional int32 selectNum = 5;//批量时选择消耗数量 } //当前命石已装备的情况返回命格数据 From f9a5b1f70d5329896c9608bb5aa35a323b3fd2b3 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Wed, 8 Dec 2021 16:26:45 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=20=E5=91=BD=E7=9F=B3=E5=90=88=E6=88=90?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=89=E8=90=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/HeroInfoProto.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index 1d882fd..4d1f155 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -512,6 +512,7 @@ import "CommonProto.proto"; //当前命石已装备的情况返回命格数据 message LifeStoneUpResponse{ optional LifeGridInfo lifeGridInfo = 1;//命格信息 + optional Drop drop = 2;//合成掉落 } //命格穿戴/卸下