diff --git a/lua/app/config/battle_exp.lua b/lua/app/config/battle_exp.lua index f00dd406..8f172d14 100644 --- a/lua/app/config/battle_exp.lua +++ b/lua/app/config/battle_exp.lua @@ -1,183 +1,183 @@ local battle_exp = { [1]={ - ["exp"]=2 + ["exp"]=10000 }, [2]={ - ["exp"]=18 + ["exp"]=20000 }, [3]={ - ["exp"]=58 + ["exp"]=30000 }, [4]={ - ["exp"]=108 + ["exp"]=40000 }, [5]={ - ["exp"]=188 + ["exp"]=50000 }, [6]={ - ["exp"]=298 + ["exp"]=60000 }, [7]={ - ["exp"]=448 + ["exp"]=70000 }, [8]={ - ["exp"]=658 + ["exp"]=80000 }, [9]={ - ["exp"]=948 + ["exp"]=90000 }, [10]={ - ["exp"]=1318 + ["exp"]=100000 }, [11]={ - ["exp"]=1858 + ["exp"]=110000 }, [12]={ - ["exp"]=2568 + ["exp"]=120000 }, [13]={ - ["exp"]=3448 + ["exp"]=130000 }, [14]={ - ["exp"]=4498 + ["exp"]=140000 }, [15]={ - ["exp"]=5718 + ["exp"]=150000 }, [16]={ - ["exp"]=7138 + ["exp"]=160000 }, [17]={ - ["exp"]=8758 + ["exp"]=170000 }, [18]={ - ["exp"]=10628 + ["exp"]=180000 }, [19]={ - ["exp"]=12748 + ["exp"]=190000 }, [20]={ - ["exp"]=15118 + ["exp"]=200000 }, [21]={ - ["exp"]=17738 + ["exp"]=210000 }, [22]={ - ["exp"]=20608 + ["exp"]=220000 }, [23]={ - ["exp"]=23728 + ["exp"]=230000 }, [24]={ - ["exp"]=27098 + ["exp"]=240000 }, [25]={ - ["exp"]=30718 + ["exp"]=250000 }, [26]={ - ["exp"]=34588 + ["exp"]=260000 }, [27]={ - ["exp"]=38708 + ["exp"]=270000 }, [28]={ - ["exp"]=43078 + ["exp"]=280000 }, [29]={ - ["exp"]=47798 + ["exp"]=290000 }, [30]={ - ["exp"]=52868 + ["exp"]=300000 }, [31]={ - ["exp"]=58288 + ["exp"]=310000 }, [32]={ - ["exp"]=64058 + ["exp"]=320000 }, [33]={ - ["exp"]=70178 + ["exp"]=330000 }, [34]={ - ["exp"]=76648 + ["exp"]=340000 }, [35]={ - ["exp"]=83468 + ["exp"]=350000 }, [36]={ - ["exp"]=90638 + ["exp"]=360000 }, [37]={ - ["exp"]=98158 + ["exp"]=370000 }, [38]={ - ["exp"]=106028 + ["exp"]=380000 }, [39]={ - ["exp"]=114248 + ["exp"]=390000 }, [40]={ - ["exp"]=122918 + ["exp"]=400000 }, [41]={ - ["exp"]=132038 + ["exp"]=410000 }, [42]={ - ["exp"]=141608 + ["exp"]=420000 }, [43]={ - ["exp"]=151628 + ["exp"]=430000 }, [44]={ - ["exp"]=162098 + ["exp"]=440000 }, [45]={ - ["exp"]=173018 + ["exp"]=450000 }, [46]={ - ["exp"]=184388 + ["exp"]=460000 }, [47]={ - ["exp"]=196208 + ["exp"]=470000 }, [48]={ - ["exp"]=208478 + ["exp"]=480000 }, [49]={ - ["exp"]=221198 + ["exp"]=490000 }, [50]={ - ["exp"]=234368 + ["exp"]=500000 }, [51]={ - ["exp"]=247988 + ["exp"]=510000 }, [52]={ - ["exp"]=262058 + ["exp"]=520000 }, [53]={ - ["exp"]=276578 + ["exp"]=530000 }, [54]={ - ["exp"]=291548 + ["exp"]=540000 }, [55]={ - ["exp"]=306968 + ["exp"]=550000 }, [56]={ - ["exp"]=322838 + ["exp"]=560000 }, [57]={ - ["exp"]=339158 + ["exp"]=570000 }, [58]={ - ["exp"]=355928 + ["exp"]=580000 }, [59]={ - ["exp"]=373148 + ["exp"]=590000 }, [60]={ - ["exp"]=390368 + ["exp"]=600000 } } local config = { diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index dcb0bca9..ab7746ba 100644 --- a/lua/app/config/buff.lua +++ b/lua/app/config/buff.lua @@ -182,10 +182,6 @@ local buff = { } }, [33]={ - ["name"]="heal_normal_attack", - ["buff_type"]=1 - }, - [34]={ ["name"]="stun", ["buff_type"]=8, ["icon"]="stun", @@ -193,60 +189,60 @@ local buff = { 4001 } }, - [35]={ + [34]={ ["name"]="shield", ["buff_type"]=2, ["fx_continued"]={ 4001 } }, - [36]={ + [35]={ ["name"]="atkp_add", ["buff_type"]=1 }, - [37]={ + [36]={ ["name"]="normal_attack_dec", ["buff_type"]=1, ["fx_continued"]={ 4001 } }, - [38]={ + [37]={ ["name"]="normal_attack_add", ["buff_type"]=1, ["fx_continued"]={ 4001 } }, - [39]={ + [38]={ ["name"]="block", ["buff_type"]=1 }, - [40]={ + [39]={ ["name"]="hpp_add", ["buff_type"]=1 }, - [41]={ + [40]={ ["name"]="crit_add", ["buff_type"]=1 }, - [42]={ + [41]={ ["name"]="crit_time_add", ["buff_type"]=1 }, - [43]={ + [42]={ ["name"]="exp_time_add", ["buff_type"]=7 }, - [44]={ + [43]={ ["name"]="cured_add", ["buff_type"]=1 }, - [45]={ + [44]={ ["name"]="add_skill", ["buff_type"]=7 }, - [46]={ + [45]={ ["name"]="skill_fire_times", ["buff_type"]=7 } @@ -285,25 +281,24 @@ local keys = { ["atkp_purple_add"]=buff[30], ["wavehealp"]=buff[31], ["heal"]=buff[32], - ["heal_normal_attack"]=buff[33], - ["stun"]=buff[34], - ["shield"]=buff[35], - ["atkp_add"]=buff[36], - ["normal_attack_dec"]=buff[37], - ["normal_attack_add"]=buff[38], - ["block"]=buff[39], - ["hpp_add"]=buff[40], - ["crit_add"]=buff[41], - ["crit_time_add"]=buff[42], - ["exp_time_add"]=buff[43], - ["cured_add"]=buff[44], - ["add_skill"]=buff[45], - ["skill_fire_times"]=buff[46] + ["stun"]=buff[33], + ["shield"]=buff[34], + ["atkp_add"]=buff[35], + ["normal_attack_dec"]=buff[36], + ["normal_attack_add"]=buff[37], + ["block"]=buff[38], + ["hpp_add"]=buff[39], + ["crit_add"]=buff[40], + ["crit_time_add"]=buff[41], + ["exp_time_add"]=buff[42], + ["cured_add"]=buff[43], + ["add_skill"]=buff[44], + ["skill_fire_times"]=buff[45] } } local config = { data=buff, keys=keys, -count=46 +count=45 } return config \ No newline at end of file diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index 6dcf6fe1..b2e5b217 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -1,9 +1,12 @@ local const = { ["element_combo"]={ ["value"]=2 + }, + ["support_interval"]={ + ["value"]=500 } } local config = { -data=const,count=1 +data=const,count=2 } return config \ No newline at end of file diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index 697695b6..c1bb72fe 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -5,7 +5,7 @@ local monster_chapter = { ["atk"]=200000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [201]={ ["monster_base"]=10004, @@ -13,7 +13,7 @@ local monster_chapter = { ["atk"]=200000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [301]={ ["monster_base"]=10002, @@ -21,7 +21,7 @@ local monster_chapter = { ["atk"]=200000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [401]={ ["monster_base"]=10006, @@ -29,7 +29,7 @@ local monster_chapter = { ["atk"]=200000, ["atk_times"]=2, ["hurt_skill"]=1000000, - ["monster_exp"]=10000 + ["monster_exp"]=19000 }, [501]={ ["monster_base"]=20004, @@ -41,7 +41,7 @@ local monster_chapter = { ["skill"]={ 1000002 }, - ["monster_exp"]=10000 + ["monster_exp"]=18000 }, [601]={ ["monster_base"]=10010, @@ -49,7 +49,7 @@ local monster_chapter = { ["atk"]=250000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [701]={ ["monster_base"]=10003, @@ -57,7 +57,7 @@ local monster_chapter = { ["atk"]=250000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [801]={ ["monster_base"]=10004, @@ -65,7 +65,7 @@ local monster_chapter = { ["atk"]=250000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [901]={ ["monster_base"]=10001, @@ -73,7 +73,7 @@ local monster_chapter = { ["atk"]=280000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=19000 }, [1001]={ ["monster_base"]=20004, @@ -85,7 +85,7 @@ local monster_chapter = { ["skill"]={ 1000002 }, - ["monster_exp"]=10000 + ["monster_exp"]=18000 }, [1101]={ ["monster_base"]=10002, @@ -93,7 +93,7 @@ local monster_chapter = { ["atk"]=300000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=9000 }, [1201]={ ["monster_base"]=10010, @@ -109,7 +109,7 @@ local monster_chapter = { ["atk"]=320000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [1401]={ ["monster_base"]=10004, @@ -117,7 +117,7 @@ local monster_chapter = { ["atk"]=330000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=12000 }, [1501]={ ["monster_base"]=20012, @@ -129,7 +129,7 @@ local monster_chapter = { ["skill"]={ 1000003 }, - ["monster_exp"]=10000 + ["monster_exp"]=12000 }, [1601]={ ["monster_base"]=10009, @@ -137,7 +137,7 @@ local monster_chapter = { ["atk"]=250000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [1701]={ ["monster_base"]=10007, @@ -145,7 +145,7 @@ local monster_chapter = { ["atk"]=250000, ["atk_times"]=2, ["hurt_skill"]=1000000, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [1801]={ ["monster_base"]=10008, @@ -153,7 +153,7 @@ local monster_chapter = { ["atk"]=250000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [1901]={ ["monster_base"]=10010, @@ -161,7 +161,7 @@ local monster_chapter = { ["atk"]=280000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=19000 }, [2001]={ ["monster_base"]=20012, @@ -173,7 +173,7 @@ local monster_chapter = { ["skill"]={ 1000003 }, - ["monster_exp"]=10000 + ["monster_exp"]=18000 }, [2101]={ ["monster_base"]=10011, @@ -181,7 +181,7 @@ local monster_chapter = { ["atk"]=300000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=9000 }, [2201]={ ["monster_base"]=10010, @@ -197,7 +197,7 @@ local monster_chapter = { ["atk"]=320000, ["atk_times"]=2, ["hurt_skill"]=1000000, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [2401]={ ["monster_base"]=10011, @@ -205,7 +205,7 @@ local monster_chapter = { ["atk"]=330000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=12000 }, [2501]={ ["monster_base"]=20010, @@ -218,7 +218,7 @@ local monster_chapter = { 1000004, 1000005 }, - ["monster_exp"]=10000 + ["monster_exp"]=12000 }, [2601]={ ["monster_base"]=10010, @@ -226,7 +226,7 @@ local monster_chapter = { ["atk"]=340000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=16000 }, [2701]={ ["monster_base"]=10009, @@ -234,7 +234,7 @@ local monster_chapter = { ["atk"]=350000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=18000 }, [2801]={ ["monster_base"]=10011, @@ -242,7 +242,7 @@ local monster_chapter = { ["atk"]=360000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=21000 }, [2901]={ ["monster_base"]=10003, @@ -250,7 +250,7 @@ local monster_chapter = { ["atk"]=370000, ["atk_times"]=2, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=22000 }, [3001]={ ["monster_base"]=20011, @@ -263,7 +263,7 @@ local monster_chapter = { 1000006, 1000007 }, - ["monster_exp"]=10000 + ["monster_exp"]=24000 }, [3101]={ ["monster_base"]=10012, @@ -271,7 +271,7 @@ local monster_chapter = { ["atk"]=250000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [3201]={ ["monster_base"]=10006, @@ -279,7 +279,7 @@ local monster_chapter = { ["atk"]=270000, ["atk_times"]=3, ["hurt_skill"]=1000000, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [3301]={ ["monster_base"]=10016, @@ -287,7 +287,7 @@ local monster_chapter = { ["atk"]=290000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [3401]={ ["monster_base"]=10005, @@ -295,7 +295,7 @@ local monster_chapter = { ["atk"]=310000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=19000 }, [3501]={ ["monster_base"]=20009, @@ -308,7 +308,7 @@ local monster_chapter = { 1000008, 1000009 }, - ["monster_exp"]=10000 + ["monster_exp"]=18000 }, [3601]={ ["monster_base"]=10005, @@ -316,7 +316,7 @@ local monster_chapter = { ["atk"]=310000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=9000 }, [3701]={ ["monster_base"]=10012, @@ -332,7 +332,7 @@ local monster_chapter = { ["atk"]=330000, ["atk_times"]=3, ["hurt_skill"]=1000000, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [3901]={ ["monster_base"]=10016, @@ -340,7 +340,7 @@ local monster_chapter = { ["atk"]=350000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=12000 }, [4001]={ ["monster_base"]=20002, @@ -353,7 +353,7 @@ local monster_chapter = { 1000011, 1000012 }, - ["monster_exp"]=10000 + ["monster_exp"]=12000 }, [4101]={ ["monster_base"]=10005, @@ -361,7 +361,7 @@ local monster_chapter = { ["atk"]=350000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=16000 }, [4201]={ ["monster_base"]=10012, @@ -369,7 +369,7 @@ local monster_chapter = { ["atk"]=370000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=18000 }, [4301]={ ["monster_base"]=10016, @@ -377,7 +377,7 @@ local monster_chapter = { ["atk"]=390000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=21000 }, [4401]={ ["monster_base"]=10006, @@ -385,7 +385,7 @@ local monster_chapter = { ["atk"]=410000, ["atk_times"]=3, ["hurt_skill"]=1000000, - ["monster_exp"]=10000 + ["monster_exp"]=22000 }, [4501]={ ["monster_base"]=20002, @@ -398,7 +398,7 @@ local monster_chapter = { 1000011, 1000012 }, - ["monster_exp"]=10000 + ["monster_exp"]=24000 }, [4601]={ ["monster_base"]=10012, @@ -406,7 +406,7 @@ local monster_chapter = { ["atk"]=430000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=15000 }, [4701]={ ["monster_base"]=10006, @@ -414,7 +414,7 @@ local monster_chapter = { ["atk"]=450000, ["atk_times"]=3, ["hurt_skill"]=1000000, - ["monster_exp"]=10000 + ["monster_exp"]=16000 }, [4801]={ ["monster_base"]=10016, @@ -422,7 +422,7 @@ local monster_chapter = { ["atk"]=470000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [4901]={ ["monster_base"]=10005, @@ -430,7 +430,7 @@ local monster_chapter = { ["atk"]=490000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [5001]={ ["monster_base"]=20009, @@ -443,7 +443,7 @@ local monster_chapter = { 1000010, 1000009 }, - ["monster_exp"]=10000 + ["monster_exp"]=22000 }, [5101]={ ["monster_base"]=10013, @@ -451,7 +451,7 @@ local monster_chapter = { ["atk"]=350000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [5201]={ ["monster_base"]=10001, @@ -459,7 +459,7 @@ local monster_chapter = { ["atk"]=370000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [5301]={ ["monster_base"]=10004, @@ -467,7 +467,7 @@ local monster_chapter = { ["atk"]=390000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [5401]={ ["monster_base"]=10013, @@ -475,7 +475,7 @@ local monster_chapter = { ["atk"]=410000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=19000 }, [5501]={ ["monster_base"]=20006, @@ -488,7 +488,7 @@ local monster_chapter = { 1000013, 1000014 }, - ["monster_exp"]=10000 + ["monster_exp"]=18000 }, [5601]={ ["monster_base"]=10007, @@ -496,7 +496,7 @@ local monster_chapter = { ["atk"]=430000, ["atk_times"]=3, ["hurt_skill"]=1000000, - ["monster_exp"]=10000 + ["monster_exp"]=9000 }, [5701]={ ["monster_base"]=10010, @@ -512,7 +512,7 @@ local monster_chapter = { ["atk"]=450000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [5901]={ ["monster_base"]=10013, @@ -520,7 +520,7 @@ local monster_chapter = { ["atk"]=510000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=12000 }, [6001]={ ["monster_base"]=20007, @@ -533,7 +533,7 @@ local monster_chapter = { 1000015, 1000017 }, - ["monster_exp"]=10000 + ["monster_exp"]=12000 }, [6101]={ ["monster_base"]=10004, @@ -541,7 +541,7 @@ local monster_chapter = { ["atk"]=530000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=16000 }, [6201]={ ["monster_base"]=10013, @@ -549,7 +549,7 @@ local monster_chapter = { ["atk"]=550000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=18000 }, [6301]={ ["monster_base"]=10010, @@ -557,7 +557,7 @@ local monster_chapter = { ["atk"]=570000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=21000 }, [6401]={ ["monster_base"]=10007, @@ -565,7 +565,7 @@ local monster_chapter = { ["atk"]=590000, ["atk_times"]=3, ["hurt_skill"]=1000000, - ["monster_exp"]=10000 + ["monster_exp"]=22000 }, [6501]={ ["monster_base"]=20011, @@ -578,7 +578,7 @@ local monster_chapter = { 1000006, 1000007 }, - ["monster_exp"]=10000 + ["monster_exp"]=24000 }, [6601]={ ["monster_base"]=10013, @@ -586,7 +586,7 @@ local monster_chapter = { ["atk"]=610000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=15000 }, [6701]={ ["monster_base"]=10007, @@ -594,7 +594,7 @@ local monster_chapter = { ["atk"]=630000, ["atk_times"]=3, ["hurt_skill"]=1000000, - ["monster_exp"]=10000 + ["monster_exp"]=16000 }, [6801]={ ["monster_base"]=10004, @@ -602,7 +602,7 @@ local monster_chapter = { ["atk"]=650000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [6901]={ ["monster_base"]=10010, @@ -610,7 +610,7 @@ local monster_chapter = { ["atk"]=670000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [7001]={ ["monster_base"]=20007, @@ -623,7 +623,7 @@ local monster_chapter = { 1000016, 1000017 }, - ["monster_exp"]=10000 + ["monster_exp"]=22000 }, [7101]={ ["monster_base"]=10011, @@ -631,7 +631,7 @@ local monster_chapter = { ["atk"]=350000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [7201]={ ["monster_base"]=10010, @@ -639,7 +639,7 @@ local monster_chapter = { ["atk"]=370000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [7301]={ ["monster_base"]=10007, @@ -647,7 +647,7 @@ local monster_chapter = { ["atk"]=390000, ["atk_times"]=3, ["hurt_skill"]=1000000, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [7401]={ ["monster_base"]=10004, @@ -655,7 +655,7 @@ local monster_chapter = { ["atk"]=410000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=19000 }, [7501]={ ["monster_base"]=20008, @@ -669,7 +669,7 @@ local monster_chapter = { 1000019, 1000020 }, - ["monster_exp"]=10000 + ["monster_exp"]=18000 }, [7601]={ ["monster_base"]=10006, @@ -677,7 +677,7 @@ local monster_chapter = { ["atk"]=430000, ["atk_times"]=3, ["hurt_skill"]=1000000, - ["monster_exp"]=10000 + ["monster_exp"]=9000 }, [7701]={ ["monster_base"]=10010, @@ -693,7 +693,7 @@ local monster_chapter = { ["atk"]=450000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [7901]={ ["monster_base"]=10004, @@ -701,7 +701,7 @@ local monster_chapter = { ["atk"]=510000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=12000 }, [8001]={ ["monster_base"]=20006, @@ -714,7 +714,7 @@ local monster_chapter = { 1000013, 1000014 }, - ["monster_exp"]=10000 + ["monster_exp"]=12000 }, [8101]={ ["monster_base"]=10006, @@ -722,7 +722,7 @@ local monster_chapter = { ["atk"]=530000, ["atk_times"]=3, ["hurt_skill"]=1000000, - ["monster_exp"]=10000 + ["monster_exp"]=16000 }, [8201]={ ["monster_base"]=10010, @@ -730,7 +730,7 @@ local monster_chapter = { ["atk"]=550000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=18000 }, [8301]={ ["monster_base"]=10011, @@ -738,7 +738,7 @@ local monster_chapter = { ["atk"]=570000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=21000 }, [8401]={ ["monster_base"]=10002, @@ -746,7 +746,7 @@ local monster_chapter = { ["atk"]=590000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=22000 }, [8501]={ ["monster_base"]=20007, @@ -759,7 +759,7 @@ local monster_chapter = { 1000016, 1000017 }, - ["monster_exp"]=10000 + ["monster_exp"]=24000 }, [8601]={ ["monster_base"]=10004, @@ -767,7 +767,7 @@ local monster_chapter = { ["atk"]=610000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=15000 }, [8701]={ ["monster_base"]=10002, @@ -775,7 +775,7 @@ local monster_chapter = { ["atk"]=630000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=16000 }, [8801]={ ["monster_base"]=10011, @@ -783,7 +783,7 @@ local monster_chapter = { ["atk"]=650000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [8901]={ ["monster_base"]=10013, @@ -791,7 +791,7 @@ local monster_chapter = { ["atk"]=670000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [9001]={ ["monster_base"]=20008, @@ -806,7 +806,7 @@ local monster_chapter = { 1000020, 1000021 }, - ["monster_exp"]=10000 + ["monster_exp"]=22000 }, [9101]={ ["monster_base"]=10017, @@ -814,7 +814,7 @@ local monster_chapter = { ["atk"]=350000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [9201]={ ["monster_base"]=10004, @@ -822,7 +822,7 @@ local monster_chapter = { ["atk"]=370000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [9301]={ ["monster_base"]=10002, @@ -830,7 +830,7 @@ local monster_chapter = { ["atk"]=390000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [9401]={ ["monster_base"]=10014, @@ -838,7 +838,7 @@ local monster_chapter = { ["atk"]=410000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=19000 }, [9501]={ ["monster_base"]=20005, @@ -852,7 +852,7 @@ local monster_chapter = { 1000023, 1000025 }, - ["monster_exp"]=10000 + ["monster_exp"]=18000 }, [9601]={ ["monster_base"]=10017, @@ -860,7 +860,7 @@ local monster_chapter = { ["atk"]=430000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=9000 }, [9701]={ ["monster_base"]=10014, @@ -876,7 +876,7 @@ local monster_chapter = { ["atk"]=450000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [9901]={ ["monster_base"]=10002, @@ -884,7 +884,7 @@ local monster_chapter = { ["atk"]=510000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=12000 }, [10001]={ ["monster_base"]=20010, @@ -897,7 +897,7 @@ local monster_chapter = { 1000004, 1000005 }, - ["monster_exp"]=10000 + ["monster_exp"]=12000 }, [10101]={ ["monster_base"]=10002, @@ -905,7 +905,7 @@ local monster_chapter = { ["atk"]=530000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=16000 }, [10201]={ ["monster_base"]=10010, @@ -913,7 +913,7 @@ local monster_chapter = { ["atk"]=550000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=18000 }, [10301]={ ["monster_base"]=10003, @@ -921,7 +921,7 @@ local monster_chapter = { ["atk"]=570000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=21000 }, [10401]={ ["monster_base"]=10008, @@ -929,7 +929,7 @@ local monster_chapter = { ["atk"]=590000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=22000 }, [10501]={ ["monster_base"]=20011, @@ -942,7 +942,7 @@ local monster_chapter = { 1000006, 1000007 }, - ["monster_exp"]=10000 + ["monster_exp"]=24000 }, [10601]={ ["monster_base"]=10007, @@ -950,7 +950,7 @@ local monster_chapter = { ["atk"]=610000, ["atk_times"]=3, ["hurt_skill"]=1000000, - ["monster_exp"]=10000 + ["monster_exp"]=15000 }, [10701]={ ["monster_base"]=10011, @@ -958,7 +958,7 @@ local monster_chapter = { ["atk"]=630000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=16000 }, [10801]={ ["monster_base"]=10012, @@ -966,7 +966,7 @@ local monster_chapter = { ["atk"]=650000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [10901]={ ["monster_base"]=10016, @@ -974,7 +974,7 @@ local monster_chapter = { ["atk"]=670000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [11001]={ ["monster_base"]=20005, @@ -988,7 +988,7 @@ local monster_chapter = { 1000024, 1000025 }, - ["monster_exp"]=10000 + ["monster_exp"]=22000 }, [11101]={ ["monster_base"]=10010, @@ -996,7 +996,7 @@ local monster_chapter = { ["atk"]=350000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [11201]={ ["monster_base"]=10003, @@ -1004,7 +1004,7 @@ local monster_chapter = { ["atk"]=370000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [11301]={ ["monster_base"]=10009, @@ -1012,7 +1012,7 @@ local monster_chapter = { ["atk"]=390000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [11401]={ ["monster_base"]=10011, @@ -1020,7 +1020,7 @@ local monster_chapter = { ["atk"]=410000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=19000 }, [11501]={ ["monster_base"]=20008, @@ -1035,7 +1035,7 @@ local monster_chapter = { 1000020, 1000021 }, - ["monster_exp"]=10000 + ["monster_exp"]=18000 }, [11601]={ ["monster_base"]=10007, @@ -1043,7 +1043,7 @@ local monster_chapter = { ["atk"]=430000, ["atk_times"]=3, ["hurt_skill"]=1000000, - ["monster_exp"]=10000 + ["monster_exp"]=9000 }, [11701]={ ["monster_base"]=10011, @@ -1059,7 +1059,7 @@ local monster_chapter = { ["atk"]=450000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [11901]={ ["monster_base"]=10016, @@ -1067,7 +1067,7 @@ local monster_chapter = { ["atk"]=510000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=12000 }, [12001]={ ["monster_base"]=20001, @@ -1080,7 +1080,7 @@ local monster_chapter = { 1000026, 1000027 }, - ["monster_exp"]=10000 + ["monster_exp"]=12000 }, [12101]={ ["monster_base"]=10017, @@ -1088,7 +1088,7 @@ local monster_chapter = { ["atk"]=530000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=16000 }, [12201]={ ["monster_base"]=10014, @@ -1096,7 +1096,7 @@ local monster_chapter = { ["atk"]=550000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=18000 }, [12301]={ ["monster_base"]=10004, @@ -1104,7 +1104,7 @@ local monster_chapter = { ["atk"]=570000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=21000 }, [12401]={ ["monster_base"]=10002, @@ -1112,7 +1112,7 @@ local monster_chapter = { ["atk"]=590000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=22000 }, [12501]={ ["monster_base"]=20004, @@ -1124,7 +1124,7 @@ local monster_chapter = { ["skill"]={ 1000002 }, - ["monster_exp"]=10000 + ["monster_exp"]=24000 }, [12601]={ ["monster_base"]=10010, @@ -1132,7 +1132,7 @@ local monster_chapter = { ["atk"]=610000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=15000 }, [12701]={ ["monster_base"]=10003, @@ -1140,7 +1140,7 @@ local monster_chapter = { ["atk"]=630000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=16000 }, [12801]={ ["monster_base"]=10009, @@ -1148,7 +1148,7 @@ local monster_chapter = { ["atk"]=650000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [12901]={ ["monster_base"]=10011, @@ -1156,7 +1156,7 @@ local monster_chapter = { ["atk"]=670000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [13001]={ ["monster_base"]=20005, @@ -1170,7 +1170,7 @@ local monster_chapter = { 1000024, 1000025 }, - ["monster_exp"]=10000 + ["monster_exp"]=22000 }, [13101]={ ["monster_base"]=10015, @@ -1178,7 +1178,7 @@ local monster_chapter = { ["atk"]=350000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [13201]={ ["monster_base"]=10017, @@ -1186,7 +1186,7 @@ local monster_chapter = { ["atk"]=370000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [13301]={ ["monster_base"]=10014, @@ -1194,7 +1194,7 @@ local monster_chapter = { ["atk"]=390000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [13401]={ ["monster_base"]=10018, @@ -1202,7 +1202,7 @@ local monster_chapter = { ["atk"]=410000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=19000 }, [13501]={ ["monster_base"]=20001, @@ -1215,7 +1215,7 @@ local monster_chapter = { 1000026, 1000027 }, - ["monster_exp"]=10000 + ["monster_exp"]=18000 }, [13601]={ ["monster_base"]=10012, @@ -1223,7 +1223,7 @@ local monster_chapter = { ["atk"]=430000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=9000 }, [13701]={ ["monster_base"]=10017, @@ -1239,7 +1239,7 @@ local monster_chapter = { ["atk"]=450000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [13901]={ ["monster_base"]=10016, @@ -1247,7 +1247,7 @@ local monster_chapter = { ["atk"]=510000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=12000 }, [14001]={ ["monster_base"]=20005, @@ -1261,7 +1261,7 @@ local monster_chapter = { 1000024, 1000025 }, - ["monster_exp"]=10000 + ["monster_exp"]=12000 }, [14101]={ ["monster_base"]=10010, @@ -1269,7 +1269,7 @@ local monster_chapter = { ["atk"]=530000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=16000 }, [14201]={ ["monster_base"]=10003, @@ -1277,7 +1277,7 @@ local monster_chapter = { ["atk"]=550000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=18000 }, [14301]={ ["monster_base"]=10009, @@ -1285,7 +1285,7 @@ local monster_chapter = { ["atk"]=570000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=21000 }, [14401]={ ["monster_base"]=10011, @@ -1293,7 +1293,7 @@ local monster_chapter = { ["atk"]=590000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=22000 }, [14501]={ ["monster_base"]=20004, @@ -1305,7 +1305,7 @@ local monster_chapter = { ["skill"]={ 1000002 }, - ["monster_exp"]=10000 + ["monster_exp"]=24000 }, [14601]={ ["monster_base"]=10015, @@ -1313,7 +1313,7 @@ local monster_chapter = { ["atk"]=610000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=15000 }, [14701]={ ["monster_base"]=10017, @@ -1321,7 +1321,7 @@ local monster_chapter = { ["atk"]=630000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=16000 }, [14801]={ ["monster_base"]=10014, @@ -1329,7 +1329,7 @@ local monster_chapter = { ["atk"]=650000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [14901]={ ["monster_base"]=10018, @@ -1337,7 +1337,7 @@ local monster_chapter = { ["atk"]=670000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [15001]={ ["monster_base"]=20003, @@ -1350,7 +1350,7 @@ local monster_chapter = { 1000028, 1000029 }, - ["monster_exp"]=10000 + ["monster_exp"]=22000 }, [15101]={ ["monster_base"]=10012, @@ -1358,7 +1358,7 @@ local monster_chapter = { ["atk"]=350000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [15201]={ ["monster_base"]=10017, @@ -1366,7 +1366,7 @@ local monster_chapter = { ["atk"]=370000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [15301]={ ["monster_base"]=10014, @@ -1374,7 +1374,7 @@ local monster_chapter = { ["atk"]=390000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [15401]={ ["monster_base"]=10016, @@ -1382,7 +1382,7 @@ local monster_chapter = { ["atk"]=410000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=19000 }, [15501]={ ["monster_base"]=20005, @@ -1396,7 +1396,7 @@ local monster_chapter = { 1000024, 1000025 }, - ["monster_exp"]=10000 + ["monster_exp"]=18000 }, [15601]={ ["monster_base"]=10007, @@ -1404,7 +1404,7 @@ local monster_chapter = { ["atk"]=430000, ["atk_times"]=3, ["hurt_skill"]=1000000, - ["monster_exp"]=10000 + ["monster_exp"]=9000 }, [15701]={ ["monster_base"]=10011, @@ -1420,7 +1420,7 @@ local monster_chapter = { ["atk"]=450000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=11000 }, [15901]={ ["monster_base"]=10016, @@ -1428,7 +1428,7 @@ local monster_chapter = { ["atk"]=510000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=12000 }, [16001]={ ["monster_base"]=20007, @@ -1441,7 +1441,7 @@ local monster_chapter = { 1000016, 1000017 }, - ["monster_exp"]=10000 + ["monster_exp"]=12000 }, [16101]={ ["monster_base"]=10015, @@ -1449,7 +1449,7 @@ local monster_chapter = { ["atk"]=530000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=16000 }, [16201]={ ["monster_base"]=10017, @@ -1457,7 +1457,7 @@ local monster_chapter = { ["atk"]=550000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=18000 }, [16301]={ ["monster_base"]=10014, @@ -1465,7 +1465,7 @@ local monster_chapter = { ["atk"]=570000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=21000 }, [16401]={ ["monster_base"]=10018, @@ -1473,7 +1473,7 @@ local monster_chapter = { ["atk"]=590000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=22000 }, [16501]={ ["monster_base"]=20008, @@ -1488,7 +1488,7 @@ local monster_chapter = { 1000020, 1000021 }, - ["monster_exp"]=10000 + ["monster_exp"]=24000 }, [16601]={ ["monster_base"]=10004, @@ -1496,7 +1496,7 @@ local monster_chapter = { ["atk"]=610000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=15000 }, [16701]={ ["monster_base"]=10002, @@ -1504,7 +1504,7 @@ local monster_chapter = { ["atk"]=630000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=16000 }, [16801]={ ["monster_base"]=10011, @@ -1512,7 +1512,7 @@ local monster_chapter = { ["atk"]=650000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [16901]={ ["monster_base"]=10013, @@ -1520,7 +1520,7 @@ local monster_chapter = { ["atk"]=670000, ["atk_times"]=3, ["hurt_skill"]=1000001, - ["monster_exp"]=10000 + ["monster_exp"]=17000 }, [17001]={ ["monster_base"]=20003, @@ -1533,7 +1533,7 @@ local monster_chapter = { 1000028, 1000029 }, - ["monster_exp"]=10000 + ["monster_exp"]=22000 } } local config = { diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 73f92706..63222814 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -196,10 +196,10 @@ local skill = { }, [14]={ ["effect_type"]=2, - ["trigger"]=3, + ["trigger"]=5, ["effect"]={ { - ["type"]="heal_normal_attack", + ["type"]="heal", ["num"]=500, ["ratio"]=10000, ["round"]=1 diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 0272071b..4f3da124 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -72,6 +72,7 @@ BattleConst.UNIT_STATE = { SWITCH_IN = 7, -- 入场 SWITCH_OUT = 8, -- 离场 ASSISTING_ATTACK = 9, -- 协助攻击 + WAIT = 10, -- 等待 } BattleConst.MATCH_DMG_ADDITION_NAME = { diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 95a2425e..622c4e8e 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -91,6 +91,7 @@ end function BattleUnitComp:resetBeforeAttack() self.attackCount = 0 + self.baseObject:getTransform():SetAsLastSibling() end function BattleUnitComp:initPassiveSkills() @@ -222,7 +223,7 @@ function BattleUnitComp:beforeAttack() self:checkPassiveEvent(PASSIVE_EVENT.ON_UNI_ATTACK_START, self) end -function BattleUnitComp:useAssistingSkill(count, callback) +function BattleUnitComp:useAssistingSkill(count, delay, callback) local skill = self.unitEntity:getAssistingSkill() if skill == nil then callback() @@ -232,10 +233,22 @@ function BattleUnitComp:useAssistingSkill(count, callback) local attrName = GConst.MATCH_ATTACK_NAME[self:getMatchType()] self.assistingDmgAddCount = self.unitEntity:addAttr(attrName, count*DEFAULT_FACTOR, true) self.actionOverCallback = callback - if not self:changeState(UNIT_STATE.ASSISTING_ATTACK) then - self.actionOverCallback = nil - self.unitEntity:addAttr(attrName, -self.assistingDmgAddCount, false) - callback() + if delay > 0 then + self.waitTime = delay + self.waitingState = UNIT_STATE.ASSISTING_ATTACK + if not self:changeState(UNIT_STATE.WAIT) then + if not self:changeState(UNIT_STATE.ASSISTING_ATTACK) then + self.actionOverCallback = nil + self.unitEntity:addAttr(attrName, -self.assistingDmgAddCount, false) + callback() + end + end + else + if not self:changeState(UNIT_STATE.ASSISTING_ATTACK) then + self.actionOverCallback = nil + self.unitEntity:addAttr(attrName, -self.assistingDmgAddCount, false) + callback() + end end end @@ -341,6 +354,8 @@ function BattleUnitComp:changeState(state) self:exitSwitchInState() elseif self.currState == UNIT_STATE.SWITCH_OUT then self:exitSwitchOutState() + elseif self.currState == UNIT_STATE.WAIT then + self:exitWaitState() end -- 进入目标状态 self.currState = state @@ -350,18 +365,20 @@ function BattleUnitComp:changeState(state) self:enterNormalAttackState() elseif state == UNIT_STATE.SKILL_ATTACK then self:enterSkillAttackState() - elseif self.currState == UNIT_STATE.ASSISTING_ATTACK then + elseif state == UNIT_STATE.ASSISTING_ATTACK then self:enterAssistingAttackState() elseif state == UNIT_STATE.DEAD then self:enterDeadState() - elseif self.currState == UNIT_STATE.BORN then + elseif state == UNIT_STATE.BORN then self:enterBornState() - elseif self.currState == UNIT_STATE.ENTER_BATTLEFIELD then + elseif state == UNIT_STATE.ENTER_BATTLEFIELD then self:enterEnterBattlefieldState() - elseif self.currState == UNIT_STATE.SWITCH_IN then + elseif state == UNIT_STATE.SWITCH_IN then self:enterSwitchInState() - elseif self.currState == UNIT_STATE.SWITCH_OUT then + elseif state == UNIT_STATE.SWITCH_OUT then self:enterSwitchOutState() + elseif state == UNIT_STATE.WAIT then + self:enterWaitState() end return true end @@ -498,6 +515,19 @@ function BattleUnitComp:updateHurt(dt) end end +function BattleUnitComp:enterWaitState() +end + +function BattleUnitComp:exitWaitState() +end + +function BattleUnitComp:updateWaitState(dt) + self.waitTime = self.waitTime - dt + if self.waitTime < 0 then + self:changeState(self.waitingState) + end +end + function BattleUnitComp:enterAssistingAttackState() self.attackOver = false self.attackTime = 0 @@ -989,6 +1019,8 @@ function BattleUnitComp:tick(dt) self:updateSwitchInState(dt) elseif self.currState == UNIT_STATE.SWITCH_OUT then self:updateSwitchOutState(dt) + elseif self.currState == UNIT_STATE.WAIT then + self:updateWaitState(dt) end end diff --git a/lua/app/module/battle/helper/battle_helper.lua b/lua/app/module/battle/helper/battle_helper.lua index 34f847b5..55d50e02 100644 --- a/lua/app/module/battle/helper/battle_helper.lua +++ b/lua/app/module/battle/helper/battle_helper.lua @@ -30,6 +30,13 @@ function BattleHelper:random(min, max) return min + self.seed*(max - min + 1)//233280 end +function BattleHelper:getSupportInterval() + if self.supportInterval == nil then + self.supportInterval = GFunc.getConstIntValue("support_interval")/1000 + end + return self.supportInterval +end + function BattleHelper:loadBattleHeroModel(id, parent, callback) local pool = self.characterPools[id] if pool and #pool > 0 then diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index 6a9aef06..7271c321 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -1,4 +1,5 @@ local BattleBuffHandle = require "app/module/battle/helper/battle_buff_handle" +local BattleHelper = require "app/module/battle/helper/battle_helper" local BattleTeam = class("BattleTeam") @@ -88,11 +89,13 @@ function BattleTeam:useAssistingSkill(assistingList, callback) callback() end end + local delay = 0 for _, v in ipairs(assistingList) do local unit = self.unitMap[v.skillMatch] if unit then unit:resetBeforeAttack() - unit:useAssistingSkill(v.count, finish) + unit:useAssistingSkill(v.count, delay, finish) + delay = delay + BattleHelper:getSupportInterval() else finish() end diff --git a/lua/app/ui/common/cell/hero_cell.lua b/lua/app/ui/common/cell/hero_cell.lua index d019aa45..ec692f52 100644 --- a/lua/app/ui/common/cell/hero_cell.lua +++ b/lua/app/ui/common/cell/hero_cell.lua @@ -64,8 +64,8 @@ function HeroCell:addClickListener(callback) self.clickCallback = callback end -function HeroCell:setVisible(visible) - self.baseObject:setVisible(visible) +function HeroCell:setVisible(visible, scale) + self.baseObject:setVisible(visible, scale) end function HeroCell:setGray(isGray) diff --git a/lua/app/ui/hero/hero_comp.lua b/lua/app/ui/hero/hero_comp.lua index 7d452ead..375e4a84 100644 --- a/lua/app/ui/hero/hero_comp.lua +++ b/lua/app/ui/hero/hero_comp.lua @@ -78,6 +78,7 @@ function HeroComp:refreshStageFormation() self.heroSpineList[i]:destroy() end spineObject:playAnimation("idle", true) + spineObject:setLocalScale(0.7, 0.7, 0.7) self.heroSpineList[i] = spineObject self.heroSpineList[i]:setLocalPosition(0, -52, 0) end) diff --git a/lua/app/ui/main_city/component/main_comp.lua b/lua/app/ui/main_city/component/main_comp.lua index 8a0d7378..d98644d9 100644 --- a/lua/app/ui/main_city/component/main_comp.lua +++ b/lua/app/ui/main_city/component/main_comp.lua @@ -129,7 +129,7 @@ function MainComp:refreshStageFormaion() if formation[i] then local heroEntity = DataManager.HeroData:getHeroById(formation[i]) if heroEntity then - heroCell:setVisible(true) + heroCell:setVisible(true, 0.84) heroCell:refresh(heroEntity) heroCell:addClickListener(function() ModuleManager.HeroManager:showHeroDetailUI(heroEntity:getCfgId()) diff --git a/lua/app/userdata/battle/skill/battle_skill_entity.lua b/lua/app/userdata/battle/skill/battle_skill_entity.lua index b3e06231..3ff5d37b 100644 --- a/lua/app/userdata/battle/skill/battle_skill_entity.lua +++ b/lua/app/userdata/battle/skill/battle_skill_entity.lua @@ -23,6 +23,7 @@ function BattleSkillEntity:init() self.cd = 0 end self:initSkillEffect() + self.available = self.skillInfo.effect_type ~= nil end function BattleSkillEntity:initSkillEffect() @@ -55,6 +56,9 @@ end -- 技能是否可用 function BattleSkillEntity:getIsAvailable() + if not self.available then + return false + end return self.cd == 0 end @@ -100,7 +104,7 @@ function BattleSkillEntity:addSkillEffectRound(effect) end end -function BattleSkillEntity:getSkillid() +function BattleSkillEntity:getSkillId() return self.skillId end diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua index 24d2ae3f..7ec7cc68 100644 --- a/lua/app/userdata/battle/team/battle_unit_entity.lua +++ b/lua/app/userdata/battle/team/battle_unit_entity.lua @@ -144,7 +144,7 @@ end function BattleUnitEntity:changeActiveSkillId(originSkillId, tartgetSkillId) for _, skillEntity in ipairs(self.activeSkills) do - if skillEntity:getSkillid() == originSkillId then + if skillEntity:getSkillId() == originSkillId then skillEntity:changeSkillId(tartgetSkillId) break end @@ -153,7 +153,7 @@ end function BattleUnitEntity:addActiveSkillParams(skillId, effect) for _, skillEntity in ipairs(self.activeSkills) do - if skillEntity:getSkillid() == skillId then + if skillEntity:getSkillId() == skillId then skillEntity:addSkillEffectParams(effect) break end @@ -162,7 +162,7 @@ end function BattleUnitEntity:addActiveSkillRound(skillId, effect) for _, skillEntity in ipairs(self.activeSkills) do - if skillEntity:getSkillid() == skillId then + if skillEntity:getSkillId() == skillId then skillEntity:addSkillEffectRound(effect) break end