Compare commits
No commits in common. "master" and "v.1.5.6_android" have entirely different histories.
master
...
v.1.5.6_an
@ -163,209 +163,9 @@ local activity = {
|
||||
["act_type"]=6,
|
||||
["start_time"]="2024-04-28 00:00:00",
|
||||
["end_time"]="2024-05-07 00:00:00"
|
||||
},
|
||||
[3406]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2024-05-06 00:00:00",
|
||||
["end_time"]="2024-05-14 00:00:00"
|
||||
},
|
||||
[3506]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2024-05-13 00:00:00",
|
||||
["end_time"]="2024-05-22 00:00:00"
|
||||
},
|
||||
[3606]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2024-05-21 00:00:00",
|
||||
["end_time"]="2024-05-29 00:00:00"
|
||||
},
|
||||
[3706]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2024-05-28 00:00:00",
|
||||
["end_time"]="2024-06-06 00:00:00"
|
||||
},
|
||||
[3806]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2024-06-05 00:00:00",
|
||||
["end_time"]="2024-06-13 00:00:00"
|
||||
},
|
||||
[3906]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2024-06-12 00:00:00",
|
||||
["end_time"]="2024-06-21 00:00:00"
|
||||
},
|
||||
[4006]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2024-06-20 00:00:00",
|
||||
["end_time"]="2024-06-28 00:00:00"
|
||||
},
|
||||
[4106]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2024-06-27 00:00:00",
|
||||
["end_time"]="2024-07-06 00:00:00"
|
||||
},
|
||||
[4206]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2024-07-05 00:00:00",
|
||||
["end_time"]="2024-07-13 00:00:00"
|
||||
},
|
||||
[4306]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2024-07-12 00:00:00",
|
||||
["end_time"]="2024-07-21 00:00:00"
|
||||
},
|
||||
[4406]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2024-07-20 00:00:00",
|
||||
["end_time"]="2024-07-28 00:00:00"
|
||||
},
|
||||
[4506]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2024-07-27 00:00:00",
|
||||
["end_time"]="2024-08-05 00:00:00"
|
||||
},
|
||||
[4606]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2024-08-04 00:00:00",
|
||||
["end_time"]="2024-08-12 00:00:00"
|
||||
},
|
||||
[4706]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2024-08-11 00:00:00",
|
||||
["end_time"]="2024-08-20 00:00:00"
|
||||
},
|
||||
[4806]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2024-08-19 00:00:00",
|
||||
["end_time"]="2024-08-27 00:00:00"
|
||||
},
|
||||
[4906]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2024-08-26 00:00:00",
|
||||
["end_time"]="2024-09-04 00:00:00"
|
||||
},
|
||||
[5006]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2024-09-03 00:00:00",
|
||||
["end_time"]="2024-09-11 00:00:00"
|
||||
},
|
||||
[5106]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2024-09-10 00:00:00",
|
||||
["end_time"]="2024-09-19 00:00:00"
|
||||
},
|
||||
[5206]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2024-09-18 00:00:00",
|
||||
["end_time"]="2024-09-26 00:00:00"
|
||||
},
|
||||
[5306]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2024-09-25 00:00:00",
|
||||
["end_time"]="2024-10-04 00:00:00"
|
||||
},
|
||||
[5406]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2024-10-03 00:00:00",
|
||||
["end_time"]="2024-10-11 00:00:00"
|
||||
},
|
||||
[5506]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2024-10-10 00:00:00",
|
||||
["end_time"]="2024-10-19 00:00:00"
|
||||
},
|
||||
[5606]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2024-10-18 00:00:00",
|
||||
["end_time"]="2024-10-26 00:00:00"
|
||||
},
|
||||
[5706]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2024-10-25 00:00:00",
|
||||
["end_time"]="2024-11-03 00:00:00"
|
||||
},
|
||||
[5806]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2024-11-02 00:00:00",
|
||||
["end_time"]="2024-11-10 00:00:00"
|
||||
},
|
||||
[5906]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2024-11-09 00:00:00",
|
||||
["end_time"]="2024-11-18 00:00:00"
|
||||
},
|
||||
[6006]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2024-11-17 00:00:00",
|
||||
["end_time"]="2024-11-25 00:00:00"
|
||||
},
|
||||
[6106]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2024-11-24 00:00:00",
|
||||
["end_time"]="2024-12-03 00:00:00"
|
||||
},
|
||||
[6206]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2024-12-02 00:00:00",
|
||||
["end_time"]="2024-12-10 00:00:00"
|
||||
},
|
||||
[6306]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2024-12-09 00:00:00",
|
||||
["end_time"]="2024-12-18 00:00:00"
|
||||
},
|
||||
[6406]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2024-12-17 00:00:00",
|
||||
["end_time"]="2024-12-25 00:00:00"
|
||||
},
|
||||
[6506]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2024-12-24 00:00:00",
|
||||
["end_time"]="2025-01-02 00:00:00"
|
||||
},
|
||||
[6606]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2025-01-01 00:00:00",
|
||||
["end_time"]="2025-01-09 00:00:00"
|
||||
},
|
||||
[6706]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2025-01-08 00:00:00",
|
||||
["end_time"]="2025-01-17 00:00:00"
|
||||
},
|
||||
[6806]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2025-01-16 00:00:00",
|
||||
["end_time"]="2025-01-24 00:00:00"
|
||||
},
|
||||
[6906]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2025-01-23 00:00:00",
|
||||
["end_time"]="2025-02-01 00:00:00"
|
||||
},
|
||||
[7006]={
|
||||
["act_type"]=3,
|
||||
["start_time"]="2025-01-31 00:00:00",
|
||||
["end_time"]="2025-02-08 00:00:00"
|
||||
},
|
||||
[7106]={
|
||||
["act_type"]=5,
|
||||
["start_time"]="2025-02-07 00:00:00",
|
||||
["end_time"]="2025-02-16 00:00:00"
|
||||
},
|
||||
[7206]={
|
||||
["act_type"]=2,
|
||||
["start_time"]="2025-02-15 00:00:00",
|
||||
["end_time"]="2025-02-23 00:00:00"
|
||||
},
|
||||
[7306]={
|
||||
["act_type"]=6,
|
||||
["start_time"]="2025-02-22 00:00:00",
|
||||
["end_time"]="2025-03-03 00:00:00"
|
||||
}
|
||||
}
|
||||
local config = {
|
||||
data=activity,count=73
|
||||
data=activity,count=33
|
||||
}
|
||||
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
@ -58,69 +58,9 @@ local arena_time = {
|
||||
["start_time"]="2024-4-15 00:00:00",
|
||||
["end_time"]="2024-5-16 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[11]={
|
||||
["season"]=11,
|
||||
["start_time"]="2024-5-16 00:00:00",
|
||||
["end_time"]="2024-6-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[12]={
|
||||
["season"]=12,
|
||||
["start_time"]="2024-6-15 00:00:00",
|
||||
["end_time"]="2024-7-16 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[13]={
|
||||
["season"]=13,
|
||||
["start_time"]="2024-7-16 00:00:00",
|
||||
["end_time"]="2024-8-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[14]={
|
||||
["season"]=14,
|
||||
["start_time"]="2024-8-15 00:00:00",
|
||||
["end_time"]="2024-9-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[15]={
|
||||
["season"]=15,
|
||||
["start_time"]="2024-9-15 00:00:00",
|
||||
["end_time"]="2024-10-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[16]={
|
||||
["season"]=16,
|
||||
["start_time"]="2024-10-15 00:00:00",
|
||||
["end_time"]="2024-11-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[17]={
|
||||
["season"]=17,
|
||||
["start_time"]="2024-11-15 00:00:00",
|
||||
["end_time"]="2024-12-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[18]={
|
||||
["season"]=18,
|
||||
["start_time"]="2024-12-15 00:00:00",
|
||||
["end_time"]="2025-1-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[19]={
|
||||
["season"]=19,
|
||||
["start_time"]="2025-1-15 00:00:00",
|
||||
["end_time"]="2025-2-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
},
|
||||
[20]={
|
||||
["season"]=20,
|
||||
["start_time"]="2025-2-15 00:00:00",
|
||||
["end_time"]="2025-3-15 00:00:00",
|
||||
["ui_banner"]="ui_arena_bounty_banner"
|
||||
}
|
||||
}
|
||||
local config = {
|
||||
data=arena_time,count=20
|
||||
data=arena_time,count=10
|
||||
}
|
||||
return config
|
||||
File diff suppressed because it is too large
Load Diff
@ -68,79 +68,9 @@ local bounty_time = {
|
||||
["end_time"]="2024-5-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner_5",
|
||||
["enter_ui_banner"]="bounty_btn_main_5"
|
||||
},
|
||||
[11]={
|
||||
["season"]=11,
|
||||
["start_time"]="2024-5-1 00:00:00",
|
||||
["end_time"]="2024-6-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner",
|
||||
["enter_ui_banner"]="bounty_btn_main_1"
|
||||
},
|
||||
[12]={
|
||||
["season"]=12,
|
||||
["start_time"]="2024-6-1 00:00:00",
|
||||
["end_time"]="2024-7-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner_2",
|
||||
["enter_ui_banner"]="bounty_btn_main_2"
|
||||
},
|
||||
[13]={
|
||||
["season"]=13,
|
||||
["start_time"]="2024-7-1 00:00:00",
|
||||
["end_time"]="2024-8-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner_3",
|
||||
["enter_ui_banner"]="bounty_btn_main_3"
|
||||
},
|
||||
[14]={
|
||||
["season"]=14,
|
||||
["start_time"]="2024-8-1 00:00:00",
|
||||
["end_time"]="2024-9-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner_4",
|
||||
["enter_ui_banner"]="bounty_btn_main_4"
|
||||
},
|
||||
[15]={
|
||||
["season"]=15,
|
||||
["start_time"]="2024-9-1 00:00:00",
|
||||
["end_time"]="2024-10-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner_5",
|
||||
["enter_ui_banner"]="bounty_btn_main_5"
|
||||
},
|
||||
[16]={
|
||||
["season"]=16,
|
||||
["start_time"]="2024-10-1 00:00:00",
|
||||
["end_time"]="2024-11-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner",
|
||||
["enter_ui_banner"]="bounty_btn_main_1"
|
||||
},
|
||||
[17]={
|
||||
["season"]=17,
|
||||
["start_time"]="2024-11-1 00:00:00",
|
||||
["end_time"]="2024-12-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner_2",
|
||||
["enter_ui_banner"]="bounty_btn_main_2"
|
||||
},
|
||||
[18]={
|
||||
["season"]=18,
|
||||
["start_time"]="2024-12-1 00:00:00",
|
||||
["end_time"]="2025-1-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner_3",
|
||||
["enter_ui_banner"]="bounty_btn_main_3"
|
||||
},
|
||||
[19]={
|
||||
["season"]=19,
|
||||
["start_time"]="2025-1-1 00:00:00",
|
||||
["end_time"]="2025-2-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner_4",
|
||||
["enter_ui_banner"]="bounty_btn_main_4"
|
||||
},
|
||||
[20]={
|
||||
["season"]=20,
|
||||
["start_time"]="2025-2-1 00:00:00",
|
||||
["end_time"]="2025-3-1 00:00:00",
|
||||
["ui_banner"]="ui_bounty_banner_5",
|
||||
["enter_ui_banner"]="bounty_btn_main_5"
|
||||
}
|
||||
}
|
||||
local config = {
|
||||
data=bounty_time,count=20
|
||||
data=bounty_time,count=10
|
||||
}
|
||||
return config
|
||||
Loading…
x
Reference in New Issue
Block a user