diff --git a/lua/app/config/fx.lua b/lua/app/config/fx.lua index 40e09bb4..070be3c6 100644 --- a/lua/app/config/fx.lua +++ b/lua/app/config/fx.lua @@ -63,6 +63,18 @@ local fx = { ["res"]="sfx_m10016_b03", ["bind"]="root" }, + [100016]={ + ["res"]="sfx_m10008_b01", + ["bind"]="root" + }, + [100017]={ + ["res"]="sfx_m10008_b02", + ["bind"]="root" + }, + [100018]={ + ["res"]="sfx_m10008_b03", + ["bind"]="root" + }, [200000]={ ["res"]="sfx_m20001_b01", ["bind"]="root" @@ -357,6 +369,6 @@ local fx = { } } local config = { -data=fx,count=89 +data=fx,count=92 } return config \ No newline at end of file diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index 4e6aebb1..67d10390 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -2,10 +2,15 @@ local hero = { [12001]={ ["position"]=1, ["qlt"]=2, - ["hurt_skill"]=1, + ["hurt_skill"]={ + 1200111, + 1200112, + 1200113, + 1200114 + }, ["hurt_num"]=3, - ["base_skill"]=120011, - ["support_skill"]=120010, + ["base_skill"]=1200120, + ["support_skill"]=1200110, ["rouge_skill"]=200500, ["rouge_skill_1"]=200501, ["rouge_skill_2"]=200502, @@ -53,10 +58,15 @@ local hero = { [22001]={ ["position"]=2, ["qlt"]=2, - ["hurt_skill"]=2, + ["hurt_skill"]={ + 2200111, + 2200112, + 2200113, + 2200114 + }, ["hurt_num"]=3, - ["base_skill"]=220011, - ["support_skill"]=220010, + ["base_skill"]=2200120, + ["support_skill"]=2200110, ["rouge_skill"]=200200, ["rouge_skill_1"]=200201, ["rouge_skill_2"]=200202, @@ -104,10 +114,15 @@ local hero = { [23001]={ ["position"]=2, ["qlt"]=3, - ["hurt_skill"]=2, + ["hurt_skill"]={ + 2300111, + 2300112, + 2300113, + 2300114 + }, ["hurt_num"]=3, - ["base_skill"]=230011, - ["support_skill"]=230010, + ["base_skill"]=2300120, + ["support_skill"]=2300110, ["rouge_skill"]=200700, ["rouge_skill_1"]=200701, ["rouge_skill_2"]=200702, @@ -155,10 +170,15 @@ local hero = { [32001]={ ["position"]=3, ["qlt"]=2, - ["hurt_skill"]=3, + ["hurt_skill"]={ + 3200111, + 3200112, + 3200113, + 3200114 + }, ["hurt_num"]=3, - ["base_skill"]=320011, - ["support_skill"]=320010, + ["base_skill"]=3200120, + ["support_skill"]=3200110, ["rouge_skill"]=200100, ["rouge_skill_1"]=200101, ["rouge_skill_2"]=200102, @@ -206,10 +226,15 @@ local hero = { [33001]={ ["position"]=3, ["qlt"]=3, - ["hurt_skill"]=3, + ["hurt_skill"]={ + 3300111, + 3300112, + 3300113, + 3300114 + }, ["hurt_num"]=3, - ["base_skill"]=330011, - ["support_skill"]=330010, + ["base_skill"]=3300120, + ["support_skill"]=3300110, ["rouge_skill"]=200600, ["rouge_skill_1"]=200601, ["rouge_skill_2"]=200602, @@ -257,10 +282,15 @@ local hero = { [42001]={ ["position"]=4, ["qlt"]=2, - ["hurt_skill"]=9, + ["hurt_skill"]={ + 4200111, + 4200112, + 4200113, + 4200114 + }, ["hurt_num"]=3, - ["base_skill"]=420011, - ["support_skill"]=420010, + ["base_skill"]=4200120, + ["support_skill"]=4200110, ["rouge_skill"]=200300, ["rouge_skill_1"]=200301, ["rouge_skill_2"]=200302, @@ -308,10 +338,15 @@ local hero = { [43001]={ ["position"]=4, ["qlt"]=3, - ["hurt_skill"]=4, + ["hurt_skill"]={ + 4300111, + 4300112, + 4300113, + 4300114 + }, ["hurt_num"]=3, - ["base_skill"]=430011, - ["support_skill"]=430010, + ["base_skill"]=4300120, + ["support_skill"]=4300110, ["rouge_skill"]=200800, ["rouge_skill_1"]=200801, ["rouge_skill_2"]=200802, @@ -359,10 +394,15 @@ local hero = { [52001]={ ["position"]=5, ["qlt"]=2, - ["hurt_skill"]=5, + ["hurt_skill"]={ + 5200111, + 5200112, + 5200113, + 5200114 + }, ["hurt_num"]=3, - ["base_skill"]=520011, - ["support_skill"]=520010, + ["base_skill"]=5200120, + ["support_skill"]=5200110, ["rouge_skill"]=200400, ["rouge_skill_1"]=200401, ["rouge_skill_2"]=200402, diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index 902e6db1..3a5c5524 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -4,7 +4,11 @@ local monster_chapter = { ["hp"]=3000000, ["atk"]=200000, ["atk_times"]=2, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=11000 }, [201]={ @@ -12,7 +16,11 @@ local monster_chapter = { ["hp"]=4000000, ["atk"]=200000, ["atk_times"]=2, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=11000 }, [301]={ @@ -20,7 +28,11 @@ local monster_chapter = { ["hp"]=9500000, ["atk"]=200000, ["atk_times"]=2, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=17000 }, [401]={ @@ -28,7 +40,11 @@ local monster_chapter = { ["hp"]=6000000, ["atk"]=200000, ["atk_times"]=2, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10004, + 10005, + 10006 + }, ["monster_exp"]=19000 }, [501]={ @@ -37,9 +53,13 @@ local monster_chapter = { ["hp"]=14000000, ["atk"]=250000, ["atk_times"]=3, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10034, + 10035, + 10036 + }, ["skill"]={ - 1000002 + 10037 }, ["monster_exp"]=18000 }, @@ -48,7 +68,11 @@ local monster_chapter = { ["hp"]=8000000, ["atk"]=250000, ["atk_times"]=2, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10007, + 10008, + 10009 + }, ["monster_exp"]=11000 }, [701]={ @@ -56,7 +80,11 @@ local monster_chapter = { ["hp"]=8000000, ["atk"]=250000, ["atk_times"]=2, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=11000 }, [801]={ @@ -64,7 +92,11 @@ local monster_chapter = { ["hp"]=10000000, ["atk"]=250000, ["atk_times"]=2, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=17000 }, [901]={ @@ -72,7 +104,11 @@ local monster_chapter = { ["hp"]=10000000, ["atk"]=280000, ["atk_times"]=2, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=19000 }, [1001]={ @@ -81,9 +117,13 @@ local monster_chapter = { ["hp"]=20000000, ["atk"]=340000, ["atk_times"]=3, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10034, + 10035, + 10036 + }, ["skill"]={ - 1000002 + 10037 }, ["monster_exp"]=18000 }, @@ -92,7 +132,11 @@ local monster_chapter = { ["hp"]=15000000, ["atk"]=300000, ["atk_times"]=2, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=9000 }, [1201]={ @@ -100,7 +144,11 @@ local monster_chapter = { ["hp"]=17000000, ["atk"]=310000, ["atk_times"]=2, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10007, + 10008, + 10009 + }, ["monster_exp"]=10000 }, [1301]={ @@ -108,7 +156,11 @@ local monster_chapter = { ["hp"]=19000000, ["atk"]=320000, ["atk_times"]=2, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10018, + 10019, + 10020 + }, ["monster_exp"]=11000 }, [1401]={ @@ -116,7 +168,11 @@ local monster_chapter = { ["hp"]=21000000, ["atk"]=330000, ["atk_times"]=2, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=12000 }, [1501]={ @@ -125,9 +181,13 @@ local monster_chapter = { ["hp"]=36000000, ["atk"]=380000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10079, + 10080, + 10081 + }, ["skill"]={ - 1000003 + 10082 }, ["monster_exp"]=12000 }, @@ -136,7 +196,11 @@ local monster_chapter = { ["hp"]=4000000, ["atk"]=250000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10018, + 10019, + 10020 + }, ["monster_exp"]=11000 }, [1701]={ @@ -144,7 +208,11 @@ local monster_chapter = { ["hp"]=6000000, ["atk"]=250000, ["atk_times"]=3, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10004, + 10005, + 10006 + }, ["monster_exp"]=11000 }, [1801]={ @@ -152,7 +220,11 @@ local monster_chapter = { ["hp"]=8000000, ["atk"]=250000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10018, + 10019, + 10020 + }, ["monster_exp"]=17000 }, [1901]={ @@ -160,7 +232,11 @@ local monster_chapter = { ["hp"]=10000000, ["atk"]=280000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10007, + 10008, + 10009 + }, ["monster_exp"]=19000 }, [2001]={ @@ -169,9 +245,13 @@ local monster_chapter = { ["hp"]=20000000, ["atk"]=340000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10079, + 10080, + 10081 + }, ["skill"]={ - 1000003 + 10082 }, ["monster_exp"]=18000 }, @@ -180,7 +260,11 @@ local monster_chapter = { ["hp"]=15000000, ["atk"]=300000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10010, + 10011, + 10012 + }, ["monster_exp"]=9000 }, [2201]={ @@ -188,7 +272,11 @@ local monster_chapter = { ["hp"]=17000000, ["atk"]=310000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10007, + 10008, + 10009 + }, ["monster_exp"]=10000 }, [2301]={ @@ -196,7 +284,11 @@ local monster_chapter = { ["hp"]=19000000, ["atk"]=320000, ["atk_times"]=3, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10004, + 10005, + 10006 + }, ["monster_exp"]=11000 }, [2401]={ @@ -204,7 +296,11 @@ local monster_chapter = { ["hp"]=21000000, ["atk"]=330000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10010, + 10011, + 10012 + }, ["monster_exp"]=12000 }, [2501]={ @@ -213,10 +309,14 @@ local monster_chapter = { ["hp"]=36000000, ["atk"]=380000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10069, + 10070, + 10071 + }, ["skill"]={ - 1000004, - 1000005 + 10072, + 10073 }, ["monster_exp"]=12000 }, @@ -225,7 +325,11 @@ local monster_chapter = { ["hp"]=21000000, ["atk"]=340000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10007, + 10008, + 10009 + }, ["monster_exp"]=16000 }, [2701]={ @@ -233,7 +337,11 @@ local monster_chapter = { ["hp"]=23000000, ["atk"]=350000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10018, + 10019, + 10020 + }, ["monster_exp"]=18000 }, [2801]={ @@ -241,7 +349,11 @@ local monster_chapter = { ["hp"]=26000000, ["atk"]=360000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10010, + 10011, + 10012 + }, ["monster_exp"]=21000 }, [2901]={ @@ -249,7 +361,11 @@ local monster_chapter = { ["hp"]=29000000, ["atk"]=370000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=22000 }, [3001]={ @@ -258,10 +374,14 @@ local monster_chapter = { ["hp"]=45000000, ["atk"]=430000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10074, + 10075, + 10076 + }, ["skill"]={ - 1000006, - 1000007 + 10077, + 10078 }, ["monster_exp"]=24000 }, @@ -270,7 +390,10 @@ local monster_chapter = { ["hp"]=7980000, ["atk"]=250000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=11000 }, [3201]={ @@ -278,7 +401,11 @@ local monster_chapter = { ["hp"]=11000000, ["atk"]=270000, ["atk_times"]=3, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10004, + 10005, + 10006 + }, ["monster_exp"]=11000 }, [3301]={ @@ -286,7 +413,11 @@ local monster_chapter = { ["hp"]=12000000, ["atk"]=290000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10004, + 10005, + 10006 + }, ["monster_exp"]=17000 }, [3401]={ @@ -294,7 +425,11 @@ local monster_chapter = { ["hp"]=13000000, ["atk"]=310000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=19000 }, [3501]={ @@ -303,10 +438,14 @@ local monster_chapter = { ["hp"]=21000000, ["atk"]=370000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10063, + 10064, + 10065 + }, ["skill"]={ - 1000008, - 1000009 + 10066, + 10067 }, ["monster_exp"]=18000 }, @@ -315,7 +454,11 @@ local monster_chapter = { ["hp"]=13000000, ["atk"]=310000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=9000 }, [3701]={ @@ -323,7 +466,10 @@ local monster_chapter = { ["hp"]=14000000, ["atk"]=330000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=10000 }, [3801]={ @@ -331,7 +477,11 @@ local monster_chapter = { ["hp"]=16000000, ["atk"]=330000, ["atk_times"]=3, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10004, + 10005, + 10006 + }, ["monster_exp"]=11000 }, [3901]={ @@ -339,7 +489,11 @@ local monster_chapter = { ["hp"]=17000000, ["atk"]=350000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=12000 }, [4001]={ @@ -348,10 +502,13 @@ local monster_chapter = { ["hp"]=28000000, ["atk"]=400000, ["atk_times"]=4, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10025, + 10026 + }, ["skill"]={ - 1000011, - 1000012 + 10027, + 10028 }, ["monster_exp"]=12000 }, @@ -360,7 +517,11 @@ local monster_chapter = { ["hp"]=21000000, ["atk"]=350000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=16000 }, [4201]={ @@ -368,7 +529,10 @@ local monster_chapter = { ["hp"]=24000000, ["atk"]=370000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=18000 }, [4301]={ @@ -376,7 +540,11 @@ local monster_chapter = { ["hp"]=27000000, ["atk"]=390000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=21000 }, [4401]={ @@ -384,7 +552,11 @@ local monster_chapter = { ["hp"]=29000000, ["atk"]=410000, ["atk_times"]=3, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10004, + 10005, + 10006 + }, ["monster_exp"]=22000 }, [4501]={ @@ -393,10 +565,13 @@ local monster_chapter = { ["hp"]=43000000, ["atk"]=640000, ["atk_times"]=4, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10025, + 10026 + }, ["skill"]={ - 1000011, - 1000012 + 10027, + 10028 }, ["monster_exp"]=24000 }, @@ -405,7 +580,10 @@ local monster_chapter = { ["hp"]=36000000, ["atk"]=430000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=15000 }, [4701]={ @@ -413,7 +591,11 @@ local monster_chapter = { ["hp"]=39000000, ["atk"]=450000, ["atk_times"]=3, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10004, + 10005, + 10006 + }, ["monster_exp"]=16000 }, [4801]={ @@ -421,7 +603,11 @@ local monster_chapter = { ["hp"]=43000000, ["atk"]=470000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=17000 }, [4901]={ @@ -429,7 +615,11 @@ local monster_chapter = { ["hp"]=47000000, ["atk"]=490000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=17000 }, [5001]={ @@ -438,10 +628,12 @@ local monster_chapter = { ["hp"]=73000000, ["atk"]=550000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 1000001 + }, ["skill"]={ - 1000010, - 1000009 + 10068, + 10067 }, ["monster_exp"]=22000 }, @@ -450,7 +642,10 @@ local monster_chapter = { ["hp"]=6400000, ["atk"]=350000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=11000 }, [5201]={ @@ -458,7 +653,11 @@ local monster_chapter = { ["hp"]=8000000, ["atk"]=370000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=11000 }, [5301]={ @@ -466,7 +665,11 @@ local monster_chapter = { ["hp"]=9600000, ["atk"]=390000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=17000 }, [5401]={ @@ -474,7 +677,10 @@ local monster_chapter = { ["hp"]=11000000, ["atk"]=410000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=19000 }, [5501]={ @@ -483,10 +689,14 @@ local monster_chapter = { ["hp"]=24000000, ["atk"]=470000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10045, + 10046, + 10047 + }, ["skill"]={ - 1000013, - 1000014 + 10048, + 10049 }, ["monster_exp"]=18000 }, @@ -495,7 +705,11 @@ local monster_chapter = { ["hp"]=14000000, ["atk"]=430000, ["atk_times"]=3, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10004, + 10005, + 10006 + }, ["monster_exp"]=9000 }, [5701]={ @@ -503,7 +717,11 @@ local monster_chapter = { ["hp"]=17000000, ["atk"]=490000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10007, + 10008, + 10009 + }, ["monster_exp"]=10000 }, [5801]={ @@ -511,7 +729,11 @@ local monster_chapter = { ["hp"]=19000000, ["atk"]=450000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=11000 }, [5901]={ @@ -519,7 +741,10 @@ local monster_chapter = { ["hp"]=22000000, ["atk"]=510000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=12000 }, [6001]={ @@ -528,10 +753,14 @@ local monster_chapter = { ["hp"]=38000000, ["atk"]=570000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10050, + 10051, + 10052 + }, ["skill"]={ - 1000015, - 1000017 + 10053, + 10055 }, ["monster_exp"]=12000 }, @@ -540,7 +769,11 @@ local monster_chapter = { ["hp"]=30000000, ["atk"]=530000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=16000 }, [6201]={ @@ -548,7 +781,10 @@ local monster_chapter = { ["hp"]=33000000, ["atk"]=550000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=18000 }, [6301]={ @@ -556,7 +792,11 @@ local monster_chapter = { ["hp"]=36000000, ["atk"]=570000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10007, + 10008, + 10009 + }, ["monster_exp"]=21000 }, [6401]={ @@ -564,7 +804,11 @@ local monster_chapter = { ["hp"]=39000000, ["atk"]=590000, ["atk_times"]=3, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10004, + 10005, + 10006 + }, ["monster_exp"]=22000 }, [6501]={ @@ -573,10 +817,14 @@ local monster_chapter = { ["hp"]=71000000, ["atk"]=590000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10074, + 10075, + 10076 + }, ["skill"]={ - 1000006, - 1000007 + 10077, + 10078 }, ["monster_exp"]=24000 }, @@ -585,7 +833,10 @@ local monster_chapter = { ["hp"]=47000000, ["atk"]=610000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=15000 }, [6701]={ @@ -593,7 +844,11 @@ local monster_chapter = { ["hp"]=50000000, ["atk"]=630000, ["atk_times"]=3, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10004, + 10005, + 10006 + }, ["monster_exp"]=16000 }, [6801]={ @@ -601,7 +856,11 @@ local monster_chapter = { ["hp"]=55000000, ["atk"]=650000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=17000 }, [6901]={ @@ -609,7 +868,11 @@ local monster_chapter = { ["hp"]=60000000, ["atk"]=670000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10007, + 10008, + 10009 + }, ["monster_exp"]=17000 }, [7001]={ @@ -618,10 +881,14 @@ local monster_chapter = { ["hp"]=95000000, ["atk"]=920000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10050, + 10051, + 10052 + }, ["skill"]={ - 1000016, - 1000017 + 10055, + 10055 }, ["monster_exp"]=22000 }, @@ -630,7 +897,11 @@ local monster_chapter = { ["hp"]=6700000, ["atk"]=380000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10010, + 10011, + 10012 + }, ["monster_exp"]=11000 }, [7201]={ @@ -638,7 +909,11 @@ local monster_chapter = { ["hp"]=8400000, ["atk"]=400000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10007, + 10008, + 10009 + }, ["monster_exp"]=11000 }, [7301]={ @@ -646,7 +921,11 @@ local monster_chapter = { ["hp"]=10000000, ["atk"]=420000, ["atk_times"]=3, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10004, + 10005, + 10006 + }, ["monster_exp"]=17000 }, [7401]={ @@ -654,7 +933,11 @@ local monster_chapter = { ["hp"]=11500000, ["atk"]=450000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=19000 }, [7501]={ @@ -663,11 +946,15 @@ local monster_chapter = { ["hp"]=25000000, ["atk"]=500000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10056, + 10057, + 10058 + }, ["skill"]={ - 1000018, - 1000019, - 1000020 + 10059, + 10060, + 10061 }, ["monster_exp"]=18000 }, @@ -676,7 +963,11 @@ local monster_chapter = { ["hp"]=15700000, ["atk"]=500000, ["atk_times"]=3, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10004, + 10005, + 10006 + }, ["monster_exp"]=9000 }, [7701]={ @@ -684,7 +975,11 @@ local monster_chapter = { ["hp"]=19100000, ["atk"]=570000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10007, + 10008, + 10009 + }, ["monster_exp"]=10000 }, [7801]={ @@ -692,7 +987,11 @@ local monster_chapter = { ["hp"]=21300000, ["atk"]=520000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10010, + 10011, + 10012 + }, ["monster_exp"]=11000 }, [7901]={ @@ -700,7 +999,11 @@ local monster_chapter = { ["hp"]=24700000, ["atk"]=590000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=12000 }, [8001]={ @@ -709,10 +1012,14 @@ local monster_chapter = { ["hp"]=39700000, ["atk"]=610000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10045, + 10046, + 10047 + }, ["skill"]={ - 1000013, - 1000014 + 10048, + 10049 }, ["monster_exp"]=12000 }, @@ -721,7 +1028,11 @@ local monster_chapter = { ["hp"]=31300000, ["atk"]=570000, ["atk_times"]=3, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10004, + 10005, + 10006 + }, ["monster_exp"]=16000 }, [8201]={ @@ -729,7 +1040,11 @@ local monster_chapter = { ["hp"]=34500000, ["atk"]=590000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10007, + 10008, + 10009 + }, ["monster_exp"]=18000 }, [8301]={ @@ -737,7 +1052,11 @@ local monster_chapter = { ["hp"]=37600000, ["atk"]=610000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10010, + 10011, + 10012 + }, ["monster_exp"]=21000 }, [8401]={ @@ -745,7 +1064,11 @@ local monster_chapter = { ["hp"]=40700000, ["atk"]=630000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=22000 }, [8501]={ @@ -754,10 +1077,14 @@ local monster_chapter = { ["hp"]=74100000, ["atk"]=630000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10050, + 10051, + 10052 + }, ["skill"]={ - 1000016, - 1000017 + 10055, + 10055 }, ["monster_exp"]=24000 }, @@ -766,7 +1093,11 @@ local monster_chapter = { ["hp"]=52500000, ["atk"]=700000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=15000 }, [8701]={ @@ -774,7 +1105,11 @@ local monster_chapter = { ["hp"]=55800000, ["atk"]=720000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=16000 }, [8801]={ @@ -782,7 +1117,11 @@ local monster_chapter = { ["hp"]=61400000, ["atk"]=740000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10010, + 10011, + 10012 + }, ["monster_exp"]=17000 }, [8901]={ @@ -790,7 +1129,10 @@ local monster_chapter = { ["hp"]=67000000, ["atk"]=770000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=17000 }, [9001]={ @@ -799,12 +1141,16 @@ local monster_chapter = { ["hp"]=107800000, ["atk"]=1060000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10056, + 10057, + 10058 + }, ["skill"]={ - 1000018, - 1000019, - 1000020, - 1000021 + 10059, + 10060, + 10061, + 10062 }, ["monster_exp"]=22000 }, @@ -813,7 +1159,11 @@ local monster_chapter = { ["hp"]=8000000, ["atk"]=480000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=11000 }, [9201]={ @@ -821,7 +1171,11 @@ local monster_chapter = { ["hp"]=10100000, ["atk"]=500000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=11000 }, [9301]={ @@ -829,7 +1183,11 @@ local monster_chapter = { ["hp"]=12000000, ["atk"]=530000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=17000 }, [9401]={ @@ -837,7 +1195,10 @@ local monster_chapter = { ["hp"]=13800000, ["atk"]=550000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=19000 }, [9501]={ @@ -846,11 +1207,15 @@ local monster_chapter = { ["hp"]=29900000, ["atk"]=620000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10038, + 10039, + 10040 + }, ["skill"]={ - 1000022, - 1000023, - 1000025 + 10041, + 10042, + 10044 }, ["monster_exp"]=18000 }, @@ -859,7 +1224,11 @@ local monster_chapter = { ["hp"]=17400000, ["atk"]=580000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=9000 }, [9701]={ @@ -867,7 +1236,10 @@ local monster_chapter = { ["hp"]=21200000, ["atk"]=650000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=10000 }, [9801]={ @@ -875,7 +1247,11 @@ local monster_chapter = { ["hp"]=23600000, ["atk"]=600000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=11000 }, [9901]={ @@ -883,7 +1259,11 @@ local monster_chapter = { ["hp"]=27400000, ["atk"]=670000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=12000 }, [10001]={ @@ -892,10 +1272,14 @@ local monster_chapter = { ["hp"]=43200000, ["atk"]=680000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10069, + 10070, + 10071 + }, ["skill"]={ - 1000004, - 1000005 + 10072, + 10073 }, ["monster_exp"]=12000 }, @@ -904,7 +1288,11 @@ local monster_chapter = { ["hp"]=34100000, ["atk"]=640000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=16000 }, [10201]={ @@ -912,7 +1300,11 @@ local monster_chapter = { ["hp"]=37600000, ["atk"]=670000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10007, + 10008, + 10009 + }, ["monster_exp"]=18000 }, [10301]={ @@ -920,7 +1312,11 @@ local monster_chapter = { ["hp"]=40900000, ["atk"]=690000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=21000 }, [10401]={ @@ -928,7 +1324,11 @@ local monster_chapter = { ["hp"]=44300000, ["atk"]=710000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10018, + 10019, + 10020 + }, ["monster_exp"]=22000 }, [10501]={ @@ -937,10 +1337,14 @@ local monster_chapter = { ["hp"]=80600000, ["atk"]=700000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10074, + 10075, + 10076 + }, ["skill"]={ - 1000006, - 1000007 + 10077, + 10078 }, ["monster_exp"]=24000 }, @@ -949,7 +1353,11 @@ local monster_chapter = { ["hp"]=54600000, ["atk"]=750000, ["atk_times"]=3, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10004, + 10005, + 10006 + }, ["monster_exp"]=15000 }, [10701]={ @@ -957,7 +1365,11 @@ local monster_chapter = { ["hp"]=58000000, ["atk"]=770000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10010, + 10011, + 10012 + }, ["monster_exp"]=16000 }, [10801]={ @@ -965,7 +1377,10 @@ local monster_chapter = { ["hp"]=63800000, ["atk"]=790000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=17000 }, [10901]={ @@ -973,7 +1388,11 @@ local monster_chapter = { ["hp"]=69600000, ["atk"]=820000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=17000 }, [11001]={ @@ -982,11 +1401,15 @@ local monster_chapter = { ["hp"]=117700000, ["atk"]=1170000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10038, + 10039, + 10040 + }, ["skill"]={ - 1000022, - 1000024, - 1000025 + 10041, + 10043, + 10044 }, ["monster_exp"]=22000 }, @@ -995,7 +1418,11 @@ local monster_chapter = { ["hp"]=9100000, ["atk"]=560000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10007, + 10008, + 10009 + }, ["monster_exp"]=11000 }, [11201]={ @@ -1003,7 +1430,11 @@ local monster_chapter = { ["hp"]=11500000, ["atk"]=590000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=11000 }, [11301]={ @@ -1011,7 +1442,11 @@ local monster_chapter = { ["hp"]=13700000, ["atk"]=620000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10018, + 10019, + 10020 + }, ["monster_exp"]=17000 }, [11401]={ @@ -1019,7 +1454,11 @@ local monster_chapter = { ["hp"]=15700000, ["atk"]=650000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10010, + 10011, + 10012 + }, ["monster_exp"]=19000 }, [11501]={ @@ -1028,12 +1467,16 @@ local monster_chapter = { ["hp"]=34000000, ["atk"]=710000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10056, + 10057, + 10058 + }, ["skill"]={ - 1000018, - 1000019, - 1000020, - 1000021 + 10059, + 10060, + 10061, + 10062 }, ["monster_exp"]=18000 }, @@ -1042,7 +1485,11 @@ local monster_chapter = { ["hp"]=19800000, ["atk"]=670000, ["atk_times"]=3, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10004, + 10005, + 10006 + }, ["monster_exp"]=9000 }, [11701]={ @@ -1050,7 +1497,11 @@ local monster_chapter = { ["hp"]=24100000, ["atk"]=760000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10010, + 10011, + 10012 + }, ["monster_exp"]=10000 }, [11801]={ @@ -1058,7 +1509,10 @@ local monster_chapter = { ["hp"]=26800000, ["atk"]=700000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=11000 }, [11901]={ @@ -1066,7 +1520,11 @@ local monster_chapter = { ["hp"]=31100000, ["atk"]=780000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=12000 }, [12001]={ @@ -1075,10 +1533,13 @@ local monster_chapter = { ["hp"]=49100000, ["atk"]=780000, ["atk_times"]=4, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10021, + 10022 + }, ["skill"]={ - 1000026, - 1000027 + 10023, + 10024 }, ["monster_exp"]=12000 }, @@ -1087,7 +1548,11 @@ local monster_chapter = { ["hp"]=38700000, ["atk"]=750000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=16000 }, [12201]={ @@ -1095,7 +1560,10 @@ local monster_chapter = { ["hp"]=42700000, ["atk"]=780000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=18000 }, [12301]={ @@ -1103,7 +1571,11 @@ local monster_chapter = { ["hp"]=46400000, ["atk"]=800000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=21000 }, [12401]={ @@ -1111,7 +1583,11 @@ local monster_chapter = { ["hp"]=50300000, ["atk"]=830000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=22000 }, [12501]={ @@ -1120,9 +1596,13 @@ local monster_chapter = { ["hp"]=94900000, ["atk"]=840000, ["atk_times"]=4, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10034, + 10035, + 10036 + }, ["skill"]={ - 1000002 + 10037 }, ["monster_exp"]=24000 }, @@ -1131,7 +1611,11 @@ local monster_chapter = { ["hp"]=63000000, ["atk"]=890000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10007, + 10008, + 10009 + }, ["monster_exp"]=15000 }, [12701]={ @@ -1139,7 +1623,11 @@ local monster_chapter = { ["hp"]=66900000, ["atk"]=910000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=16000 }, [12801]={ @@ -1147,7 +1635,11 @@ local monster_chapter = { ["hp"]=73600000, ["atk"]=930000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10018, + 10019, + 10020 + }, ["monster_exp"]=17000 }, [12901]={ @@ -1155,7 +1647,11 @@ local monster_chapter = { ["hp"]=80300000, ["atk"]=960000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10010, + 10011, + 10012 + }, ["monster_exp"]=17000 }, [13001]={ @@ -1164,11 +1660,15 @@ local monster_chapter = { ["hp"]=127000000, ["atk"]=1280000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10038, + 10039, + 10040 + }, ["skill"]={ - 1000022, - 1000024, - 1000025 + 10041, + 10043, + 10044 }, ["monster_exp"]=22000 }, @@ -1177,7 +1677,10 @@ local monster_chapter = { ["hp"]=9500000, ["atk"]=610000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=11000 }, [13201]={ @@ -1185,7 +1688,11 @@ local monster_chapter = { ["hp"]=12000000, ["atk"]=630000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=11000 }, [13301]={ @@ -1193,7 +1700,10 @@ local monster_chapter = { ["hp"]=14300000, ["atk"]=660000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=17000 }, [13401]={ @@ -1201,7 +1711,11 @@ local monster_chapter = { ["hp"]=16300000, ["atk"]=690000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=19000 }, [13501]={ @@ -1210,10 +1724,13 @@ local monster_chapter = { ["hp"]=37000000, ["atk"]=790000, ["atk_times"]=4, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10021, + 10022 + }, ["skill"]={ - 1000026, - 1000027 + 10023, + 10024 }, ["monster_exp"]=18000 }, @@ -1222,7 +1739,10 @@ local monster_chapter = { ["hp"]=21500000, ["atk"]=760000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=9000 }, [13701]={ @@ -1230,7 +1750,11 @@ local monster_chapter = { ["hp"]=26200000, ["atk"]=850000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=10000 }, [13801]={ @@ -1238,7 +1762,10 @@ local monster_chapter = { ["hp"]=29100000, ["atk"]=780000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=11000 }, [13901]={ @@ -1246,7 +1773,11 @@ local monster_chapter = { ["hp"]=33800000, ["atk"]=880000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=12000 }, [14001]={ @@ -1255,11 +1786,15 @@ local monster_chapter = { ["hp"]=53300000, ["atk"]=870000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10038, + 10039, + 10040 + }, ["skill"]={ - 1000022, - 1000024, - 1000025 + 10041, + 10043, + 10044 }, ["monster_exp"]=12000 }, @@ -1268,7 +1803,11 @@ local monster_chapter = { ["hp"]=42100000, ["atk"]=840000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10007, + 10008, + 10009 + }, ["monster_exp"]=16000 }, [14201]={ @@ -1276,7 +1815,11 @@ local monster_chapter = { ["hp"]=46400000, ["atk"]=870000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=18000 }, [14301]={ @@ -1284,7 +1827,11 @@ local monster_chapter = { ["hp"]=50400000, ["atk"]=900000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10018, + 10019, + 10020 + }, ["monster_exp"]=21000 }, [14401]={ @@ -1292,7 +1839,11 @@ local monster_chapter = { ["hp"]=54600000, ["atk"]=920000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10010, + 10011, + 10012 + }, ["monster_exp"]=22000 }, [14501]={ @@ -1301,9 +1852,13 @@ local monster_chapter = { ["hp"]=99300000, ["atk"]=900000, ["atk_times"]=4, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10034, + 10035, + 10036 + }, ["skill"]={ - 1000002 + 10037 }, ["monster_exp"]=24000 }, @@ -1312,7 +1867,10 @@ local monster_chapter = { ["hp"]=65900000, ["atk"]=950000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=15000 }, [14701]={ @@ -1320,7 +1878,11 @@ local monster_chapter = { ["hp"]=70000000, ["atk"]=970000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=16000 }, [14801]={ @@ -1328,7 +1890,10 @@ local monster_chapter = { ["hp"]=77000000, ["atk"]=1000000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=17000 }, [14901]={ @@ -1336,7 +1901,11 @@ local monster_chapter = { ["hp"]=84000000, ["atk"]=1030000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=17000 }, [15001]={ @@ -1345,10 +1914,14 @@ local monster_chapter = { ["hp"]=138100000, ["atk"]=1400000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10029, + 10030, + 10031 + }, ["skill"]={ - 1000028, - 1000029 + 10032, + 10033 }, ["monster_exp"]=22000 }, @@ -1357,7 +1930,10 @@ local monster_chapter = { ["hp"]=10900000, ["atk"]=720000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=11000 }, [15201]={ @@ -1365,7 +1941,11 @@ local monster_chapter = { ["hp"]=13700000, ["atk"]=750000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=11000 }, [15301]={ @@ -1373,7 +1953,10 @@ local monster_chapter = { ["hp"]=16400000, ["atk"]=780000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=17000 }, [15401]={ @@ -1381,7 +1964,11 @@ local monster_chapter = { ["hp"]=18700000, ["atk"]=820000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=19000 }, [15501]={ @@ -1390,11 +1977,15 @@ local monster_chapter = { ["hp"]=40400000, ["atk"]=880000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10038, + 10039, + 10040 + }, ["skill"]={ - 1000022, - 1000024, - 1000025 + 10041, + 10043, + 10044 }, ["monster_exp"]=18000 }, @@ -1403,7 +1994,11 @@ local monster_chapter = { ["hp"]=23500000, ["atk"]=850000, ["atk_times"]=3, - ["hurt_skill"]=1000000, + ["hurt_skill"]={ + 10004, + 10005, + 10006 + }, ["monster_exp"]=9000 }, [15701]={ @@ -1411,7 +2006,11 @@ local monster_chapter = { ["hp"]=28700000, ["atk"]=950000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10010, + 10011, + 10012 + }, ["monster_exp"]=10000 }, [15801]={ @@ -1419,7 +2018,10 @@ local monster_chapter = { ["hp"]=31800000, ["atk"]=880000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=11000 }, [15901]={ @@ -1427,7 +2029,11 @@ local monster_chapter = { ["hp"]=36900000, ["atk"]=980000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=12000 }, [16001]={ @@ -1436,10 +2042,14 @@ local monster_chapter = { ["hp"]=60100000, ["atk"]=990000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10050, + 10051, + 10052 + }, ["skill"]={ - 1000016, - 1000017 + 10055, + 10055 }, ["monster_exp"]=12000 }, @@ -1448,7 +2058,10 @@ local monster_chapter = { ["hp"]=47500000, ["atk"]=970000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=16000 }, [16201]={ @@ -1456,7 +2069,11 @@ local monster_chapter = { ["hp"]=52300000, ["atk"]=1000000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=18000 }, [16301]={ @@ -1464,7 +2081,10 @@ local monster_chapter = { ["hp"]=56800000, ["atk"]=1030000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=21000 }, [16401]={ @@ -1472,7 +2092,11 @@ local monster_chapter = { ["hp"]=61600000, ["atk"]=1060000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10015, + 10016, + 10017 + }, ["monster_exp"]=22000 }, [16501]={ @@ -1481,12 +2105,16 @@ local monster_chapter = { ["hp"]=118000000, ["atk"]=1080000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10056, + 10057, + 10058 + }, ["skill"]={ - 1000018, - 1000019, - 1000020, - 1000021 + 10059, + 10060, + 10061, + 10062 }, ["monster_exp"]=24000 }, @@ -1495,7 +2123,11 @@ local monster_chapter = { ["hp"]=80900000, ["atk"]=1190000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=15000 }, [16701]={ @@ -1503,7 +2135,11 @@ local monster_chapter = { ["hp"]=85900000, ["atk"]=1210000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10001, + 10002, + 10003 + }, ["monster_exp"]=16000 }, [16801]={ @@ -1511,7 +2147,11 @@ local monster_chapter = { ["hp"]=94500000, ["atk"]=1250000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10010, + 10011, + 10012 + }, ["monster_exp"]=17000 }, [16901]={ @@ -1519,7 +2159,10 @@ local monster_chapter = { ["hp"]=103100000, ["atk"]=1290000, ["atk_times"]=3, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10013, + 10014 + }, ["monster_exp"]=17000 }, [17001]={ @@ -1528,10 +2171,14 @@ local monster_chapter = { ["hp"]=177600000, ["atk"]=1820000, ["atk_times"]=4, - ["hurt_skill"]=1000001, + ["hurt_skill"]={ + 10029, + 10030, + 10031 + }, ["skill"]={ - 1000028, - 1000029 + 10032, + 10033 }, ["monster_exp"]=22000 } diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 292a13f8..65c71e4e 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -1,174 +1,4 @@ local skill = { - [1]={ - ["position"]=1, - ["effect_type"]=1, - ["trigger"]=1, - ["effect"]={ - { - ["type"]="hurt_red", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - } - }, - ["obj"]=2, - ["skill_position"]=1, - ["shake_time"]=100, - ["shake_type"]=1 - }, - [2]={ - ["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 - }, - [3]={ - ["position"]=3, - ["effect_type"]=1, - ["trigger"]=1, - ["effect"]={ - { - ["type"]="hurt_green", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - } - }, - ["obj"]=2, - ["skill_position"]=1, - ["shake_time"]=100, - ["shake_type"]=1 - }, - [4]={ - ["position"]=4, - ["effect_type"]=1, - ["trigger"]=1, - ["effect"]={ - { - ["type"]="hurt_blue", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - } - }, - ["obj"]=2, - ["skill_position"]=1, - ["shake_time"]=100, - ["shake_type"]=1 - }, - [5]={ - ["position"]=5, - ["effect_type"]=1, - ["trigger"]=1, - ["effect"]={ - { - ["type"]="hurt_purple", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - } - }, - ["obj"]=2, - ["skill_position"]=1, - ["shake_time"]=100, - ["shake_type"]=1 - }, - [6]={ - ["position"]=1, - ["effect_type"]=1, - ["trigger"]=1, - ["effect"]={ - { - ["type"]="hurt_red", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - } - }, - ["obj"]=2, - ["skill_position"]=2, - ["shake_time"]=100, - ["shake_type"]=1 - }, - [7]={ - ["position"]=2, - ["effect_type"]=1, - ["trigger"]=1, - ["effect"]={ - { - ["type"]="hurt_yellow", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - } - }, - ["obj"]=2, - ["skill_position"]=2, - ["shake_time"]=100, - ["shake_type"]=1 - }, - [8]={ - ["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 - }, - [9]={ - ["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 - }, - [10]={ - ["position"]=5, - ["effect_type"]=1, - ["trigger"]=1, - ["effect"]={ - { - ["type"]="hurt_purple", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - } - }, - ["obj"]=2, - ["skill_position"]=2, - ["shake_time"]=100, - ["shake_type"]=1 - }, [11]={ ["effect_type"]=2, ["trigger"]=4, @@ -227,13 +57,13 @@ local skill = { }, ["obj"]=1 }, - [320010]={ - ["position"]=3, + [1200110]={ + ["position"]=1, ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { - ["type"]="hurt_green", + ["type"]="hurt_red", ["num"]=10000, ["ratio"]=10000, ["round"]=0 @@ -244,26 +74,102 @@ local skill = { ["shake_type"]=1, ["name_act"]="support01" }, - [320011]={ + [1200111]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=300017 + }, + [1200112]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=300018 + }, + [1200113]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=300019 + }, + [1200114]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack04", + ["fx_self"]=300020 + }, + [1200120]={ ["energy"]=10, - ["position"]=3, + ["position"]=1, ["method"]=2, ["skill_type"]=1, ["boardrange"]={ { - ["type"]=1, - ["range"]=1 + ["type"]=3, + ["range"]=2 }, { - ["type"]=2, - ["range"]=1 + ["type"]=4, + ["range"]=2 } }, - ["icon"]=10, - ["battle_icon"]="1", - ["skill_position"]=1 + ["icon"]=50, + ["battle_icon"]="5", + ["skill_position"]=2 }, - [220010]={ + [2200110]={ ["position"]=2, ["effect_type"]=1, ["trigger"]=1, @@ -280,7 +186,83 @@ local skill = { ["shake_type"]=1, ["name_act"]="support01" }, - [220011]={ + [2200111]={ + ["position"]=1, + ["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, + ["name_act"]="attack01", + ["fx_self"]=300004 + }, + [2200112]={ + ["position"]=1, + ["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, + ["name_act"]="attack02", + ["fx_self"]=300005 + }, + [2200113]={ + ["position"]=1, + ["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, + ["name_act"]="attack03", + ["fx_self"]=300006 + }, + [2200114]={ + ["position"]=1, + ["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, + ["name_act"]="attack04", + ["fx_self"]=300007 + }, + [2200120]={ ["energy"]=10, ["position"]=2, ["method"]=1, @@ -301,9 +283,10 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=4, - ["name_act"]="skill01" + ["name_act"]="skill01", + ["fx_self"]=300008 }, - [220012]={ + [2200121]={ ["energy"]=10, ["position"]=2, ["method"]=1, @@ -341,156 +324,14 @@ local skill = { ["round"]=0 } }, + ["obj"]=2, ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=4, - ["name_act"]="skill01" + ["name_act"]="skill01", + ["fx_self"]=300008 }, - [420010]={ - ["position"]=4, - ["effect_type"]=1, - ["trigger"]=1, - ["effect"]={ - { - ["type"]="hurt_blue", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - } - }, - ["skill_position"]=2, - ["shake_time"]=100, - ["shake_type"]=1, - ["name_act"]="support01" - }, - [420011]={ - ["energy"]=10, - ["position"]=4, - ["method"]=1, - ["skill_type"]=1, - ["boardrange"]={ - { - ["type"]=0, - ["range"]=2 - } - }, - ["icon"]=30, - ["battle_icon"]="3", - ["skill_position"]=2 - }, - [520010]={ - ["position"]=5, - ["effect_type"]=1, - ["trigger"]=1, - ["effect"]={ - { - ["type"]="hurt_purple", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - } - }, - ["skill_position"]=2, - ["shake_time"]=100, - ["shake_type"]=1, - ["name_act"]="support01" - }, - [520011]={ - ["energy"]=10, - ["position"]=5, - ["method"]=1, - ["skill_type"]=0, - ["icon"]=40, - ["battle_icon"]="4", - ["effect_type"]=1, - ["trigger"]=1, - ["effect"]={ - { - ["type"]="shield", - ["num"]=1000, - ["ratio"]=10000, - ["round"]=1 - } - }, - ["obj"]=1, - ["skill_position"]=2, - ["name_act"]="skill01" - }, - [120010]={ - ["position"]=1, - ["effect_type"]=1, - ["trigger"]=1, - ["effect"]={ - { - ["type"]="hurt_red", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - } - }, - ["skill_position"]=2, - ["shake_time"]=100, - ["shake_type"]=1, - ["name_act"]="support01" - }, - [120011]={ - ["energy"]=10, - ["position"]=1, - ["method"]=2, - ["skill_type"]=1, - ["boardrange"]={ - { - ["type"]=3, - ["range"]=2 - }, - { - ["type"]=4, - ["range"]=2 - } - }, - ["icon"]=50, - ["battle_icon"]="5", - ["skill_position"]=2 - }, - [330010]={ - ["position"]=3, - ["effect_type"]=1, - ["trigger"]=1, - ["effect"]={ - { - ["type"]="hurt_green", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - } - }, - ["skill_position"]=2, - ["shake_time"]=100, - ["shake_type"]=1, - ["name_act"]="support01" - }, - [330011]={ - ["energy"]=10, - ["position"]=3, - ["method"]=1, - ["skill_type"]=0, - ["icon"]=60, - ["battle_icon"]="6", - ["effect_type"]=1, - ["trigger"]=1, - ["effect"]={ - { - ["type"]="heal", - ["num"]=8000, - ["ratio"]=10000, - ["round"]=1 - } - }, - ["obj"]=1, - ["skill_position"]=2, - ["name_act"]="skill01" - }, - [230010]={ + [2300110]={ ["position"]=2, ["effect_type"]=1, ["trigger"]=1, @@ -507,7 +348,83 @@ local skill = { ["shake_type"]=1, ["name_act"]="support01" }, - [230011]={ + [2300111]={ + ["position"]=1, + ["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, + ["name_act"]="attack01", + ["fx_self"]=300026 + }, + [2300112]={ + ["position"]=1, + ["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, + ["name_act"]="attack02", + ["fx_self"]=300027 + }, + [2300113]={ + ["position"]=1, + ["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, + ["name_act"]="attack03", + ["fx_self"]=300028 + }, + [2300114]={ + ["position"]=1, + ["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, + ["name_act"]="attack04", + ["fx_self"]=300029 + }, + [2300120]={ ["energy"]=10, ["position"]=2, ["method"]=1, @@ -527,7 +444,7 @@ local skill = { ["obj"]=1, ["skill_position"]=2 }, - [230012]={ + [2300121]={ ["energy"]=10, ["position"]=2, ["method"]=1, @@ -568,7 +485,7 @@ local skill = { ["obj"]=1, ["skill_position"]=2 }, - [230013]={ + [2300122]={ ["energy"]=10, ["position"]=2, ["method"]=1, @@ -625,7 +542,234 @@ local skill = { ["obj"]=1, ["skill_position"]=2 }, - [430010]={ + [3200110]={ + ["position"]=3, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="support01" + }, + [3200111]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=300000 + }, + [3200112]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=300001 + }, + [3200113]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=300002 + }, + [3200114]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack04", + ["fx_self"]=300003 + }, + [3200120]={ + ["energy"]=10, + ["position"]=3, + ["method"]=2, + ["skill_type"]=1, + ["boardrange"]={ + { + ["type"]=1, + ["range"]=1 + }, + { + ["type"]=2, + ["range"]=1 + } + }, + ["icon"]=10, + ["battle_icon"]="1", + ["skill_position"]=1 + }, + [3300110]={ + ["position"]=3, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="support01" + }, + [3300111]={ + ["position"]=1, + ["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, + ["name_act"]="attack01", + ["fx_self"]=300021 + }, + [3300112]={ + ["position"]=1, + ["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, + ["name_act"]="attack02", + ["fx_self"]=300022 + }, + [3300113]={ + ["position"]=1, + ["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, + ["name_act"]="attack03", + ["fx_self"]=300023 + }, + [3300114]={ + ["position"]=1, + ["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, + ["name_act"]="attack04", + ["fx_self"]=300024 + }, + [3300120]={ + ["energy"]=10, + ["position"]=3, + ["method"]=1, + ["skill_type"]=0, + ["icon"]=60, + ["battle_icon"]="6", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="heal", + ["num"]=8000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["skill_position"]=2, + ["name_act"]="skill01", + ["fx_self"]=300025 + }, + [4200110]={ ["position"]=4, ["effect_type"]=1, ["trigger"]=1, @@ -642,7 +786,191 @@ local skill = { ["shake_type"]=1, ["name_act"]="support01" }, - [430011]={ + [4200111]={ + ["position"]=1, + ["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, + ["name_act"]="attack01", + ["fx_self"]=300009 + }, + [4200112]={ + ["position"]=1, + ["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, + ["name_act"]="attack02", + ["fx_self"]=300010 + }, + [4200113]={ + ["position"]=1, + ["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, + ["name_act"]="attack03", + ["fx_self"]=300011 + }, + [4200114]={ + ["position"]=1, + ["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, + ["name_act"]="attack04", + ["fx_self"]=300012 + }, + [4200120]={ + ["energy"]=10, + ["position"]=4, + ["method"]=1, + ["skill_type"]=1, + ["boardrange"]={ + { + ["type"]=0, + ["range"]=2 + } + }, + ["icon"]=30, + ["battle_icon"]="3", + ["skill_position"]=2 + }, + [4300110]={ + ["position"]=4, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="support01" + }, + [4300111]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=300030 + }, + [4300112]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=300030 + }, + [4300113]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=300030 + }, + [4300114]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack04", + ["fx_self"]=300030 + }, + [4300120]={ ["energy"]=10, ["position"]=4, ["method"]=1, @@ -668,9 +996,11 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=3, - ["name_act"]="skill01" + ["name_act"]="skill01", + ["fx_self"]=300031, + ["fx_target"]=300032 }, - [430012]={ + [4300121]={ ["energy"]=10, ["position"]=4, ["method"]=1, @@ -714,190 +1044,520 @@ local skill = { ["skill_position"]=1, ["shake_time"]=100, ["shake_type"]=3, - ["name_act"]="skill01" + ["name_act"]="skill01", + ["fx_self"]=300031, + ["fx_target"]=300032 }, - [1000000]={ + [5200110]={ + ["position"]=5, ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { - ["type"]="hurt", + ["type"]="hurt_purple", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="support01" + }, + [5200111]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_purple", ["num"]=10000, ["ratio"]=10000, ["round"]=0 } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]=1, ["shake_time"]=100, - ["shake_type"]=1 + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=300013 }, - [1000001]={ + [5200112]={ + ["position"]=1, ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { - ["type"]="hurt", + ["type"]="hurt_purple", ["num"]=10000, ["ratio"]=10000, ["round"]=0 } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]=1, ["shake_time"]=100, - ["shake_type"]=1 + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=300013 }, - [1000002]={ + [5200113]={ + ["position"]=1, ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { - ["type"]="heal", + ["type"]="hurt_purple", ["num"]=10000, ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=300014 + }, + [5200114]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_purple", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack04", + ["fx_self"]=300015 + }, + [5200120]={ + ["energy"]=10, + ["position"]=5, + ["method"]=1, + ["skill_type"]=0, + ["icon"]=40, + ["battle_icon"]="4", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="shield", + ["num"]=1000, + ["ratio"]=10000, ["round"]=1 } }, ["obj"]=1, - ["skill_position"]=2, - ["cd"]=3, - ["cd_start"]=3, - ["name_act"]="skill01" + ["skill_position"]=2 }, - [1000003]={ + [10001]={ ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { ["type"]="hurt", - ["num"]=40000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 } }, ["obj"]=2, ["skill_position"]=2, - ["cd"]=4, - ["cd_start"]=4, ["shake_time"]=100, - ["shake_type"]=4, - ["name_act"]="skill01" + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=100000 }, - [1000004]={ - ["effect_type"]=1, - ["trigger"]=1, - ["effect"]={ - { - ["type"]="heal", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=1 - } - }, - ["obj"]=1, - ["skill_position"]=2, - ["cd"]=2, - ["cd_start"]=2, - ["name_act"]="skill01" - }, - [1000005]={ - ["effect_type"]=2, - ["trigger"]=2, - ["effect"]={ - { - ["type"]="dec_dmg_red_add", - ["num"]=5000, - ["ratio"]=10000, - ["round"]=999 - } - }, - ["obj"]=1, - ["skill_position"]=2 - }, - [1000006]={ - ["skill_type"]=3, - ["skill_type_parameter"]={ - 3, - 3 - }, + [10002]={ ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 } }, ["obj"]=2, ["skill_position"]=2, - ["cd"]=3, - ["cd_start"]=3, ["shake_time"]=100, - ["shake_type"]=4, - ["name_act"]="skill01" + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=100001 }, - [1000007]={ - ["effect_type"]=2, - ["trigger"]=2, + [10003]={ + ["effect_type"]=1, + ["trigger"]=1, ["effect"]={ { - ["type"]="dec_dmg_ryellow_add", - ["num"]=5000, - ["ratio"]=10000, - ["round"]=999 - } - }, - ["obj"]=1, - ["skill_position"]=2 - }, - [1000008]={ - ["skill_type"]=3, - ["skill_type_parameter"]={ - 4, - 2 - }, - ["obj"]=2, - ["skill_position"]=2, - ["cd"]=2, - ["cd_start"]=2, - ["name_act"]="skill01" - }, - [1000009]={ - ["effect_type"]=2, - ["trigger"]=2, - ["effect"]={ - { - ["type"]="weakness_purple_add", + ["type"]="hurt", ["num"]=10000, ["ratio"]=10000, - ["round"]=999 - }, - { - ["type"]="dec_dmg_green_add", - ["num"]=5000, - ["ratio"]=10000, - ["round"]=999 + ["round"]=0 } }, - ["obj"]=1, - ["skill_position"]=2 - }, - [1000010]={ - ["skill_type"]=3, - ["skill_type_parameter"]={ - 4, - 4 - }, ["obj"]=2, ["skill_position"]=2, - ["cd"]=2, - ["cd_start"]=2, - ["name_act"]="skill01" + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=100002 }, - [1000011]={ + [10004]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=100003 + }, + [10005]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=100004 + }, + [10006]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=100005 + }, + [10007]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=100006 + }, + [10008]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=100007 + }, + [10009]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=100008 + }, + [10010]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=100009 + }, + [10011]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=100009 + }, + [10012]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=100010 + }, + [10013]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=100011 + }, + [10014]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=100012 + }, + [10015]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=100013 + }, + [10016]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=100014 + }, + [10017]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=100015 + }, + [10018]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=100016 + }, + [10019]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=100017 + }, + [10020]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=100018 + }, + [10021]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=200000 + }, + [10022]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=200001 + }, + [10023]={ ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -914,125 +1574,10 @@ local skill = { ["cd_start"]=2, ["shake_time"]=100, ["shake_type"]=3, - ["name_act"]="skill01" + ["name_act"]="skill01", + ["fx_self"]=200002 }, - [1000012]={ - ["effect_type"]=2, - ["trigger"]=2, - ["effect"]={ - { - ["type"]="dec_dmg_green_add", - ["num"]=5000, - ["ratio"]=10000, - ["round"]=999 - } - }, - ["obj"]=1, - ["skill_position"]=2 - }, - [1000013]={ - ["effect_type"]=1, - ["trigger"]=1, - ["effect"]={ - { - ["type"]="shield", - ["num"]=1000, - ["ratio"]=10000, - ["round"]=1 - } - }, - ["obj"]=1, - ["skill_position"]=2, - ["cd"]=3, - ["cd_start"]=3, - ["name_act"]="skill01" - }, - [1000014]={ - ["effect_type"]=2, - ["trigger"]=2, - ["effect"]={ - { - ["type"]="dec_dmg_green_add", - ["num"]=5000, - ["ratio"]=10000, - ["round"]=999 - } - }, - ["obj"]=1, - ["skill_position"]=2 - }, - [1000015]={ - ["skill_type"]=3, - ["skill_type_parameter"]={ - 5, - 2 - }, - ["obj"]=2, - ["skill_position"]=2, - ["cd"]=2, - ["cd_start"]=2, - ["name_act"]="skill01" - }, - [1000016]={ - ["skill_type"]=3, - ["skill_type_parameter"]={ - 5, - 4 - }, - ["obj"]=2, - ["skill_position"]=2, - ["cd"]=2, - ["cd_start"]=2, - ["name_act"]="skill01" - }, - [1000017]={ - ["effect_type"]=2, - ["trigger"]=2, - ["effect"]={ - { - ["type"]="dec_dmg_blue_add", - ["num"]=5000, - ["ratio"]=10000, - ["round"]=999 - } - }, - ["obj"]=1, - ["skill_position"]=2 - }, - [1000018]={ - ["effect_type"]=2, - ["trigger"]=3, - ["effect"]={ - { - ["type"]="normal_attack_add", - ["num"]=30000, - ["ratio"]=10000, - ["round"]=0 - } - }, - ["obj"]=1, - ["skill_position"]=2, - ["cd"]=3, - ["cd_start"]=3 - }, - [1000019]={ - ["effect_type"]=1, - ["trigger"]=1, - ["effect"]={ - { - ["type"]="shield", - ["num"]=1000, - ["ratio"]=10000, - ["round"]=1 - } - }, - ["obj"]=1, - ["skill_position"]=2, - ["cd"]=3, - ["cd_start"]=3, - ["name_act"]="skill01" - }, - [1000020]={ + [10024]={ ["effect_type"]=2, ["trigger"]=2, ["effect"]={ @@ -1046,73 +1591,43 @@ local skill = { ["obj"]=1, ["skill_position"]=2 }, - [1000021]={ - ["skill_type"]=3, - ["skill_type_parameter"]={ - 5, - 4 - }, - ["obj"]=2, - ["skill_position"]=2, - ["cd"]=2, - ["cd_start"]=2, - ["name_act"]="skill01" - }, - [1000022]={ - ["effect_type"]=2, - ["trigger"]=3, + [10025]={ + ["effect_type"]=1, + ["trigger"]=1, ["effect"]={ { - ["type"]="normal_attack_add", - ["num"]=30000, + ["type"]="hurt", + ["num"]=10000, ["ratio"]=10000, ["round"]=0 } }, - ["obj"]=1, - ["skill_position"]=2, - ["cd"]=3, - ["cd_start"]=3 - }, - [1000023]={ - ["skill_type"]=3, - ["skill_type_parameter"]={ - 3, - 2 - }, ["obj"]=2, ["skill_position"]=2, - ["cd"]=3, - ["cd_start"]=3, - ["name_act"]="skill01" + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=200003 }, - [1000024]={ - ["skill_type"]=3, - ["skill_type_parameter"]={ - 3, - 4 - }, - ["obj"]=2, - ["skill_position"]=2, - ["cd"]=3, - ["cd_start"]=3, - ["name_act"]="skill01" - }, - [1000025]={ - ["effect_type"]=2, - ["trigger"]=2, + [10026]={ + ["effect_type"]=1, + ["trigger"]=1, ["effect"]={ { - ["type"]="dec_dmg_green_add", - ["num"]=5000, + ["type"]="hurt", + ["num"]=10000, ["ratio"]=10000, - ["round"]=999 + ["round"]=0 } }, - ["obj"]=1, - ["skill_position"]=2 + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=200004 }, - [1000026]={ + [10027]={ ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -1129,14 +1644,15 @@ local skill = { ["cd_start"]=2, ["shake_time"]=100, ["shake_type"]=3, - ["name_act"]="skill01" + ["name_act"]="skill01", + ["fx_self"]=200005 }, - [1000027]={ + [10028]={ ["effect_type"]=2, ["trigger"]=2, ["effect"]={ { - ["type"]="dec_dmg_ryellow_add", + ["type"]="dec_dmg_green_add", ["num"]=5000, ["ratio"]=10000, ["round"]=999 @@ -1145,7 +1661,64 @@ local skill = { ["obj"]=1, ["skill_position"]=2 }, - [1000028]={ + [10029]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=200006, + ["fx_target"]=200009 + }, + [10030]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=200007, + ["fx_target"]=200009 + }, + [10031]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=200008, + ["fx_target"]=200009 + }, + [10032]={ ["effect_type"]=2, ["trigger"]=3, ["effect"]={ @@ -1167,7 +1740,7 @@ local skill = { ["cd"]=3, ["cd_start"]=3 }, - [1000029]={ + [10033]={ ["effect_type"]=2, ["trigger"]=2, ["effect"]={ @@ -1180,9 +1753,833 @@ local skill = { }, ["obj"]=1, ["skill_position"]=2 + }, + [10034]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_target"]=200010 + }, + [10035]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_target"]=200010 + }, + [10036]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_target"]=200010 + }, + [10037]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="heal", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["skill_position"]=2, + ["cd"]=3, + ["cd_start"]=3, + ["name_act"]="skill01", + ["fx_self"]=200011 + }, + [10038]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=200012 + }, + [10039]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=200013 + }, + [10040]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=200014 + }, + [10041]={ + ["effect_type"]=2, + ["trigger"]=3, + ["effect"]={ + { + ["type"]="normal_attack_add", + ["num"]=30000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=1, + ["skill_position"]=2, + ["cd"]=3, + ["cd_start"]=3 + }, + [10042]={ + ["skill_type"]=3, + ["skill_type_parameter"]={ + 3, + 2 + }, + ["obj"]=2, + ["skill_position"]=2, + ["cd"]=3, + ["cd_start"]=3, + ["name_act"]="skill01", + ["fx_self"]=200015 + }, + [10043]={ + ["skill_type"]=3, + ["skill_type_parameter"]={ + 3, + 4 + }, + ["obj"]=2, + ["skill_position"]=2, + ["cd"]=3, + ["cd_start"]=3, + ["name_act"]="skill01", + ["fx_self"]=200015 + }, + [10044]={ + ["effect_type"]=2, + ["trigger"]=2, + ["effect"]={ + { + ["type"]="dec_dmg_green_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=1, + ["skill_position"]=2 + }, + [10045]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=200016 + }, + [10046]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=200017 + }, + [10047]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=200018 + }, + [10048]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="shield", + ["num"]=1000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["skill_position"]=2, + ["cd"]=3, + ["cd_start"]=3, + ["name_act"]="skill01", + ["fx_self"]=200019 + }, + [10049]={ + ["effect_type"]=2, + ["trigger"]=2, + ["effect"]={ + { + ["type"]="dec_dmg_green_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=1, + ["skill_position"]=2 + }, + [10050]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=200020 + }, + [10051]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=200021 + }, + [10052]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=200022 + }, + [10053]={ + ["skill_type"]=3, + ["skill_type_parameter"]={ + 5, + 2 + }, + ["obj"]=2, + ["skill_position"]=2, + ["cd"]=2, + ["cd_start"]=2, + ["name_act"]="skill01", + ["fx_self"]=200023 + }, + [10054]={ + ["skill_type"]=3, + ["skill_type_parameter"]={ + 5, + 4 + }, + ["obj"]=2, + ["skill_position"]=2, + ["cd"]=2, + ["cd_start"]=2, + ["name_act"]="skill01", + ["fx_self"]=200023 + }, + [10055]={ + ["effect_type"]=2, + ["trigger"]=2, + ["effect"]={ + { + ["type"]="dec_dmg_blue_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=1, + ["skill_position"]=2 + }, + [10056]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=200024 + }, + [10057]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=200025 + }, + [10058]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=200026 + }, + [10059]={ + ["effect_type"]=2, + ["trigger"]=3, + ["effect"]={ + { + ["type"]="normal_attack_add", + ["num"]=30000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=1, + ["skill_position"]=2, + ["cd"]=3, + ["cd_start"]=3 + }, + [10060]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="shield", + ["num"]=1000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["skill_position"]=2, + ["cd"]=3, + ["cd_start"]=3, + ["name_act"]="skill01", + ["fx_self"]=200027 + }, + [10061]={ + ["effect_type"]=2, + ["trigger"]=2, + ["effect"]={ + { + ["type"]="dec_dmg_ryellow_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=1, + ["skill_position"]=2 + }, + [10062]={ + ["skill_type"]=3, + ["skill_type_parameter"]={ + 5, + 4 + }, + ["obj"]=2, + ["skill_position"]=2, + ["cd"]=2, + ["cd_start"]=2 + }, + [10063]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=200028 + }, + [10064]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=200029 + }, + [10065]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=200030 + }, + [10066]={ + ["skill_type"]=3, + ["skill_type_parameter"]={ + 4, + 2 + }, + ["obj"]=2, + ["skill_position"]=2, + ["cd"]=2, + ["cd_start"]=2, + ["name_act"]="skill01" + }, + [10067]={ + ["effect_type"]=2, + ["trigger"]=2, + ["effect"]={ + { + ["type"]="weakness_purple_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=999 + }, + { + ["type"]="dec_dmg_green_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=1, + ["skill_position"]=2 + }, + [10068]={ + ["skill_type"]=3, + ["skill_type_parameter"]={ + 4, + 4 + }, + ["obj"]=2, + ["skill_position"]=2, + ["cd"]=2, + ["cd_start"]=2, + ["name_act"]="skill01" + }, + [10069]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=200031 + }, + [10070]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=200031 + }, + [10071]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=200032 + }, + [10072]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="heal", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["skill_position"]=2, + ["cd"]=2, + ["cd_start"]=2, + ["name_act"]="skill01" + }, + [10073]={ + ["effect_type"]=2, + ["trigger"]=2, + ["effect"]={ + { + ["type"]="dec_dmg_red_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=1, + ["skill_position"]=2 + }, + [10074]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=200033 + }, + [10075]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=200034 + }, + [10076]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=200035 + }, + [10077]={ + ["skill_type"]=3, + ["skill_type_parameter"]={ + 3, + 3 + }, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=25000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["cd"]=3, + ["cd_start"]=3, + ["shake_time"]=100, + ["shake_type"]=4, + ["name_act"]="skill01" + }, + [10078]={ + ["effect_type"]=2, + ["trigger"]=2, + ["effect"]={ + { + ["type"]="dec_dmg_ryellow_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=1, + ["skill_position"]=2 + }, + [10079]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack01", + ["fx_self"]=200036 + }, + [10080]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack02", + ["fx_self"]=200037 + }, + [10081]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, + ["name_act"]="attack03", + ["fx_self"]=200038 + }, + [10082]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=40000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["cd"]=4, + ["cd_start"]=4, + ["shake_time"]=100, + ["shake_type"]=4, + ["name_act"]="skill01", + ["fx_self"]=200039 } } local config = { -data=skill,count=64 +data=skill,count=138 } 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 0160c3ce..8979678f 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -724,7 +724,7 @@ local skill_rogue = { ["qlt"]=3, ["type"]=1, ["parameter"]={ - 220012 + 2200121 }, ["skill_position"]=2, ["icon"]="34" @@ -755,13 +755,13 @@ local skill_rogue = { ["effect"]={ { ["type"]="skill_fire_times", - ["num"]=220011, + ["num"]=2200120, ["ratio"]=10000, ["round"]=1 }, { ["type"]="skill_fire_times", - ["num"]=220012, + ["num"]=2200121, ["ratio"]=10000, ["round"]=1 } @@ -980,7 +980,7 @@ local skill_rogue = { ["qlt"]=3, ["type"]=1, ["parameter"]={ - 230012 + 2300121 }, ["skill_position"]=2, ["icon"]="49" @@ -1008,7 +1008,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=1, ["parameter"]={ - 230013 + 2300122 }, ["skill_position"]=2, ["icon"]="51" @@ -1027,7 +1027,7 @@ local skill_rogue = { ["qlt"]=3, ["type"]=1, ["parameter"]={ - 430012 + 4300121 }, ["skill_position"]=4, ["icon"]="52" diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua index e275a824..af73b73f 100644 --- a/lua/app/config/tutorial.lua +++ b/lua/app/config/tutorial.lua @@ -2,7 +2,6 @@ local tutorial = { [10000]={ ["next_id"]=10010, ["type"]=6, - ["finish"]=4, ["target_element"]={ 53, 44, @@ -33,7 +32,6 @@ local tutorial = { [10040]={ ["next_id"]=10050, ["type"]=6, - ["finish"]=4, ["target_element"]={ 33, 23, @@ -55,7 +53,6 @@ local tutorial = { }, [10060]={ ["type"]=6, - ["finish"]=4, ["target_element"]={ 23, 13, diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 07fbc5f6..42817a6e 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -653,7 +653,7 @@ function BattleUnitComp:enterSkillAttackState() self.targetX = nil local skill if self.normalSkillCount > 0 then - skill = self.unitEntity:getNormalSkill() + skill = self.unitEntity:getNormalSkill(true) else skill = self.currActiveSkill end @@ -672,12 +672,9 @@ function BattleUnitComp:enterSkillAttackState() else self.isMove = false self.attackTime = 0 - local attackName + local attackName = skill:getSkillAttackName() if self.normalSkillCount > 0 then - attackName = skill:getRandomNormalAttackName() self:attackAndSpeedUp() - else - attackName = skill:getSkillAttackName() end self.currAttackDuration = self:getAnimationDuration(attackName) self.currAttackKeyTime = self:getAnimationKeyFrameTime(attackName) @@ -842,8 +839,9 @@ end function BattleUnitComp:doNextNormalAttack() self.attackTime = 0 - local skill = self.unitEntity:getNormalSkill() - local attackName = skill:getRandomNormalAttackName() + local skill = self.unitEntity:getNormalSkill(true) + skill:startUse() + local attackName = skill:getSkillAttackName() self.currAttackDuration = self:getAnimationDuration(attackName) self.currAttackKeyTime = self:getAnimationKeyFrameTime(attackName) self:playAnimation(attackName, false, false) @@ -855,8 +853,9 @@ function BattleUnitComp:doNextAttack() self.attackTime = 0 local attackName = nil if self.normalSkillCount > 0 then - local skill = self.unitEntity:getNormalSkill() - attackName = skill:getRandomNormalAttackName() + local skill = self.unitEntity:getNormalSkill(true) + skill:startUse() + attackName = skill:getSkillAttackName() if attackName then self.currAttackDuration = self:getAnimationDuration(attackName) self.currAttackKeyTime = self:getAnimationKeyFrameTime(attackName) @@ -867,6 +866,7 @@ function BattleUnitComp:doNextAttack() self:moveBackToInitPosition() end elseif self.currActiveSkill then + self.currActiveSkill:startUse() attackName = self.currActiveSkill:getSkillAttackName() if attackName then self.currAttackDuration = self:getAnimationDuration(attackName) @@ -885,7 +885,7 @@ end function BattleUnitComp:enterNormalAttackState() self.attackOver = false self.attackTime = 0 - local skill = self.unitEntity:getNormalSkill() + local skill = self.unitEntity:getNormalSkill(true) skill:startUse() if skill:getMoveType() == BattleConst.SKILL_MOVE_TYPE.MOVE then self.isMove = true @@ -901,7 +901,7 @@ function BattleUnitComp:enterNormalAttackState() else self.isMove = false self.attackTime = 0 - local attackName = skill:getRandomNormalAttackName() + local attackName = skill:getSkillAttackName() self.currAttackDuration = self:getAnimationDuration(attackName) self.currAttackKeyTime = self:getAnimationKeyFrameTime(attackName) self:playAnimation(attackName, false, false) @@ -1278,9 +1278,8 @@ function BattleUnitComp:getEffectAndPlay(skill, fxInfo) -- effectObj:changeSortingOrderToFudge(BattleConst.BATTLE_BASE_ORDER, BattleConst.FX_SORTING_FUDGE_COEFFICIENT) -- end effectObj:play() - duration = duration or effectObj:getDuration() local sid - sid = BattleHelper:performDurationDelay(duration, function() + sid = BattleHelper:performDurationDelay(effectObj:getDuration(), function() BattleHelper:recycleEffect(effectObj) end) end) diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 6dbac373..beea5482 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -177,9 +177,9 @@ function BattleController:init(params) self.time = 0 self.battleData:init() BattleScheduler:init() + BattlePool:init() BattleHelper:init() BattlePassive:init() - BattlePool:init() self:setTimeScale(DataManager.BattleData:getTimeScale()) self:bindData() self:initBattleTeam() diff --git a/lua/app/module/battle/helper/battle_helper.lua b/lua/app/module/battle/helper/battle_helper.lua index 45d29792..125f11a2 100644 --- a/lua/app/module/battle/helper/battle_helper.lua +++ b/lua/app/module/battle/helper/battle_helper.lua @@ -1,5 +1,6 @@ local UIPrefabObject = require "app/bf/unity/uiprefab_object" local BattlePool = require "app/module/battle/helper/battle_pool" +local BattleScheduler = require "app/module/battle/helper/battle_scheduler" local BattleHelper = {} @@ -100,14 +101,15 @@ function BattleHelper:getEffectAsync(name, parent, callback) end local effect = self.effectPools:pop(path) if effect then - if parent then - effect:setParent(parent, false) - end + -- if parent then + -- effect:setParent(parent, false) + -- end if self.effectMap then self.effectMap[effect:getInstanceID()] = effect end local timeScale = DataManager.BattleData:getTimeScale() effect:setTimeScale(timeScale) + effect:setActive(true) callback(effect) else EffectManager:loadBattleEffectAsync(path, parent, function(effect) @@ -134,8 +136,9 @@ function BattleHelper:recycleEffect(effect) end end effect:stop() + effect:setActive(false) if self.effectPools then - self.effectPools:push(effect) + self.effectPools:push(effect, true) end if self.effectMap then self.effectMap[effect:getInstanceID()] = nil @@ -218,6 +221,18 @@ function BattleHelper:recycleBuffEffect(buffEffect) table.insert(self.buffEffectPool, buffEffect) end +function BattleHelper:performDurationDelay(delay, func) + return BattleScheduler:performWithDelayGlobal(func, delay) +end + +function BattleHelper:scheduleGlobal(inter, func) + return BattleScheduler:scheduleGlobal(func, inter) +end + +function BattleHelper:unscheduleGlobal(scheduleId) + BattleScheduler:unscheduleGlobal(scheduleId) +end + function BattleHelper:clear() self.isClear = true self.characterPools = nil diff --git a/lua/app/userdata/battle/battle_data.lua b/lua/app/userdata/battle/battle_data.lua index c419b967..23b3d484 100644 --- a/lua/app/userdata/battle/battle_data.lua +++ b/lua/app/userdata/battle/battle_data.lua @@ -479,9 +479,8 @@ function BattleData:initHeroData() id = heroId, modelId = heroEntity:getModelId(), matchType = matchType, - normalSkill = heroEntity:getHurtSkill(), + normalSkills = heroEntity:getHurtSkill(), activeSkills = {activeSkill}, - normalSkillCount = heroEntity:getHurtNum(), assistingSkill = heroEntity:getAssistingSkill(), attr = { hp = hp, @@ -512,9 +511,8 @@ function BattleData:addMonster(monsterId, newTeam) id = monsterId, modelId = monsterInfo.model_id, matchType = 0, - normalSkill = monsterInfo.hurt_skill, + normalSkills = monsterInfo.hurt_skill, activeSkills = monsterInfo.skill, - normalSkillCount = monsterInfo.hurt_num, assistingSkill = nil, isBoss = monsterInfo.is_boss, exp = monsterInfo.monster_exp or 0, diff --git a/lua/app/userdata/battle/skill/battle_skill_entity.lua b/lua/app/userdata/battle/skill/battle_skill_entity.lua index 109af92a..342bb39f 100644 --- a/lua/app/userdata/battle/skill/battle_skill_entity.lua +++ b/lua/app/userdata/battle/skill/battle_skill_entity.lua @@ -125,25 +125,6 @@ function BattleSkillEntity:getMoveType() return self.skillInfo.skill_position end -function BattleSkillEntity:getRandomNormalAttackName() - if self.normalSkillNameList == nil then - local normalSkillNameList, count = self.owner:getNormalSkillNameList() - self.normalSkillNameList = {} - for i = 1, count do - self.normalSkillNameList[i] = normalSkillNameList[i] - end - end - if self.normalSkillNameIndex == nil then - self.normalSkillNameIndex = math.random(1, #self.normalSkillNameList) - else - local temp = self.normalSkillNameList[#self.normalSkillNameList] - self.normalSkillNameList[#self.normalSkillNameList] = self.normalSkillNameList[self.normalSkillNameIndex] - self.normalSkillNameList[self.normalSkillNameIndex] = temp - self.normalSkillNameIndex = math.random(1, #self.normalSkillNameList - 1) - end - return self.normalSkillNameList[self.normalSkillNameIndex] -end - function BattleSkillEntity:getSkillAttackName() return self.skillInfo.name_act end diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua index 51b8e877..461540e9 100644 --- a/lua/app/userdata/battle/team/battle_unit_entity.lua +++ b/lua/app/userdata/battle/team/battle_unit_entity.lua @@ -14,9 +14,17 @@ end function BattleUnitEntity:initSkill() self.activeSkills = {} - if self.unitData.normalSkill then - self.normalSkill = BattleSkillEntity:create(self.unitData.normalSkill, GConst.BattleConst.SKILL_TYPE_NORMAL, self) + if self.unitData.normalSkills then + self.normalSkills = {} + for k, v in ipairs(self.unitData.normalSkills) do + local skill = BattleSkillEntity:create(v, GConst.BattleConst.SKILL_TYPE_NORMAL, self) + table.insert(self.normalSkills, skill) + end + self.normalSkillCount = #self.normalSkills + else + self.normalSkillCount = 0 end + self.normalSkill = nil if self.unitData.assistingSkill then self.assistingSkill = BattleSkillEntity:create(self.unitData.assistingSkill, GConst.BattleConst.SKILL_TYPE_ASSISTING, self) end @@ -99,7 +107,22 @@ function BattleUnitEntity:getIsMainUnit() return self.isMainUnit end -function BattleUnitEntity:getNormalSkill() +function BattleUnitEntity:getNormalSkill(reRandom) + if self.normalSkills == nil then + return nil + end + if not reRandom then + return self.normalSkill + end + if self.normalSkillIndex == nil then + self.normalSkillIndex = math.random(1, #self.normalSkills) + else + local temp = self.normalSkills[#self.normalSkills] + self.normalSkills[#self.normalSkills] = self.normalSkills[self.normalSkillIndex] + self.normalSkills[self.normalSkillIndex] = temp + self.normalSkillIndex = math.random(1, #self.normalSkills - 1) + end + self.normalSkill = self.normalSkills[self.normalSkillIndex] return self.normalSkill end @@ -124,18 +147,7 @@ function BattleUnitEntity:getActiveSkill(index) end function BattleUnitEntity:getNormalSkillCount() - return self.unitData.normalSkillCount or 0 -end - -function BattleUnitEntity:getNormalSkillNameList() - local count = self.unitData.normalSkillCount or 0 - if self.normalSkillNameList == nil then - self.normalSkillNameList = {} - for i = 1, count do - table.insert(self.normalSkillNameList, DataManager.BattleData:getNormalAttackName(i)) - end - end - return self.normalSkillNameList, count + return self.normalSkillCount end function BattleUnitEntity:getPassiveSkills()