diff --git a/lua/app/common/config_manager.lua b/lua/app/common/config_manager.lua index 8147541b..58fe120e 100644 --- a/lua/app/common/config_manager.lua +++ b/lua/app/common/config_manager.lua @@ -111,6 +111,8 @@ function ConfigManager:preLoadConfig() end handleMonsterGrow("monster_chapter") handleMonsterGrow("monster_daily_challenge") + handleMonsterGrow("monster_dungeon_gold") + handleMonsterGrow("monster_dungeon_shards") self.configs["monster"] = { data = monsterFullData, diff --git a/lua/app/config/chapter_board_dungeon_gold.lua b/lua/app/config/chapter_board_dungeon_gold.lua index 9828ac71..e4d63461 100644 --- a/lua/app/config/chapter_board_dungeon_gold.lua +++ b/lua/app/config/chapter_board_dungeon_gold.lua @@ -1,6 +1,6 @@ local chapter_board_dungeon_gold = { [1]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -200,7 +200,7 @@ local chapter_board_dungeon_gold = { } }, [2]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -400,7 +400,7 @@ local chapter_board_dungeon_gold = { } }, [3]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -600,7 +600,7 @@ local chapter_board_dungeon_gold = { } }, [4]={ - ["board_daily_challenge"]={ + ["board"]={ { 0, 3 @@ -800,7 +800,7 @@ local chapter_board_dungeon_gold = { } }, [5]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -1000,7 +1000,7 @@ local chapter_board_dungeon_gold = { } }, [6]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -1200,7 +1200,7 @@ local chapter_board_dungeon_gold = { } }, [7]={ - ["board_daily_challenge"]={ + ["board"]={ { 21, 1 @@ -1400,7 +1400,7 @@ local chapter_board_dungeon_gold = { } }, [8]={ - ["board_daily_challenge"]={ + ["board"]={ { 3, 0 @@ -1600,7 +1600,7 @@ local chapter_board_dungeon_gold = { } }, [9]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -1800,7 +1800,7 @@ local chapter_board_dungeon_gold = { } }, [10]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -2000,7 +2000,7 @@ local chapter_board_dungeon_gold = { } }, [11]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -2200,7 +2200,7 @@ local chapter_board_dungeon_gold = { } }, [12]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -2400,7 +2400,7 @@ local chapter_board_dungeon_gold = { } }, [13]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -2600,7 +2600,7 @@ local chapter_board_dungeon_gold = { } }, [14]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -2800,7 +2800,7 @@ local chapter_board_dungeon_gold = { } }, [15]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3000,7 +3000,7 @@ local chapter_board_dungeon_gold = { } }, [16]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3200,7 +3200,7 @@ local chapter_board_dungeon_gold = { } }, [17]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3400,7 +3400,7 @@ local chapter_board_dungeon_gold = { } }, [18]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3600,7 +3600,7 @@ local chapter_board_dungeon_gold = { } }, [19]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3800,7 +3800,7 @@ local chapter_board_dungeon_gold = { } }, [20]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -4000,7 +4000,7 @@ local chapter_board_dungeon_gold = { } }, [21]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -4200,7 +4200,7 @@ local chapter_board_dungeon_gold = { } }, [22]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -4400,7 +4400,7 @@ local chapter_board_dungeon_gold = { } }, [23]={ - ["board_daily_challenge"]={ + ["board"]={ { 32, 0 @@ -4600,7 +4600,7 @@ local chapter_board_dungeon_gold = { } }, [24]={ - ["board_daily_challenge"]={ + ["board"]={ { 31, 0 @@ -4800,7 +4800,7 @@ local chapter_board_dungeon_gold = { } }, [25]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5000,7 +5000,7 @@ local chapter_board_dungeon_gold = { } }, [26]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5200,7 +5200,7 @@ local chapter_board_dungeon_gold = { } }, [27]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5400,7 +5400,7 @@ local chapter_board_dungeon_gold = { } }, [28]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5600,7 +5600,7 @@ local chapter_board_dungeon_gold = { } }, [29]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5800,7 +5800,7 @@ local chapter_board_dungeon_gold = { } }, [30]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 diff --git a/lua/app/config/chapter_board_dungeon_shards.lua b/lua/app/config/chapter_board_dungeon_shards.lua index 94c08151..16852fd8 100644 --- a/lua/app/config/chapter_board_dungeon_shards.lua +++ b/lua/app/config/chapter_board_dungeon_shards.lua @@ -1,6 +1,6 @@ local chapter_board_dungeon_shards = { [1]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -200,7 +200,7 @@ local chapter_board_dungeon_shards = { } }, [2]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -400,7 +400,7 @@ local chapter_board_dungeon_shards = { } }, [3]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -600,7 +600,7 @@ local chapter_board_dungeon_shards = { } }, [4]={ - ["board_daily_challenge"]={ + ["board"]={ { 0, 3 @@ -800,7 +800,7 @@ local chapter_board_dungeon_shards = { } }, [5]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -1000,7 +1000,7 @@ local chapter_board_dungeon_shards = { } }, [6]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -1200,7 +1200,7 @@ local chapter_board_dungeon_shards = { } }, [7]={ - ["board_daily_challenge"]={ + ["board"]={ { 21, 1 @@ -1400,7 +1400,7 @@ local chapter_board_dungeon_shards = { } }, [8]={ - ["board_daily_challenge"]={ + ["board"]={ { 3, 0 @@ -1600,7 +1600,7 @@ local chapter_board_dungeon_shards = { } }, [9]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -1800,7 +1800,7 @@ local chapter_board_dungeon_shards = { } }, [10]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -2000,7 +2000,7 @@ local chapter_board_dungeon_shards = { } }, [11]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -2200,7 +2200,7 @@ local chapter_board_dungeon_shards = { } }, [12]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -2400,7 +2400,7 @@ local chapter_board_dungeon_shards = { } }, [13]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -2600,7 +2600,7 @@ local chapter_board_dungeon_shards = { } }, [14]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -2800,7 +2800,7 @@ local chapter_board_dungeon_shards = { } }, [15]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3000,7 +3000,7 @@ local chapter_board_dungeon_shards = { } }, [16]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3200,7 +3200,7 @@ local chapter_board_dungeon_shards = { } }, [17]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3400,7 +3400,7 @@ local chapter_board_dungeon_shards = { } }, [18]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3600,7 +3600,7 @@ local chapter_board_dungeon_shards = { } }, [19]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3800,7 +3800,7 @@ local chapter_board_dungeon_shards = { } }, [20]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -4000,7 +4000,7 @@ local chapter_board_dungeon_shards = { } }, [21]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -4200,7 +4200,7 @@ local chapter_board_dungeon_shards = { } }, [22]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -4400,7 +4400,7 @@ local chapter_board_dungeon_shards = { } }, [23]={ - ["board_daily_challenge"]={ + ["board"]={ { 32, 0 @@ -4600,7 +4600,7 @@ local chapter_board_dungeon_shards = { } }, [24]={ - ["board_daily_challenge"]={ + ["board"]={ { 31, 0 @@ -4800,7 +4800,7 @@ local chapter_board_dungeon_shards = { } }, [25]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5000,7 +5000,7 @@ local chapter_board_dungeon_shards = { } }, [26]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5200,7 +5200,7 @@ local chapter_board_dungeon_shards = { } }, [27]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5400,7 +5400,7 @@ local chapter_board_dungeon_shards = { } }, [28]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5600,7 +5600,7 @@ local chapter_board_dungeon_shards = { } }, [29]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5800,7 +5800,7 @@ local chapter_board_dungeon_shards = { } }, [30]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -6000,7 +6000,7 @@ local chapter_board_dungeon_shards = { } }, [31]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -6200,7 +6200,7 @@ local chapter_board_dungeon_shards = { } }, [32]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -6400,7 +6400,7 @@ local chapter_board_dungeon_shards = { } }, [33]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -6600,7 +6600,7 @@ local chapter_board_dungeon_shards = { } }, [34]={ - ["board_daily_challenge"]={ + ["board"]={ { 0, 3 @@ -6800,7 +6800,7 @@ local chapter_board_dungeon_shards = { } }, [35]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -7000,7 +7000,7 @@ local chapter_board_dungeon_shards = { } }, [36]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -7200,7 +7200,7 @@ local chapter_board_dungeon_shards = { } }, [37]={ - ["board_daily_challenge"]={ + ["board"]={ { 21, 1 @@ -7400,7 +7400,7 @@ local chapter_board_dungeon_shards = { } }, [38]={ - ["board_daily_challenge"]={ + ["board"]={ { 3, 0 @@ -7600,7 +7600,7 @@ local chapter_board_dungeon_shards = { } }, [39]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -7800,7 +7800,7 @@ local chapter_board_dungeon_shards = { } }, [40]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -8000,7 +8000,7 @@ local chapter_board_dungeon_shards = { } }, [41]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -8200,7 +8200,7 @@ local chapter_board_dungeon_shards = { } }, [42]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -8400,7 +8400,7 @@ local chapter_board_dungeon_shards = { } }, [43]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -8600,7 +8600,7 @@ local chapter_board_dungeon_shards = { } }, [44]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -8800,7 +8800,7 @@ local chapter_board_dungeon_shards = { } }, [45]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -9000,7 +9000,7 @@ local chapter_board_dungeon_shards = { } }, [46]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -9200,7 +9200,7 @@ local chapter_board_dungeon_shards = { } }, [47]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -9400,7 +9400,7 @@ local chapter_board_dungeon_shards = { } }, [48]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -9600,7 +9600,7 @@ local chapter_board_dungeon_shards = { } }, [49]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -9800,7 +9800,7 @@ local chapter_board_dungeon_shards = { } }, [50]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -10000,7 +10000,7 @@ local chapter_board_dungeon_shards = { } }, [51]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -10200,7 +10200,7 @@ local chapter_board_dungeon_shards = { } }, [52]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -10400,7 +10400,7 @@ local chapter_board_dungeon_shards = { } }, [53]={ - ["board_daily_challenge"]={ + ["board"]={ { 32, 0 @@ -10600,7 +10600,7 @@ local chapter_board_dungeon_shards = { } }, [54]={ - ["board_daily_challenge"]={ + ["board"]={ { 31, 0 @@ -10800,7 +10800,7 @@ local chapter_board_dungeon_shards = { } }, [55]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -11000,7 +11000,7 @@ local chapter_board_dungeon_shards = { } }, [56]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -11200,7 +11200,7 @@ local chapter_board_dungeon_shards = { } }, [57]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -11400,7 +11400,7 @@ local chapter_board_dungeon_shards = { } }, [58]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -11600,7 +11600,7 @@ local chapter_board_dungeon_shards = { } }, [59]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -11800,7 +11800,7 @@ local chapter_board_dungeon_shards = { } }, [60]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -12000,7 +12000,7 @@ local chapter_board_dungeon_shards = { } }, [61]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -12200,7 +12200,7 @@ local chapter_board_dungeon_shards = { } }, [62]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -12400,7 +12400,7 @@ local chapter_board_dungeon_shards = { } }, [63]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -12600,7 +12600,7 @@ local chapter_board_dungeon_shards = { } }, [64]={ - ["board_daily_challenge"]={ + ["board"]={ { 0, 3 @@ -12800,7 +12800,7 @@ local chapter_board_dungeon_shards = { } }, [65]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -13000,7 +13000,7 @@ local chapter_board_dungeon_shards = { } }, [66]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -13200,7 +13200,7 @@ local chapter_board_dungeon_shards = { } }, [67]={ - ["board_daily_challenge"]={ + ["board"]={ { 21, 1 @@ -13400,7 +13400,7 @@ local chapter_board_dungeon_shards = { } }, [68]={ - ["board_daily_challenge"]={ + ["board"]={ { 3, 0 @@ -13600,7 +13600,7 @@ local chapter_board_dungeon_shards = { } }, [69]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -13800,7 +13800,7 @@ local chapter_board_dungeon_shards = { } }, [70]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -14000,7 +14000,7 @@ local chapter_board_dungeon_shards = { } }, [71]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -14200,7 +14200,7 @@ local chapter_board_dungeon_shards = { } }, [72]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -14400,7 +14400,7 @@ local chapter_board_dungeon_shards = { } }, [73]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -14600,7 +14600,7 @@ local chapter_board_dungeon_shards = { } }, [74]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -14800,7 +14800,7 @@ local chapter_board_dungeon_shards = { } }, [75]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -15000,7 +15000,7 @@ local chapter_board_dungeon_shards = { } }, [76]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -15200,7 +15200,7 @@ local chapter_board_dungeon_shards = { } }, [77]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -15400,7 +15400,7 @@ local chapter_board_dungeon_shards = { } }, [78]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -15600,7 +15600,7 @@ local chapter_board_dungeon_shards = { } }, [79]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -15800,7 +15800,7 @@ local chapter_board_dungeon_shards = { } }, [80]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -16000,7 +16000,7 @@ local chapter_board_dungeon_shards = { } }, [81]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -16200,7 +16200,7 @@ local chapter_board_dungeon_shards = { } }, [82]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -16400,7 +16400,7 @@ local chapter_board_dungeon_shards = { } }, [83]={ - ["board_daily_challenge"]={ + ["board"]={ { 32, 0 @@ -16600,7 +16600,7 @@ local chapter_board_dungeon_shards = { } }, [84]={ - ["board_daily_challenge"]={ + ["board"]={ { 31, 0 @@ -16800,7 +16800,7 @@ local chapter_board_dungeon_shards = { } }, [85]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -17000,7 +17000,7 @@ local chapter_board_dungeon_shards = { } }, [86]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -17200,7 +17200,7 @@ local chapter_board_dungeon_shards = { } }, [87]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -17400,7 +17400,7 @@ local chapter_board_dungeon_shards = { } }, [88]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -17600,7 +17600,7 @@ local chapter_board_dungeon_shards = { } }, [89]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -17800,7 +17800,7 @@ local chapter_board_dungeon_shards = { } }, [90]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -18000,7 +18000,7 @@ local chapter_board_dungeon_shards = { } }, [91]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -18200,7 +18200,7 @@ local chapter_board_dungeon_shards = { } }, [92]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -18400,7 +18400,7 @@ local chapter_board_dungeon_shards = { } }, [93]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -18600,7 +18600,7 @@ local chapter_board_dungeon_shards = { } }, [94]={ - ["board_daily_challenge"]={ + ["board"]={ { 0, 3 @@ -18800,7 +18800,7 @@ local chapter_board_dungeon_shards = { } }, [95]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -19000,7 +19000,7 @@ local chapter_board_dungeon_shards = { } }, [96]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -19200,7 +19200,7 @@ local chapter_board_dungeon_shards = { } }, [97]={ - ["board_daily_challenge"]={ + ["board"]={ { 21, 1 @@ -19400,7 +19400,7 @@ local chapter_board_dungeon_shards = { } }, [98]={ - ["board_daily_challenge"]={ + ["board"]={ { 3, 0 @@ -19600,7 +19600,7 @@ local chapter_board_dungeon_shards = { } }, [99]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -19800,7 +19800,7 @@ local chapter_board_dungeon_shards = { } }, [100]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -20000,7 +20000,7 @@ local chapter_board_dungeon_shards = { } }, [101]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -20200,7 +20200,7 @@ local chapter_board_dungeon_shards = { } }, [102]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -20400,7 +20400,7 @@ local chapter_board_dungeon_shards = { } }, [103]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -20600,7 +20600,7 @@ local chapter_board_dungeon_shards = { } }, [104]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -20800,7 +20800,7 @@ local chapter_board_dungeon_shards = { } }, [105]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -21000,7 +21000,7 @@ local chapter_board_dungeon_shards = { } }, [106]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -21200,7 +21200,7 @@ local chapter_board_dungeon_shards = { } }, [107]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -21400,7 +21400,7 @@ local chapter_board_dungeon_shards = { } }, [108]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -21600,7 +21600,7 @@ local chapter_board_dungeon_shards = { } }, [109]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -21800,7 +21800,7 @@ local chapter_board_dungeon_shards = { } }, [110]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -22000,7 +22000,7 @@ local chapter_board_dungeon_shards = { } }, [111]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -22200,7 +22200,7 @@ local chapter_board_dungeon_shards = { } }, [112]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -22400,7 +22400,7 @@ local chapter_board_dungeon_shards = { } }, [113]={ - ["board_daily_challenge"]={ + ["board"]={ { 32, 0 @@ -22600,7 +22600,7 @@ local chapter_board_dungeon_shards = { } }, [114]={ - ["board_daily_challenge"]={ + ["board"]={ { 31, 0 @@ -22800,7 +22800,7 @@ local chapter_board_dungeon_shards = { } }, [115]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -23000,7 +23000,7 @@ local chapter_board_dungeon_shards = { } }, [116]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -23200,7 +23200,7 @@ local chapter_board_dungeon_shards = { } }, [117]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -23400,7 +23400,7 @@ local chapter_board_dungeon_shards = { } }, [118]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -23600,7 +23600,7 @@ local chapter_board_dungeon_shards = { } }, [119]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -23800,7 +23800,7 @@ local chapter_board_dungeon_shards = { } }, [120]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -24000,7 +24000,7 @@ local chapter_board_dungeon_shards = { } }, [121]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -24200,7 +24200,7 @@ local chapter_board_dungeon_shards = { } }, [122]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -24400,7 +24400,7 @@ local chapter_board_dungeon_shards = { } }, [123]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -24600,7 +24600,7 @@ local chapter_board_dungeon_shards = { } }, [124]={ - ["board_daily_challenge"]={ + ["board"]={ { 0, 3 @@ -24800,7 +24800,7 @@ local chapter_board_dungeon_shards = { } }, [125]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -25000,7 +25000,7 @@ local chapter_board_dungeon_shards = { } }, [126]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -25200,7 +25200,7 @@ local chapter_board_dungeon_shards = { } }, [127]={ - ["board_daily_challenge"]={ + ["board"]={ { 21, 1 @@ -25400,7 +25400,7 @@ local chapter_board_dungeon_shards = { } }, [128]={ - ["board_daily_challenge"]={ + ["board"]={ { 3, 0 @@ -25600,7 +25600,7 @@ local chapter_board_dungeon_shards = { } }, [129]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -25800,7 +25800,7 @@ local chapter_board_dungeon_shards = { } }, [130]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -26000,7 +26000,7 @@ local chapter_board_dungeon_shards = { } }, [131]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -26200,7 +26200,7 @@ local chapter_board_dungeon_shards = { } }, [132]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -26400,7 +26400,7 @@ local chapter_board_dungeon_shards = { } }, [133]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -26600,7 +26600,7 @@ local chapter_board_dungeon_shards = { } }, [134]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -26800,7 +26800,7 @@ local chapter_board_dungeon_shards = { } }, [135]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -27000,7 +27000,7 @@ local chapter_board_dungeon_shards = { } }, [136]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -27200,7 +27200,7 @@ local chapter_board_dungeon_shards = { } }, [137]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -27400,7 +27400,7 @@ local chapter_board_dungeon_shards = { } }, [138]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -27600,7 +27600,7 @@ local chapter_board_dungeon_shards = { } }, [139]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -27800,7 +27800,7 @@ local chapter_board_dungeon_shards = { } }, [140]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -28000,7 +28000,7 @@ local chapter_board_dungeon_shards = { } }, [141]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -28200,7 +28200,7 @@ local chapter_board_dungeon_shards = { } }, [142]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -28400,7 +28400,7 @@ local chapter_board_dungeon_shards = { } }, [143]={ - ["board_daily_challenge"]={ + ["board"]={ { 32, 0 @@ -28600,7 +28600,7 @@ local chapter_board_dungeon_shards = { } }, [144]={ - ["board_daily_challenge"]={ + ["board"]={ { 31, 0 @@ -28800,7 +28800,7 @@ local chapter_board_dungeon_shards = { } }, [145]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -29000,7 +29000,7 @@ local chapter_board_dungeon_shards = { } }, [146]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -29200,7 +29200,7 @@ local chapter_board_dungeon_shards = { } }, [147]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -29400,7 +29400,7 @@ local chapter_board_dungeon_shards = { } }, [148]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -29600,7 +29600,7 @@ local chapter_board_dungeon_shards = { } }, [149]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -29800,7 +29800,7 @@ local chapter_board_dungeon_shards = { } }, [150]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 diff --git a/lua/app/config/chapter_dungeon_gold.lua b/lua/app/config/chapter_dungeon_gold.lua index 0b66bbbd..36ce6388 100644 --- a/lua/app/config/chapter_dungeon_gold.lua +++ b/lua/app/config/chapter_dungeon_gold.lua @@ -3,9 +3,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=1, - ["monster_base"]=20003, - ["hp"]=8000000, + ["board"]={ + 1 + }, + ["monster"]={ + 105 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -27,9 +30,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=2, - ["monster_base"]=20003, - ["hp"]=11000000, + ["board"]={ + 2 + }, + ["monster"]={ + 205 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -51,9 +57,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=3, - ["monster_base"]=20003, - ["hp"]=12000000, + ["board"]={ + 3 + }, + ["monster"]={ + 305 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -75,9 +84,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=4, - ["monster_base"]=20003, - ["hp"]=15000000, + ["board"]={ + 4 + }, + ["monster"]={ + 405 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -99,9 +111,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=5, - ["monster_base"]=20003, - ["hp"]=23000000, + ["board"]={ + 5 + }, + ["monster"]={ + 505 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -123,9 +138,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=6, - ["monster_base"]=20003, - ["hp"]=15000000, + ["board"]={ + 6 + }, + ["monster"]={ + 605 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -147,9 +165,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=7, - ["monster_base"]=20003, - ["hp"]=17000000, + ["board"]={ + 7 + }, + ["monster"]={ + 705 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -171,9 +192,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=8, - ["monster_base"]=20003, - ["hp"]=20000000, + ["board"]={ + 8 + }, + ["monster"]={ + 805 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -195,9 +219,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=9, - ["monster_base"]=20003, - ["hp"]=22000000, + ["board"]={ + 9 + }, + ["monster"]={ + 905 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -219,9 +246,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=10, - ["monster_base"]=20003, - ["hp"]=42000000, + ["board"]={ + 10 + }, + ["monster"]={ + 1005 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -243,9 +273,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=11, - ["monster_base"]=20003, - ["hp"]=23000000, + ["board"]={ + 11 + }, + ["monster"]={ + 1105 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -267,9 +300,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=12, - ["monster_base"]=20003, - ["hp"]=28000000, + ["board"]={ + 12 + }, + ["monster"]={ + 1205 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -291,9 +327,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=13, - ["monster_base"]=20003, - ["hp"]=31000000, + ["board"]={ + 13 + }, + ["monster"]={ + 1305 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -315,9 +354,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=14, - ["monster_base"]=20003, - ["hp"]=35000000, + ["board"]={ + 14 + }, + ["monster"]={ + 1405 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -339,9 +381,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=15, - ["monster_base"]=20003, - ["hp"]=52000000, + ["board"]={ + 15 + }, + ["monster"]={ + 1505 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -363,9 +408,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=16, - ["monster_base"]=20003, - ["hp"]=40000000, + ["board"]={ + 16 + }, + ["monster"]={ + 1605 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -387,9 +435,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=17, - ["monster_base"]=20003, - ["hp"]=44000000, + ["board"]={ + 17 + }, + ["monster"]={ + 1705 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -411,9 +462,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=18, - ["monster_base"]=20003, - ["hp"]=50000000, + ["board"]={ + 18 + }, + ["monster"]={ + 1805 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -435,9 +489,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=19, - ["monster_base"]=20003, - ["hp"]=54000000, + ["board"]={ + 19 + }, + ["monster"]={ + 1905 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -459,9 +516,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=20, - ["monster_base"]=20003, - ["hp"]=90000000, + ["board"]={ + 20 + }, + ["monster"]={ + 2005 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -483,9 +543,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=21, - ["monster_base"]=20003, - ["hp"]=8000000, + ["board"]={ + 21 + }, + ["monster"]={ + 2105 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -507,9 +570,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=22, - ["monster_base"]=20003, - ["hp"]=11000000, + ["board"]={ + 22 + }, + ["monster"]={ + 2205 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -531,9 +597,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=23, - ["monster_base"]=20003, - ["hp"]=12000000, + ["board"]={ + 23 + }, + ["monster"]={ + 2305 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -555,9 +624,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=24, - ["monster_base"]=20003, - ["hp"]=15000000, + ["board"]={ + 24 + }, + ["monster"]={ + 2405 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -579,9 +651,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=25, - ["monster_base"]=20003, - ["hp"]=23000000, + ["board"]={ + 25 + }, + ["monster"]={ + 2505 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -603,9 +678,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=26, - ["monster_base"]=20003, - ["hp"]=15000000, + ["board"]={ + 26 + }, + ["monster"]={ + 2605 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -627,9 +705,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=27, - ["monster_base"]=20003, - ["hp"]=17000000, + ["board"]={ + 27 + }, + ["monster"]={ + 2705 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -651,9 +732,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=28, - ["monster_base"]=20003, - ["hp"]=20000000, + ["board"]={ + 28 + }, + ["monster"]={ + 2805 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -675,9 +759,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=29, - ["monster_base"]=20003, - ["hp"]=22000000, + ["board"]={ + 29 + }, + ["monster"]={ + 2905 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -699,9 +786,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=30, - ["monster_base"]=20003, - ["hp"]=42000000, + ["board"]={ + 30 + }, + ["monster"]={ + 3005 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", diff --git a/lua/app/config/chapter_dungeon_shards.lua b/lua/app/config/chapter_dungeon_shards.lua index 01720577..56a01e75 100644 --- a/lua/app/config/chapter_dungeon_shards.lua +++ b/lua/app/config/chapter_dungeon_shards.lua @@ -3,7 +3,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 1, 2, 3, @@ -101,7 +101,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 6, 7, 8, @@ -199,7 +199,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 11, 12, 13, @@ -297,7 +297,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 16, 17, 18, @@ -395,7 +395,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 21, 22, 23, @@ -493,7 +493,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 26, 27, 28, @@ -591,7 +591,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 31, 32, 33, @@ -689,7 +689,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 36, 37, 38, @@ -787,7 +787,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 41, 42, 43, @@ -885,7 +885,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 46, 47, 48, @@ -983,7 +983,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 51, 52, 53, @@ -1081,7 +1081,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 56, 57, 58, @@ -1179,7 +1179,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 61, 62, 63, @@ -1277,7 +1277,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 66, 67, 68, @@ -1375,7 +1375,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 71, 72, 73, @@ -1473,7 +1473,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 76, 77, 78, @@ -1571,7 +1571,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 81, 82, 83, @@ -1669,7 +1669,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 86, 87, 88, @@ -1767,7 +1767,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 91, 92, 93, @@ -1865,7 +1865,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 96, 97, 98, @@ -1963,7 +1963,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 101, 102, 103, @@ -2061,7 +2061,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 106, 107, 108, @@ -2159,7 +2159,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 111, 112, 113, @@ -2257,7 +2257,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 116, 117, 118, @@ -2355,7 +2355,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 121, 122, 123, @@ -2453,7 +2453,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 126, 127, 128, @@ -2551,7 +2551,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 131, 132, 133, @@ -2649,7 +2649,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 136, 137, 138, @@ -2747,7 +2747,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 141, 142, 143, @@ -2845,7 +2845,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 146, 147, 148, diff --git a/lua/app/config/monster_dungeon_gold.lua b/lua/app/config/monster_dungeon_gold.lua new file mode 100644 index 00000000..45a7477e --- /dev/null +++ b/lua/app/config/monster_dungeon_gold.lua @@ -0,0 +1,216 @@ +local monster_dungeon_gold = { + [105]={ + ["monster_base"]=20003, + ["hp"]=90000000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [205]={ + ["monster_base"]=20003, + ["hp"]=90200000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [305]={ + ["monster_base"]=20003, + ["hp"]=90400000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [405]={ + ["monster_base"]=20003, + ["hp"]=90600000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [505]={ + ["monster_base"]=20003, + ["hp"]=90800000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [605]={ + ["monster_base"]=20003, + ["hp"]=91000000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [705]={ + ["monster_base"]=20003, + ["hp"]=91200000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [805]={ + ["monster_base"]=20003, + ["hp"]=91400000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [905]={ + ["monster_base"]=20003, + ["hp"]=91600000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1005]={ + ["monster_base"]=20003, + ["hp"]=91800000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1105]={ + ["monster_base"]=20003, + ["hp"]=92000000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1205]={ + ["monster_base"]=20003, + ["hp"]=92200000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1305]={ + ["monster_base"]=20003, + ["hp"]=92400000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1405]={ + ["monster_base"]=20003, + ["hp"]=92600000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1505]={ + ["monster_base"]=20003, + ["hp"]=92800000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1605]={ + ["monster_base"]=20003, + ["hp"]=93000000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1705]={ + ["monster_base"]=20003, + ["hp"]=93200000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1805]={ + ["monster_base"]=20003, + ["hp"]=93400000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1905]={ + ["monster_base"]=20003, + ["hp"]=93600000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2005]={ + ["monster_base"]=20003, + ["hp"]=93800000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2105]={ + ["monster_base"]=20003, + ["hp"]=94000000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2205]={ + ["monster_base"]=20003, + ["hp"]=94200000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2305]={ + ["monster_base"]=20003, + ["hp"]=94400000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2405]={ + ["monster_base"]=20003, + ["hp"]=94600000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2505]={ + ["monster_base"]=20003, + ["hp"]=94800000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2605]={ + ["monster_base"]=20003, + ["hp"]=95000000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2705]={ + ["monster_base"]=20003, + ["hp"]=95200000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2805]={ + ["monster_base"]=20003, + ["hp"]=95400000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2905]={ + ["monster_base"]=20003, + ["hp"]=95600000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [3005]={ + ["monster_base"]=20003, + ["hp"]=95800000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + } +} +local config = { +data=monster_dungeon_gold,count=30 +} +return config \ No newline at end of file diff --git a/lua/app/config/monster_dungeon_gold.lua.meta b/lua/app/config/monster_dungeon_gold.lua.meta new file mode 100644 index 00000000..4d0e5e24 --- /dev/null +++ b/lua/app/config/monster_dungeon_gold.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4154138c3cd0f0147b333237de79e966 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 1ff6f078..e174009d 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -11,7 +11,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [9]={ ["effect_type"]=2, @@ -52,7 +55,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [12]={ ["effect_type"]=2, @@ -66,7 +72,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [13]={ ["effect_type"]=2, @@ -107,7 +116,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -129,7 +141,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -151,7 +166,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -173,7 +191,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -210,7 +231,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -237,7 +261,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=1 + ["skill_position"]={ + 1, + 0 + } }, [1200122]={ ["position"]=1, @@ -258,7 +285,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=1 + ["skill_position"]={ + 1, + 0 + } }, [1200123]={ ["position"]=1, @@ -290,7 +320,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=1 + ["skill_position"]={ + 1, + 0 + } }, [1200124]={ ["effect_type"]=2, @@ -318,7 +351,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -340,7 +376,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -362,7 +401,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -384,7 +426,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -427,7 +472,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -522,7 +570,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -607,7 +658,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -629,7 +683,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -651,7 +708,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -673,7 +733,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -747,7 +810,10 @@ local skill = { 4, 6 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -861,7 +927,10 @@ local skill = { 4, 6 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -892,7 +961,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -914,7 +986,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -936,7 +1011,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=4, ["sound_hit"]={ @@ -958,7 +1036,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1034,7 +1115,10 @@ local skill = { 4, 5 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -1101,20 +1185,6 @@ local skill = { }, ["obj"]=2 }, - [1400124]={ - ["position"]=1, - ["effect_type"]=2, - ["trigger"]=6, - ["effect"]={ - { - ["type"]="stun", - ["num"]=0, - ["ratio"]=10000, - ["round"]=2 - } - }, - ["obj"]=2 - }, [1400125]={ ["position"]=1, ["effect_type"]=2, @@ -1144,6 +1214,292 @@ local skill = { ["obj"]=2, ["fx_target"]=4 }, + [1400210]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound_hit"]={ + 1000011 + }, + ["name_act"]="attack01", + ["fx_self"]=300045 + }, + [1400211]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound_hit"]={ + 1000012 + }, + ["name_act"]="attack02", + ["fx_self"]=300046 + }, + [1400212]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=4, + ["sound_hit"]={ + 1000013 + }, + ["name_act"]="attack03", + ["fx_self"]=300047 + }, + [1400213]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000014 + }, + ["name_act"]="attack04", + ["fx_self"]=300048 + }, + [1400220]={ + ["energy"]=10, + ["link"]=1, + ["position"]=1, + ["method"]=1, + ["skill_type"]=0, + ["battle_icon"]="20", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=60000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound_hit"]={ + 54001201 + }, + ["name_act"]="skill01", + ["fx_self"]=300089, + ["bullet_time"]={ + 1800, + 3000, + 400 + } + }, + [1400221]={ + ["position"]=1, + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="burn", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + } + }, + [1400222]={ + ["position"]=1, + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="frozen", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, + ["condition_rel"]={ + { + 1, + 1 + } + }, + ["effect_type"]=2, + ["trigger"]=7, + ["effect"]={ + { + ["type"]="dmg_addition_yellow_add", + ["num"]=2000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 140 + } + }, + [1400223]={ + ["energy"]=10, + ["link"]=1, + ["position"]=1, + ["method"]=1, + ["skill_type"]=4, + ["boardrange"]={ + { + ["type"]=3, + ["range"]=2 + }, + { + ["type"]=4, + ["range"]=2 + } + }, + ["battle_icon"]="20", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=60000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound_hit"]={ + 54001201 + }, + ["name_act"]="skill01", + ["fx_self"]=300089, + ["bullet_time"]={ + 1800, + 3000, + 400 + } + }, + [1400224]={ + ["position"]=1, + ["effect_type"]=2, + ["trigger"]=5, + ["effect"]={ + { + ["type"]="burn", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + } + }, + [1400225]={ + ["position"]=1, + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="frozen", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, + ["condition_rel"]={ + { + 1, + 1 + } + }, + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="normal_attack_add", + ["num"]=2, + ["ratio"]=10000, + ["round"]=3 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 140 + } + }, [2200110]={ ["position"]=2, ["effect_type"]=1, @@ -1157,7 +1513,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1179,7 +1538,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1201,7 +1563,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1223,7 +1588,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1249,7 +1617,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -1293,7 +1664,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [2200122]={ ["position"]=2, @@ -1308,7 +1682,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [2200123]={ ["energy"]=10, @@ -1338,7 +1715,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -1365,7 +1745,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1387,7 +1770,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1409,7 +1795,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1431,7 +1820,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1482,7 +1874,10 @@ local skill = { 3, 4 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -1552,7 +1947,10 @@ local skill = { 3, 4 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -1669,7 +2067,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1691,7 +2092,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1713,7 +2117,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1735,7 +2142,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1791,7 +2201,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -1877,7 +2290,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1899,7 +2315,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1921,7 +2340,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1943,7 +2365,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1973,7 +2398,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -1998,35 +2426,7 @@ local skill = { ["v"]=0, ["side"]=2 } - } - }, - ["condition_rel"]={ - { - 2, - 1 - } - }, - ["effect_type"]=2, - ["trigger"]=6, - ["effect"]={ - { - ["type"]="hurt_yellow", - ["num"]=30000, - ["ratio"]=10000, - ["round"]=0 }, - { - ["type"]="stun", - ["num"]=0, - ["ratio"]=3000, - ["round"]=2 - } - }, - ["obj"]=2 - }, - [2400122]={ - ["position"]=2, - ["buff_condition"]={ { { ["type"]="state", @@ -2038,6 +2438,10 @@ local skill = { } }, ["condition_rel"]={ + { + 1, + 1 + }, { 2, 1 @@ -2061,6 +2465,56 @@ local skill = { }, ["obj"]=2 }, + [2400122]={ + ["position"]=2, + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="frozen", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + }, + { + { + ["type"]="state", + ["attr"]="frozen", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, + ["condition_rel"]={ + { + 1, + 1 + }, + { + 2, + 1 + } + }, + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=30000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="stun", + ["num"]=0, + ["ratio"]=7000, + ["round"]=2 + } + }, + ["obj"]=2 + }, [2400123]={ ["energy"]=10, ["link"]=1, @@ -2083,12 +2537,15 @@ local skill = { { ["type"]="imprison", ["num"]=0, - ["ratio"]=5000, + ["ratio"]=7000, ["round"]=2 } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -2129,7 +2586,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -2157,6 +2617,176 @@ local skill = { }, ["obj"]=1 }, + [2400210]={ + ["position"]=2, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1 + }, + [2400211]={ + ["position"]=2, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1 + }, + [2400212]={ + ["position"]=2, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1 + }, + [2400213]={ + ["position"]=2, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1 + }, + [2400220]={ + ["energy"]=10, + ["link"]=1, + ["position"]=2, + ["method"]=1, + ["skill_type"]=1, + ["boardrange"]={ + + }, + ["battle_icon"]="17", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=60000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=200, + ["shake_type"]=6 + }, + [2400221]={ + ["skill_type"]=11, + ["skill_type_parameter"]={ + 0, + 2 + }, + ["effect_type"]=2, + ["trigger"]=3, + ["obj"]=1 + }, + [2400222]={ + ["effect_type"]=2, + ["trigger"]=5, + ["effect"]={ + { + ["type"]="weaken", + ["num"]=2500, + ["ratio"]=1000, + ["round"]=1 + } + }, + ["obj"]=2 + }, + [2400223]={ + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="shield_rebound_200", + ["num"]=1000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=1 + }, + [2400224]={ + ["effect_type"]=2, + ["trigger"]=5, + ["effect"]={ + { + ["type"]="weaken", + ["num"]=2500, + ["ratio"]=1000, + ["round"]=2 + } + }, + ["obj"]=2 + }, + [2400225]={ + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="shield_rebound_400", + ["num"]=1000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=1 + }, [3200110]={ ["position"]=3, ["effect_type"]=1, @@ -2170,7 +2800,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2192,7 +2825,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2214,7 +2850,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -2236,7 +2875,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2266,7 +2908,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -2366,7 +3011,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -2388,7 +3036,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2410,7 +3061,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -2432,7 +3086,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -2458,7 +3115,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["sound_hit"]={ 3300120 }, @@ -2549,7 +3209,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["sound_hit"]={ 3300120 }, @@ -2569,7 +3232,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2591,7 +3257,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -2613,7 +3282,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2635,7 +3307,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -2687,7 +3362,10 @@ local skill = { 2, 3 }, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -2780,7 +3458,10 @@ local skill = { 2, 4 }, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -2860,7 +3541,10 @@ local skill = { 2, 4 }, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -2887,7 +3571,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2909,7 +3596,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2931,7 +3621,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2953,7 +3646,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3006,7 +3702,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -3130,7 +3829,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -3157,7 +3859,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -3179,7 +3884,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3201,7 +3909,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3223,7 +3934,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -3256,7 +3970,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -3359,7 +4076,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -3381,7 +4101,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3403,7 +4126,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3425,7 +4151,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3458,7 +4187,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -3504,7 +4236,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [4300122]={ ["position"]=4, @@ -3519,7 +4254,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [4300123]={ ["position"]=4, @@ -3534,7 +4272,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [4300124]={ ["position"]=4, @@ -3549,7 +4290,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [4300125]={ ["energy"]=10, @@ -3585,7 +4329,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -3614,7 +4361,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3636,7 +4386,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3658,7 +4411,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3680,7 +4436,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3733,7 +4492,10 @@ local skill = { 2, 4 }, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -3850,7 +4612,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3872,7 +4637,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3894,7 +4662,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3916,7 +4687,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3955,7 +4729,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -4003,12 +4780,12 @@ local skill = { [4400122]={ ["position"]=4, ["effect_type"]=2, - ["trigger"]=6, + ["trigger"]=5, ["effect"]={ { ["type"]="frozen", ["num"]=0, - ["ratio"]=5000, + ["ratio"]=1000, ["round"]=2 } }, @@ -4017,12 +4794,12 @@ local skill = { [4400123]={ ["position"]=4, ["effect_type"]=2, - ["trigger"]=6, + ["trigger"]=5, ["effect"]={ { ["type"]="frozen", ["num"]=0, - ["ratio"]=7000, + ["ratio"]=2000, ["round"]=2 } }, @@ -4041,7 +4818,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4063,7 +4843,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4085,7 +4868,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4107,7 +4893,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4137,7 +4926,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["sound_hit"]={ 5200120 }, @@ -4165,7 +4957,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["sound_hit"]={ 5200120 }, @@ -4193,7 +4988,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["sound_hit"]={ 5200120 }, @@ -4226,7 +5024,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4248,7 +5049,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4270,7 +5074,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4292,7 +5099,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4343,7 +5153,10 @@ local skill = { 3, 4 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -4451,7 +5264,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4473,7 +5289,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4495,7 +5314,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4517,7 +5339,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4560,7 +5385,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -4711,7 +5539,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -4740,7 +5571,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4762,7 +5596,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4784,7 +5621,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4806,7 +5646,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4850,7 +5693,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -4921,7 +5767,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -4972,7 +5821,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4992,7 +5844,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -5012,7 +5867,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -5032,7 +5890,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -5052,7 +5913,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -5072,7 +5936,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -5092,7 +5959,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -5112,7 +5982,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [10009]={ ["effect_type"]=2, @@ -5126,7 +5999,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [10010]={ ["effect_type"]=2, @@ -5140,7 +6016,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [10011]={ ["effect_type"]=2, @@ -5154,7 +6033,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [10012]={ ["effect_type"]=2, @@ -5168,7 +6050,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [10013]={ ["effect_type"]=2, @@ -5182,7 +6067,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [10014]={ ["effect_type"]=2, @@ -5209,7 +6097,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["sound_hit"]={ @@ -5229,7 +6120,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5263,7 +6157,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5302,7 +6199,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5336,7 +6236,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5370,7 +6273,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5404,7 +6310,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5434,7 +6343,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0 }, @@ -5455,7 +6367,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5504,7 +6419,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5563,7 +6481,10 @@ local skill = { 4, 5 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5597,7 +6518,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0 }, @@ -5617,7 +6541,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5657,7 +6584,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5708,7 +6638,10 @@ local skill = { 2, 4 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5739,7 +6672,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5767,7 +6703,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["sound_hit"]={ @@ -5793,7 +6732,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5851,7 +6793,10 @@ local skill = { 3, 5 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5901,7 +6846,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5969,7 +6917,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -6038,7 +6989,10 @@ local skill = { 4, 6 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -6070,7 +7024,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["sound_hit"]={ @@ -6126,7 +7083,10 @@ local skill = { 3, 5 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6248,7 +7208,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -6296,7 +7259,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6357,7 +7323,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6417,7 +7386,10 @@ local skill = { 3, 5 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=1, ["shake_time"]=200, @@ -6451,7 +7423,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["name_act"]="skill01", @@ -6475,7 +7450,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6531,7 +7509,10 @@ local skill = { 3, 4 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=1, ["shake_time"]=200, @@ -6617,7 +7598,10 @@ local skill = { 3, 4 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6690,7 +7674,10 @@ local skill = { 5, 6 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, @@ -6746,7 +7733,10 @@ local skill = { 2, 4 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6787,7 +7777,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, @@ -6816,7 +7809,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["name_act"]="skill01" @@ -6859,7 +7855,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -6893,7 +7892,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6933,7 +7935,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6972,7 +7977,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -7000,7 +8008,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0 }, @@ -7033,7 +8044,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -7061,7 +8075,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0 }, @@ -7106,7 +8123,10 @@ local skill = { 2, 5 }, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -7134,7 +8154,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -7174,7 +8197,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -7197,7 +8223,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7218,7 +8247,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7239,7 +8271,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7260,7 +8295,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7281,7 +8319,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7302,7 +8343,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7323,7 +8367,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7344,7 +8391,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7365,7 +8415,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7386,7 +8439,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7407,7 +8463,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7428,7 +8487,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7449,7 +8511,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7470,7 +8535,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7491,7 +8559,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7512,7 +8583,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7533,7 +8607,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7554,7 +8631,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7575,7 +8655,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7596,7 +8679,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7617,7 +8703,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7638,7 +8727,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7659,7 +8751,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7680,7 +8775,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7701,7 +8799,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7722,7 +8823,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7743,7 +8847,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7764,7 +8871,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7785,7 +8895,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7806,7 +8919,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7827,7 +8943,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7848,7 +8967,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7869,7 +8991,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7890,7 +9015,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7911,7 +9039,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7932,7 +9063,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7953,7 +9087,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7974,7 +9111,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7995,7 +9135,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8016,7 +9159,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8037,7 +9183,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8058,7 +9207,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8079,7 +9231,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8100,7 +9255,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8121,7 +9279,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8142,7 +9303,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8163,7 +9327,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8184,7 +9351,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8205,7 +9375,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8226,7 +9399,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8247,7 +9423,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8268,7 +9447,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8289,7 +9471,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8310,7 +9495,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8331,7 +9519,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8352,7 +9543,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8373,7 +9567,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8394,7 +9591,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8415,7 +9615,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8436,7 +9639,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8457,7 +9663,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8478,7 +9687,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8499,7 +9711,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8520,7 +9735,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8541,7 +9759,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8562,7 +9783,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8583,7 +9807,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8604,7 +9831,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8625,7 +9855,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8646,7 +9879,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8667,7 +9903,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8688,7 +9927,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8709,7 +9951,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8730,7 +9975,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8751,7 +9999,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8772,7 +10023,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8793,7 +10047,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8814,7 +10071,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8835,7 +10095,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8856,7 +10119,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8877,7 +10143,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8898,7 +10167,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8919,7 +10191,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8940,7 +10215,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8961,7 +10239,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8982,7 +10263,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9003,7 +10287,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9024,7 +10311,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9045,7 +10335,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9066,7 +10359,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9087,7 +10383,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9108,7 +10407,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9129,7 +10431,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9150,7 +10455,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9171,7 +10479,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9192,7 +10503,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9213,7 +10527,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9234,7 +10551,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9255,7 +10575,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9276,7 +10599,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9297,7 +10623,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9318,7 +10647,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9339,7 +10671,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9360,7 +10695,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9381,7 +10719,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9402,7 +10743,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9423,7 +10767,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9444,7 +10791,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9465,7 +10815,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9486,7 +10839,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9507,7 +10863,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9528,7 +10887,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9549,7 +10911,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9570,7 +10935,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9591,7 +10959,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9612,7 +10983,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9633,7 +11007,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9654,7 +11031,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9675,7 +11055,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9696,7 +11079,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9717,7 +11103,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9738,7 +11127,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9759,7 +11151,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9780,7 +11175,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9801,7 +11199,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9822,7 +11223,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9843,7 +11247,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9864,7 +11271,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9885,7 +11295,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9906,7 +11319,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9927,7 +11343,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9948,7 +11367,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9969,7 +11391,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9990,7 +11415,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10011,7 +11439,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10032,7 +11463,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10053,7 +11487,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10074,7 +11511,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10095,7 +11535,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10116,7 +11559,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10137,7 +11583,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10158,7 +11607,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10179,7 +11631,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10200,7 +11655,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10221,7 +11679,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10242,7 +11703,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10263,7 +11727,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10284,7 +11751,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10305,7 +11775,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10326,7 +11799,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10347,7 +11823,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10368,7 +11847,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10389,7 +11871,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10410,7 +11895,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10431,7 +11919,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10452,7 +11943,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10473,7 +11967,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10494,7 +11991,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10515,7 +12015,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10536,7 +12039,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10557,7 +12063,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10578,7 +12087,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10599,7 +12111,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10620,7 +12135,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10641,7 +12159,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10662,7 +12183,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10683,7 +12207,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10704,7 +12231,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10725,7 +12255,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10746,7 +12279,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10767,7 +12303,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10788,7 +12327,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10809,7 +12351,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10830,7 +12375,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10851,7 +12399,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10872,7 +12423,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10893,7 +12447,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10914,7 +12471,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10935,7 +12495,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10956,7 +12519,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10977,7 +12543,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10998,7 +12567,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11019,7 +12591,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11040,7 +12615,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11061,7 +12639,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11082,7 +12663,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11103,7 +12687,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11124,7 +12711,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11145,7 +12735,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11166,7 +12759,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11187,7 +12783,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11208,7 +12807,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11229,7 +12831,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11250,7 +12855,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11271,7 +12879,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11292,7 +12903,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11313,7 +12927,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11334,7 +12951,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11355,7 +12975,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11376,7 +12999,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11397,7 +13023,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11418,7 +13047,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11439,7 +13071,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11460,7 +13095,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11481,7 +13119,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11502,7 +13143,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11523,7 +13167,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11544,7 +13191,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11565,7 +13215,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11586,7 +13239,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11607,7 +13263,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11628,7 +13287,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11649,7 +13311,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11670,7 +13335,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11691,7 +13359,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11712,7 +13383,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11733,7 +13407,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11754,7 +13431,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11775,7 +13455,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11796,7 +13479,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11817,7 +13503,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11838,7 +13527,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11859,7 +13551,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11880,7 +13575,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11901,7 +13599,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11922,7 +13623,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11943,7 +13647,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11964,7 +13671,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11985,7 +13695,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12006,7 +13719,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12027,7 +13743,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12048,7 +13767,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12069,7 +13791,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12090,7 +13815,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12111,7 +13839,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12132,7 +13863,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12153,7 +13887,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12174,7 +13911,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12195,7 +13935,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12216,7 +13959,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12237,7 +13983,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12258,7 +14007,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12279,7 +14031,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12300,7 +14055,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12321,7 +14079,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12342,7 +14103,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12363,7 +14127,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12384,7 +14151,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12405,7 +14175,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12426,7 +14199,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12447,7 +14223,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12468,7 +14247,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12489,7 +14271,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12510,7 +14295,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12531,7 +14319,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12552,7 +14343,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12573,7 +14367,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12594,7 +14391,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12615,7 +14415,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12636,7 +14439,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12657,7 +14463,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12678,7 +14487,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12699,7 +14511,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12720,7 +14535,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12741,7 +14559,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12762,7 +14583,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12783,7 +14607,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12804,7 +14631,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12825,7 +14655,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12846,7 +14679,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12867,7 +14703,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12888,7 +14727,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12909,7 +14751,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12930,7 +14775,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12951,7 +14799,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12972,7 +14823,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12993,7 +14847,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13014,7 +14871,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13035,7 +14895,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13056,7 +14919,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13077,7 +14943,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13098,7 +14967,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13119,7 +14991,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13140,7 +15015,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13161,7 +15039,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13182,7 +15063,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13203,7 +15087,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13224,7 +15111,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13245,7 +15135,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13266,7 +15159,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13287,7 +15183,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13308,7 +15207,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13329,7 +15231,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13350,7 +15255,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13371,7 +15279,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13392,7 +15303,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13413,7 +15327,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13434,7 +15351,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13455,7 +15375,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13476,7 +15399,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13497,7 +15423,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13518,7 +15447,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13539,7 +15471,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13560,7 +15495,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13581,7 +15519,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13602,7 +15543,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13613,7 +15557,10 @@ local skill = { }, [110001]={ ["skill_type"]=5, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" @@ -13623,14 +15570,20 @@ local skill = { ["skill_type_parameter"]={ 1 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" }, [110003]={ ["skill_type"]=7, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" @@ -13640,7 +15593,10 @@ local skill = { ["skill_type_parameter"]={ 1 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" @@ -13650,7 +15606,10 @@ local skill = { ["skill_type_parameter"]={ 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" @@ -13661,7 +15620,10 @@ local skill = { 1, 2 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" @@ -13672,7 +15634,10 @@ local skill = { 1, 1 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" @@ -13682,13 +15647,16 @@ local skill = { ["skill_type_parameter"]={ 10000 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" } } local config = { -data=skill,count=577 +data=skill,count=596 } 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 0fd20214..20fd7300 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -1131,22 +1131,15 @@ local skill_rogue = { ["icon"]="138" }, [1400104]={ - ["unlock"]=1400102, - ["cover_unlock"]=1400102, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, - ["type"]=12, - ["skill_position"]=1, - ["effect"]={ - { - ["type"]="add_skill", - ["num"]=1400124, - ["ratio"]=10000, - ["round"]=1 - } + ["type"]=7, + ["parameter"]={ + 1, + 6000 }, - ["obj"]=3, + ["skill_position"]=1, ["icon"]="139" }, [1400105]={ @@ -1205,6 +1198,136 @@ local skill_rogue = { ["obj"]=3, ["icon"]="142" }, + [1400200]={ + ["limit_times"]=1, + ["weight"]=100000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=1, + ["icon"]="186" + }, + [1400201]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=12, + ["skill_position"]=1, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=1400221, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=3, + ["icon"]="136" + }, + [1400202]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=12, + ["skill_position"]=1, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=1400222, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=3, + ["icon"]="137" + }, + [1400203]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=1, + ["parameter"]={ + 1400223 + }, + ["skill_position"]=1, + ["icon"]="138" + }, + [1400204]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=9, + ["skill_position"]=1, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=1400224, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=3, + ["icon"]="139" + }, + [1400205]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=12, + ["skill_position"]=1, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=1400225, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=3, + ["icon"]="140" + }, + [1400206]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=9, + ["skill_position"]=1, + ["effect"]={ + { + ["type"]="atkp_red_add", + ["num"]=1500, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=3, + ["icon"]="141" + }, + [1400207]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=15, + ["parameter"]={ + 6 + }, + ["skill_position"]=1, + ["effect"]={ + { + ["type"]="skill_fire_times", + ["num"]=1400220, + ["ratio"]=10000, + ["round"]=1 + }, + { + ["type"]="skill_fire_times", + ["num"]=1400223, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=3, + ["icon"]="142" + }, [2200100]={ ["limit_times"]=1, ["weight"]=100000, @@ -1737,6 +1860,132 @@ local skill_rogue = { ["obj"]=4, ["icon"]="149" }, + [2400200]={ + ["limit_times"]=1, + ["weight"]=100000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=2, + ["icon"]="187" + }, + [2400201]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=2, + ["skill_position"]=2, + ["boardrange"]={ + { + ["type"]=0, + ["range"]=4 + } + }, + ["icon"]="143" + }, + [2400202]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=12, + ["skill_position"]=2, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=2400221, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=4, + ["icon"]="144" + }, + [2400203]={ + ["unlock"]=2400201, + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=2, + ["skill_position"]=2, + ["boardrange"]={ + { + ["type"]=0, + ["range"]=2 + } + }, + ["icon"]="145" + }, + [2400204]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=12, + ["skill_position"]=2, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=2400222, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=4, + ["icon"]="146" + }, + [2400205]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=12, + ["skill_position"]=2, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=2400223, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=4, + ["icon"]="147" + }, + [2400206]={ + ["unlock"]=2400204, + ["cover_unlock"]=2400206, + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=12, + ["skill_position"]=2, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=2400224, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=4, + ["icon"]="148" + }, + [2400207]={ + ["unlock"]=2400205, + ["cover_unlock"]=2400205, + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=12, + ["skill_position"]=2, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=2400225, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=4, + ["icon"]="149" + }, [3200100]={ ["limit_times"]=1, ["weight"]=100000, @@ -2229,6 +2478,83 @@ local skill_rogue = { ["obj"]=5, ["icon"]="156" }, + [3400200]={ + ["limit_times"]=1, + ["weight"]=100000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=3, + ["icon"]="188" + }, + [3400201]={ + ["limit_times"]=1, + ["weight"]=3000, + ["type"]=1, + ["icon"]="150" + }, + [3400202]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=3, + ["skill_position"]=3, + ["effect"]={ + { + ["type"]="atkp", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["icon"]="151" + }, + [3400203]={ + ["limit_times"]=1, + ["weight"]=3000, + ["type"]=8, + ["icon"]="152" + }, + [3400204]={ + ["limit_times"]=1, + ["weight"]=3000, + ["type"]=7, + ["icon"]="153" + }, + [3400205]={ + ["limit_times"]=1, + ["weight"]=3000, + ["type"]=12, + ["obj"]=5, + ["icon"]="154" + }, + [3400206]={ + ["unlock"]=3400201, + ["limit_times"]=1, + ["weight"]=3000, + ["type"]=2, + ["skill_position"]=3, + ["boardrange"]={ + { + ["type"]=3, + ["range"]=2 + }, + { + ["type"]=4, + ["range"]=2 + } + }, + ["icon"]="155" + }, + [3400207]={ + ["unlock"]=3400205, + ["cover_unlock"]=3400205, + ["limit_times"]=1, + ["weight"]=3000, + ["type"]=12, + ["obj"]=5, + ["icon"]="156" + }, [4200100]={ ["limit_times"]=1, ["weight"]=100000, @@ -2659,14 +2985,14 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, - ["type"]=12, + ["type"]=9, ["skill_position"]=4, ["effect"]={ { ["type"]="add_skill", ["num"]=4400122, ["ratio"]=10000, - ["round"]=1 + ["round"]=999 } }, ["obj"]=6, @@ -2695,14 +3021,14 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, - ["type"]=12, + ["type"]=9, ["skill_position"]=4, ["effect"]={ { ["type"]="add_skill", ["num"]=4400123, ["ratio"]=10000, - ["round"]=1 + ["round"]=999 } }, ["obj"]=6, @@ -3003,23 +3329,6 @@ local skill_rogue = { ["icon"]="131" }, [5300204]={ - ["limit_times"]=1, - ["weight"]=3000, - ["qlt"]=3, - ["type"]=9, - ["skill_position"]=5, - ["effect"]={ - { - ["type"]="atkp_purple_add", - ["num"]=1500, - ["ratio"]=10000, - ["round"]=999 - } - }, - ["obj"]=7, - ["icon"]="132" - }, - [5300205]={ ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -3036,6 +3345,23 @@ local skill_rogue = { ["obj"]=7, ["icon"]="133" }, + [5300205]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=9, + ["skill_position"]=5, + ["effect"]={ + { + ["type"]="atkp_purple_add", + ["num"]=1500, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=7, + ["icon"]="132" + }, [5300206]={ ["unlock"]=5300202, ["cover_unlock"]=5300202, @@ -3192,6 +3518,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=204 +data=skill_rogue,count=228 } return config \ No newline at end of file diff --git a/lua/app/module/battle/battle_manager.lua b/lua/app/module/battle/battle_manager.lua index 080c39c3..cd2ea012 100644 --- a/lua/app/module/battle/battle_manager.lua +++ b/lua/app/module/battle/battle_manager.lua @@ -9,6 +9,8 @@ local BATTLE_CONTROLLER_BASE = "app/module/battle/controller/battle_controller" local BATTLE_CONTROLLER = { [BattleConst.BATTLE_TYPE.STAGE] = "app/module/battle/controller/battle_controller_stage", [BattleConst.BATTLE_TYPE.DAILY_CHALLENGE] = "app/module/battle/controller/battle_controller_daily_challenge", + [BattleConst.BATTLE_TYPE.DUNGEON_GOLD] = "app/module/battle/controller/battle_controller_dungeon_gold", + [BattleConst.BATTLE_TYPE.DUNGEON_SHARDS] = "app/module/battle/controller/battle_controller_dungeon_shards", } function BattleManager:showPauseUI(battleType) diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index a80e0eb5..1686077b 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -19,24 +19,80 @@ local BUFF_NAME_TO_ATTR = BattleConst.BUFF_NAME_TO_ATTR local GRID_BREAK_CONDITION = BattleConst.GRID_BREAK_CONDITION -- *************各个子模块的战斗需要重写的方法 START************* +function BattleController:getBoardConfig() + return {} +end + +function BattleController:getChapterConfig() + return {} +end + function BattleController:getChapterId() return 0 end function BattleController:getInitBoard() - return {} + if not self.boradList then + self.boradList = {} + self.fixedRandomGrid = {} + self.mysteryBoxIndexMap = {} + + local config = self:getChapterConfig()[self.chapterId] + local boardCfg = self:getBoardConfig() + for _, boardId in ipairs(config.board) do + local cfg = boardCfg[boardId] + if cfg then + table.insert(self.boradList, {board = GFunc.getTable(cfg.board), mysteryBoard = GFunc.getTable(cfg.mystery_box_board)}) + table.insert(self.fixedRandomGrid, GFunc.getTable(cfg.control_element)) + end + end + + if config.mystery_box and config.mystery_box_reward then + for i, index in ipairs(config.mystery_box) do + if not DataManager.ChapterData:getChapterMysteryBoxIsGot(self.chapterId, i) then + self.mysteryBoxIndexMap[index] = config.mystery_box_reward[i] + end + end + end + end + + return self.boradList, self.fixedRandomGrid, self.mysteryBoxIndexMap end function BattleController:getNotInvolvedSkills() - return {} + if not self.notInvolvedSkills then + self.notInvolvedSkills = {} + local config = self:getchapterConfig()[self.chapterId] + if config.not_involved_skill then + for _, skillId in ipairs(config.not_involved_skill) do + self.notInvolvedSkills[skillId] = true + end + end + end + + return self.notInvolvedSkills end function BattleController:getFixedRogueSkill() - return {} + if not self.fixedRogueSkill then + self.fixedRogueSkill = {} + end + + return self.fixedRogueSkill end function BattleController:getSealElementType() - return {} + if not self.sealElementType then + self.sealElementType = {} + local config = self:getchapterConfig()[self.chapterId] + if config.seal_element then + for _, elementType in ipairs(config.seal_element) do + self.sealElementType[elementType] = true + end + end + end + + return self.sealElementType end function BattleController:getBuffs() @@ -112,7 +168,11 @@ end -- 一共有多少波 function BattleController:getMaxWave() - return 1 + local config = self:getChapterConfig()[self.chapterId] + if not config or not config.monster then + return 0 + end + return #config.monster end function BattleController:getMinEliminationCount() @@ -123,11 +183,82 @@ function BattleController:getMinEliminationCount() end function BattleController:initDefUnits(callback) - callback() + local config = self:getChapterConfig()[self.chapterId] + self.battleUI:loadBg(config.scene) + local unitEntity = DataManager.BattleData:addMonster(config.monster[1]) + local modelId = unitEntity:getModelId() + BattleHelper:loadBattleHeroModel(modelId, self.battleUI:getBattleNode(), function(spineObject) + local monsterComp = spineObject:addLuaComponent(GConst.BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT) + monsterComp:initWithEntity(modelId, unitEntity, self) + self.defTeam:addUnit(monsterComp, true) + self.battleUI:refreshDefHp(unitEntity:getHp(), unitEntity:getHpPercent()) + callback() + end) +end + +function BattleController:generateNextMonster() + local config = self:getchapterConfig()[self.chapterId] + local monsterId = config.monster[self.waveIndex + 1] + if monsterId == nil then + return self:enterNextWave() + end + local isBoss = self.defTeam:getIsBoss() + local unitEntity = DataManager.BattleData:addMonster(monsterId, true) + local modelId = unitEntity:getModelId() + BattleHelper:loadBattleHeroModel(modelId, self.battleUI:getBattleNode(), function(spineObject) + self.defTeam:removeAllUnits() + local monsterComp = spineObject:addLuaComponent(GConst.BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT) + monsterComp:initWithEntity(modelId, unitEntity, self) + self.defTeam:addUnit(monsterComp, true) + self:handleBuffs(GConst.BattleConst.SIDE_DEF) + self.battleUI:refreshDefHp(unitEntity:getHp(), unitEntity:getHpPercent()) + local bornTime = monsterComp:getAnimationDuration(GConst.BattleConst.SPINE_ANIMATION_NAME.BORN) + if isBoss then -- 如果是boss就跑过去 + local count = 0 + local function onFinish() + count = count + 1 + if count == 2 then + self.atkTeam:stopRunAction() + self:onRoundEnd(true) + end + end + self.atkTeam:playRunAction() + self.atkTeam:recoverHpOnWaveOver(onFinish) + + isBoss = self.defTeam:getIsBoss() + if isBoss then + local monsterInfo = ConfigManager:getConfig("monster")[monsterId] + self.battleUI:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() + monsterComp:playEnterBattlefield(true, onFinish) + end) + else + monsterComp:playEnterBattlefield(true, onFinish) + end + else + local count = 0 + local function onFinish() + count = count + 1 + if count == 2 then + self:onRoundEnd(true) + end + end + self.atkTeam:recoverHpOnWaveOver(onFinish) + + isBoss = self.defTeam:getIsBoss() + if isBoss then + local monsterInfo = ConfigManager:getConfig("monster")[monsterId] + self.battleUI:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() + monsterComp:playEnterBattlefield(false, onFinish) + end) + else + monsterComp:playEnterBattlefield(false, onFinish) + end + end + end) end function BattleController:findNextDefUnit() - self:enterRoundEnd() + self:generateNextMonster() end function BattleController:onDefDead(callback) @@ -239,11 +370,19 @@ end ---- 障碍格子图片 function BattleController:getBlockIcon() - return "battle_hinder_4" + local chapterInfo = self:getChapterConfig()[self.chapterId] + if not chapterInfo then + return "battle_hinder_4" + end + return chapterInfo.block_icon end function BattleController:getChessBoardBgName() - return "chessboard_1" + local chapterInfo = self:getChapterConfig()[self.chapterId] + if not chapterInfo then + return "chessboard_1" + end + return chapterInfo.chess_board end -- *************各个子模块的战斗需要重写的方法 END************* diff --git a/lua/app/module/battle/controller/battle_controller_daily_challenge.lua b/lua/app/module/battle/controller/battle_controller_daily_challenge.lua index c0051ace..7427b8ed 100644 --- a/lua/app/module/battle/controller/battle_controller_daily_challenge.lua +++ b/lua/app/module/battle/controller/battle_controller_daily_challenge.lua @@ -1,28 +1,20 @@ local BattleHelper = require "app/module/battle/helper/battle_helper" local BattleController = require "app/module/battle/controller/battle_controller" local BattleControllerDailyChallenge = class("BattleControllerDailyChallenge", BattleController) -local CHAPTER_CFG = ConfigManager:getConfig("chapter_daily_challenge") local BattleBuffEntity = require "app/userdata/battle/skill/battle_buff_entity" +function BattleControllerDailyChallenge:getBoardConfig() + return ConfigManager:getConfig("chapter_board_daily_challenge") +end + +function BattleControllerDailyChallenge:getChapterConfig() + return ConfigManager:getConfig("chapter_daily_challenge") +end + function BattleControllerDailyChallenge:getChapterId() return DataManager.DailyChallengeData:getChapterDailyId() end -function BattleControllerDailyChallenge:getMaxWave() - if CHAPTER_CFG[self.chapterId] then - return #CHAPTER_CFG[self.chapterId].monster - end - return 0 -end - -function BattleControllerDailyChallenge:getChessBoardBgName() - local chapterInfo = CHAPTER_CFG[self.chapterId] - if not chapterInfo then - return "chessboard_1" - end - return chapterInfo.chess_board -end - function BattleControllerDailyChallenge:getBuffs() if not self.initBuffs then self.initBuffs = {} @@ -50,8 +42,8 @@ function BattleControllerDailyChallenge:onLoadComplete(...) end function BattleControllerDailyChallenge:initOther() - local ChapterId = DataManager.DailyChallengeData:getFixedChapterId() - local cfg = ConfigManager:getConfig("chapter")[ChapterId] + local chapterId = DataManager.DailyChallengeData:getFixedChapterId() + local cfg = ConfigManager:getConfig("chapter")[chapterId] self.monsterAtkAddition = 0 self.monsterHpAddition = 0 if cfg and cfg.daily_challenge_difficulty then @@ -70,89 +62,14 @@ function BattleControllerDailyChallenge:getMonsterHpAddition() return self.monsterHpAddition end -function BattleControllerDailyChallenge:initDefUnits(callback) - local config = CHAPTER_CFG[self.chapterId] - self.battleUI:loadBg(config.scene) - local unitEntity = DataManager.BattleData:addMonster(config.monster[1], nil, self) - local modelId = unitEntity:getModelId() - BattleHelper:loadBattleHeroModel(modelId, self.battleUI:getBattleNode(), function(spineObject) - local monsterComp = spineObject:addLuaComponent(GConst.BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT) - monsterComp:initWithEntity(modelId, unitEntity, self) - self.defTeam:addUnit(monsterComp, true) - self.battleUI:refreshDefHp(unitEntity:getHp(), unitEntity:getHpPercent()) - callback() - end) -end - -function BattleControllerDailyChallenge:_stageGenerateNextMonster() - local config = CHAPTER_CFG[self.chapterId] - local monsterId = config.monster[self.waveIndex + 1] - if monsterId == nil then - return self:enterNextWave() - end - local isBoss = self.defTeam:getIsBoss() - local unitEntity = DataManager.BattleData:addMonster(monsterId, true, self) - local modelId = unitEntity:getModelId() - BattleHelper:loadBattleHeroModel(modelId, self.battleUI:getBattleNode(), function(spineObject) - self.defTeam:removeAllUnits() - local monsterComp = spineObject:addLuaComponent(GConst.BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT) - monsterComp:initWithEntity(modelId, unitEntity, self) - self.defTeam:addUnit(monsterComp, true) - self:handleBuffs(GConst.BattleConst.SIDE_DEF) - self.battleUI:refreshDefHp(unitEntity:getHp(), unitEntity:getHpPercent()) - local bornTime = monsterComp:getAnimationDuration(GConst.BattleConst.SPINE_ANIMATION_NAME.BORN) - if isBoss then -- 如果是boss就跑过去 - local count = 0 - local function onFinish() - count = count + 1 - if count == 2 then - self.atkTeam:stopRunAction() - self:onRoundEnd(true) - end - end - self.atkTeam:playRunAction() - self.atkTeam:recoverHpOnWaveOver(onFinish) - - isBoss = self.defTeam:getIsBoss() - if isBoss then - local monsterInfo = ConfigManager:getConfig("monster")[monsterId] - self.battleUI:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() - monsterComp:playEnterBattlefield(true, onFinish) - end) - else - monsterComp:playEnterBattlefield(true, onFinish) - end - else - local count = 0 - local function onFinish() - count = count + 1 - if count == 2 then - self:onRoundEnd(true) - end - end - self.atkTeam:recoverHpOnWaveOver(onFinish) - - isBoss = self.defTeam:getIsBoss() - if isBoss then - local monsterInfo = ConfigManager:getConfig("monster")[monsterId] - self.battleUI:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() - monsterComp:playEnterBattlefield(false, onFinish) - end) - else - monsterComp:playEnterBattlefield(false, onFinish) - end - end - end) -end - function BattleControllerDailyChallenge:getInitBoard() if not self.boradList then self.boradList = {} self.fixedRandomGrid = {} self.mysteryBoxIndexMap = {} - local config = CHAPTER_CFG[self.chapterId] - local boardCfg = ConfigManager:getConfig("chapter_board_daily_challenge") + local config = self:getChapterConfig()[self.chapterId] + local boardCfg = self:getBoardConfig() for _, boardId in ipairs(config.chapter_board_daily_challenge) do local cfg = boardCfg[boardId] if cfg then @@ -164,51 +81,6 @@ function BattleControllerDailyChallenge:getInitBoard() return self.boradList, self.fixedRandomGrid, self.mysteryBoxIndexMap end -function BattleControllerDailyChallenge:getSealElementType() - if not self.sealElementType then - self.sealElementType = {} - local config = CHAPTER_CFG[self.chapterId] - if config.seal_element then - for _, elementType in ipairs(config.seal_element) do - self.sealElementType[elementType] = true - end - end - end - - return self.sealElementType -end - -function BattleControllerDailyChallenge:getNotInvolvedSkills() - if not self.notInvolvedSkills then - self.notInvolvedSkills = {} - local config = CHAPTER_CFG[self.chapterId] - if config.not_involved_skill then - for _, skillId in ipairs(config.not_involved_skill) do - self.notInvolvedSkills[skillId] = true - end - end - end - - return self.notInvolvedSkills -end - -function BattleControllerDailyChallenge:getFixedRogueSkill() - if not self.fixedRogueSkill then - local config = CHAPTER_CFG[self.chapterId] - if config.involved_skill then - self.fixedRogueSkill = GFunc.getTable(config.involved_skill) - else - self.fixedRogueSkill = {} - end - end - - return self.fixedRogueSkill -end - -function BattleControllerDailyChallenge:findNextDefUnit() - self:_stageGenerateNextMonster() -end - function BattleControllerDailyChallenge:controllBattleEnd() self.combatReport = { battleType = GConst.BattleConst.BATTLE_TYPE.DAILY_CHALLENGE, diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua new file mode 100644 index 00000000..26153854 --- /dev/null +++ b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua @@ -0,0 +1,73 @@ +local BattleController = require "app/module/battle/controller/battle_controller" +local BattleControllerDungeonGold = class("BattleControllerDungeonGold", BattleController) + +function BattleControllerDungeonGold:getBoardConfig() + return ConfigManager:getConfig("chapter_board_dungeon_gold") +end + +function BattleControllerDungeonGold:getChapterConfig() + return ConfigManager:getConfig("chapter_dungeon_gold") +end + +function BattleControllerDungeonGold:getChapterId() + return 1 -- Todo +end + +function BattleControllerDungeonGold:controllBattleEnd() + self.combatReport = { + battleType = GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD, + wave = self.waveIndex, + victory = self.victory, + } + local atkReport = {} + local teamEntity = DataManager.BattleData:getAtkTeam() + local members = teamEntity:getAllMembers() + for k, v in pairs(members) do + local report = { + heroId = v:getId(), + dmg = v:getDamageCount(), + } + table.insert(atkReport, report) + end + self.combatReport.atkReport = atkReport + if not self.victory then + self.combatReport.wave = self.combatReport.wave - 1 + end + -- ModuleManager.ChapterManager:endFight(self.chapterId, self.combatReport, self.gotMysteryBoxIndexs, self.taskProgress) +end + +function BattleControllerDungeonGold:postWaveOver(atkDead, isQuit) + -- local deathType = BIReport.FIGHT_DEATH_TYPE.SURVIVE + -- local waveEndType = BIReport.FIGHT_WAVE_END_TYPE.WIN + -- if atkDead then + -- if self.isBossWave then + -- deathType = BIReport.FIGHT_DEATH_TYPE.BOSS_FAIL + -- else + -- deathType = BIReport.FIGHT_DEATH_TYPE.NORMAL_FAIL + -- end + -- waveEndType = BIReport.FIGHT_WAVE_END_TYPE.FAIL + -- end + + -- if isQuit then + -- waveEndType = BIReport.FIGHT_WAVE_END_TYPE.QUIT + -- end + + -- local duration = self.waveDurationTime + -- local totalTime = self.totalDurationTime + -- local startTimes = DataManager.ChapterData:getChapterFightCount(self.chapterId) + -- local isFirstWin = false + -- if not DataManager.ChapterData:getChapterPassed(self.chapterId) and self.victory then + -- isFirstWin = true + -- end + + -- local isFianlStep = self.waveIndex >= self.maxWaveIndex + + -- BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.STAGE, self.chapterId, self.waveIndex, duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) +end + +function BattleControllerDungeonGold:postFightStart() + -- local unlockMaxChapter = DataManager.ChapterData:getNewChapterId() + -- BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.STAGE, self.waveIndex, self.chapterId, unlockMaxChapter, DataManager.ChapterData:getChapterFightCount(self.chapterId)) +end + +return BattleControllerDungeonGold \ No newline at end of file diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua.meta b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua.meta new file mode 100644 index 00000000..17c51a60 --- /dev/null +++ b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f918b2e0ce7132d4bb9f23da30447f0d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/battle/controller/battle_controller_stage.lua b/lua/app/module/battle/controller/battle_controller_stage.lua index f0f21360..fb4a15b2 100644 --- a/lua/app/module/battle/controller/battle_controller_stage.lua +++ b/lua/app/module/battle/controller/battle_controller_stage.lua @@ -3,166 +3,18 @@ local BattleHelper = require "app/module/battle/helper/battle_helper" local BattleController = require "app/module/battle/controller/battle_controller" local BattleControllerStage = class("BattleControllerStage", BattleController) +function BattleControllerStage:getBoardConfig() + return ConfigManager:getConfig("chapter_board") +end + +function BattleControllerStage:getChapterConfig() + return ConfigManager:getConfig("chapter") +end + function BattleControllerStage:getChapterId() return DataManager.ChapterData:getChapterId() end -function BattleControllerStage:getMaxWave() - return DataManager.ChapterData:getChapterCfgMaxWave(self.chapterId) -end - -function BattleControllerStage:getBlockIcon() - local chapterInfo = ConfigManager:getConfig("chapter")[self.chapterId] - if not chapterInfo then - return "battle_hinder_4" - end - return chapterInfo.block_icon -end - -function BattleControllerStage:getChessBoardBgName() - local chapterInfo = ConfigManager:getConfig("chapter")[self.chapterId] - if not chapterInfo then - return "chessboard_1" - end - return chapterInfo.chess_board -end - - -function BattleControllerStage:initOther() - -end - -function BattleControllerStage:initDefUnits(callback) - local config = ConfigManager:getConfig("chapter")[self.chapterId] - self.battleUI:loadBg(config.scene) - local unitEntity = DataManager.BattleData:addMonster(config.monster[1]) - local modelId = unitEntity:getModelId() - BattleHelper:loadBattleHeroModel(modelId, self.battleUI:getBattleNode(), function(spineObject) - local monsterComp = spineObject:addLuaComponent(GConst.BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT) - monsterComp:initWithEntity(modelId, unitEntity, self) - self.defTeam:addUnit(monsterComp, true) - self.battleUI:refreshDefHp(unitEntity:getHp(), unitEntity:getHpPercent()) - callback() - end) -end - -function BattleControllerStage:_stageGenerateNextMonster() - local config = ConfigManager:getConfig("chapter")[self.chapterId] - local monsterId = config.monster[self.waveIndex + 1] - if monsterId == nil then - return self:enterNextWave() - end - local isBoss = self.defTeam:getIsBoss() - local unitEntity = DataManager.BattleData:addMonster(monsterId, true) - local modelId = unitEntity:getModelId() - BattleHelper:loadBattleHeroModel(modelId, self.battleUI:getBattleNode(), function(spineObject) - self.defTeam:removeAllUnits() - local monsterComp = spineObject:addLuaComponent(GConst.BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT) - monsterComp:initWithEntity(modelId, unitEntity, self) - self.defTeam:addUnit(monsterComp, true) - self:handleBuffs(GConst.BattleConst.SIDE_DEF) - self.battleUI:refreshDefHp(unitEntity:getHp(), unitEntity:getHpPercent()) - local bornTime = monsterComp:getAnimationDuration(GConst.BattleConst.SPINE_ANIMATION_NAME.BORN) - if isBoss then -- 如果是boss就跑过去 - local count = 0 - local function onFinish() - count = count + 1 - if count == 2 then - self.atkTeam:stopRunAction() - self:onRoundEnd(true) - end - end - self.atkTeam:playRunAction() - self.atkTeam:recoverHpOnWaveOver(onFinish) - - isBoss = self.defTeam:getIsBoss() - if isBoss then - local monsterInfo = ConfigManager:getConfig("monster")[monsterId] - self.battleUI:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() - monsterComp:playEnterBattlefield(true, onFinish) - end) - else - monsterComp:playEnterBattlefield(true, onFinish) - end - else - local count = 0 - local function onFinish() - count = count + 1 - if count == 2 then - self:onRoundEnd(true) - end - end - self.atkTeam:recoverHpOnWaveOver(onFinish) - - isBoss = self.defTeam:getIsBoss() - if isBoss then - local monsterInfo = ConfigManager:getConfig("monster")[monsterId] - self.battleUI:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() - monsterComp:playEnterBattlefield(false, onFinish) - end) - else - monsterComp:playEnterBattlefield(false, onFinish) - end - end - end) -end - -function BattleControllerStage:getInitBoard() - if not self.boradList then - self.boradList = {} - self.fixedRandomGrid = {} - self.mysteryBoxIndexMap = {} - - local config = ConfigManager:getConfig("chapter")[self.chapterId] - local boardCfg = ConfigManager:getConfig("chapter_board") - for _, boardId in ipairs(config.board) do - local cfg = boardCfg[boardId] - if cfg then - table.insert(self.boradList, {board = GFunc.getTable(cfg.board), mysteryBoard = GFunc.getTable(cfg.mystery_box_board)}) - table.insert(self.fixedRandomGrid, GFunc.getTable(cfg.control_element)) - end - end - - if config.mystery_box and config.mystery_box_reward then - for i, index in ipairs(config.mystery_box) do - if not DataManager.ChapterData:getChapterMysteryBoxIsGot(self.chapterId, i) then - self.mysteryBoxIndexMap[index] = config.mystery_box_reward[i] - end - end - end - end - - return self.boradList, self.fixedRandomGrid, self.mysteryBoxIndexMap -end - -function BattleControllerStage:getSealElementType() - if not self.sealElementType then - self.sealElementType = {} - local config = ConfigManager:getConfig("chapter")[self.chapterId] - if config.seal_element then - for _, elementType in ipairs(config.seal_element) do - self.sealElementType[elementType] = true - end - end - end - - return self.sealElementType -end - -function BattleControllerStage:getNotInvolvedSkills() - if not self.notInvolvedSkills then - self.notInvolvedSkills = {} - local config = ConfigManager:getConfig("chapter")[self.chapterId] - if config.not_involved_skill then - for _, skillId in ipairs(config.not_involved_skill) do - self.notInvolvedSkills[skillId] = true - end - end - end - - return self.notInvolvedSkills -end - function BattleControllerStage:getFixedRogueSkill() if not self.fixedRogueSkill then local config = ConfigManager:getConfig("chapter")[self.chapterId] @@ -176,10 +28,6 @@ function BattleControllerStage:getFixedRogueSkill() return self.fixedRogueSkill end -function BattleControllerStage:findNextDefUnit() - self:_stageGenerateNextMonster() -end - function BattleControllerStage:controllBattleEnd() self.combatReport = { battleType = GConst.BattleConst.BATTLE_TYPE.STAGE, diff --git a/lua/app/module/dungeon/dungeon_manager.lua b/lua/app/module/dungeon/dungeon_manager.lua index 42357dc9..0864dd12 100644 --- a/lua/app/module/dungeon/dungeon_manager.lua +++ b/lua/app/module/dungeon/dungeon_manager.lua @@ -30,6 +30,7 @@ end -- 响应挑战副本 function DungeonManager:respChallengeGold(result) if result.err_code == GConst.ERROR_STR.SUCCESS then + ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD) end end diff --git a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua index 1bd7422f..8950cbb7 100644 --- a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua +++ b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua @@ -58,6 +58,7 @@ function DungeonDifficultyUI:onLoadRootComplete() end) self.btnStart:addClickListener(function() -- 开始挑战 + ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD) end) self.btnSweep:addClickListener(function() -- 开始扫荡