From d51a4292f327c37e0a68c365f6fcd33a3114539c Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 22 Oct 2021 18:30:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=8F=90=E4=BA=A4=20=20?= =?UTF-8?q?=E4=B8=BB=E8=A7=92=E6=8A=80=E8=83=BD=E5=9B=BE=E6=A0=87=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9=20=20=E7=8E=89=E8=99=9A=E6=88=98?= =?UTF-8?q?=E6=96=97=E8=AE=B0=E5=BD=95=E6=95=8C=E6=96=B9=E5=88=86=E6=95=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Message/CommonProto_pb.lua | 13 ++++++++++++- .../Modules/Practice/PracticeSkillInfoPanel.lua | 2 +- .../Modules/WorldArena/WorldArenaRecordPopup.lua | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua index d299027119..2ec4ccc35c 100644 --- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua @@ -742,6 +742,7 @@ CROSSYXLDPLAYERRECORDINFO_RESULT_FIELD = protobuf.FieldDescriptor(); CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD = protobuf.FieldDescriptor(); CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD = protobuf.FieldDescriptor(); CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD = protobuf.FieldDescriptor(); +CROSSYXLDPLAYERRECORDINFO_DEFSCORECHANGE_FIELD = protobuf.FieldDescriptor(); SIXIANGXINFAPROPERTYINFO = protobuf.Descriptor(); SIXIANGXINFAPROPERTYINFO_PROPERTYID_FIELD = protobuf.FieldDescriptor(); SIXIANGXINFAPROPERTYINFO_PROPERTYNUM_FIELD = protobuf.FieldDescriptor(); @@ -7855,11 +7856,21 @@ CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.default_value = {} CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.type = 5 CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.cpp_type = 1 +CROSSYXLDPLAYERRECORDINFO_DEFSCORECHANGE_FIELD.name = "defScoreChange" +CROSSYXLDPLAYERRECORDINFO_DEFSCORECHANGE_FIELD.full_name = ".rpc.protocols.crossYxldPlayerRecordInfo.defScoreChange" +CROSSYXLDPLAYERRECORDINFO_DEFSCORECHANGE_FIELD.number = 21 +CROSSYXLDPLAYERRECORDINFO_DEFSCORECHANGE_FIELD.index = 20 +CROSSYXLDPLAYERRECORDINFO_DEFSCORECHANGE_FIELD.label = 1 +CROSSYXLDPLAYERRECORDINFO_DEFSCORECHANGE_FIELD.has_default_value = false +CROSSYXLDPLAYERRECORDINFO_DEFSCORECHANGE_FIELD.default_value = 0 +CROSSYXLDPLAYERRECORDINFO_DEFSCORECHANGE_FIELD.type = 5 +CROSSYXLDPLAYERRECORDINFO_DEFSCORECHANGE_FIELD.cpp_type = 1 + CROSSYXLDPLAYERRECORDINFO.name = "crossYxldPlayerRecordInfo" CROSSYXLDPLAYERRECORDINFO.full_name = ".rpc.protocols.crossYxldPlayerRecordInfo" CROSSYXLDPLAYERRECORDINFO.nested_types = {} CROSSYXLDPLAYERRECORDINFO.enum_types = {} -CROSSYXLDPLAYERRECORDINFO.fields = {CROSSYXLDPLAYERRECORDINFO_UID_FIELD, CROSSYXLDPLAYERRECORDINFO_LEVEL_FIELD, CROSSYXLDPLAYERRECORDINFO_HEAD_FIELD, CROSSYXLDPLAYERRECORDINFO_USERNAME_FIELD, CROSSYXLDPLAYERRECORDINFO_HEADFRAME_FIELD, CROSSYXLDPLAYERRECORDINFO_TIME_FIELD, CROSSYXLDPLAYERRECORDINFO_FIGHTDATA1_FIELD, CROSSYXLDPLAYERRECORDINFO_FIGHTDATA2_FIELD, CROSSYXLDPLAYERRECORDINFO_FIGHTDATA3_FIELD, CROSSYXLDPLAYERRECORDINFO_POWER_FIELD, CROSSYXLDPLAYERRECORDINFO_TYPE_FIELD, CROSSYXLDPLAYERRECORDINFO_PRACTICELEVEL_FIELD, CROSSYXLDPLAYERRECORDINFO_MYSCORECHANGE_FIELD, CROSSYXLDPLAYERRECORDINFO_RESULTLIST_FIELD, CROSSYXLDPLAYERRECORDINFO_SCORE_FIELD, CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD, CROSSYXLDPLAYERRECORDINFO_RESULT_FIELD, CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD, CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD, CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD} +CROSSYXLDPLAYERRECORDINFO.fields = {CROSSYXLDPLAYERRECORDINFO_UID_FIELD, CROSSYXLDPLAYERRECORDINFO_LEVEL_FIELD, CROSSYXLDPLAYERRECORDINFO_HEAD_FIELD, CROSSYXLDPLAYERRECORDINFO_USERNAME_FIELD, CROSSYXLDPLAYERRECORDINFO_HEADFRAME_FIELD, CROSSYXLDPLAYERRECORDINFO_TIME_FIELD, CROSSYXLDPLAYERRECORDINFO_FIGHTDATA1_FIELD, CROSSYXLDPLAYERRECORDINFO_FIGHTDATA2_FIELD, CROSSYXLDPLAYERRECORDINFO_FIGHTDATA3_FIELD, CROSSYXLDPLAYERRECORDINFO_POWER_FIELD, CROSSYXLDPLAYERRECORDINFO_TYPE_FIELD, CROSSYXLDPLAYERRECORDINFO_PRACTICELEVEL_FIELD, CROSSYXLDPLAYERRECORDINFO_MYSCORECHANGE_FIELD, CROSSYXLDPLAYERRECORDINFO_RESULTLIST_FIELD, CROSSYXLDPLAYERRECORDINFO_SCORE_FIELD, CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD, CROSSYXLDPLAYERRECORDINFO_RESULT_FIELD, CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD, CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD, CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD, CROSSYXLDPLAYERRECORDINFO_DEFSCORECHANGE_FIELD} CROSSYXLDPLAYERRECORDINFO.is_extendable = false CROSSYXLDPLAYERRECORDINFO.extensions = {} SIXIANGXINFAPROPERTYINFO_PROPERTYID_FIELD.name = "propertyId" diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeSkillInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeSkillInfoPanel.lua index 8b5ff5cb41..f98ad5e3c7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeSkillInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeSkillInfoPanel.lua @@ -77,7 +77,7 @@ function PracticeSkillInfoPanel:RefreshShow(id,lv) local currData=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PlayerSkill,"SkillID",id,"Level",currLv) nextData=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PlayerSkill,"SkillID",id,"Level",currLv+1) self.currInfo.text="本级效果:"..currData.Desc - self.skillIcon.sprite=self.spLoader:LoadSprite(GetResourcePath(SkillBaseConfig[id].Icon)) + self.skillIcon.sprite=self.spLoader:LoadSprite(GetResourcePath(tonumber(SkillBaseConfig[id].Icon))) self.titleTxt.text=SkillBaseConfig[id].Name self.skillLv.text=currLv self.skillLv.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRecordPopup.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRecordPopup.lua index a0b00f0103..1494b4e05c 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRecordPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRecordPopup.lua @@ -145,7 +145,7 @@ function this.RankNodeAdapter(node, data,index) enTeamInfo.serverName= data.serverName enTeamInfo.name=data.userName enTeamInfo.crossTeamScore=data.score - enTeamInfo.myScore= data.myScoreChange*-1 + enTeamInfo.myScore= data.defScoreChange local fightDataList={msg.recordData.fightData1,msg.recordData.fightData2,msg.recordData.fightData3} --获取双方队伍数据 local allHeroTeam={} @@ -203,7 +203,7 @@ function this.RankNodeAdapter(node, data,index) windData.defTeamInfo=enTeamInfo windData.fightData=fightDataList windData.myScore= data.myScoreChange - windData.defScore= data.myScoreChange *-1 + windData.defScore= data.defScoreChange UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,windData,2,nil,msg.recordData.result) end)