From 3d96082be3eb4603aaced301dd3dc25577d7aee6 Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 31 Aug 2021 11:40:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E7=81=B5=E8=AF=95=E7=82=BC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/PlayerInfoProto.proto | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 97eb38e..fa0a9df 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -75,7 +75,6 @@ import "CommonProto.proto"; optional int32 worldLeve = 34;//世界等级 repeated int32 DemonsTrialRewardInfo = 35;//心魔试炼已领取奖励信息 repeated HeadFrameList headFrameBag = 36;//头像框背包 -<<<<<<< HEAD repeated UserSkinInfo userSkinList = 37;//玩家皮肤信息 repeated UserTitleInfo userTitleList = 38;//玩家称号信息 repeated UserMountInfo userMountList = 39;//玩家坐骑信息 @@ -84,9 +83,7 @@ import "CommonProto.proto"; repeated PurpleMansionSeal sealList = 42;//神印列表 optional int32 randomCount = 43;//抽卡剩余必出 repeated randomTypeNum drawTimes = 44;//类型抽卡总次数 -======= - repeated HelpFightList helpFightList = 37;//已选取的助战信息 ->>>>>>> master_test_hw_four_challenge + repeated HelpFightList helpFightList = 45;//已选取的助战信息 }