diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua index ae5b267e96..bbb5f6828e 100644 --- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua +++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua @@ -163,6 +163,8 @@ ConfigName = { ExchangeRate = "ExchangeRate", CustomEventConfig = "CustomEventConfig", ExpeditionRecruitConfig = "ExpeditionRecruitConfig", + GodSacrificeConfig = "GodSacrificeConfig", + GodSacrificeSetting = "GodSacrificeSetting", } require "Framework/GameDataBase" diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua index c02b76c21c..cab9eb9a76 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua @@ -2,9 +2,14 @@ require("Base/BasePanel") GeneralRankRewardPanel = Inherit(BasePanel) local this = GeneralRankRewardPanel local RewardList -local ActRankReward = ConfigManager.GetConfig(ConfigName.ActivityRankingReward) +local GloActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity) +local RewardConfig local itemList = {}--优化itemView使用 local sorting = 0 +local ConfigList = { + [1] = ConfigManager.GetConfig(ConfigName.ActivityRankingReward), + [ActivityTypeDef.Celebration] = ConfigManager.GetConfig(ConfigName.GodSacrificeConfig), +} --初始化组件(用于子类重写) function GeneralRankRewardPanel:InitComponent() @@ -37,6 +42,11 @@ end --界面打开时调用(用于子类重写) function GeneralRankRewardPanel:OnOpen(ActivityId,myRank) + if ConfigList[GloActConfig[ActivityId].Type] then + RewardConfig = ConfigList[GloActConfig[ActivityId].Type] + else + RewardConfig = ConfigList[1] + end this.ShowRewardInfo(ActivityId) this.SetMyRank(myRank) end @@ -66,7 +76,7 @@ end function this.ShowRewardInfo(ActivityId) RewardList = {} --guildCheckpointRank - for _, configInfo in ConfigPairs(ActRankReward) do + for _, configInfo in ConfigPairs(RewardConfig) do if configInfo.ActivityId == ActivityId then table.insert(RewardList,configInfo) end