diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index e96655706b..21194f155c 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1082,6 +1082,7 @@ ActivityTypeDef = { DynamicAct_Treasure = 20002,--主题活动珍奇宝阁 TreasureStore = 6000,--百宝商会 + YiJingBaoKu = 8000,--易经宝库 } --活动结束需要处理面板关闭类型 ActivityTypePanel = { diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 6d36427035..e49fabeeaa 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -2,7 +2,6 @@ DynamicActivityManager = {} local this = DynamicActivityManager this.curLevel = 0--社稷大典的等级 -this.curBaoKuLevel = 0--易经宝库等级 function this.Initialize() end @@ -57,15 +56,27 @@ function this.SheJiCheckRedPoint() end function this.GetBaoKuData() - local ActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.Celebration)--活动数据 - this.curBaoKuLevel = 1 - local activityId = 7001--ActInfo.activityId - local BlessingConfigNew = ConfigManager.GetConfigDataByKey(ConfigName.BlessingConfigNewl,"ActivityId",activityId) - local curPool = BlessingConfigNew.BasicPoolId[this.curBaoKuLevel] - local BlessingRewardPoolNew = ConfigManager.GetAllConfigsDataByKey(ConfigName.BlessingRewardPoolNew,"PoolId",curPool) + 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) + local RewardConfig = ConfigManager.GetConfig(ConfigName.BlessingRewardPoolNew) + local data={} for i = 1, #ActInfo.mission do + data[i].rewardId = ActInfo.mission[i].missionId + data[i].progress = ActInfo.mission[i].progress + data[i].state = ActInfo.mission[i].state + data[i].reward = RewardConfig[data[i].rewardId].Reward end + + local ActInfo={} + ActInfo.activityId = ActInfo.activityId + ActInfo.curPool = curPool + ActInfo.curLevel = ActInfo.value + ActInfo.data = data + + return ActInfo end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index aec16989ab..a7428158e6 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -81,7 +81,7 @@ local tabs = { }, [19] = { --易经宝库 default = "y_yijingbaoku_anniu_01", lock = "y_yijingbaoku_anniu_01", select = "y_yijingbaoku_anniu", - rpType = RedPointType.YiJingBaoKu,panelType = PanelType.YiJingBaoKu,ActType = ActivityTypeDef.QianKunBox + rpType = RedPointType.YiJingBaoKu,panelType = PanelType.YiJingBaoKu,ActType = ActivityTypeDef.YiJingBaoKu }, } local _PageInfo = {--后期可以做成tableInsert,icon名字都去读表