This commit is contained in:
puxuan 2025-11-07 16:44:18 +08:00
parent 7bf9d6f356
commit 818d4468c4
5 changed files with 1370 additions and 1149 deletions

File diff suppressed because it is too large Load Diff

View File

@ -496,9 +496,15 @@ local const = {
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
} }
} }
},
["summon_skip_1"]={
["value"]=10
},
["summon_skip_2"]={
["value"]=100
} }
} }
local config = { local config = {
data=const,count=81 data=const,count=83
} }
return config return config

View File

@ -140,6 +140,19 @@ local grid_type = {
["cant_upset"]=1, ["cant_upset"]=1,
["break_sfx"]="sfx_piece_za_b07" ["break_sfx"]="sfx_piece_za_b07"
}, },
[13]={
["icon"]="battle_obstacle_stone_3",
["next_type"]=8,
["break_condition"]={
1,
3
},
["break_count"]=1,
["cant_link"]=1,
["element_invalid"]=1,
["cant_upset"]=1,
["break_sfx"]="sfx_piece_za_b03"
},
[14]={ [14]={
["icon"]="battle_obstacle_shenxiang", ["icon"]="battle_obstacle_shenxiang",
["next_type"]=0, ["next_type"]=0,
@ -211,9 +224,131 @@ local grid_type = {
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["cant_upset"]=1 ["cant_upset"]=1
},
[18]={
["icon"]="battle_obstacle_rocket_up",
["next_type"]=0,
["break_condition"]={
1,
3
},
["break_count"]=1,
["cant_link"]=1,
["element_invalid"]=1,
["cant_upset"]=1,
["effect"]=1,
["effect_sfx"]="sfx_piece_huojian_b01",
["sfx_flow"]=1,
["effect_params"]={
1
},
["effect_trigger"]=2
},
[19]={
["icon"]="battle_obstacle_rocket_down",
["next_type"]=0,
["break_condition"]={
1,
3
},
["break_count"]=1,
["cant_link"]=1,
["element_invalid"]=1,
["cant_upset"]=1,
["effect"]=1,
["effect_sfx"]="sfx_piece_huojian_b01",
["sfx_flow"]=1,
["effect_params"]={
2
},
["effect_trigger"]=2
},
[20]={
["icon"]="battle_obstacle_rocket_left",
["next_type"]=0,
["break_condition"]={
1,
3
},
["break_count"]=1,
["cant_link"]=1,
["element_invalid"]=1,
["cant_upset"]=1,
["effect"]=1,
["effect_sfx"]="sfx_piece_huojian_b01",
["sfx_flow"]=1,
["effect_params"]={
3
},
["effect_trigger"]=2
},
[21]={
["icon"]="battle_obstacle_rocket_right",
["next_type"]=0,
["break_condition"]={
1,
3
},
["break_count"]=1,
["cant_link"]=1,
["element_invalid"]=1,
["cant_upset"]=1,
["effect"]=1,
["effect_sfx"]="sfx_piece_huojian_b01",
["sfx_flow"]=1,
["effect_params"]={
4
},
["effect_trigger"]=2
},
[22]={
["icon"]="battle_obstacle_jelly",
["next_type"]=0,
["break_condition"]={
1,
3
},
["break_count"]=1,
["break_stay_element"]=1,
["can_fall"]=1,
["cant_link"]=1,
["element_invalid"]=1,
["cant_upset"]=1,
["break_sfx"]="sfx_piece_guodong_b01",
["effect"]=5,
["effect_sfx"]="sfx_piece_guodong_b02",
["effect_trigger"]=1
},
[23]={
["icon"]="battle_obstacle_leaf",
["next_type"]=0,
["break_condition"]={
1,
3
},
["break_count"]=1,
["break_stay_element"]=1,
["can_fall"]=1,
["cant_link"]=1,
["cant_upset"]=1,
["break_sfx"]="sfx_piece_kucao_b01"
},
[24]={
["icon"]="battle_obstacle_firesnake",
["next_type"]=0,
["spine_name"]="ui_battle_obstacle_firesnake",
["zoom"]=1.0,
["spine_idle"]="idle",
["can_fall"]=1,
["cant_link"]=1,
["element_invalid"]=1,
["cant_upset"]=1,
["break_sfx"]="sfx_piece_rongyan_b01",
["effect"]=6,
["effect_trigger"]=1
} }
} }
local config = { local config = {
data=grid_type,count=17 data=grid_type,count=25
} }
return config return config

View File

@ -836,6 +836,12 @@ local skill = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=0 ["round"]=0
}, },
{
["type"]="hurt_red",
["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{ {
["type"]="hurt_red", ["type"]="hurt_red",
["num"]=10000, ["num"]=10000,
@ -857,7 +863,8 @@ local skill = {
1, 1,
2, 2,
3, 3,
4 4,
5
}, },
["skill_position"]={ ["skill_position"]={
2, 2,
@ -871,6 +878,7 @@ local skill = {
"suffer01", "suffer01",
"suffer02", "suffer02",
"suffer01", "suffer01",
"suffer02",
"suffer03" "suffer03"
}, },
["fx_self"]=300043, ["fx_self"]=300043,
@ -915,6 +923,12 @@ local skill = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=0 ["round"]=0
}, },
{
["type"]="hurt_red",
["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{ {
["type"]="hurt_red", ["type"]="hurt_red",
["num"]=10000, ["num"]=10000,
@ -936,7 +950,8 @@ local skill = {
1, 1,
2, 2,
3, 3,
4 4,
5
}, },
["skill_position"]={ ["skill_position"]={
2, 2,
@ -950,6 +965,7 @@ local skill = {
"suffer01", "suffer01",
"suffer02", "suffer02",
"suffer01", "suffer01",
"suffer02",
"suffer03" "suffer03"
}, },
["fx_self"]=300043, ["fx_self"]=300043,
@ -994,6 +1010,12 @@ local skill = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=0 ["round"]=0
}, },
{
["type"]="hurt_red",
["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{ {
["type"]="hurt_red", ["type"]="hurt_red",
["num"]=10000, ["num"]=10000,
@ -1015,7 +1037,8 @@ local skill = {
1, 1,
2, 2,
3, 3,
4 4,
5
}, },
["skill_position"]={ ["skill_position"]={
2, 2,
@ -1029,6 +1052,7 @@ local skill = {
"suffer01", "suffer01",
"suffer02", "suffer02",
"suffer01", "suffer01",
"suffer02",
"suffer03" "suffer03"
}, },
["fx_self"]=300043, ["fx_self"]=300043,
@ -1073,6 +1097,12 @@ local skill = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=0 ["round"]=0
}, },
{
["type"]="hurt_red",
["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{ {
["type"]="hurt_red", ["type"]="hurt_red",
["num"]=10000, ["num"]=10000,
@ -1094,7 +1124,8 @@ local skill = {
1, 1,
2, 2,
3, 3,
4 4,
5
}, },
["skill_position"]={ ["skill_position"]={
2, 2,
@ -1108,6 +1139,7 @@ local skill = {
"suffer01", "suffer01",
"suffer02", "suffer02",
"suffer01", "suffer01",
"suffer02",
"suffer03" "suffer03"
}, },
["fx_self"]=300043, ["fx_self"]=300043,
@ -1479,6 +1511,7 @@ local skill = {
["shake_time"]=150, ["shake_time"]=150,
["shake_type"]=6, ["shake_type"]=6,
["sound"]=1500205, ["sound"]=1500205,
["sound_delay"]=-0.1,
["name_act"]="skill01", ["name_act"]="skill01",
["name_hit"]={ ["name_hit"]={
"suffer02", "suffer02",
@ -1597,6 +1630,7 @@ local skill = {
["shake_time"]=150, ["shake_time"]=150,
["shake_type"]=6, ["shake_type"]=6,
["sound"]=1500205, ["sound"]=1500205,
["sound_delay"]=-0.1,
["name_act"]="skill01", ["name_act"]="skill01",
["name_hit"]={ ["name_hit"]={
"suffer02", "suffer02",
@ -1673,6 +1707,7 @@ local skill = {
["shake_time"]=150, ["shake_time"]=150,
["shake_type"]=6, ["shake_type"]=6,
["sound"]=1500205, ["sound"]=1500205,
["sound_delay"]=-0.1,
["name_act"]="skill01", ["name_act"]="skill01",
["name_hit"]={ ["name_hit"]={
"suffer02", "suffer02",
@ -1749,6 +1784,7 @@ local skill = {
["shake_time"]=150, ["shake_time"]=150,
["shake_type"]=6, ["shake_type"]=6,
["sound"]=1500205, ["sound"]=1500205,
["sound_delay"]=-0.1,
["name_act"]="skill01", ["name_act"]="skill01",
["name_hit"]={ ["name_hit"]={
"suffer02", "suffer02",
@ -1975,7 +2011,7 @@ local skill = {
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound"]=1600101, ["sound"]=3500201,
["name_act"]="attack02", ["name_act"]="attack02",
["name_hit"]={ ["name_hit"]={
"suffer01" "suffer01"
@ -2002,7 +2038,7 @@ local skill = {
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound"]=1600102, ["sound"]=3500201,
["name_act"]="attack02", ["name_act"]="attack02",
["name_hit"]={ ["name_hit"]={
"suffer01" "suffer01"
@ -2029,7 +2065,7 @@ local skill = {
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound"]=1600103, ["sound"]=3500201,
["name_act"]="attack03", ["name_act"]="attack03",
["name_hit"]={ ["name_hit"]={
"suffer02" "suffer02"
@ -2056,7 +2092,7 @@ local skill = {
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound"]=1600104, ["sound"]=3500201,
["name_act"]="attack04", ["name_act"]="attack04",
["name_hit"]={ ["name_hit"]={
"suffer01" "suffer01"
@ -2128,7 +2164,7 @@ local skill = {
}, },
["shake_time"]=250, ["shake_time"]=250,
["shake_type"]=5, ["shake_type"]=5,
["sound"]=1600105, ["sound"]=3500205,
["name_act"]="skill01", ["name_act"]="skill01",
["name_hit"]={ ["name_hit"]={
"suffer01", "suffer01",
@ -2237,7 +2273,7 @@ local skill = {
}, },
["shake_time"]=250, ["shake_time"]=250,
["shake_type"]=5, ["shake_type"]=5,
["sound"]=1600105, ["sound"]=3500205,
["name_act"]="skill01", ["name_act"]="skill01",
["name_hit"]={ ["name_hit"]={
"suffer01", "suffer01",
@ -2624,6 +2660,7 @@ local skill = {
["shake_time"]=250, ["shake_time"]=250,
["shake_type"]=6, ["shake_type"]=6,
["sound"]=2300105, ["sound"]=2300105,
["sound_delay"]=0.13,
["name_act"]="skill01", ["name_act"]="skill01",
["name_hit"]={ ["name_hit"]={
"suffer03" "suffer03"
@ -4091,7 +4128,7 @@ local skill = {
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound"]=2600101, ["sound"]=2500201,
["name_act"]="attack01", ["name_act"]="attack01",
["name_hit"]={ ["name_hit"]={
"suffer01" "suffer01"
@ -4118,7 +4155,7 @@ local skill = {
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound"]=2600102, ["sound"]=2500202,
["name_act"]="attack02", ["name_act"]="attack02",
["name_hit"]={ ["name_hit"]={
"suffer02" "suffer02"
@ -4145,7 +4182,7 @@ local skill = {
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound"]=2600103, ["sound"]=2500203,
["name_act"]="attack03", ["name_act"]="attack03",
["name_hit"]={ ["name_hit"]={
"suffer01" "suffer01"
@ -4172,7 +4209,7 @@ local skill = {
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound"]=2600104, ["sound"]=2500204,
["name_act"]="attack04", ["name_act"]="attack04",
["name_hit"]={ ["name_hit"]={
"suffer02" "suffer02"
@ -4221,7 +4258,7 @@ local skill = {
}, },
["shake_time"]=250, ["shake_time"]=250,
["shake_type"]=5, ["shake_type"]=5,
["sound"]=2600105, ["sound"]=2500205,
["name_act"]="skill01", ["name_act"]="skill01",
["name_hit"]={ ["name_hit"]={
"suffer01", "suffer01",
@ -4278,7 +4315,7 @@ local skill = {
}, },
["shake_time"]=250, ["shake_time"]=250,
["shake_type"]=5, ["shake_type"]=5,
["sound"]=2600105, ["sound"]=2500205,
["name_act"]="skill01", ["name_act"]="skill01",
["name_hit"]={ ["name_hit"]={
"suffer01", "suffer01",
@ -4344,7 +4381,7 @@ local skill = {
}, },
["shake_time"]=250, ["shake_time"]=250,
["shake_type"]=5, ["shake_type"]=5,
["sound"]=2600105, ["sound"]=2500205,
["name_act"]="skill01", ["name_act"]="skill01",
["name_hit"]={ ["name_hit"]={
"suffer01", "suffer01",
@ -4410,7 +4447,7 @@ local skill = {
}, },
["shake_time"]=250, ["shake_time"]=250,
["shake_type"]=5, ["shake_type"]=5,
["sound"]=2600105, ["sound"]=2500205,
["name_act"]="skill01", ["name_act"]="skill01",
["name_hit"]={ ["name_hit"]={
"suffer01", "suffer01",
@ -11120,6 +11157,7 @@ local skill = {
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound"]=20007001,
["name_act"]="attack01", ["name_act"]="attack01",
["name_hit"]={ ["name_hit"]={
"suffer01" "suffer01"
@ -11144,6 +11182,7 @@ local skill = {
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound"]=20007001,
["name_act"]="attack02", ["name_act"]="attack02",
["name_hit"]={ ["name_hit"]={
"suffer02" "suffer02"
@ -11168,6 +11207,7 @@ local skill = {
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound"]=20007001,
["name_act"]="attack03", ["name_act"]="attack03",
["name_hit"]={ ["name_hit"]={
"suffer01" "suffer01"
@ -11192,6 +11232,7 @@ local skill = {
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound"]=20007001,
["name_act"]="attack04", ["name_act"]="attack04",
["name_hit"]={ ["name_hit"]={
"suffer01" "suffer01"
@ -11241,6 +11282,7 @@ local skill = {
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=5, ["shake_type"]=5,
["sound"]=20007005,
["name_act"]="skill01", ["name_act"]="skill01",
["name_hit"]={ ["name_hit"]={
"suffer01", "suffer01",
@ -11272,6 +11314,7 @@ local skill = {
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound"]=20008001,
["name_act"]="attack01", ["name_act"]="attack01",
["name_hit"]={ ["name_hit"]={
"suffer01" "suffer01"
@ -11296,6 +11339,7 @@ local skill = {
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound"]=20008001,
["name_act"]="attack02", ["name_act"]="attack02",
["name_hit"]={ ["name_hit"]={
"suffer02" "suffer02"
@ -11320,6 +11364,7 @@ local skill = {
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound"]=20008001,
["name_act"]="attack03", ["name_act"]="attack03",
["name_hit"]={ ["name_hit"]={
"suffer01" "suffer01"
@ -11369,6 +11414,7 @@ local skill = {
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
["sound"]=20008004,
["name_act"]="skill01", ["name_act"]="skill01",
["name_hit"]={ ["name_hit"]={
"suffer01", "suffer01",

View File

@ -159,6 +159,40 @@ local summon = {
["weight"]=200 ["weight"]=200
} }
}, },
["guarantee50_summon"]={
{
["id"]=15002,
["weight"]=200
},
{
["id"]=25001,
["weight"]=200
},
{
["id"]=25002,
["weight"]=200
},
{
["id"]=35001,
["weight"]=200
},
{
["id"]=45001,
["weight"]=200
},
{
["id"]=45002,
["weight"]=200
},
{
["id"]=55001,
["weight"]=200
},
{
["id"]=55002,
["weight"]=200
}
},
["show"]={ ["show"]={
{ {
3, 3,