From 7e954b997af38ebd397ee1b913cab9e41f95074d Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 18 Sep 2021 15:15:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=98=93=E7=BB=8F=E5=AE=9D=E5=BA=93?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E6=9F=A5=E7=9C=8B=E5=89=A9=E4=BD=99?= =?UTF-8?q?=E5=A5=96=E5=8A=B1=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/DynamicActivityManager.lua | 3 ++- .../View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index cfcd34bf51..b2f6731cce 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -221,6 +221,7 @@ function this.GetBaoKuData() if v.missionId == 100 then actData.curLevel = v.progress curBasicPool = tonumber(BasicPoolId[v.progress]) + actData.poolId = curBasicPool curFinalPool = BlessingConfigNew.FinalPoolId elseif v.missionId > 1000 then local data = {} @@ -271,7 +272,7 @@ end function this.GetLeftRewardData() local actData = this.GetBaoKuData() local finalCardDatas = actData.finalCardDatas - local RewardConfig = ConfigManager.GetAllConfigsDataByKey(ConfigName.BlessingRewardPoolNew,"PoolId",actData.curLevel)--初始所有奖励数据 + local RewardConfig = ConfigManager.GetAllConfigsDataByKey(ConfigName.BlessingRewardPoolNew,"PoolId",actData.poolId)--初始所有奖励数据 local data={} for i = 1, #RewardConfig do data[RewardConfig[i].Id] = {} diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua index e6ecc4fdc1..bb5b0c265f 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua @@ -81,7 +81,7 @@ function this:OnShow(_parent,...) table.insert(tempData,value) end this.ScrollView:SetData(tempData, function(index, go) - this:SetSingleData(index,go,leftRewardData[index + (ActData.curLevel-1)*10]) + this:SetSingleData(index,go,leftRewardData[index + (ActData.poolId-1)*10]) end) end