Compare commits
No commits in common. "v.1.6.6_android" and "master" have entirely different histories.
v.1.6.6_an
...
master
@ -363,214 +363,9 @@ local activity = {
|
||||
["act_type"]=6,
|
||||
["start_time"]="2025-02-22 00:00:00",
|
||||
["end_time"]="2025-03-03 00:00:00"
|
||||
},
|
||||
[7406]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2025-03-02 00:00:00",
|
||||
["end_time"]="2025-03-10 00:00:00"
|
||||
},
|
||||
[7506]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2025-03-09 00:00:00",
|
||||
["end_time"]="2025-03-18 00:00:00"
|
||||
},
|
||||
[7606]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2025-03-17 00:00:00",
|
||||
["end_time"]="2025-03-25 00:00:00"
|
||||
},
|
||||
[7706]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2025-03-24 00:00:00",
|
||||
["end_time"]="2025-04-02 00:00:00"
|
||||
},
|
||||
[7806]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2025-04-01 00:00:00",
|
||||
["end_time"]="2025-04-09 00:00:00"
|
||||
},
|
||||
[7906]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2025-04-08 00:00:00",
|
||||
["end_time"]="2025-04-17 00:00:00"
|
||||
},
|
||||
[8006]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2025-04-16 00:00:00",
|
||||
["end_time"]="2025-04-24 00:00:00"
|
||||
},
|
||||
[8106]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2025-04-23 00:00:00",
|
||||
["end_time"]="2025-05-02 00:00:00"
|
||||
},
|
||||
[8206]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2025-05-01 00:00:00",
|
||||
["end_time"]="2025-05-09 00:00:00"
|
||||
},
|
||||
[8306]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2025-05-08 00:00:00",
|
||||
["end_time"]="2025-05-17 00:00:00"
|
||||
},
|
||||
[8406]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2025-05-16 00:00:00",
|
||||
["end_time"]="2025-05-24 00:00:00"
|
||||
},
|
||||
[8506]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2025-05-23 00:00:00",
|
||||
["end_time"]="2025-06-01 00:00:00"
|
||||
},
|
||||
[8606]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2025-05-31 00:00:00",
|
||||
["end_time"]="2025-06-08 00:00:00"
|
||||
},
|
||||
[8706]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2025-06-07 00:00:00",
|
||||
["end_time"]="2025-06-16 00:00:00"
|
||||
},
|
||||
[8806]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2025-06-15 00:00:00",
|
||||
["end_time"]="2025-06-23 00:00:00"
|
||||
},
|
||||
[8906]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2025-06-22 00:00:00",
|
||||
["end_time"]="2025-07-01 00:00:00"
|
||||
},
|
||||
[9006]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2025-06-30 00:00:00",
|
||||
["end_time"]="2025-07-08 00:00:00"
|
||||
},
|
||||
[9106]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2025-07-07 00:00:00",
|
||||
["end_time"]="2025-07-16 00:00:00"
|
||||
},
|
||||
[9206]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2025-07-15 00:00:00",
|
||||
["end_time"]="2025-07-23 00:00:00"
|
||||
},
|
||||
[9306]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2025-07-22 00:00:00",
|
||||
["end_time"]="2025-07-31 00:00:00"
|
||||
},
|
||||
[9406]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2025-07-30 00:00:00",
|
||||
["end_time"]="2025-08-07 00:00:00"
|
||||
},
|
||||
[9506]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2025-08-06 00:00:00",
|
||||
["end_time"]="2025-08-15 00:00:00"
|
||||
},
|
||||
[9606]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2025-08-14 00:00:00",
|
||||
["end_time"]="2025-08-22 00:00:00"
|
||||
},
|
||||
[9706]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2025-08-21 00:00:00",
|
||||
["end_time"]="2025-08-30 00:00:00"
|
||||
},
|
||||
[9806]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2025-08-29 00:00:00",
|
||||
["end_time"]="2025-09-06 00:00:00"
|
||||
},
|
||||
[9906]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2025-09-05 00:00:00",
|
||||
["end_time"]="2025-09-14 00:00:00"
|
||||
},
|
||||
[10006]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2025-09-13 00:00:00",
|
||||
["end_time"]="2025-09-21 00:00:00"
|
||||
},
|
||||
[10106]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2025-09-20 00:00:00",
|
||||
["end_time"]="2025-09-29 00:00:00"
|
||||
},
|
||||
[10206]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2025-09-28 00:00:00",
|
||||
["end_time"]="2025-10-06 00:00:00"
|
||||
},
|
||||
[10306]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2025-10-05 00:00:00",
|
||||
["end_time"]="2025-10-14 00:00:00"
|
||||
},
|
||||
[10406]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2025-10-13 00:00:00",
|
||||
["end_time"]="2025-10-21 00:00:00"
|
||||
},
|
||||
[10506]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2025-10-20 00:00:00",
|
||||
["end_time"]="2025-10-29 00:00:00"
|
||||
},
|
||||
[10606]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2025-10-28 00:00:00",
|
||||
["end_time"]="2025-11-05 00:00:00"
|
||||
},
|
||||
[10706]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2025-11-04 00:00:00",
|
||||
["end_time"]="2025-11-13 00:00:00"
|
||||
},
|
||||
[10806]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2025-11-12 00:00:00",
|
||||
["end_time"]="2025-11-20 00:00:00"
|
||||
},
|
||||
[10906]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2025-11-19 00:00:00",
|
||||
["end_time"]="2025-11-28 00:00:00"
|
||||
},
|
||||
[11006]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2025-11-27 00:00:00",
|
||||
["end_time"]="2025-12-05 00:00:00"
|
||||
},
|
||||
[11106]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2025-12-04 00:00:00",
|
||||
["end_time"]="2025-12-13 00:00:00"
|
||||
},
|
||||
[11206]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2025-12-12 00:00:00",
|
||||
["end_time"]="2025-12-20 00:00:00"
|
||||
},
|
||||
[11306]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2025-12-19 00:00:00",
|
||||
["end_time"]="2025-12-28 00:00:00"
|
||||
},
|
||||
[11406]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2025-12-27 00:00:00",
|
||||
["end_time"]="2026-01-04 00:00:00"
|
||||
}
|
||||
}
|
||||
local config = {
|
||||
data=activity,count=114
|
||||
data=activity,count=73
|
||||
}
|
||||
return config
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -118,69 +118,9 @@ local arena_time = {
|
||||
["start_time"]="2025-2-15 00:00:00",
|
||||
["end_time"]="2025-3-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[21]={
|
||||
["season"]=21,
|
||||
["start_time"]="2025-3-15 00:00:00",
|
||||
["end_time"]="2025-4-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[22]={
|
||||
["season"]=22,
|
||||
["start_time"]="2025-4-15 00:00:00",
|
||||
["end_time"]="2025-5-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[23]={
|
||||
["season"]=23,
|
||||
["start_time"]="2025-5-15 00:00:00",
|
||||
["end_time"]="2025-6-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[24]={
|
||||
["season"]=24,
|
||||
["start_time"]="2025-6-15 00:00:00",
|
||||
["end_time"]="2025-7-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[25]={
|
||||
["season"]=25,
|
||||
["start_time"]="2025-7-15 00:00:00",
|
||||
["end_time"]="2025-8-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[26]={
|
||||
["season"]=26,
|
||||
["start_time"]="2025-8-15 00:00:00",
|
||||
["end_time"]="2025-9-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[27]={
|
||||
["season"]=27,
|
||||
["start_time"]="2025-9-15 00:00:00",
|
||||
["end_time"]="2025-10-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[28]={
|
||||
["season"]=28,
|
||||
["start_time"]="2025-10-15 00:00:00",
|
||||
["end_time"]="2025-11-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[29]={
|
||||
["season"]=29,
|
||||
["start_time"]="2025-11-15 00:00:00",
|
||||
["end_time"]="2025-12-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[30]={
|
||||
["season"]=30,
|
||||
["start_time"]="2025-12-15 00:00:00",
|
||||
["end_time"]="2026-1-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
}
|
||||
}
|
||||
local config = {
|
||||
data=arena_time,count=30
|
||||
data=arena_time,count=20
|
||||
}
|
||||
return config
|
||||
File diff suppressed because it is too large
Load Diff
@ -138,79 +138,9 @@ local bounty_time = {
|
||||
["end_time"]="2025-3-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner_5",
|
||||
["enter_ui_banner"]="bounty_btn_main_5"
|
||||
},
|
||||
[21]={
|
||||
["season"]=21,
|
||||
["start_time"]="2025-3-1 00:00:00",
|
||||
["end_time"]="2025-4-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner",
|
||||
["enter_ui_banner"]="bounty_btn_main_1"
|
||||
},
|
||||
[22]={
|
||||
["season"]=22,
|
||||
["start_time"]="2025-4-1 00:00:00",
|
||||
["end_time"]="2025-5-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner_2",
|
||||
["enter_ui_banner"]="bounty_btn_main_2"
|
||||
},
|
||||
[23]={
|
||||
["season"]=23,
|
||||
["start_time"]="2025-5-1 00:00:00",
|
||||
["end_time"]="2025-6-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner_3",
|
||||
["enter_ui_banner"]="bounty_btn_main_3"
|
||||
},
|
||||
[24]={
|
||||
["season"]=24,
|
||||
["start_time"]="2025-6-1 00:00:00",
|
||||
["end_time"]="2025-7-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner_4",
|
||||
["enter_ui_banner"]="bounty_btn_main_4"
|
||||
},
|
||||
[25]={
|
||||
["season"]=25,
|
||||
["start_time"]="2025-7-1 00:00:00",
|
||||
["end_time"]="2025-8-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner_5",
|
||||
["enter_ui_banner"]="bounty_btn_main_5"
|
||||
},
|
||||
[26]={
|
||||
["season"]=26,
|
||||
["start_time"]="2025-8-1 00:00:00",
|
||||
["end_time"]="2025-9-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner",
|
||||
["enter_ui_banner"]="bounty_btn_main_1"
|
||||
},
|
||||
[27]={
|
||||
["season"]=27,
|
||||
["start_time"]="2025-9-1 00:00:00",
|
||||
["end_time"]="2025-10-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner_2",
|
||||
["enter_ui_banner"]="bounty_btn_main_2"
|
||||
},
|
||||
[28]={
|
||||
["season"]=28,
|
||||
["start_time"]="2025-10-1 00:00:00",
|
||||
["end_time"]="2025-11-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner_3",
|
||||
["enter_ui_banner"]="bounty_btn_main_3"
|
||||
},
|
||||
[29]={
|
||||
["season"]=29,
|
||||
["start_time"]="2025-11-1 00:00:00",
|
||||
["end_time"]="2025-12-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner_4",
|
||||
["enter_ui_banner"]="bounty_btn_main_4"
|
||||
},
|
||||
[30]={
|
||||
["season"]=30,
|
||||
["start_time"]="2025-12-1 00:00:00",
|
||||
["end_time"]="2026-1-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner_5",
|
||||
["enter_ui_banner"]="bounty_btn_main_5"
|
||||
}
|
||||
}
|
||||
local config = {
|
||||
data=bounty_time,count=30
|
||||
data=bounty_time,count=20
|
||||
}
|
||||
return config
|
||||
Loading…
x
Reference in New Issue
Block a user