This commit is contained in:
puxuan 2025-08-22 14:56:41 +08:00
parent fdfe3a1d4f
commit 4049b0831b
8 changed files with 2694 additions and 798 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,10 @@
local arena_time = { local arena_time = {
[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]={ [26]={
["season"]=26, ["season"]=26,
["start_time"]="2025-8-15 00:00:00", ["start_time"]="2025-8-15 00:00:00",
@ -31,6 +37,6 @@ local arena_time = {
} }
} }
local config = { local config = {
data=arena_time,count=5 data=arena_time,count=6
} }
return config return config

View File

@ -87,7 +87,7 @@ local const = {
["value"]=2 ["value"]=2
}, },
["idle_drop_fast_times_2"]={ ["idle_drop_fast_times_2"]={
["value"]=1 ["value"]=5
}, },
["idle_drop_fast_time"]={ ["idle_drop_fast_time"]={
["value"]=21600 ["value"]=21600
@ -99,8 +99,8 @@ local const = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=3, ["id"]=3,
["id_for_nothing"]="VQ==", ["id_for_nothing"]="VQ==",
["num"]=30, ["num"]=15,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="Vw0="
} }
} }
}, },
@ -537,8 +537,8 @@ local const = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=3, ["id"]=3,
["id_for_nothing"]="VQ==", ["id_for_nothing"]="VQ==",
["num"]=30, ["num"]=15,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="Vw0="
} }
} }
}, },
@ -549,13 +549,13 @@ local const = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=2, ["id"]=2,
["id_for_nothing"]="VA==", ["id_for_nothing"]="VA==",
["num"]=100, ["num"]=120,
["num_for_nothing"]="Vwhc" ["num_for_nothing"]="Vwpc"
} }
} }
}, },
["stamina_diamond_times"]={ ["stamina_diamond_times"]={
["value"]=2 ["value"]=4
}, },
["stamina_ad_buy"]={ ["stamina_ad_buy"]={
["reward"]={ ["reward"]={
@ -564,13 +564,13 @@ local const = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=3, ["id"]=3,
["id_for_nothing"]="VQ==", ["id_for_nothing"]="VQ==",
["num"]=30, ["num"]=5,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="Uw=="
} }
} }
}, },
["stamina_ad_times"]={ ["stamina_ad_times"]={
["value"]=2 ["value"]=3
}, },
["chapter_finish_reward_1"]={ ["chapter_finish_reward_1"]={
["value"]=40 ["value"]=40

View File

@ -447,6 +447,46 @@ local fx = {
["res"]="sfx_c1_m20005_04", ["res"]="sfx_c1_m20005_04",
["bind"]="root" ["bind"]="root"
}, },
[500001]={
["res"]="sfx_c1_m30001_01",
["bind"]="root"
},
[500002]={
["res"]="sfx_c1_m30001_02",
["bind"]="root"
},
[500003]={
["res"]="sfx_c1_m30001_03",
["bind"]="root"
},
[500004]={
["res"]="sfx_c1_m30001_04",
["bind"]="root"
},
[500005]={
["res"]="sfx_c1_m30001_05",
["bind"]="root"
},
[500006]={
["res"]="sfx_c1_m30002_01",
["bind"]="root"
},
[500007]={
["res"]="sfx_c1_m30002_02",
["bind"]="root"
},
[500008]={
["res"]="sfx_c1_m30002_03",
["bind"]="root"
},
[500009]={
["res"]="sfx_c1_m30002_04",
["bind"]="root"
},
[500010]={
["res"]="sfx_c1_m30002_05",
["bind"]="root"
},
[300001]={ [300001]={
["res"]="sfx_c1_p45002_01", ["res"]="sfx_c1_p45002_01",
["bind"]="root" ["bind"]="root"
@ -971,6 +1011,6 @@ local fx = {
} }
} }
local config = { local config = {
data=fx,count=224 data=fx,count=234
} }
return config return config

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@ local recovery = {
[3]={ [3]={
["type"]=1, ["type"]=1,
["time"]=600, ["time"]=600,
["limit"]=60 ["limit"]=30
}, },
[8]={ [8]={
["type"]=2, ["type"]=2,

View File

@ -3195,25 +3195,13 @@ local skill = {
["effect"]={ ["effect"]={
{ {
["type"]="hurt_yellow", ["type"]="hurt_yellow",
["num"]=20000, ["num"]=30000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=0 ["round"]=0
}, },
{ {
["type"]="hurt_yellow", ["type"]="hurt_yellow",
["num"]=20000, ["num"]=50000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_yellow",
["num"]=20000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_yellow",
["num"]=20000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=0 ["round"]=0
} }
@ -3221,9 +3209,7 @@ local skill = {
["obj"]=2, ["obj"]=2,
["effect_block"]={ ["effect_block"]={
1, 1,
2, 2
3,
4
}, },
["skill_position"]={ ["skill_position"]={
1, 1,
@ -9525,7 +9511,8 @@ local skill = {
["name_act"]="attack01", ["name_act"]="attack01",
["name_hit"]={ ["name_hit"]={
"suffer01" "suffer01"
} },
["fx_self"]=500001
}, },
[20092]={ [20092]={
["effect_type"]=1, ["effect_type"]=1,
@ -9546,7 +9533,8 @@ local skill = {
["name_act"]="attack02", ["name_act"]="attack02",
["name_hit"]={ ["name_hit"]={
"suffer02" "suffer02"
} },
["fx_self"]=500002
}, },
[20093]={ [20093]={
["effect_type"]=1, ["effect_type"]=1,
@ -9567,7 +9555,8 @@ local skill = {
["name_act"]="attack03", ["name_act"]="attack03",
["name_hit"]={ ["name_hit"]={
"suffer01" "suffer01"
} },
["fx_self"]=500003
}, },
[20094]={ [20094]={
["skill_type"]=3, ["skill_type"]=3,
@ -9601,7 +9590,7 @@ local skill = {
["name_hit"]={ ["name_hit"]={
"suffer03" "suffer03"
}, },
["fx_self_delay"]=200028, ["fx_self"]=500004,
["bullet_time"]={ ["bullet_time"]={
500, 500,
3000, 3000,
@ -9638,7 +9627,7 @@ local skill = {
["name_hit"]={ ["name_hit"]={
"suffer03" "suffer03"
}, },
["fx_self_delay"]=400063, ["fx_self"]=500005,
["bullet_time"]={ ["bullet_time"]={
1066, 1066,
3000, 3000,
@ -9658,13 +9647,14 @@ local skill = {
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]={ ["skill_position"]={
1, 2,
140 0
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["name_hit"]={ ["name_hit"]={
"suffer01" "suffer01"
} },
["fx_self"]=500006
}, },
[20097]={ [20097]={
["effect_type"]=1, ["effect_type"]=1,
@ -9679,13 +9669,14 @@ local skill = {
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]={ ["skill_position"]={
1, 2,
140 0
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["name_hit"]={ ["name_hit"]={
"suffer02" "suffer02"
} },
["fx_self"]=500007
}, },
[20098]={ [20098]={
["effect_type"]=1, ["effect_type"]=1,
@ -9700,13 +9691,14 @@ local skill = {
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]={ ["skill_position"]={
1, 2,
140 0
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["name_hit"]={ ["name_hit"]={
"suffer01" "suffer01"
} },
["fx_self"]=500008
}, },
[20099]={ [20099]={
["skill_type"]=3, ["skill_type"]=3,
@ -9737,6 +9729,7 @@ local skill = {
["name_hit"]={ ["name_hit"]={
"suffer03" "suffer03"
}, },
["fx_self"]=500009,
["bullet_time"]={ ["bullet_time"]={
966, 966,
5000, 5000,
@ -9791,6 +9784,7 @@ local skill = {
["name_hit"]={ ["name_hit"]={
"suffer03" "suffer03"
}, },
["fx_self"]=500010,
["bullet_time"]={ ["bullet_time"]={
333, 333,
3000, 3000,
@ -10981,9 +10975,329 @@ local skill = {
} }
}, },
["obj"]=1 ["obj"]=1
},
[40001]={
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt",
["num"]=10000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["skill_position"]={
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
["sound_hit"]={
1000001
},
["name_act"]="attack01",
["name_hit"]={
"suffer01"
},
["fx_self"]=400055
},
[40002]={
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt",
["num"]=10000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["skill_position"]={
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
["sound_hit"]={
1000002
},
["name_act"]="attack02",
["name_hit"]={
"suffer02"
},
["fx_self"]=400055
},
[40003]={
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt",
["num"]=10000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["skill_position"]={
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
["sound_hit"]={
1000003
},
["name_act"]="attack03",
["name_hit"]={
"suffer01"
},
["fx_self"]=400055
},
[40004]={
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt",
["num"]=10000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["skill_position"]={
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
["sound_hit"]={
1000004
},
["name_act"]="attack04",
["name_hit"]={
"suffer02"
},
["fx_self"]=400055
},
[40005]={
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt",
["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="stun",
["num"]=0,
["ratio"]=3000,
["round"]=2
}
},
["obj"]=2,
["effect_block"]={
1,
2,
3
},
["skill_position"]={
2,
0
},
["cd"]=3,
["cd_start"]=0,
["shake_time"]=200,
["shake_type"]=5,
["sound"]=12001200,
["sound_delay"]=0.0,
["name_act"]="skill01",
["name_hit"]={
"suffer01",
"suffer02",
"suffer01"
},
["fx_self"]=400056,
["bullet_time"]={
1167,
3000,
300
}
},
[40006]={
["effect_type"]=2,
["trigger"]=6,
["effect"]={
{
["type"]="heal",
["num"]=6000,
["ratio"]=10000,
["round"]=1
}
},
["obj"]=1
},
[40007]={
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt",
["num"]=10000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["skill_position"]={
1,
140
},
["shake_time"]=100,
["shake_type"]=1,
["sound_hit"]={
1000001
},
["name_act"]="attack01",
["name_hit"]={
"suffer01"
},
["fx_self"]=400024
},
[40008]={
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt",
["num"]=10000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["skill_position"]={
1,
140
},
["shake_time"]=100,
["shake_type"]=1,
["sound_hit"]={
1000002
},
["name_act"]="attack02",
["name_hit"]={
"suffer02"
},
["fx_self"]=400025
},
[40009]={
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt",
["num"]=10000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["skill_position"]={
1,
140
},
["shake_time"]=100,
["shake_type"]=1,
["sound_hit"]={
1000003
},
["name_act"]="attack03",
["name_hit"]={
"suffer01"
},
["fx_self"]=400026
},
[40010]={
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt",
["num"]=10000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["skill_position"]={
1,
140
},
["shake_time"]=100,
["shake_type"]=1,
["sound_hit"]={
1000004
},
["name_act"]="attack04",
["name_hit"]={
"suffer02"
},
["fx_self"]=400027
},
[40011]={
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="shield",
["num"]=1000,
["ratio"]=10000,
["round"]=2
},
{
["type"]="thorns",
["num"]=2000,
["ratio"]=3000,
["round"]=2
}
},
["obj"]=1,
["skill_position"]={
1,
140
},
["cd"]=3,
["cd_start"]=0,
["sound_hit"]={
5200120
},
["name_act"]="skill01",
["name_hit"]={
"suffer03"
},
["fx_self"]=400028
} }
} }
local config = { local config = {
data=skill,count=414 data=skill,count=425
} }
return config return config

View File

@ -52,7 +52,7 @@ function ArenaSeasonRewardUI:onLoadRootComplete()
self.getReward = uiMap["arena_season_reward_ui.bg.last_reward"] self.getReward = uiMap["arena_season_reward_ui.bg.last_reward"]
self.txSeason = uiMap["arena_season_reward_ui.bg.last_reward.tx_season"] self.txSeason = uiMap["arena_season_reward_ui.bg.last_reward.tx_season"]
self.spineRoot = uiMap["arena_season_reward_ui.bg.last_reward.spine_root"] self.spineRoot = uiMap["arena_season_reward_ui.bg.last_reward.spine_root"]
self.txGrading = uiMap["arena_season_reward_ui.bg.last_reward.img_grading.tx_grading"] self.txGrading = uiMap["arena_season_reward_ui.bg.last_reward.tx_grading"]
self.rewardList = uiMap["arena_season_reward_ui.bg.last_reward.rewards"] self.rewardList = uiMap["arena_season_reward_ui.bg.last_reward.rewards"]
self.getRewardComp = self.rewardList:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) self.getRewardComp = self.rewardList:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
self.btnGet = uiMap["arena_season_reward_ui.bg.last_reward.btn_get"] self.btnGet = uiMap["arena_season_reward_ui.bg.last_reward.btn_get"]