diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index e7b43da2..162d8ce2 100644 --- a/lua/app/config/buff.lua +++ b/lua/app/config/buff.lua @@ -501,10 +501,28 @@ local buff = { } }, [74]={ - ["name"]="remove_skill", - ["buff_type"]=7, - ["stack"]=2, - ["decr"]=3 + ["name"]="shield_ice", + ["buff_type"]=2, + ["decr"]=3, + ["icon"]="shield_ice", + ["fx_continued"]={ + 11 + }, + ["fx_disappear"]={ + 14 + } + }, + [75]={ + ["name"]="shield_ice_rebound_400", + ["buff_type"]=2, + ["decr"]=3, + ["icon"]="shield_ice", + ["fx_continued"]={ + 11 + }, + ["fx_disappear"]={ + 14 + } } } local keys = { @@ -582,12 +600,13 @@ local keys = { ["be_dmg_to_heal"]=buff[71], ["death_summon"]=buff[72], ["shield_rebound_400"]=buff[73], - ["remove_skill"]=buff[74] + ["shield_ice"]=buff[74], + ["shield_ice_rebound_400"]=buff[75] } } local config = { data=buff, keys=keys, -count=74 +count=75 } return config \ No newline at end of file diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 7b46331d..b97c6a32 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -88,41 +88,17 @@ local chapter = { ["idle_exp"]=11, ["idle_gold"]=16, ["idle_drop"]={ + { + ["type"]=1, + ["id"]=4, + ["num"]=3, + ["weight"]=100 + }, { ["type"]=1, ["id"]=5, ["num"]=1, ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=6, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=7, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=8, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=9, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=10, - ["num"]=1, - ["weight"]=100 } } }, @@ -266,41 +242,17 @@ local chapter = { ["idle_exp"]=12, ["idle_gold"]=17, ["idle_drop"]={ + { + ["type"]=1, + ["id"]=4, + ["num"]=3, + ["weight"]=100 + }, { ["type"]=1, ["id"]=5, ["num"]=1, ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=6, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=7, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=8, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=9, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=10, - ["num"]=1, - ["weight"]=100 } } }, @@ -466,41 +418,17 @@ local chapter = { ["idle_exp"]=13, ["idle_gold"]=18, ["idle_drop"]={ + { + ["type"]=1, + ["id"]=4, + ["num"]=3, + ["weight"]=100 + }, { ["type"]=1, ["id"]=5, ["num"]=1, ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=6, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=7, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=8, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=9, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=10, - ["num"]=1, - ["weight"]=100 } } }, @@ -673,41 +601,17 @@ local chapter = { ["idle_exp"]=14, ["idle_gold"]=19, ["idle_drop"]={ + { + ["type"]=1, + ["id"]=4, + ["num"]=3, + ["weight"]=100 + }, { ["type"]=1, ["id"]=5, ["num"]=1, ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=6, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=7, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=8, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=9, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=10, - ["num"]=1, - ["weight"]=100 } } }, @@ -880,41 +784,17 @@ local chapter = { ["idle_exp"]=15, ["idle_gold"]=20, ["idle_drop"]={ + { + ["type"]=1, + ["id"]=4, + ["num"]=3, + ["weight"]=100 + }, { ["type"]=1, ["id"]=5, ["num"]=1, ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=6, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=7, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=8, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=9, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=10, - ["num"]=1, - ["weight"]=100 } } }, @@ -1087,41 +967,17 @@ local chapter = { ["idle_exp"]=16, ["idle_gold"]=21, ["idle_drop"]={ + { + ["type"]=1, + ["id"]=4, + ["num"]=3, + ["weight"]=100 + }, { ["type"]=1, ["id"]=5, ["num"]=1, ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=6, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=7, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=8, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=9, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=10, - ["num"]=1, - ["weight"]=100 } } }, @@ -1310,41 +1166,17 @@ local chapter = { ["idle_exp"]=17, ["idle_gold"]=22, ["idle_drop"]={ + { + ["type"]=1, + ["id"]=4, + ["num"]=3, + ["weight"]=100 + }, { ["type"]=1, ["id"]=5, ["num"]=1, ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=6, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=7, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=8, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=9, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=10, - ["num"]=1, - ["weight"]=100 } } }, @@ -1533,41 +1365,17 @@ local chapter = { ["idle_exp"]=18, ["idle_gold"]=23, ["idle_drop"]={ + { + ["type"]=1, + ["id"]=4, + ["num"]=3, + ["weight"]=100 + }, { ["type"]=1, ["id"]=5, ["num"]=1, ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=6, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=7, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=8, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=9, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=10, - ["num"]=1, - ["weight"]=100 } } }, @@ -1756,41 +1564,17 @@ local chapter = { ["idle_exp"]=19, ["idle_gold"]=24, ["idle_drop"]={ + { + ["type"]=1, + ["id"]=4, + ["num"]=3, + ["weight"]=100 + }, { ["type"]=1, ["id"]=5, ["num"]=1, ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=6, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=7, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=8, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=9, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=10, - ["num"]=1, - ["weight"]=100 } } }, @@ -1978,41 +1762,17 @@ local chapter = { ["idle_exp"]=20, ["idle_gold"]=25, ["idle_drop"]={ + { + ["type"]=1, + ["id"]=4, + ["num"]=3, + ["weight"]=100 + }, { ["type"]=1, ["id"]=5, ["num"]=1, ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=6, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=7, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=8, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=9, - ["num"]=1, - ["weight"]=100 - }, - { - ["type"]=1, - ["id"]=10, - ["num"]=1, - ["weight"]=100 } } } diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index ff39447d..a00d558a 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -228,7 +228,7 @@ local hero = { }, ["model_id"]="p0011", ["icon"]="5", - ["item_id"]=24001, + ["item_id"]=14001, ["unlock_chapter"]=1 }, [22001]={ @@ -347,6 +347,64 @@ local hero = { ["item_id"]=23001, ["unlock_chapter"]=1 }, + [23002]={ + ["position"]=2, + ["qlt"]=3, + ["hurt_skill"]={ + 2300210, + 2300211, + 2300212, + 2300213 + }, + ["base_skill"]=2300220, + ["rouge_skill"]=2300200, + ["rouge_skill_1"]=2300201, + ["rouge_skill_2"]=2300202, + ["rouge_skill_3"]=2300203, + ["rouge_skill_4"]=2300204, + ["rouge_skill_5"]=2300205, + ["rouge_skill_6"]=2300206, + ["rouge_skill_7"]=2300207, + ["begin_lv"]=3, + ["hp"]={ + 2000000, + 2400000, + 2800000, + 3220000, + 3660000, + 4120000, + 4620000, + 5160000, + 5760000, + 6420000, + 7140000, + 7940000, + 8840000, + 9840000, + 10980000 + }, + ["atk"]={ + 1000000, + 1200000, + 1400000, + 1610000, + 1830000, + 2060000, + 2310000, + 2580000, + 2880000, + 3210000, + 3570000, + 3970000, + 4420000, + 4920000, + 5490000 + }, + ["model_id"]="p0010", + ["icon"]="5", + ["item_id"]=23002, + ["unlock_chapter"]=1 + }, [24001]={ ["position"]=2, ["qlt"]=4, @@ -521,6 +579,122 @@ local hero = { ["item_id"]=33001, ["unlock_chapter"]=1 }, + [33002]={ + ["position"]=3, + ["qlt"]=3, + ["hurt_skill"]={ + 3300210, + 3300211, + 3300212, + 3300213 + }, + ["base_skill"]=3300220, + ["rouge_skill"]=3300200, + ["rouge_skill_1"]=3300201, + ["rouge_skill_2"]=3300202, + ["rouge_skill_3"]=3300203, + ["rouge_skill_4"]=3300204, + ["rouge_skill_5"]=3300205, + ["rouge_skill_6"]=3300206, + ["rouge_skill_7"]=3300207, + ["begin_lv"]=3, + ["hp"]={ + 2000000, + 2400000, + 2800000, + 3220000, + 3660000, + 4120000, + 4620000, + 5160000, + 5760000, + 6420000, + 7140000, + 7940000, + 8840000, + 9840000, + 10980000 + }, + ["atk"]={ + 1000000, + 1200000, + 1400000, + 1610000, + 1830000, + 2060000, + 2310000, + 2580000, + 2880000, + 3210000, + 3570000, + 3970000, + 4420000, + 4920000, + 5490000 + }, + ["model_id"]="p0006", + ["icon"]="6", + ["item_id"]=33002, + ["unlock_chapter"]=1 + }, + [34001]={ + ["position"]=3, + ["qlt"]=4, + ["hurt_skill"]={ + 3400110, + 3400111, + 3400112, + 3400113 + }, + ["base_skill"]=3400120, + ["rouge_skill"]=3400100, + ["rouge_skill_1"]=3400101, + ["rouge_skill_2"]=3400102, + ["rouge_skill_3"]=3400103, + ["rouge_skill_4"]=3400104, + ["rouge_skill_5"]=3400105, + ["rouge_skill_6"]=3400106, + ["rouge_skill_7"]=3400107, + ["begin_lv"]=5, + ["hp"]={ + 2000000, + 2400000, + 2800000, + 3220000, + 3660000, + 4120000, + 4620000, + 5160000, + 5760000, + 6420000, + 7140000, + 7940000, + 8840000, + 9840000, + 10980000 + }, + ["atk"]={ + 1000000, + 1200000, + 1400000, + 1610000, + 1830000, + 2060000, + 2310000, + 2580000, + 2880000, + 3210000, + 3570000, + 3970000, + 4420000, + 4920000, + 5490000 + }, + ["model_id"]="p0006", + ["icon"]="6", + ["item_id"]=34001, + ["unlock_chapter"]=1 + }, [42001]={ ["position"]=4, ["qlt"]=2, @@ -579,6 +753,72 @@ local hero = { ["item_id"]=42001, ["unlock_chapter"]=1 }, + [43001]={ + ["position"]=4, + ["qlt"]=3, + ["hurt_skill"]={ + 4300110, + 4300111, + 4300112, + 4300113 + }, + ["base_skill"]=4300120, + ["rouge_skill"]=4300100, + ["rouge_skill_1"]=4300101, + ["rouge_skill_2"]=4300102, + ["rouge_skill_3"]=4300103, + ["rouge_skill_4"]=4300104, + ["rouge_skill_5"]=4300105, + ["rouge_skill_6"]=4300106, + ["rouge_skill_7"]=4300107, + ["begin_lv"]=3, + ["hp"]={ + 2000000, + 2400000, + 2800000, + 3220000, + 3660000, + 4120000, + 4620000, + 5160000, + 5760000, + 6420000, + 7140000, + 7940000, + 8840000, + 9840000, + 10980000 + }, + ["atk"]={ + 1000000, + 1200000, + 1400000, + 1610000, + 1830000, + 2060000, + 2310000, + 2580000, + 2880000, + 3210000, + 3570000, + 3970000, + 4420000, + 4920000, + 5490000 + }, + ["model_id"]="p0003", + ["icon"]="3", + ["item_id"]=43001, + ["unlock_chapter"]=1 + }, + [43002]={ + ["position"]=4, + ["qlt"]=3, + ["model_id"]="p0003", + ["icon"]="3", + ["item_id"]=43002, + ["unlock_chapter"]=1 + }, [44001]={ ["position"]=4, ["qlt"]=4, @@ -697,6 +937,6 @@ local hero = { } } local config = { -data=hero,count=12 +data=hero,count=17 } return config \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 2241deba..7417e85c 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -399,7 +399,8 @@ local skill = { ["type"]="state", ["attr"]="bleed", ["op"]=">", - ["v"]=0 + ["v"]=0, + ["side"]=2 } } }, @@ -702,7 +703,8 @@ local skill = { ["type"]="state", ["attr"]="imprison", ["op"]=">", - ["v"]=0 + ["v"]=0, + ["side"]=2 } } }, @@ -974,7 +976,8 @@ local skill = { ["type"]="state", ["attr"]="stun", ["op"]=">", - ["v"]=0 + ["v"]=0, + ["side"]=2 } } }, @@ -998,7 +1001,8 @@ local skill = { ["type"]="state", ["attr"]="bleed", ["op"]=">", - ["v"]=0 + ["v"]=0, + ["side"]=2 } } }, @@ -1176,7 +1180,8 @@ local skill = { ["type"]="state", ["attr"]="burn", ["op"]=">", - ["v"]=0 + ["v"]=0, + ["side"]=2 } } }, @@ -1365,12 +1370,13 @@ local skill = { } }, [2300121]={ + ["position"]=2, ["effect_type"]=2, ["trigger"]=6, ["effect"]={ { ["type"]="bleed", - ["num"]=0, + ["num"]=3500, ["ratio"]=10000, ["round"]=2 } @@ -1440,13 +1446,15 @@ local skill = { } }, [2300123]={ + ["position"]=2, ["buff_condition"]={ { { ["type"]="state", ["attr"]="lethargy", ["op"]=">", - ["v"]=0 + ["v"]=0, + ["side"]=2 } } }, @@ -1469,12 +1477,13 @@ local skill = { ["obj"]=2 }, [2300124]={ + ["position"]=2, ["effect_type"]=2, ["trigger"]=6, ["effect"]={ { ["type"]="bleed", - ["num"]=0, + ["num"]=3500, ["ratio"]=10000, ["round"]=3 } @@ -1482,6 +1491,7 @@ local skill = { ["obj"]=2 }, [2300125]={ + ["position"]=2, ["effect_type"]=2, ["trigger"]=8, ["effect"]={ @@ -1495,13 +1505,15 @@ local skill = { ["obj"]=1 }, [2300126]={ + ["position"]=2, ["buff_condition"]={ { { ["type"]="state", ["attr"]="lethargy", ["op"]=">", - ["v"]=0 + ["v"]=0, + ["side"]=2 } } }, @@ -1523,6 +1535,194 @@ local skill = { }, ["obj"]=2 }, + [2300210]={ + ["position"]=2, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=2200111, + ["name_act"]="attack01", + ["fx_self"]=300004, + ["fx_target"]=4, + ["fx_target_delay"]=366 + }, + [2300211]={ + ["position"]=2, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=2200112, + ["name_act"]="attack02", + ["fx_self"]=300005, + ["fx_target"]=4, + ["fx_target_delay"]=400 + }, + [2300212]={ + ["position"]=2, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=2200113, + ["name_act"]="attack03", + ["fx_self"]=300006, + ["fx_target"]=4, + ["fx_target_delay"]=333 + }, + [2300213]={ + ["position"]=2, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=2200114, + ["name_act"]="attack04", + ["fx_self"]=300007, + ["fx_target"]=4, + ["fx_target_delay"]=433 + }, + [2300220]={ + ["energy"]=10, + ["link"]=1, + ["position"]=2, + ["method"]=2, + ["skill_type"]=4, + ["boardrange"]={ + + }, + ["battle_icon"]="2", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=33400, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["eliminate_effect"]={ + { + ["type"]="dmg_addition_all_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["eliminate_obj"]=1, + ["skill_position"]=1, + ["shake_time"]=200, + ["shake_type"]=5, + ["sound_hit"]=2200120, + ["name_act"]="skill01", + ["fx_self"]=300008, + ["fx_target"]=4, + ["fx_target_delay"]=1100, + ["bullet_time"]={ + 1100, + 3000, + 400 + } + }, + [2300221]={ + ["effect_type"]=2, + ["trigger"]=3, + ["effect"]={ + { + ["type"]="crit_add", + ["num"]=2000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1 + }, + [2300222]={ + ["effect_type"]=2, + ["trigger"]=3, + ["effect"]={ + { + ["type"]="crit_add", + ["num"]=3000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1 + }, + [2300223]={ + ["buff_condition"]={ + { + { + ["type"]="attr", + ["attr"]="hpp", + ["op"]="<", + ["v"]=5000, + ["side"]=2 + } + } + }, + ["condition_rel"]={ + { + 1, + 1 + } + }, + ["effect_type"]=2, + ["trigger"]=3, + ["effect"]={ + { + ["type"]="crit_time_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1 + }, [2400110]={ ["position"]=2, ["effect_type"]=1, @@ -1637,13 +1837,15 @@ local skill = { } }, [2400121]={ + ["position"]=2, ["buff_condition"]={ { { ["type"]="state", ["attr"]="frozen", ["op"]=">", - ["v"]=0 + ["v"]=0, + ["side"]=2 } } }, @@ -1672,13 +1874,15 @@ local skill = { ["obj"]=2 }, [2400122]={ + ["position"]=2, ["buff_condition"]={ { { ["type"]="state", ["attr"]="frozen", ["op"]=">", - ["v"]=0 + ["v"]=0, + ["side"]=2 } } }, @@ -1929,7 +2133,8 @@ local skill = { ["type"]="state", ["attr"]="poison", ["op"]=">", - ["v"]=0 + ["v"]=0, + ["side"]=2 } } }, @@ -2141,6 +2346,437 @@ local skill = { }, ["obj"]=1 }, + [3300210]={ + ["position"]=3, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=3300111, + ["name_act"]="attack01", + ["fx_target"]=300021 + }, + [3300211]={ + ["position"]=3, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=3300112, + ["name_act"]="attack02", + ["fx_target"]=300022 + }, + [3300212]={ + ["position"]=3, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=3300113, + ["name_act"]="attack03", + ["fx_target"]=300023 + }, + [3300213]={ + ["position"]=3, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=3300114, + ["name_act"]="attack04", + ["fx_target"]=300024 + }, + [3300220]={ + ["energy"]=10, + ["link"]=1, + ["position"]=3, + ["method"]=2, + ["battle_icon"]="6", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=33400, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["eliminate_effect"]={ + { + ["type"]="dmg_addition_all_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["eliminate_obj"]=1, + ["skill_position"]=1, + ["shake_time"]=200, + ["shake_type"]=5, + ["sound_hit"]=2200120, + ["name_act"]="skill01", + ["fx_self"]=300008, + ["fx_target"]=4, + ["fx_target_delay"]=1100, + ["bullet_time"]={ + 1100, + 3000, + 400 + } + }, + [3300221]={ + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="vulnerable", + ["num"]=2500, + ["ratio"]=5000, + ["round"]=2 + } + }, + ["obj"]=2 + }, + [3300222]={ + ["energy"]=10, + ["link"]=1, + ["position"]=3, + ["method"]=2, + ["battle_icon"]="6", + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="poison", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, + ["condition_rel"]={ + { + 1, + 1 + } + }, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=33400, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="poison", + ["num"]=5000, + ["ratio"]=5000, + ["round"]=2 + } + }, + ["obj"]=2, + ["eliminate_effect"]={ + { + ["type"]="dmg_addition_all_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["eliminate_obj"]=1, + ["skill_position"]=1, + ["shake_time"]=200, + ["shake_type"]=5, + ["sound_hit"]=2200120, + ["name_act"]="skill01", + ["fx_self"]=300008, + ["fx_target"]=4, + ["fx_target_delay"]=1100, + ["bullet_time"]={ + 1100, + 3000, + 400 + } + }, + [3300223]={ + ["energy"]=10, + ["link"]=1, + ["position"]=3, + ["method"]=2, + ["battle_icon"]="6", + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="poison", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, + ["condition_rel"]={ + { + 1, + 1 + } + }, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=33400, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="poison", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=2, + ["eliminate_effect"]={ + { + ["type"]="dmg_addition_all_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["eliminate_obj"]=1, + ["skill_position"]=1, + ["shake_time"]=200, + ["shake_type"]=5, + ["sound_hit"]=2200120, + ["name_act"]="skill01", + ["fx_self"]=300008, + ["fx_target"]=4, + ["fx_target_delay"]=1100, + ["bullet_time"]={ + 1100, + 3000, + 400 + } + }, + [3400110]={ + ["position"]=3, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=3300111, + ["name_act"]="attack01", + ["fx_target"]=300021 + }, + [3400111]={ + ["position"]=3, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=3300112, + ["name_act"]="attack02", + ["fx_target"]=300022 + }, + [3400112]={ + ["position"]=3, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=3300113, + ["name_act"]="attack03", + ["fx_target"]=300023 + }, + [3400113]={ + ["position"]=3, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=3300114, + ["name_act"]="attack04", + ["fx_target"]=300024 + }, + [3400120]={ + ["energy"]=10, + ["link"]=1, + ["position"]=3, + ["method"]=2, + ["battle_icon"]="6", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=43750, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["eliminate_effect"]={ + { + ["type"]="dmg_addition_all_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["eliminate_obj"]=1, + ["skill_position"]=1, + ["shake_time"]=200, + ["shake_type"]=5, + ["sound_hit"]=2200120, + ["name_act"]="skill01", + ["fx_self"]=300008, + ["fx_target"]=4, + ["fx_target_delay"]=1100, + ["bullet_time"]={ + 1100, + 3000, + 400 + } + }, + [3400121]={ + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="vulnerable", + ["num"]=2500, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=2 + }, + [3400122]={ + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="vulnerable", + ["num"]=3500, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=2 + }, + [3400123]={ + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="bleed", + ["num"]=3500, + ["ratio"]=5000, + ["round"]=2 + } + }, + ["obj"]=2 + }, + [3400124]={ + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="bleed", + ["num"]=7000, + ["ratio"]=5000, + ["round"]=2 + } + }, + ["obj"]=2 + }, [4200110]={ ["position"]=4, ["effect_type"]=1, @@ -2274,7 +2910,8 @@ local skill = { ["type"]="state", ["attr"]="normal_attack_dec", ["op"]=">", - ["v"]=0 + ["v"]=0, + ["side"]=2 } } }, @@ -2304,7 +2941,8 @@ local skill = { ["type"]="state", ["attr"]="normal_attack_dec", ["op"]=">", - ["v"]=0 + ["v"]=0, + ["side"]=2 } } }, @@ -2326,6 +2964,199 @@ local skill = { }, ["obj"]=2 }, + [4300110]={ + ["position"]=4, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=4200111, + ["name_act"]="attack01", + ["fx_target"]=300009 + }, + [4300111]={ + ["position"]=4, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=4200112, + ["name_act"]="attack02", + ["fx_target"]=300010 + }, + [4300112]={ + ["position"]=4, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=4200113, + ["name_act"]="attack03", + ["fx_target"]=300011 + }, + [4300113]={ + ["position"]=4, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=4200114, + ["name_act"]="attack04", + ["fx_target"]=300012 + }, + [4300120]={ + ["energy"]=10, + ["link"]=1, + ["position"]=4, + ["method"]=2, + ["skill_type"]=4, + ["boardrange"]={ + + }, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=40000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="normal_attack_dec", + ["num"]=1, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound_hit"]=4200120, + ["name_act"]="skill01", + ["fx_target"]=300011 + }, + [4300121]={ + ["position"]=4, + ["effect_type"]=2, + ["trigger"]=7, + ["effect"]={ + { + ["type"]="dmg_addition_blue_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["skill_position"]=2 + }, + [4300122]={ + ["position"]=4, + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="frozen", + ["num"]=0, + ["ratio"]=5000, + ["round"]=1 + } + }, + ["obj"]=2, + ["skill_position"]=2 + }, + [4300123]={ + ["position"]=4, + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="shield_ice", + ["num"]=1000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=1, + ["skill_position"]=2 + }, + [4300124]={ + ["position"]=4, + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="shield_ice_rebound_400", + ["num"]=10000, + ["ratio"]=5000, + ["round"]=2 + } + }, + ["obj"]=1, + ["skill_position"]=2 + }, + [4300210]={ + ["position"]=4, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]=4200111, + ["name_act"]="attack01", + ["fx_target"]=300009 + }, [4400110]={ ["position"]=4, ["effect_type"]=1, @@ -2458,7 +3289,8 @@ local skill = { ["type"]="state", ["attr"]="burn", ["op"]=">", - ["v"]=0 + ["v"]=0, + ["side"]=2 } } }, @@ -4301,6 +5133,6 @@ local skill = { } } local config = { -data=skill,count=203 +data=skill,count=238 } return config \ No newline at end of file diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 4f80a9d1..0f9916df 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -772,6 +772,7 @@ local skill_rogue = { }, [1200107]={ ["unlock"]=1200105, + ["cover_unlock"]=1200105, ["limit_times"]=1, ["weight"]=1000, ["qlt"]=4, @@ -781,12 +782,6 @@ local skill_rogue = { }, ["skill_position"]=1, ["effect"]={ - { - ["type"]="remove_skill", - ["num"]=1200121, - ["ratio"]=10000, - ["round"]=1 - }, { ["type"]="add_skill", ["num"]=1200122, @@ -852,18 +847,13 @@ local skill_rogue = { }, [1300104]={ ["unlock"]=1300101, + ["cover_unlock"]=1300101, ["limit_times"]=1, ["weight"]=1000, ["qlt"]=3, ["type"]=12, ["skill_position"]=1, ["effect"]={ - { - ["type"]="remove_skill", - ["num"]=1300121, - ["ratio"]=10000, - ["round"]=1 - }, { ["type"]="add_skill", ["num"]=1300124, @@ -896,6 +886,7 @@ local skill_rogue = { }, [1300106]={ ["unlock"]=1300105, + ["cover_unlock"]=1300105, ["limit_times"]=1, ["weight"]=1000, ["qlt"]=3, @@ -905,12 +896,6 @@ local skill_rogue = { }, ["skill_position"]=1, ["effect"]={ - { - ["type"]="remove_skill", - ["num"]=1300126, - ["ratio"]=10000, - ["round"]=1 - }, { ["type"]="add_skill", ["num"]=1300127, @@ -1138,18 +1123,13 @@ local skill_rogue = { }, [1400105]={ ["unlock"]=1400101, + ["cover_unlock"]=1400101, ["limit_times"]=1, ["weight"]=1000, ["qlt"]=4, ["type"]=12, ["skill_position"]=1, ["effect"]={ - { - ["type"]="remove_skill", - ["num"]=1400122, - ["ratio"]=10000, - ["round"]=1 - }, { ["type"]="add_skill", ["num"]=1400125, @@ -1392,18 +1372,13 @@ local skill_rogue = { }, [2300104]={ ["unlock"]=2300101, + ["cover_unlock"]=2300101, ["limit_times"]=1, ["weight"]=1000, ["qlt"]=3, ["type"]=12, ["skill_position"]=2, ["effect"]={ - { - ["type"]="remove_skill", - ["num"]=2400121, - ["ratio"]=10000, - ["round"]=1 - }, { ["type"]="add_skill", ["num"]=2300124, @@ -1433,18 +1408,13 @@ local skill_rogue = { }, [2300106]={ ["unlock"]=2300103, + ["cover_unlock"]=2300103, ["limit_times"]=1, ["weight"]=1000, ["qlt"]=4, ["type"]=12, ["skill_position"]=2, ["effect"]={ - { - ["type"]="remove_skill", - ["num"]=2300123, - ["ratio"]=10000, - ["round"]=1 - }, { ["type"]="add_skill", ["num"]=2300126, @@ -1472,6 +1442,159 @@ local skill_rogue = { ["obj"]=4, ["icon"]="45" }, + [2300200]={ + ["limit_times"]=1, + ["weight"]=30000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=2, + ["icon"]="56" + }, + [2300201]={ + ["limit_times"]=1, + ["weight"]=1000, + ["qlt"]=3, + ["type"]=2, + ["skill_position"]=2, + ["boardrange"]={ + { + ["type"]=1, + ["range"]=1 + }, + { + ["type"]=2, + ["range"]=1 + }, + { + ["type"]=3, + ["range"]=1 + }, + { + ["type"]=4, + ["range"]=1 + } + }, + ["icon"]="51" + }, + [2300202]={ + ["limit_times"]=1, + ["weight"]=1000, + ["qlt"]=3, + ["type"]=9, + ["skill_position"]=2, + ["effect"]={ + { + ["type"]="atkp_yellow_add", + ["num"]=1000, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=4, + ["icon"]="45" + }, + [2300203]={ + ["limit_times"]=1, + ["weight"]=1000, + ["qlt"]=2, + ["type"]=3, + ["skill_position"]=2, + ["effect"]={ + { + ["type"]="atkp", + ["num"]=1500, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["icon"]="45" + }, + [2300204]={ + ["limit_times"]=1, + ["weight"]=1000, + ["qlt"]=3, + ["type"]=2, + ["skill_position"]=2, + ["boardrange"]={ + { + ["type"]=5, + ["range"]=1 + }, + { + ["type"]=6, + ["range"]=1 + }, + { + ["type"]=7, + ["range"]=1 + }, + { + ["type"]=8, + ["range"]=1 + } + }, + ["icon"]="49" + }, + [2300205]={ + ["limit_times"]=1, + ["weight"]=1000, + ["qlt"]=4, + ["type"]=14, + ["parameter"]={ + 4 + }, + ["skill_position"]=2, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=2300221, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=4, + ["icon"]="51" + }, + [2300206]={ + ["unlock"]=2300205, + ["cover_unlock"]=2300205, + ["limit_times"]=1, + ["weight"]=1000, + ["qlt"]=4, + ["type"]=14, + ["parameter"]={ + 4 + }, + ["skill_position"]=2, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=2300222, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=4, + ["icon"]="51" + }, + [2300207]={ + ["limit_times"]=1, + ["weight"]=1000, + ["qlt"]=4, + ["type"]=12, + ["skill_position"]=2, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=2300223, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=4, + ["icon"]="45" + }, [2400100]={ ["limit_times"]=1, ["weight"]=30000, @@ -1525,18 +1648,13 @@ local skill_rogue = { }, [2400103]={ ["unlock"]=2400102, + ["cover_unlock"]=2400102, ["limit_times"]=1, ["weight"]=1000, ["qlt"]=4, ["type"]=12, ["skill_position"]=2, ["effect"]={ - { - ["type"]="remove_skill", - ["num"]=2400121, - ["ratio"]=10000, - ["round"]=1 - }, { ["type"]="add_skill", ["num"]=2400122, @@ -1577,6 +1695,7 @@ local skill_rogue = { }, [2400106]={ ["unlock"]=2400105, + ["cover_unlock"]=2400105, ["limit_times"]=1, ["weight"]=1000, ["qlt"]=3, @@ -1656,14 +1775,6 @@ local skill_rogue = { 30000 }, ["skill_position"]=3, - ["effect"]={ - { - ["type"]="add_skill", - ["num"]=9, - ["ratio"]=10000, - ["round"]=1 - } - }, ["obj"]=5, ["icon"]="33" }, @@ -1691,6 +1802,15 @@ local skill_rogue = { ["range"]=1 } }, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=9, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=5, ["icon"]="55" }, [3200105]={ @@ -1712,18 +1832,13 @@ local skill_rogue = { }, [3200106]={ ["unlock"]=3200105, + ["cover_unlock"]=3200105, ["limit_times"]=1, ["weight"]=1000, ["qlt"]=3, ["type"]=12, ["skill_position"]=3, ["effect"]={ - { - ["type"]="remove_skill", - ["num"]=3200123, - ["ratio"]=10000, - ["round"]=1 - }, { ["type"]="add_skill", ["num"]=3200124, @@ -1850,18 +1965,13 @@ local skill_rogue = { }, [3300106]={ ["unlock"]=3300104, + ["cover_unlock"]=3300104, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=2, ["type"]=12, ["skill_position"]=3, ["effect"]={ - { - ["type"]="remove_skill", - ["num"]=3300123, - ["ratio"]=10000, - ["round"]=1 - }, { ["type"]="add_skill", ["num"]=3300124, @@ -1892,6 +2002,233 @@ local skill_rogue = { ["obj"]=8, ["icon"]="48" }, + [3300200]={ + ["limit_times"]=1, + ["weight"]=1000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=3, + ["icon"]="38" + }, + [3300201]={ + ["limit_times"]=1, + ["weight"]=1000, + ["qlt"]=3, + ["type"]=12, + ["skill_position"]=3, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=3300221, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["icon"]="38" + }, + [3300202]={ + ["limit_times"]=1, + ["weight"]=1000, + ["qlt"]=3, + ["type"]=3, + ["skill_position"]=3, + ["effect"]={ + { + ["type"]="atkp", + ["num"]=1500, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["icon"]="38" + }, + [3300203]={ + ["limit_times"]=1, + ["weight"]=1000, + ["qlt"]=4, + ["type"]=7, + ["parameter"]={ + 1, + 30000 + }, + ["skill_position"]=3, + ["icon"]="38" + }, + [3300204]={ + ["limit_times"]=1, + ["weight"]=1000, + ["qlt"]=3, + ["type"]=1, + ["parameter"]={ + 3300222 + }, + ["skill_position"]=3, + ["icon"]="38" + }, + [3300205]={ + ["unlock"]=3300204, + ["limit_times"]=1, + ["weight"]=1000, + ["qlt"]=4, + ["type"]=7, + ["parameter"]={ + 2, + 5000 + }, + ["skill_position"]=3, + ["icon"]="38" + }, + [3300206]={ + ["limit_times"]=1, + ["weight"]=1000, + ["qlt"]=3, + ["type"]=9, + ["skill_position"]=4, + ["effect"]={ + { + ["type"]="atkp_green_add", + ["num"]=1500, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=5, + ["icon"]="38" + }, + [3300207]={ + ["unlock"]=3300204, + ["cover_unlock"]=3300204, + ["limit_times"]=1, + ["weight"]=1000, + ["qlt"]=4, + ["type"]=1, + ["parameter"]={ + 3300223 + }, + ["skill_position"]=3, + ["icon"]="38" + }, + [3400100]={ + ["type"]=6, + ["icon"]="67" + }, + [3400101]={ + ["type"]=12, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=3400121, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=5, + ["icon"]="67" + }, + [3400102]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=2, + ["skill_position"]=3, + ["boardrange"]={ + { + ["type"]=1, + ["range"]=1 + }, + { + ["type"]=2, + ["range"]=1 + }, + { + ["type"]=3, + ["range"]=1 + }, + { + ["type"]=4, + ["range"]=1 + } + }, + ["icon"]="67" + }, + [3400103]={ + ["limit_times"]=1, + ["weight"]=1000, + ["qlt"]=3, + ["type"]=9, + ["skill_position"]=4, + ["effect"]={ + { + ["type"]="atkp_green_add", + ["num"]=1500, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=5, + ["icon"]="67" + }, + [3400104]={ + ["unlock"]=3400101, + ["cover_unlock"]=3400101, + ["type"]=12, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=3400122, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=5, + ["icon"]="67" + }, + [3400105]={ + ["type"]=12, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=3400123, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=5, + ["icon"]="67" + }, + [3400106]={ + ["unlock"]=3400106, + ["cover_unlock"]=3400106, + ["type"]=12, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=3400124, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=5, + ["icon"]="67" + }, + [3400107]={ + ["type"]=14, + ["parameter"]={ + 4 + }, + ["effect"]={ + { + ["type"]="skill_fire_times", + ["num"]=3400120, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=5, + ["icon"]="67" + }, [4200100]={ ["limit_times"]=1, ["weight"]=30000, @@ -1998,18 +2335,13 @@ local skill_rogue = { }, [4200107]={ ["unlock"]=4200105, + ["cover_unlock"]=4200105, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["skill_position"]=4, ["effect"]={ - { - ["type"]="remove_skill", - ["num"]=4200122, - ["ratio"]=10000, - ["round"]=1 - }, { ["type"]="add_skill", ["num"]=4200123, @@ -2020,6 +2352,181 @@ local skill_rogue = { ["obj"]=6, ["icon"]="39" }, + [4300100]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=6 + }, + [4300101]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=2, + ["skill_position"]=4, + ["boardrange"]={ + { + ["type"]=1, + ["range"]=1 + }, + { + ["type"]=2, + ["range"]=1 + }, + { + ["type"]=3, + ["range"]=1 + }, + { + ["type"]=4, + ["range"]=1 + } + } + }, + [4300102]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=12, + ["skill_position"]=4, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=4300121, + ["ratio"]=10000, + ["round"]=1 + } + } + }, + [4300103]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=8, + ["parameter"]={ + 2, + 1 + }, + ["skill_position"]=4 + }, + [4300104]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=7, + ["parameter"]={ + 1, + 30000 + }, + ["skill_position"]=4 + }, + [4300105]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=12, + ["skill_position"]=4, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=4300122, + ["ratio"]=10000, + ["round"]=1 + } + } + }, + [4300106]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=12, + ["skill_position"]=4, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=4300123, + ["ratio"]=10000, + ["round"]=1 + } + } + }, + [4300107]={ + ["unlock"]=4300106, + ["cover_unlock"]=4300106, + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=12, + ["skill_position"]=4, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=4300124, + ["ratio"]=10000, + ["round"]=1 + } + } + }, + [4300300]={ + ["limit_times"]=1 + }, + [4300301]={ + ["limit_times"]=1 + }, + [4300302]={ + ["limit_times"]=1 + }, + [4300303]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=3, + ["skill_position"]=4, + ["effect"]={ + { + ["type"]="atkp", + ["num"]=1500, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["icon"]="44" + }, + [4300304]={ + ["limit_times"]=1 + }, + [4300305]={ + ["limit_times"]=1 + }, + [4300306]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=3, + ["skill_position"]=4, + ["boardrange"]={ + { + ["type"]=1, + ["range"]=1 + }, + { + ["type"]=2, + ["range"]=1 + }, + { + ["type"]=3, + ["range"]=1 + }, + { + ["type"]=4, + ["range"]=1 + } + } + }, + [4300307]={ + ["limit_times"]=1 + }, [4400100]={ ["limit_times"]=1, ["weight"]=30000, @@ -2119,18 +2626,13 @@ local skill_rogue = { }, [4400107]={ ["unlock"]=4400105, + ["cover_unlock"]=4400105, ["limit_times"]=1, ["weight"]=1000, ["qlt"]=4, ["type"]=12, ["skill_position"]=4, ["effect"]={ - { - ["type"]="remove_skill", - ["num"]=4400122, - ["ratio"]=10000, - ["round"]=1 - }, { ["type"]="add_skill", ["num"]=4400123, @@ -2246,6 +2748,7 @@ local skill_rogue = { }, [5200107]={ ["unlock"]=5200105, + ["cover_unlock"]=5200105, ["limit_times"]=1, ["weight"]=1000, ["qlt"]=4, @@ -2258,6 +2761,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=140 +data=skill_rogue,count=180 } return config \ No newline at end of file diff --git a/lua/app/config/struct.lua b/lua/app/config/struct.lua index eb5c95d7..fa049262 100644 --- a/lua/app/config/struct.lua +++ b/lua/app/config/struct.lua @@ -33,7 +33,8 @@ local struct = { ["parameter1"]="type:string", ["parameter2"]="attr:string", ["parameter3"]="op:string", - ["parameter4"]="v:int" + ["parameter4"]="v:int", + ["parameter5"]="side:int" } } local config = {