diff --git a/lua/app/config/activity.lua b/lua/app/config/activity.lua index d2faa5e4..901673a5 100644 --- a/lua/app/config/activity.lua +++ b/lua/app/config/activity.lua @@ -82,7 +82,7 @@ local activity = { [1706]={ ["act_type"]=6, ["start_time"]="2023-12-30 00:00:00", - ["end_time"]="2023-01-08 00:00:00" + ["end_time"]="2024-01-08 00:00:00" } } local config = { diff --git a/lua/app/config/bounty_time.lua b/lua/app/config/bounty_time.lua index 457874cd..3c40e875 100644 --- a/lua/app/config/bounty_time.lua +++ b/lua/app/config/bounty_time.lua @@ -3,37 +3,43 @@ local bounty_time = { ["season"]=1, ["start_time"]="2023-6-20 00:00:00", ["end_time"]="2023-8-1 00:00:00", - ["ui_banner"]="ui_bounty_banner" + ["ui_banner"]="ui_bounty_banner", + ["enter_ui_banner"]="bounty_btn_main_1" }, [2]={ ["season"]=2, ["start_time"]="2023-8-1 00:00:00", ["end_time"]="2023-9-1 00:00:00", - ["ui_banner"]="ui_bounty_banner_2" + ["ui_banner"]="ui_bounty_banner_2", + ["enter_ui_banner"]="bounty_btn_main_2" }, [3]={ ["season"]=3, ["start_time"]="2023-9-1 00:00:00", ["end_time"]="2023-10-1 00:00:00", - ["ui_banner"]="ui_bounty_banner_3" + ["ui_banner"]="ui_bounty_banner_3", + ["enter_ui_banner"]="bounty_btn_main_3" }, [4]={ ["season"]=4, ["start_time"]="2023-10-1 00:00:00", ["end_time"]="2023-11-1 00:00:00", - ["ui_banner"]="ui_bounty_banner_4" + ["ui_banner"]="ui_bounty_banner_4", + ["enter_ui_banner"]="bounty_btn_main_4" }, [5]={ ["season"]=5, ["start_time"]="2023-11-1 00:00:00", ["end_time"]="2023-12-1 00:00:00", - ["ui_banner"]="ui_bounty_banner_5" + ["ui_banner"]="ui_bounty_banner_5", + ["enter_ui_banner"]="bounty_btn_main_5" }, [6]={ ["season"]=6, ["start_time"]="2023-12-1 00:00:00", ["end_time"]="2024-1-1 00:00:00", - ["ui_banner"]="ui_bounty_banner" + ["ui_banner"]="ui_bounty_banner", + ["enter_ui_banner"]="bounty_btn_main_1" } } local config = { diff --git a/lua/app/userdata/bounty/bounty_data.lua b/lua/app/userdata/bounty/bounty_data.lua index a46603f3..1faf7050 100644 --- a/lua/app/userdata/bounty/bounty_data.lua +++ b/lua/app/userdata/bounty/bounty_data.lua @@ -168,7 +168,7 @@ function BountyData:getIsOpen() end function BountyData:getBannerName() - return "bounty_btn_main_" .. self.season + return ConfigManager:getConfig("bounty_time")[self.season].enter_ui_banner end function BountyData:getRewardBannerName()