From 106647a69c9a62a5716f1429e73db5884a5fcd88 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 18 Jun 2021 14:47:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=8D=E5=A6=96=E5=A4=BA=E5=AE=9D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua | 2 +- .../View/GeneralBigPopup_RecrutDetail.lua | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua index 91693d73b3..2f99c669a6 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua @@ -69,7 +69,7 @@ function XiangYaoDuoBao:BindEvent() UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.XiangYaoDuoBao,self.helpPosition.x,self.helpPosition.y) end) Util.AddOnceClick(self.detailBtn, function() - UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.RecrutDetail,self.actConfig.HelpId,self.actType,PRE_REWARD_POOL_TYPE.XIANG_YAO_UP) + UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.RecrutDetail,self.actConfig.HelpId,self.actType,PRE_REWARD_POOL_TYPE.XIANG_YAO_UP,PRE_REWARD_POOL_TYPE.XIANG_YAO_UP) end) Util.AddOnceClick(self.btn,function () local thread=coroutine.start(function() diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua index 82528dc471..6c6616dda4 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua @@ -194,7 +194,16 @@ function this:BuildRateData(actType,UpItem,upItemList) end rateList = this:RefreshMonsterRate(upItemList,_upRateList) elseif actType == ActivityTypeDef.XiangYaoDuoBao then - rateList = this:RefreshNewHeroRate(UpItem,upItemList,"5星UP!",ConfigName.HeroConfig) + local rewardData,showData,curScore = DynamicActivityManager.XiangYaoBuildData(activityType) + for n,m in ipairs(upItemList) do + if m and m.Reward[1] == showData.monsterId then + local _config = ConfigManager.GetConfigData(ConfigName.HeroConfig,m.Reward[1]) + local readingName = _config.ReadingName or _config.Name + table.insert(_upRateList,{id = m.Reward[1],tag="5星UP!",name = readingName,value = m.Weight}) + break + end + end + rateList = this:RefreshNewHeroRate(upItemList,_upRateList,"5星UP!",ConfigName.HeroConfig) end for k,v in ipairs(this.ratePreList) do