diff --git a/lua/app/config/activity.lua b/lua/app/config/activity.lua index 7eab9bac..d2faa5e4 100644 --- a/lua/app/config/activity.lua +++ b/lua/app/config/activity.lua @@ -81,7 +81,7 @@ local activity = { }, [1706]={ ["act_type"]=6, - ["start_time"]="2023-11-30 00:00:00", + ["start_time"]="2023-12-30 00:00:00", ["end_time"]="2023-01-08 00:00:00" } } diff --git a/lua/app/config/bounty_time.lua b/lua/app/config/bounty_time.lua index 67ebf2a7..457874cd 100644 --- a/lua/app/config/bounty_time.lua +++ b/lua/app/config/bounty_time.lua @@ -2,32 +2,38 @@ local bounty_time = { [1]={ ["season"]=1, ["start_time"]="2023-6-20 00:00:00", - ["end_time"]="2023-8-1 00:00:00" + ["end_time"]="2023-8-1 00:00:00", + ["ui_banner"]="ui_bounty_banner" }, [2]={ ["season"]=2, ["start_time"]="2023-8-1 00:00:00", - ["end_time"]="2023-9-1 00:00:00" + ["end_time"]="2023-9-1 00:00:00", + ["ui_banner"]="ui_bounty_banner_2" }, [3]={ ["season"]=3, ["start_time"]="2023-9-1 00:00:00", - ["end_time"]="2023-10-1 00:00:00" + ["end_time"]="2023-10-1 00:00:00", + ["ui_banner"]="ui_bounty_banner_3" }, [4]={ ["season"]=4, ["start_time"]="2023-10-1 00:00:00", - ["end_time"]="2023-11-1 00:00:00" + ["end_time"]="2023-11-1 00:00:00", + ["ui_banner"]="ui_bounty_banner_4" }, [5]={ ["season"]=5, ["start_time"]="2023-11-1 00:00:00", - ["end_time"]="2023-12-1 00:00:00" + ["end_time"]="2023-12-1 00:00:00", + ["ui_banner"]="ui_bounty_banner_5" }, [6]={ ["season"]=6, ["start_time"]="2023-12-1 00:00:00", - ["end_time"]="2024-1-1 00:00:00" + ["end_time"]="2024-1-1 00:00:00", + ["ui_banner"]="ui_bounty_banner" } } local config = { diff --git a/lua/app/userdata/bounty/bounty_data.lua b/lua/app/userdata/bounty/bounty_data.lua index 80692b7f..a46603f3 100644 --- a/lua/app/userdata/bounty/bounty_data.lua +++ b/lua/app/userdata/bounty/bounty_data.lua @@ -176,11 +176,7 @@ function BountyData:getRewardBannerName() end function BountyData:getBannerSpineName() - if self.season == 1 then - return "ui_bounty_banner" - else - return "ui_bounty_banner_" .. self.season - end + return ConfigManager:getConfig("bounty_time")[self.season].ui_banner end function BountyData:getSeason()