From 809c6daa01cfa24a56f1052943bf63129c0ff5f3 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 4 Nov 2020 10:53:02 +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=E6=95=B0=E6=8D=AE=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicActivity/DynamicActivityManager.lua | 16 ++++++++++++---- .../~Lua/Modules/DynamicActivity/YiJingBaoKu.lua | 4 ++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index e49fabeeaa..3e4255c0d8 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -57,11 +57,18 @@ end function this.GetBaoKuData() local ActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.YiJingBaoKu)--活动数据 - local BlessingConfigNew = ConfigManager.GetConfigDataByKey(ConfigName.BlessingConfigNewl,"ActivityId",ActInfo.activityId) - local curPool = BlessingConfigNew.BasicPoolId[ActInfo.value] - -- local BlessingRewardPoolNew = ConfigManager.GetAllConfigsDataByKey(ConfigName.BlessingRewardPoolNew,"PoolId",curPool) + LogPink("ActInfo.activityId:"..ActInfo.activityId)--待删除 + local BlessingConfigNew = ConfigManager.GetConfigDataByKey(ConfigName.BlessingConfigNew,"ActivityId",ActInfo.activityId) + LogPink("ActInfo.value:"..tostring(ActInfo.value))--待删除 + ActInfo.value = 1--待删除 + local curBasicPool = BlessingConfigNew.BasicPoolId[ActInfo.value] + local curFinalPool = BlessingConfigNew.FinalPoolId + LogPink("curBasicPool:"..tostring(curBasicPool))--待删除 + LogPink("curFinalPool:"..tostring(curFinalPool))--待删除 + -- local BlessingRewardPoolNew = ConfigManager.GetAllConfigsDataByKey(ConfigName.BlessingRewardPoolNew,"PoolId",curPool)--待删除 local RewardConfig = ConfigManager.GetConfig(ConfigName.BlessingRewardPoolNew) + LogPink("mission个数:"..#ActInfo.mission) local data={} for i = 1, #ActInfo.mission do data[i].rewardId = ActInfo.mission[i].missionId @@ -72,7 +79,8 @@ function this.GetBaoKuData() local ActInfo={} ActInfo.activityId = ActInfo.activityId - ActInfo.curPool = curPool + ActInfo.curBasicPool = curBasicPool + ActInfo.curFinalPool = curFinalPool ActInfo.curLevel = ActInfo.value ActInfo.data = data diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua index 49a7458e03..6ed19eb9b7 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua @@ -2,6 +2,8 @@ local YiJingBaoKu = quick_class("YiJingBaoKu") local this = YiJingBaoKu local _itemsList = {} local _itemsPosList={} + +local ActInfo = {} local sortingOrder = 0 local parent @@ -79,6 +81,8 @@ function YiJingBaoKu:OnShow(_sortingOrder,_parent) end function YiJingBaoKu:Refresh() + ActInfo = DynamicActivityManager.GetBaoKuData() + LogYellow("data数量:"..#ActInfo.data) YiJingBaoKu:ResetCard() YiJingBaoKu:AddBackToFrontClick() end