From e4dad61f521b5d382b7efde962f3a9c3464e2cd4 Mon Sep 17 00:00:00 2001 From: Fang Date: Thu, 8 Jun 2023 18:36:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=89=AF=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/bi_report.lua | 6 + lua/app/common/data_manager.lua | 4 + lua/app/common/event_manager.lua | 3 +- lua/app/common/module_manager.lua | 4 + lua/app/common/time.lua | 18 + lua/app/config/chapter_board_dungeon_gold.lua | 60 +- .../config/chapter_board_dungeon_shards.lua | 300 +- lua/app/config/chapter_dungeon_gold.lua | 270 +- lua/app/config/chapter_dungeon_shards.lua | 60 +- lua/app/config/hero.lua | 287 +- lua/app/config/item.lua | 29 +- .../localization_global_const.lua | 1 + lua/app/config/monster_dungeon_gold.lua | 186 + lua/app/config/monster_dungeon_gold.lua.meta | 10 + lua/app/config/skill.lua | 3771 ++++++++++++++--- lua/app/config/skill_rogue.lua | 676 ++- lua/app/config/strings/cn/global.lua | 1 + lua/app/config/strings/cn/hero.lua | 17 +- lua/app/config/strings/cn/item.lua | 22 +- lua/app/config/strings/cn/skill.lua | 17 +- lua/app/config/strings/cn/skill_rogue.lua | 124 +- lua/app/config/strings/de/hero.lua | 17 +- lua/app/config/strings/de/item.lua | 17 +- lua/app/config/strings/de/skill.lua | 17 +- lua/app/config/strings/de/skill_rogue.lua | 122 +- lua/app/config/strings/en/global.lua | 1 + lua/app/config/strings/en/hero.lua | 17 +- lua/app/config/strings/en/item.lua | 17 +- lua/app/config/strings/en/skill.lua | 17 +- lua/app/config/strings/en/skill_rogue.lua | 122 +- lua/app/config/strings/fr/hero.lua | 17 +- lua/app/config/strings/fr/item.lua | 17 +- lua/app/config/strings/fr/skill.lua | 17 +- lua/app/config/strings/fr/skill_rogue.lua | 122 +- lua/app/config/strings/id/hero.lua | 17 +- lua/app/config/strings/id/item.lua | 17 +- lua/app/config/strings/id/skill.lua | 17 +- lua/app/config/strings/id/skill_rogue.lua | 122 +- lua/app/config/strings/ja/hero.lua | 17 +- lua/app/config/strings/ja/item.lua | 17 +- lua/app/config/strings/ja/skill.lua | 17 +- lua/app/config/strings/ja/skill_rogue.lua | 122 +- lua/app/config/strings/ko/hero.lua | 17 +- lua/app/config/strings/ko/item.lua | 17 +- lua/app/config/strings/ko/skill.lua | 17 +- lua/app/config/strings/ko/skill_rogue.lua | 122 +- lua/app/config/strings/pt/hero.lua | 17 +- lua/app/config/strings/pt/item.lua | 17 +- lua/app/config/strings/pt/skill.lua | 17 +- lua/app/config/strings/pt/skill_rogue.lua | 122 +- lua/app/config/strings/ru/hero.lua | 17 +- lua/app/config/strings/ru/item.lua | 17 +- lua/app/config/strings/ru/skill.lua | 17 +- lua/app/config/strings/ru/skill_rogue.lua | 122 +- lua/app/config/strings/th/hero.lua | 17 +- lua/app/config/strings/th/item.lua | 17 +- lua/app/config/strings/th/skill.lua | 17 +- lua/app/config/strings/th/skill_rogue.lua | 122 +- lua/app/config/strings/vi/hero.lua | 17 +- lua/app/config/strings/vi/item.lua | 17 +- lua/app/config/strings/vi/skill.lua | 17 +- lua/app/config/strings/vi/skill_rogue.lua | 122 +- lua/app/config/strings/zh/global.lua | 1 + lua/app/config/strings/zh/hero.lua | 17 +- lua/app/config/strings/zh/item.lua | 17 +- lua/app/config/strings/zh/skill.lua | 17 +- lua/app/config/strings/zh/skill_rogue.lua | 122 +- lua/app/global/global_func.lua | 9 - lua/app/module/battle/battle_const.lua | 2 + lua/app/module/dungeon.meta | 8 + lua/app/module/dungeon/dungeon_manager.lua | 206 + .../module/dungeon/dungeon_manager.lua.meta | 10 + lua/app/module/maincity/maincity_const.lua | 1 + lua/app/proto/proto_msg_type.lua | 42 + lua/app/ui/dungeon.meta | 8 + lua/app/ui/dungeon/dungeon_board_cell.lua | 100 + .../ui/dungeon/dungeon_board_cell.lua.meta | 10 + lua/app/ui/dungeon/dungeon_difficulty_ui.lua | 116 + .../ui/dungeon/dungeon_difficulty_ui.lua.meta | 10 + .../ui/main_city/component/chapter_comp.lua | 4 +- .../component/daily_challenge_comp.lua | 4 +- .../ui/main_city/component/dungeon_comp.lua | 49 + .../main_city/component/dungeon_comp.lua.meta | 10 + lua/app/ui/main_city/component/main_comp.lua | 59 +- .../component/main_comp_base_cell.lua | 2 +- lua/app/ui/main_city/main_city_ui.lua | 54 +- .../daily_challenge/daily_challenge_data.lua | 9 - lua/app/userdata/dungeon.meta | 8 + lua/app/userdata/dungeon/dungeon_data.lua | 297 ++ .../userdata/dungeon/dungeon_data.lua.meta | 10 + .../dungeon/dungeon_data_base_comp.lua | 92 + .../dungeon/dungeon_data_base_comp.lua.meta | 10 + .../dungeon/dungeon_gold_data_comp.lua | 67 + .../dungeon/dungeon_gold_data_comp.lua.meta | 10 + .../dungeon/dungeon_shards_data_comp.lua | 77 + .../dungeon/dungeon_shards_data_comp.lua.meta | 10 + 96 files changed, 8072 insertions(+), 993 deletions(-) create mode 100644 lua/app/config/monster_dungeon_gold.lua create mode 100644 lua/app/config/monster_dungeon_gold.lua.meta create mode 100644 lua/app/module/dungeon.meta create mode 100644 lua/app/module/dungeon/dungeon_manager.lua create mode 100644 lua/app/module/dungeon/dungeon_manager.lua.meta create mode 100644 lua/app/ui/dungeon.meta create mode 100644 lua/app/ui/dungeon/dungeon_board_cell.lua create mode 100644 lua/app/ui/dungeon/dungeon_board_cell.lua.meta create mode 100644 lua/app/ui/dungeon/dungeon_difficulty_ui.lua create mode 100644 lua/app/ui/dungeon/dungeon_difficulty_ui.lua.meta create mode 100644 lua/app/ui/main_city/component/dungeon_comp.lua create mode 100644 lua/app/ui/main_city/component/dungeon_comp.lua.meta create mode 100644 lua/app/userdata/dungeon.meta create mode 100644 lua/app/userdata/dungeon/dungeon_data.lua create mode 100644 lua/app/userdata/dungeon/dungeon_data.lua.meta create mode 100644 lua/app/userdata/dungeon/dungeon_data_base_comp.lua create mode 100644 lua/app/userdata/dungeon/dungeon_data_base_comp.lua.meta create mode 100644 lua/app/userdata/dungeon/dungeon_gold_data_comp.lua create mode 100644 lua/app/userdata/dungeon/dungeon_gold_data_comp.lua.meta create mode 100644 lua/app/userdata/dungeon/dungeon_shards_data_comp.lua create mode 100644 lua/app/userdata/dungeon/dungeon_shards_data_comp.lua.meta diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index 8536f33d..8d9a2e81 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -96,6 +96,12 @@ BIReport.ITEM_GET_TYPE = { DAILY_CHALLENGE_END = "DailyChallengeEnd", -- 每日挑战结算 DAILY_CHALLENGE_RESET = "DailyChallengeReset", -- 每日挑战重置 DAILY_CHALLENGE_TASK_REWARD = "DailyChallengeTaskReward", -- 每日挑战任务奖励 + DUNGEON_GOLD_CHALLENGE = "DungeonGoldChallenge", -- 金币副本挑战 + DUNGEON_GOLD_END = "DungeonGoldEnd", -- 金币副本结算 + DUNGEON_GOLD_SWEEP = "DungeonGoldSweep", -- 金币副本扫荡 + DUNGEON_SHARDS_CHALLENGE = "DungeonShardsChallenge", -- 碎片副本挑战 + DUNGEON_SHARDS_END = "DungeonShardsEnd", -- 碎片副本结算 + DUNGEON_SHARDS_SWEEP = "DungeonShardsSweep", -- 碎片副本扫荡 } BIReport.ADS_CLICK_TYPE = { diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index d6a0dd4a..0d06a130 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -9,6 +9,7 @@ function DataManager:init() self:initManager("PlayerData", "app/userdata/player/player_data") self:initManager("ChapterData", "app/userdata/chapter/chapter_data") self:initManager("DailyChallengeData", "app/userdata/daily_challenge/daily_challenge_data") + self:initManager("DungeonData", "app/userdata/dungeon/dungeon_data") self:initManager("HeroData", "app/userdata/hero/hero_data") self:initManager("BagData", "app/userdata/bag/bag_data") self:initManager("BattleData", "app/userdata/battle/battle_data") @@ -85,6 +86,7 @@ function DataManager:clear() self.PlayerData:clear() self.ChapterData:clear() self.DailyChallengeData:clear() + self.DungeonData:clear() self.HeroData:clear() self.BagData:clear() self.FormationData:clear() @@ -119,6 +121,8 @@ function DataManager:initWithServerData(data) self.PlayerData:init(data) self.ChapterData:init(data.chapter) self.DailyChallengeData:init(data.chapter_daily_challenge) + self.DungeonData:initDungeonGold(data.chapter_gold_challenge) + self.DungeonData:initDungeonShards(data.chapter_shards_challenge) self.HeroData:init(data.bag.heroes) self.BagData:init(data.bag) self.FormationData:init(data.fight_info) diff --git a/lua/app/common/event_manager.lua b/lua/app/common/event_manager.lua index 12cb89c1..c4b8ff53 100644 --- a/lua/app/common/event_manager.lua +++ b/lua/app/common/event_manager.lua @@ -29,8 +29,7 @@ EventManager.CUSTOM_EVENT = { SKILL_REFRESH_SUCC = "SKILL_REFRESH_SUCC", GO_SHOP = "GO_SHOP", -- 跳转商店 UPDATE_MAIN_MALL_HEIGHT = "UPDATE_MAIN_MALL_HEIGHT", -- 更新主要商品的高度 - GO_DAILY_CHALLENGE = "GO_DAILY_CHALLENGE", -- 跳转每日挑战 - GO_CHAPTER = "GO_CHAPTER", -- 跳转主线章节 + CHANGE_MAIN_COMP_MODULE = "CHANGE_MAIN_COMP_MODULE", -- 切换主界面模块 CLOSE_BOX_HERO_UI = "CLOSE_BOX_HERO_UI", CLOSE_BOX_OPEN_UI = "CLOSE_BOX_OPEN_UI", BIND_ACCOUNT_SUCCESS = "BIND_ACCOUNT_SUCCESS", diff --git a/lua/app/common/module_manager.lua b/lua/app/common/module_manager.lua index 1329067a..0e299a5e 100644 --- a/lua/app/common/module_manager.lua +++ b/lua/app/common/module_manager.lua @@ -51,6 +51,8 @@ local MODULE_PATHS = { PlayerManager = "app/module/player/player_manager", -- 账号 AccountManager= "app/module/account/account_manager", + -- 活动副本 + DungeonManager = "app/module/dungeon/dungeon_manager", } -- 这里的key对应func_open里的id @@ -70,6 +72,8 @@ ModuleManager.MODULE_KEY = { FIRST_RECHARGE = "first_charge", -- 首充礼包 BEGINNER_GIFT = "new_player_gift", -- 新手礼包 MAIL = "mail_open", -- 邮件 + DUNGEON_SHARDS = "dungeon_shards_open", -- 碎片副本 + DUNGEON_GOLD = "dungeon_gold_open", -- 金币副本 } local _moduleMgrs = {} diff --git a/lua/app/common/time.lua b/lua/app/common/time.lua index e26e3e01..ea3a7b6e 100644 --- a/lua/app/common/time.lua +++ b/lua/app/common/time.lua @@ -137,6 +137,15 @@ function Time:getOverOfServerToday(time) return self:getBeginningOfServerToday() + SECONDS_PRE_DAY end +-- 获取今日剩余时间 +function Time:getTodaySurplusTime() + local result = self:getOverOfServerToday() - self:getServerTime() + if result < 0 then + result = 0 + end + return result +end + function Time:getBeginningOfToday() local now = os.date('*t', self:getServerTime() + self:getTimeZoneOffset()*SECONDS_PRE_HOUR) local beginDay = os.time{year = now.year, month = now.month, day = now.day, hour = 0} @@ -271,6 +280,15 @@ function Time:getDayByTimeStamp(time) return now.day end +-- 获取当前处于星期几 +function Time:getWeekByTimeStamp(time) + time = time or self:getServerTime() + local now = os.date('!*t', time) + + local weekTab = {7, 1, 2, 3, 4, 5, 6} + return weekTab[now.wday] +end + -- 转换服务器时间字符串(ISO 8601)的对应的时间戳,例如2022-09-10T18:10:00.000Z function Time:convertServerTimeStringToTimestamp(str) local dateTime = CS.System.DateTime.Parse(str) 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/hero.lua b/lua/app/config/hero.lua index df22f7a1..f0d15d64 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -233,6 +233,63 @@ local hero = { ["item_id"]=14001, ["is_show"]=1 }, + [14002]={ + ["position"]=1, + ["qlt"]=4, + ["hurt_skill"]={ + 1400210, + 1400211, + 1400212, + 1400213 + }, + ["base_skill"]=1400220, + ["rouge_skill"]=1400200, + ["rouge_skill_1"]=1400201, + ["rouge_skill_2"]=1400202, + ["rouge_skill_3"]=1400203, + ["rouge_skill_4"]=1400204, + ["rouge_skill_5"]=1400205, + ["rouge_skill_6"]=1400206, + ["rouge_skill_7"]=1400207, + ["begin_lv"]=5, + ["hp"]={ + 6000000, + 6800000, + 7600000, + 8440000, + 9320000, + 10240000, + 11240000, + 12320000, + 13520000, + 14840000, + 16280000, + 17880000, + 19680000, + 21680000, + 23960000 + }, + ["atk"]={ + 3000000, + 3400000, + 3800000, + 4220000, + 4660000, + 5120000, + 5620000, + 6160000, + 6760000, + 7420000, + 8140000, + 8940000, + 9840000, + 10840000, + 11980000 + }, + ["model_id"]="p0018", + ["icon"]="1", + ["item_id"]=14002 + }, [22001]={ ["position"]=2, ["qlt"]=2, @@ -468,6 +525,63 @@ local hero = { ["unlock_chapter"]=21, ["is_show"]=1 }, + [24002]={ + ["position"]=2, + ["qlt"]=4, + ["hurt_skill"]={ + 2400210, + 2400211, + 2400212, + 2400213 + }, + ["base_skill"]=2400220, + ["rouge_skill"]=2400200, + ["rouge_skill_1"]=2400201, + ["rouge_skill_2"]=2400202, + ["rouge_skill_3"]=2400203, + ["rouge_skill_4"]=2400204, + ["rouge_skill_5"]=2400205, + ["rouge_skill_6"]=2400206, + ["rouge_skill_7"]=2400207, + ["begin_lv"]=5, + ["hp"]={ + 6000000, + 6800000, + 7600000, + 8440000, + 9320000, + 10240000, + 11240000, + 12320000, + 13520000, + 14840000, + 16280000, + 17880000, + 19680000, + 21680000, + 23960000 + }, + ["atk"]={ + 3000000, + 3400000, + 3800000, + 4220000, + 4660000, + 5120000, + 5620000, + 6160000, + 6760000, + 7420000, + 8140000, + 8940000, + 9840000, + 10840000, + 11980000 + }, + ["model_id"]="p0017", + ["icon"]="2", + ["item_id"]=24002 + }, [32001]={ ["position"]=3, ["qlt"]=2, @@ -703,6 +817,63 @@ local hero = { ["unlock_chapter"]=2, ["is_show"]=1 }, + [34002]={ + ["position"]=3, + ["qlt"]=4, + ["hurt_skill"]={ + 3400210, + 3400211, + 3400212, + 3400213 + }, + ["base_skill"]=3400220, + ["rouge_skill"]=3400200, + ["rouge_skill_1"]=3400201, + ["rouge_skill_2"]=3400202, + ["rouge_skill_3"]=3400203, + ["rouge_skill_4"]=3400204, + ["rouge_skill_5"]=3400205, + ["rouge_skill_6"]=3400206, + ["rouge_skill_7"]=3400207, + ["begin_lv"]=5, + ["hp"]={ + 6000000, + 6800000, + 7600000, + 8440000, + 9320000, + 10240000, + 11240000, + 12320000, + 13520000, + 14840000, + 16280000, + 17880000, + 19680000, + 21680000, + 23960000 + }, + ["atk"]={ + 3000000, + 3400000, + 3800000, + 4220000, + 4660000, + 5120000, + 5620000, + 6160000, + 6760000, + 7420000, + 8140000, + 8940000, + 9840000, + 10840000, + 11980000 + }, + ["model_id"]="p0001", + ["icon"]="3", + ["item_id"]=34002 + }, [42001]={ ["position"]=4, ["qlt"]=2, @@ -938,6 +1109,63 @@ local hero = { ["unlock_chapter"]=10, ["is_show"]=1 }, + [44002]={ + ["position"]=4, + ["qlt"]=4, + ["hurt_skill"]={ + 4400210, + 4400211, + 4400212, + 4400213 + }, + ["base_skill"]=4400220, + ["rouge_skill"]=4400200, + ["rouge_skill_1"]=4400201, + ["rouge_skill_2"]=4400202, + ["rouge_skill_3"]=4400203, + ["rouge_skill_4"]=4400204, + ["rouge_skill_5"]=4400205, + ["rouge_skill_6"]=4400206, + ["rouge_skill_7"]=4400207, + ["begin_lv"]=5, + ["hp"]={ + 6000000, + 6800000, + 7600000, + 8440000, + 9320000, + 10240000, + 11240000, + 12320000, + 13520000, + 14840000, + 16280000, + 17880000, + 19680000, + 21680000, + 23960000 + }, + ["atk"]={ + 3000000, + 3400000, + 3800000, + 4220000, + 4660000, + 5120000, + 5620000, + 6160000, + 6760000, + 7420000, + 8140000, + 8940000, + 9840000, + 10840000, + 11980000 + }, + ["model_id"]="p0003", + ["icon"]="4", + ["item_id"]=44002 + }, [52001]={ ["position"]=5, ["qlt"]=2, @@ -1172,9 +1400,66 @@ local hero = { ["icon"]="20", ["item_id"]=54001, ["is_show"]=1 + }, + [54002]={ + ["position"]=5, + ["qlt"]=4, + ["hurt_skill"]={ + 5400210, + 5400211, + 5400212, + 5400213 + }, + ["base_skill"]=5400220, + ["rouge_skill"]=5400200, + ["rouge_skill_1"]=5400201, + ["rouge_skill_2"]=5400202, + ["rouge_skill_3"]=5400203, + ["rouge_skill_4"]=5400204, + ["rouge_skill_5"]=5400205, + ["rouge_skill_6"]=5400206, + ["rouge_skill_7"]=5400207, + ["begin_lv"]=5, + ["hp"]={ + 6000000, + 6800000, + 7600000, + 8440000, + 9320000, + 10240000, + 11240000, + 12320000, + 13520000, + 14840000, + 16280000, + 17880000, + 19680000, + 21680000, + 23960000 + }, + ["atk"]={ + 3000000, + 3400000, + 3800000, + 4220000, + 4660000, + 5120000, + 5620000, + 6160000, + 6760000, + 7420000, + 8140000, + 8940000, + 9840000, + 10840000, + 11980000 + }, + ["model_id"]="p0006", + ["icon"]="5", + ["item_id"]=54002 } } local config = { -data=hero,count=20 +data=hero,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index 2a8600f8..aadb914e 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -369,6 +369,9 @@ local item = { ["parameter"]=14001, ["qlt"]=4, ["icon"]="14001" + }, + [14002]={ + }, [22001]={ ["type"]=5, @@ -394,6 +397,12 @@ local item = { ["qlt"]=4, ["icon"]="24001" }, + [24002]={ + ["type"]=5, + ["parameter"]=24001, + ["qlt"]=4, + ["icon"]="24001" + }, [32001]={ ["type"]=5, ["parameter"]=32001, @@ -418,6 +427,12 @@ local item = { ["qlt"]=4, ["icon"]="34001" }, + [34002]={ + ["type"]=5, + ["parameter"]=34001, + ["qlt"]=4, + ["icon"]="34001" + }, [42001]={ ["type"]=5, ["parameter"]=42001, @@ -442,6 +457,12 @@ local item = { ["qlt"]=4, ["icon"]="44001" }, + [44002]={ + ["type"]=5, + ["parameter"]=44001, + ["qlt"]=4, + ["icon"]="44001" + }, [52001]={ ["type"]=5, ["parameter"]=52001, @@ -465,9 +486,15 @@ local item = { ["parameter"]=54001, ["qlt"]=4, ["icon"]="54001" + }, + [54002]={ + ["type"]=5, + ["parameter"]=54001, + ["qlt"]=4, + ["icon"]="54001" } } local config = { -data=item,count=39 +data=item,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 9f44a86f..2388e36d 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -228,6 +228,7 @@ local LocalizationGlobalConst = DUNGEON_SHARDS_HELP = "DUNGEON_SHARDS_HELP", DUNGEON_SHARDS_OPEN = "DUNGEON_SHARDS_OPEN", MAIN_CHAPTER = "MAIN_CHAPTER", + SMASH = "SMASH", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/monster_dungeon_gold.lua b/lua/app/config/monster_dungeon_gold.lua new file mode 100644 index 00000000..d7c528f1 --- /dev/null +++ b/lua/app/config/monster_dungeon_gold.lua @@ -0,0 +1,186 @@ +local monster_dungeon_gold = { + [105]={ + ["monster_base"]=20003, + ["hp"]=90000000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [205]={ + ["monster_base"]=20003, + ["hp"]=90200000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [305]={ + ["monster_base"]=20003, + ["hp"]=90400000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [405]={ + ["monster_base"]=20003, + ["hp"]=90600000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [505]={ + ["monster_base"]=20003, + ["hp"]=90800000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [605]={ + ["monster_base"]=20003, + ["hp"]=91000000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [705]={ + ["monster_base"]=20003, + ["hp"]=91200000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [805]={ + ["monster_base"]=20003, + ["hp"]=91400000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [905]={ + ["monster_base"]=20003, + ["hp"]=91600000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1005]={ + ["monster_base"]=20003, + ["hp"]=91800000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1105]={ + ["monster_base"]=20003, + ["hp"]=92000000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1205]={ + ["monster_base"]=20003, + ["hp"]=92200000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1305]={ + ["monster_base"]=20003, + ["hp"]=92400000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1405]={ + ["monster_base"]=20003, + ["hp"]=92600000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1505]={ + ["monster_base"]=20003, + ["hp"]=92800000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1605]={ + ["monster_base"]=20003, + ["hp"]=93000000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1705]={ + ["monster_base"]=20003, + ["hp"]=93200000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1805]={ + ["monster_base"]=20003, + ["hp"]=93400000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1905]={ + ["monster_base"]=20003, + ["hp"]=93600000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2005]={ + ["monster_base"]=20003, + ["hp"]=93800000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2105]={ + ["monster_base"]=20003, + ["hp"]=94000000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2205]={ + ["monster_base"]=20003, + ["hp"]=94200000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2305]={ + ["monster_base"]=20003, + ["hp"]=94400000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2405]={ + ["monster_base"]=20003, + ["hp"]=94600000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2505]={ + ["monster_base"]=20003, + ["hp"]=94800000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2605]={ + ["monster_base"]=20003, + ["hp"]=95000000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2705]={ + ["monster_base"]=20003, + ["hp"]=95200000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2805]={ + ["monster_base"]=20003, + ["hp"]=95400000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2905]={ + ["monster_base"]=20003, + ["hp"]=95600000, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [3005]={ + ["monster_base"]=20003, + ["hp"]=95800000, + ["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..58d100e7 --- /dev/null +++ b/lua/app/config/monster_dungeon_gold.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: bd10dd527d521404d991152e6a9cbf96 +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 e34e229c..0afcf881 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -11,7 +11,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0} + ["skill_position"]={ + 2, + 0 + } }, [9]={ ["effect_type"]=2, @@ -52,7 +55,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0} + ["skill_position"]={ + 2, + 0 + } }, [12]={ ["effect_type"]=2, @@ -66,7 +72,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0} + ["skill_position"]={ + 2, + 0 + } }, [13]={ ["effect_type"]=2, @@ -107,7 +116,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -129,7 +141,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -151,7 +166,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -173,7 +191,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -210,7 +231,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -237,7 +261,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={1, 140} + ["skill_position"]={ + 1, + 140 + } }, [1200122]={ ["position"]=1, @@ -258,7 +285,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={1, 140} + ["skill_position"]={ + 1, + 140 + } }, [1200123]={ ["position"]=1, @@ -290,7 +320,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={1, 140} + ["skill_position"]={ + 1, + 140 + } }, [1200124]={ ["effect_type"]=2, @@ -318,7 +351,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -340,7 +376,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -362,7 +401,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -384,7 +426,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -427,7 +472,10 @@ local skill = { 2, 3 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -522,7 +570,10 @@ local skill = { 2, 3 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -607,7 +658,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -629,7 +683,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -651,7 +708,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -673,7 +733,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -747,7 +810,10 @@ local skill = { 4, 6 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -861,7 +927,10 @@ local skill = { 4, 6 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -892,7 +961,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -914,7 +986,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -936,7 +1011,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=4, ["sound_hit"]={ @@ -958,7 +1036,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1034,7 +1115,10 @@ local skill = { 4, 5 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["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, + 0 + }, + ["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, + 0 + }, + ["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, + 0 + }, + ["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, + 0 + }, + ["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, + 0 + }, + ["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, + 0 + } + }, + [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"]=5000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 0 + } + }, + [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, + 0 + }, + ["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, + 0 + } + }, + [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, + 0 + } + }, [2200110]={ ["position"]=2, ["effect_type"]=1, @@ -1157,7 +1513,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1179,7 +1538,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1201,7 +1563,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1223,7 +1588,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1249,7 +1617,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -1293,7 +1664,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0} + ["skill_position"]={ + 2, + 0 + } }, [2200122]={ ["position"]=2, @@ -1308,7 +1682,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0} + ["skill_position"]={ + 2, + 0 + } }, [2200123]={ ["energy"]=10, @@ -1338,7 +1715,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -1365,7 +1745,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1387,7 +1770,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1409,7 +1795,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1431,7 +1820,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1482,7 +1874,10 @@ local skill = { 3, 4 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -1552,7 +1947,10 @@ local skill = { 3, 4 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -1669,7 +2067,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1691,7 +2092,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1713,7 +2117,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1735,7 +2142,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1791,7 +2201,10 @@ local skill = { 2, 3 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -1877,7 +2290,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1899,7 +2315,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1921,7 +2340,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1943,7 +2365,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1973,7 +2398,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["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,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -2129,7 +2586,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -2157,6 +2617,206 @@ 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, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000011 + }, + ["name_act"]="attack01", + ["fx_self"]=300028 + }, + [2400211]={ + ["position"]=2, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000012 + }, + ["name_act"]="attack02", + ["fx_self"]=300029 + }, + [2400212]={ + ["position"]=2, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000013 + }, + ["name_act"]="attack03", + ["fx_self"]=300030 + }, + [2400213]={ + ["position"]=2, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000014 + }, + ["name_act"]="attack04", + ["fx_self"]=300031 + }, + [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, + 0 + }, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound_hit"]={ + 2400120 + }, + ["name_act"]="skill01", + ["fx_self"]=300032, + ["bullet_time"]={ + 2033, + 3000, + 400 + } + }, + [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 +2830,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2192,7 +2855,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2214,7 +2880,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -2236,7 +2905,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2266,7 +2938,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -2366,7 +3041,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -2388,7 +3066,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2410,7 +3091,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -2432,7 +3116,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -2458,7 +3145,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["sound_hit"]={ 3300120 }, @@ -2549,7 +3239,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["sound_hit"]={ 3300120 }, @@ -2569,7 +3262,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2591,7 +3287,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -2613,7 +3312,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2635,7 +3337,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -2687,7 +3392,10 @@ local skill = { 2, 3 }, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -2780,7 +3488,10 @@ local skill = { 2, 4 }, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -2860,7 +3571,10 @@ local skill = { 2, 4 }, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -2887,7 +3601,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2909,7 +3626,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2931,7 +3651,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2953,7 +3676,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3006,7 +3732,10 @@ local skill = { 2, 3 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -3130,7 +3859,10 @@ local skill = { 2, 3 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -3144,6 +3876,226 @@ local skill = { 200 } }, + [3400210]={ + ["position"]=3, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000001 + }, + ["name_act"]="attack01", + ["fx_self"]=300091 + }, + [3400211]={ + ["position"]=3, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000002 + }, + ["name_act"]="attack02", + ["fx_self"]=300091 + }, + [3400212]={ + ["position"]=3, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000003 + }, + ["name_act"]="attack03", + ["fx_self"]=300091 + }, + [3400213]={ + ["position"]=3, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000004 + }, + ["name_act"]="attack04", + ["fx_self"]=300091 + }, + [3400220]={ + ["energy"]=10, + ["link"]=1, + ["position"]=3, + ["method"]=1, + ["skill_type"]=0, + ["battle_icon"]="18", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=40000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="curse", + ["num"]=2500, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 140 + }, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound_hit"]={ + 3400120 + }, + ["name_act"]="skill01", + ["fx_self"]=300092, + ["bullet_time"]={ + 1600, + 3000, + 200 + } + }, + [3400221]={ + ["energy"]=10, + ["link"]=1, + ["position"]=3, + ["method"]=2, + ["skill_type"]=4, + ["boardrange"]={ + { + ["type"]=1, + ["range"]=2 + }, + { + ["type"]=2, + ["range"]=2 + } + }, + ["battle_icon"]="18", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_green", + ["num"]=40000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="curse", + ["num"]=2500, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 140 + }, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound_hit"]={ + 3400120 + }, + ["name_act"]="skill01", + ["fx_self"]=300092, + ["bullet_time"]={ + 1600, + 3000, + 200 + } + }, + [3400222]={ + ["position"]=3, + ["effect_type"]=2, + ["trigger"]=5, + ["effect"]={ + { + ["type"]="corrupt", + ["num"]=5000, + ["ratio"]=1000, + ["round"]=2 + } + }, + ["obj"]=2 + }, + [3400223]={ + ["position"]=3, + ["effect_type"]=2, + ["trigger"]=5, + ["effect"]={ + { + ["type"]="corrupt", + ["num"]=5000, + ["ratio"]=1000, + ["round"]=2 + } + }, + ["obj"]=2 + }, [4200110]={ ["position"]=4, ["effect_type"]=1, @@ -3157,7 +4109,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -3179,7 +4134,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3201,7 +4159,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3223,7 +4184,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -3256,7 +4220,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -3359,7 +4326,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -3381,7 +4351,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3403,7 +4376,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3425,7 +4401,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3458,7 +4437,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -3504,7 +4486,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0} + ["skill_position"]={ + 2, + 0 + } }, [4300122]={ ["position"]=4, @@ -3519,7 +4504,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0} + ["skill_position"]={ + 2, + 0 + } }, [4300123]={ ["position"]=4, @@ -3534,7 +4522,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0} + ["skill_position"]={ + 2, + 0 + } }, [4300124]={ ["position"]=4, @@ -3549,7 +4540,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0} + ["skill_position"]={ + 2, + 0 + } }, [4300125]={ ["energy"]=10, @@ -3585,7 +4579,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -3614,7 +4611,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3636,7 +4636,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3658,7 +4661,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3680,7 +4686,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3733,7 +4742,10 @@ local skill = { 2, 4 }, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -3850,7 +4862,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3872,7 +4887,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3894,7 +4912,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3916,7 +4937,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3955,7 +4979,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -4003,12 +5030,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,17 +5044,255 @@ local skill = { [4400123]={ ["position"]=4, ["effect_type"]=2, - ["trigger"]=6, + ["trigger"]=5, ["effect"]={ { ["type"]="frozen", ["num"]=0, - ["ratio"]=7000, + ["ratio"]=2000, ["round"]=2 } }, ["obj"]=2 }, + [4400210]={ + ["position"]=4, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000001 + }, + ["name_act"]="attack01", + ["fx_self"]=300033 + }, + [4400211]={ + ["position"]=4, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000002 + }, + ["name_act"]="attack02", + ["fx_self"]=300033 + }, + [4400212]={ + ["position"]=4, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000003 + }, + ["name_act"]="attack03", + ["fx_self"]=300093 + }, + [4400213]={ + ["position"]=4, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000004 + }, + ["name_act"]="attack04", + ["fx_self"]=300094 + }, + [4400220]={ + ["energy"]=10, + ["link"]=1, + ["position"]=4, + ["method"]=2, + ["skill_type"]=4, + ["boardrange"]={ + + }, + ["battle_icon"]="19", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=40000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="lethargy", + ["num"]=0, + ["ratio"]=5000, + ["round"]=2 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=200, + ["shake_type"]=5, + ["sound_hit"]={ + 4300120 + }, + ["name_act"]="skill01", + ["fx_target"]=300034, + ["bullet_time"]={ + 633, + 3000, + 400 + } + }, + [4400221]={ + ["position"]=4, + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="weaken", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, + ["effect_type"]=2, + ["trigger"]=7, + ["effect"]={ + { + ["type"]="dmg_addition_blue_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1 + }, + [4400222]={ + ["position"]=4, + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="lethargy", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, + ["effect_type"]=2, + ["trigger"]=5, + ["effect"]={ + { + ["type"]="imprison", + ["num"]=0, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=2 + }, + [4400223]={ + ["energy"]=8, + ["link"]=1, + ["position"]=4, + ["method"]=2, + ["skill_type"]=4, + ["boardrange"]={ + + }, + ["battle_icon"]="19", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_blue", + ["num"]=40000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="lethargy", + ["num"]=0, + ["ratio"]=5000, + ["round"]=2 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=200, + ["shake_type"]=5, + ["sound_hit"]={ + 4300120 + }, + ["name_act"]="skill01", + ["fx_target"]=300034, + ["bullet_time"]={ + 633, + 3000, + 400 + } + }, [5200110]={ ["position"]=5, ["effect_type"]=1, @@ -4041,7 +5306,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4063,7 +5331,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4085,7 +5356,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4107,7 +5381,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4137,7 +5414,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["sound_hit"]={ 5200120 }, @@ -4165,7 +5445,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["sound_hit"]={ 5200120 }, @@ -4193,7 +5476,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["sound_hit"]={ 5200120 }, @@ -4226,7 +5512,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4248,7 +5537,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4270,7 +5562,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4292,7 +5587,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4343,7 +5641,10 @@ local skill = { 3, 4 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -4451,7 +5752,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4473,7 +5777,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4495,7 +5802,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4517,7 +5827,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4560,7 +5873,10 @@ local skill = { 2, 3 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -4711,7 +6027,10 @@ local skill = { 2, 3 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -4740,7 +6059,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4762,7 +6084,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4784,7 +6109,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4806,7 +6134,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4850,7 +6181,10 @@ local skill = { 2, 3 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -4921,7 +6255,10 @@ local skill = { 2, 3 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -4960,6 +6297,225 @@ local skill = { ["trigger"]=9, ["obj"]=1 }, + [5400210]={ + ["position"]=5, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_purple", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound_hit"]={ + 1000001 + }, + ["name_act"]="attack01", + ["fx_self"]=300085 + }, + [5400211]={ + ["position"]=5, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_purple", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound_hit"]={ + 1000002 + }, + ["name_act"]="attack02", + ["fx_self"]=300086 + }, + [5400212]={ + ["position"]=5, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_purple", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000003 + }, + ["name_act"]="attack03", + ["fx_self"]=300087 + }, + [5400213]={ + ["position"]=5, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_purple", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound_hit"]={ + 1000004 + }, + ["name_act"]="attack04", + ["fx_self"]=300088 + }, + [5400220]={ + ["energy"]=10, + ["link"]=1, + ["position"]=5, + ["method"]=1, + ["skill_type"]=11, + ["skill_type_parameter"]={ + 0, + 2 + }, + ["battle_icon"]="20", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="counterattack", + ["num"]=2500, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 0 + }, + ["name_act"]="skill01", + ["fx_self"]=300089 + }, + [5400221]={ + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="curse", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, + ["effect_type"]=2, + ["trigger"]=5, + ["effect"]={ + { + ["type"]="hurt_purple", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2 + }, + [5400222]={ + ["energy"]=10, + ["link"]=1, + ["position"]=5, + ["method"]=1, + ["skill_type"]=11, + ["skill_type_parameter"]={ + 0, + 4 + }, + ["battle_icon"]="20", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="counterattack", + ["num"]=2500, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 0 + }, + ["name_act"]="skill01", + ["fx_self"]=300089 + }, + [5400223]={ + ["effect_type"]=2, + ["trigger"]=5, + ["effect"]={ + { + ["type"]="poison", + ["num"]=2500, + ["ratio"]=1000, + ["round"]=2 + } + }, + ["obj"]=2 + }, + [5400224]={ + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="curse", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, + ["effect_type"]=2, + ["trigger"]=5, + ["effect"]={ + { + ["type"]="hurt_purple", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2 + }, [10001]={ ["effect_type"]=1, ["trigger"]=1, @@ -4972,7 +6528,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4992,7 +6551,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -5012,7 +6574,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -5032,7 +6597,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -5052,7 +6620,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -5072,7 +6643,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -5092,7 +6666,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -5112,7 +6689,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0} + ["skill_position"]={ + 2, + 0 + } }, [10009]={ ["effect_type"]=2, @@ -5126,7 +6706,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0} + ["skill_position"]={ + 2, + 0 + } }, [10010]={ ["effect_type"]=2, @@ -5140,7 +6723,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0} + ["skill_position"]={ + 2, + 0 + } }, [10011]={ ["effect_type"]=2, @@ -5154,7 +6740,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0} + ["skill_position"]={ + 2, + 0 + } }, [10012]={ ["effect_type"]=2, @@ -5168,7 +6757,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0} + ["skill_position"]={ + 2, + 0 + } }, [10013]={ ["effect_type"]=2, @@ -5182,7 +6774,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0} + ["skill_position"]={ + 2, + 0 + } }, [10014]={ ["effect_type"]=2, @@ -5209,7 +6804,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["sound_hit"]={ @@ -5229,7 +6827,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5263,7 +6864,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5302,7 +6906,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5336,7 +6943,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5370,7 +6980,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5404,7 +7017,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5434,7 +7050,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0 }, @@ -5455,7 +7074,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5504,7 +7126,10 @@ local skill = { 2, 3 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5563,7 +7188,10 @@ local skill = { 4, 5 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5597,7 +7225,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0 }, @@ -5617,7 +7248,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5657,7 +7291,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5708,7 +7345,10 @@ local skill = { 2, 4 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5739,7 +7379,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5767,7 +7410,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["sound_hit"]={ @@ -5793,7 +7439,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5851,7 +7500,10 @@ local skill = { 3, 5 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5901,7 +7553,10 @@ local skill = { 2, 3 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5969,7 +7624,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -6038,7 +7696,10 @@ local skill = { 4, 6 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -6070,7 +7731,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["sound_hit"]={ @@ -6126,7 +7790,10 @@ local skill = { 3, 5 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6248,7 +7915,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -6296,7 +7966,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6357,7 +8030,10 @@ local skill = { 2, 3 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6417,7 +8093,10 @@ local skill = { 3, 5 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=1, ["shake_time"]=200, @@ -6451,7 +8130,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["name_act"]="skill01", @@ -6475,7 +8157,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6531,7 +8216,10 @@ local skill = { 3, 4 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=1, ["shake_time"]=200, @@ -6617,7 +8305,10 @@ local skill = { 3, 4 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6690,7 +8381,10 @@ local skill = { 5, 6 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, @@ -6746,7 +8440,10 @@ local skill = { 2, 4 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6787,7 +8484,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, @@ -6816,7 +8516,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["name_act"]="skill01" @@ -6859,7 +8562,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -6893,7 +8599,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6933,7 +8642,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6972,7 +8684,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -7000,7 +8715,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0 }, @@ -7033,7 +8751,10 @@ local skill = { 2, 3 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -7061,7 +8782,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0 }, @@ -7106,7 +8830,10 @@ local skill = { 2, 5 }, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -7134,7 +8861,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -7174,7 +8904,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -7197,7 +8930,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7218,7 +8954,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7239,7 +8978,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7260,7 +9002,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7281,7 +9026,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7302,7 +9050,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7323,7 +9074,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7344,7 +9098,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7365,7 +9122,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7386,7 +9146,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7407,7 +9170,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7428,7 +9194,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7449,7 +9218,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7470,7 +9242,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7491,7 +9266,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7512,7 +9290,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7533,7 +9314,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7554,7 +9338,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7575,7 +9362,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7596,7 +9386,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7617,7 +9410,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7638,7 +9434,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7659,7 +9458,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7680,7 +9482,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7701,7 +9506,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7722,7 +9530,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7743,7 +9554,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7764,7 +9578,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7785,7 +9602,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7806,7 +9626,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7827,7 +9650,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7848,7 +9674,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7869,7 +9698,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7890,7 +9722,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7911,7 +9746,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7932,7 +9770,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7953,7 +9794,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7974,7 +9818,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7995,7 +9842,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8016,7 +9866,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8037,7 +9890,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8058,7 +9914,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8079,7 +9938,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8100,7 +9962,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8121,7 +9986,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8142,7 +10010,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8163,7 +10034,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8184,7 +10058,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8205,7 +10082,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8226,7 +10106,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8247,7 +10130,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8268,7 +10154,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8289,7 +10178,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8310,7 +10202,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8331,7 +10226,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8352,7 +10250,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8373,7 +10274,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8394,7 +10298,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8415,7 +10322,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8436,7 +10346,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8457,7 +10370,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8478,7 +10394,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8499,7 +10418,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8520,7 +10442,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8541,7 +10466,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8562,7 +10490,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8583,7 +10514,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8604,7 +10538,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8625,7 +10562,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8646,7 +10586,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8667,7 +10610,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8688,7 +10634,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8709,7 +10658,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8730,7 +10682,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8751,7 +10706,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8772,7 +10730,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8793,7 +10754,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8814,7 +10778,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8835,7 +10802,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8856,7 +10826,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8877,7 +10850,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8898,7 +10874,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8919,7 +10898,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8940,7 +10922,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8961,7 +10946,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8982,7 +10970,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9003,7 +10994,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9024,7 +11018,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9045,7 +11042,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9066,7 +11066,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9087,7 +11090,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9108,7 +11114,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9129,7 +11138,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9150,7 +11162,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9171,7 +11186,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9192,7 +11210,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9213,7 +11234,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9234,7 +11258,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9255,7 +11282,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9276,7 +11306,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9297,7 +11330,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9318,7 +11354,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9339,7 +11378,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9360,7 +11402,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9381,7 +11426,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9402,7 +11450,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9423,7 +11474,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9444,7 +11498,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9465,7 +11522,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9486,7 +11546,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9507,7 +11570,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9528,7 +11594,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9549,7 +11618,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9570,7 +11642,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9591,7 +11666,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9612,7 +11690,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9633,7 +11714,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9654,7 +11738,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9675,7 +11762,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9696,7 +11786,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9717,7 +11810,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9738,7 +11834,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9759,7 +11858,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9780,7 +11882,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9801,7 +11906,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9822,7 +11930,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9843,7 +11954,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9864,7 +11978,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9885,7 +12002,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9906,7 +12026,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9927,7 +12050,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9948,7 +12074,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9969,7 +12098,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9990,7 +12122,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10011,7 +12146,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10032,7 +12170,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10053,7 +12194,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10074,7 +12218,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10095,7 +12242,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10116,7 +12266,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10137,7 +12290,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10158,7 +12314,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10179,7 +12338,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10200,7 +12362,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10221,7 +12386,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10242,7 +12410,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10263,7 +12434,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10284,7 +12458,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10305,7 +12482,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10326,7 +12506,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10347,7 +12530,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10368,7 +12554,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10389,7 +12578,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10410,7 +12602,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10431,7 +12626,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10452,7 +12650,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10473,7 +12674,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10494,7 +12698,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10515,7 +12722,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10536,7 +12746,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10557,7 +12770,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10578,7 +12794,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10599,7 +12818,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10620,7 +12842,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10641,7 +12866,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10662,7 +12890,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10683,7 +12914,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10704,7 +12938,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10725,7 +12962,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10746,7 +12986,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10767,7 +13010,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10788,7 +13034,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10809,7 +13058,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10830,7 +13082,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10851,7 +13106,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10872,7 +13130,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10893,7 +13154,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10914,7 +13178,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10935,7 +13202,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10956,7 +13226,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10977,7 +13250,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10998,7 +13274,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11019,7 +13298,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11040,7 +13322,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11061,7 +13346,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11082,7 +13370,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11103,7 +13394,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11124,7 +13418,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11145,7 +13442,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11166,7 +13466,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11187,7 +13490,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11208,7 +13514,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11229,7 +13538,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11250,7 +13562,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11271,7 +13586,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11292,7 +13610,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11313,7 +13634,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11334,7 +13658,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11355,7 +13682,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11376,7 +13706,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11397,7 +13730,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11418,7 +13754,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11439,7 +13778,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11460,7 +13802,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11481,7 +13826,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11502,7 +13850,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11523,7 +13874,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11544,7 +13898,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11565,7 +13922,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11586,7 +13946,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11607,7 +13970,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11628,7 +13994,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11649,7 +14018,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11670,7 +14042,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11691,7 +14066,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11712,7 +14090,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11733,7 +14114,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11754,7 +14138,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11775,7 +14162,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11796,7 +14186,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11817,7 +14210,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11838,7 +14234,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11859,7 +14258,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11880,7 +14282,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11901,7 +14306,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11922,7 +14330,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11943,7 +14354,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11964,7 +14378,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11985,7 +14402,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12006,7 +14426,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12027,7 +14450,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12048,7 +14474,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12069,7 +14498,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12090,7 +14522,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12111,7 +14546,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12132,7 +14570,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12153,7 +14594,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12174,7 +14618,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12195,7 +14642,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12216,7 +14666,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12237,7 +14690,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12258,7 +14714,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12279,7 +14738,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12300,7 +14762,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12321,7 +14786,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12342,7 +14810,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12363,7 +14834,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12384,7 +14858,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12405,7 +14882,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12426,7 +14906,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12447,7 +14930,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12468,7 +14954,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12489,7 +14978,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12510,7 +15002,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12531,7 +15026,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12552,7 +15050,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12573,7 +15074,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12594,7 +15098,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12615,7 +15122,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12636,7 +15146,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12657,7 +15170,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12678,7 +15194,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12699,7 +15218,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12720,7 +15242,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12741,7 +15266,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12762,7 +15290,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12783,7 +15314,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12804,7 +15338,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12825,7 +15362,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12846,7 +15386,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12867,7 +15410,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12888,7 +15434,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12909,7 +15458,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12930,7 +15482,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12951,7 +15506,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12972,7 +15530,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12993,7 +15554,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13014,7 +15578,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13035,7 +15602,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13056,7 +15626,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13077,7 +15650,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13098,7 +15674,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13119,7 +15698,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13140,7 +15722,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13161,7 +15746,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13182,7 +15770,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13203,7 +15794,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13224,7 +15818,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13245,7 +15842,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13266,7 +15866,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13287,7 +15890,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13308,7 +15914,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13329,7 +15938,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13350,7 +15962,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13371,7 +15986,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13392,7 +16010,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13413,7 +16034,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13434,7 +16058,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13455,7 +16082,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13476,7 +16106,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13497,7 +16130,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13518,7 +16154,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13539,7 +16178,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13560,7 +16202,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13581,7 +16226,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13602,7 +16250,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]={1, 140}, + ["skill_position"]={ + 1, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13613,7 +16264,10 @@ local skill = { }, [110001]={ ["skill_type"]=5, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" @@ -13623,14 +16277,20 @@ local skill = { ["skill_type_parameter"]={ 1 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" }, [110003]={ ["skill_type"]=7, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" @@ -13640,7 +16300,10 @@ local skill = { ["skill_type_parameter"]={ 1 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" @@ -13650,7 +16313,10 @@ local skill = { ["skill_type_parameter"]={ 3 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" @@ -13661,7 +16327,10 @@ local skill = { 1, 2 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" @@ -13672,7 +16341,10 @@ local skill = { 1, 1 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" @@ -13682,13 +16354,16 @@ local skill = { ["skill_type_parameter"]={ 10000 }, - ["skill_position"]={2,0}, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" } } local config = { -data=skill,count=577 +data=skill,count=621 } 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..e4e1e462 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,131 @@ 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"]=4, + ["type"]=12, + ["skill_position"]=2, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=2400221, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=4, + ["icon"]="144" + }, + [2400203]={ + ["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 +2477,121 @@ 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, + ["qlt"]=3, + ["type"]=1, + ["parameter"]={ + 3400221 + }, + ["skill_position"]=3, + ["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, + ["qlt"]=4, + ["type"]=8, + ["parameter"]={ + 2, + 1 + }, + ["skill_position"]=3, + ["icon"]="152" + }, + [3400204]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=7, + ["parameter"]={ + 2, + 2500 + }, + ["skill_position"]=3, + ["icon"]="153" + }, + [3400205]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=9, + ["skill_position"]=3, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=3400222, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=5, + ["icon"]="154" + }, + [3400206]={ + ["unlock"]=3400201, + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["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, + ["qlt"]=3, + ["type"]=9, + ["skill_position"]=3, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=3400223, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=5, + ["icon"]="156" + }, [4200100]={ ["limit_times"]=1, ["weight"]=100000, @@ -2659,14 +3022,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,17 +3058,151 @@ 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"]=999 + } + }, + ["obj"]=6, + ["icon"]="163" + }, + [4400200]={ + ["limit_times"]=1, + ["weight"]=100000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=4, + ["icon"]="189" + }, + [4400201]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=2, + ["skill_position"]=4, + ["boardrange"]={ + { + ["type"]=5, + ["range"]=1 + }, + { + ["type"]=6, + ["range"]=1 + }, + { + ["type"]=7, + ["range"]=1 + }, + { + ["type"]=8, + ["range"]=1 + } + }, + ["icon"]="157" + }, + [4400202]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=12, + ["skill_position"]=4, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=4400221, + ["ratio"]=10000, ["round"]=1 } }, ["obj"]=6, + ["icon"]="158" + }, + [4400203]={ + ["unlock"]=4400201, + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=2, + ["skill_position"]=4, + ["boardrange"]={ + { + ["type"]=5, + ["range"]=1 + }, + { + ["type"]=6, + ["range"]=1 + }, + { + ["type"]=7, + ["range"]=1 + }, + { + ["type"]=8, + ["range"]=1 + } + }, + ["icon"]="159" + }, + [4400204]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=16, + ["parameter"]={ + 2, + 5000 + }, + ["skill_position"]=4, + ["icon"]="160" + }, + [4400205]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=9, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=4400222, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=6, + ["icon"]="161" + }, + [4400206]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=9, + ["skill_position"]=4, + ["effect"]={ + { + ["type"]="atkp_blue_add", + ["num"]=1500, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=6, + ["icon"]="162" + }, + [4400207]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=1, + ["parameter"]={ + 4400223 + }, + ["skill_position"]=4, ["icon"]="163" }, [5200100]={ @@ -3003,23 +3500,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 +3516,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, @@ -3189,9 +3686,122 @@ local skill_rogue = { }, ["obj"]=7, ["icon"]="170" + }, + [5400200]={ + ["limit_times"]=1, + ["weight"]=100000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=5, + ["icon"]="190" + }, + [5400201]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=8, + ["parameter"]={ + 1, + 1 + }, + ["skill_position"]=5, + ["icon"]="164" + }, + [5400202]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=9, + ["skill_position"]=5, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=5400221, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=7, + ["icon"]="165" + }, + [5400203]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=1, + ["parameter"]={ + 5400222 + }, + ["skill_position"]=5, + ["icon"]="166" + }, + [5400204]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=8, + ["parameter"]={ + 1, + 1 + }, + ["skill_position"]=5, + ["icon"]="167" + }, + [5400205]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=9, + ["skill_position"]=5, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=5400223, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=7, + ["icon"]="168" + }, + [5400206]={ + ["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"]="169" + }, + [5400207]={ + ["unlock"]=5400202, + ["cover_unlock"]=5400202, + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=9, + ["skill_position"]=5, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=5400224, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=7, + ["icon"]="170" } } local config = { -data=skill_rogue,count=204 +data=skill_rogue,count=244 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 0f459dd7..b188bea5 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -228,6 +228,7 @@ local localization_global = ["DUNGEON_SHARDS_HELP"] = "检测实力的时候到了！\n打倒所有拦路的怪物们，告诉他们谁才是真正的勇士！\n注意！怪物们有备而来，部分角色的攻击会下降。", ["DUNGEON_SHARDS_OPEN"] = "开启时间：周一、周三、周五、周日", ["MAIN_CHAPTER"] = "主线章节", + ["SMASH"] = "扫荡", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/hero.lua b/lua/app/config/strings/cn/hero.lua index 60cb1454..cebd7b0a 100644 --- a/lua/app/config/strings/cn/hero.lua +++ b/lua/app/config/strings/cn/hero.lua @@ -15,6 +15,9 @@ local hero = { ["name"]="亚历山大", ["desc"]="没人能抗住亚历山大的钢铁重击，如果扛住了，那就再来一击。" }, + [14002]={ + ["name"]="潘达" + }, [22001]={ ["name"]="刀妹", ["desc"]="剑一出鞘，必要见血。" @@ -31,6 +34,9 @@ local hero = { ["name"]="巨剑魔童", ["desc"]="我可能拿不起巨剑，但不妨碍我用它轰人。" }, + [24002]={ + ["name"]="索尔" + }, [32001]={ ["name"]="洋葱头", ["desc"]="盾牌只是为了掩饰下一次突刺。" @@ -47,6 +53,9 @@ local hero = { ["name"]="木兰", ["desc"]="这一箭下去你可能会死。" }, + [34002]={ + ["name"]="艳后" + }, [42001]={ ["name"]="冰心", ["desc"]="我的心和我的法术一样冰冷。" @@ -63,6 +72,9 @@ local hero = { ["name"]="寒冰妖姬", ["desc"]="有人持剑起舞，寒冰妖姬用剑让敌人起舞。" }, + [44002]={ + ["name"]="梦魔" + }, [52001]={ ["name"]="忍者伦", ["desc"]="虽然带的是手里剑，但是最擅长的还是护盾术，忍者伦最大的愿望还是世界和平。" @@ -78,9 +90,12 @@ local hero = { [54001]={ ["name"]="蝴蝶", ["desc"]="蝴蝶破茧而出，美丽又坚韧，坚韧的不止是内心，还有手里同样美丽的长刀。" + }, + [54002]={ + ["name"]="闪烁法师" } } local config = { -data=hero,count=20 +data=hero,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index 1c5c20a8..3e377f88 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -91,6 +91,10 @@ local item = { ["name"]="亚历山大碎片", ["desc"]="亚历山大碎片，凑齐可激活或升级。" }, + [14002]={ + ["name"]="潘达碎片", + ["desc"]="潘达碎片，凑齐可激活或升级。" + }, [22001]={ ["name"]="刀妹碎片", ["desc"]="刀妹碎片，凑齐可激活或升级。" @@ -107,6 +111,10 @@ local item = { ["name"]="巨剑魔童碎片", ["desc"]="巨剑魔童碎片，凑齐可激活或升级。" }, + [24002]={ + ["name"]="索尔碎片", + ["desc"]="索尔碎片，凑齐可激活或升级。" + }, [32001]={ ["name"]="洋葱头碎片", ["desc"]="洋葱头碎片，凑齐可激活或升级。" @@ -123,6 +131,10 @@ local item = { ["name"]="木兰碎片", ["desc"]="木兰碎片，凑齐可激活或升级。" }, + [34002]={ + ["name"]="艳后碎片", + ["desc"]="艳后碎片，凑齐可激活或升级。" + }, [42001]={ ["name"]="冰心碎片", ["desc"]="冰心碎片，凑齐可激活或升级。" @@ -139,6 +151,10 @@ local item = { ["name"]="寒冰妖姬碎片", ["desc"]="寒冰妖姬碎片，凑齐可激活或升级。" }, + [44002]={ + ["name"]="梦魔碎片", + ["desc"]="梦魔碎片，凑齐可激活或升级。" + }, [52001]={ ["name"]="忍者伦碎片", ["desc"]="忍者伦碎片，凑齐可激活或升级。" @@ -154,9 +170,13 @@ local item = { [54001]={ ["name"]="蝴蝶碎片", ["desc"]="蝴蝶碎片，凑齐可激活或升级。" + }, + [54002]={ + ["name"]="闪烁法师碎片", + ["desc"]="闪烁法师碎片，凑齐可激活或升级。" } } local config = { -data=item,count=39 +data=item,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/skill.lua b/lua/app/config/strings/cn/skill.lua index 0c6f7d82..5b52a138 100644 --- a/lua/app/config/strings/cn/skill.lua +++ b/lua/app/config/strings/cn/skill.lua @@ -11,6 +11,9 @@ local skill = { [1400120]={ ["desc"]="钢铁重击：将周围4个元素变色，并造成多次大量技能伤害。" }, + [1400220]={ + ["desc"]="熊猫爆竹：额外造成一次大量技能伤害。" + }, [2200120]={ ["desc"]="拔刀斩：额外造成一次技能伤害。" }, @@ -23,6 +26,9 @@ local skill = { [2400120]={ ["desc"]="巨剑轰击：额外造成一次巨量技能伤害。" }, + [2400220]={ + ["desc"]="雷神之锤：额外造成一次大量技能伤害。" + }, [3200120]={ ["desc"]="长枪突刺：额外造成一次技能伤害。" }, @@ -35,6 +41,9 @@ local skill = { [3400120]={ ["desc"]="流星追月：使用后本次伤害提升，并造成一次巨量技能伤害。" }, + [3400220]={ + ["desc"]="法老诅咒：额外造成一次技能伤害，附加诅咒效果，1回合。" + }, [4200120]={ ["desc"]="元素链接：随机消除3个元素，并造成一次技能伤害。" }, @@ -47,6 +56,9 @@ local skill = { [4400120]={ ["desc"]="冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。" }, + [4400220]={ + ["desc"]="美丽梦魇：额外造成一次大量技能伤害，50%概率附加昏睡效果，2回合。" + }, [5200120]={ ["desc"]="护盾术：为团队附加一个护盾，1回合。" }, @@ -58,9 +70,12 @@ local skill = { }, [5400120]={ ["desc"]="蝶舞斩：额外造成多次技能伤害。" + }, + [5400220]={ + ["desc"]="脉动反击：随机增加一个技能2点能量，并为团队附加反击效果，1回合。" } } local config = { -data=skill,count=20 +data=skill,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index ace7dd43..24cb21bc 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -227,6 +227,30 @@ local skill_rogue = { [1400107]={ ["desc"]="钢铁重击每连接4个元素则额外发射1个火球造成伤害。" }, + [1400200]={ + ["desc"]="解锁熊猫爆竹：额外造成一次大量技能伤害。" + }, + [1400201]={ + ["desc"]="熊猫爆竹可附加灼烧效果，2回合。" + }, + [1400202]={ + ["desc"]="熊猫爆竹对冻结敌人的伤害增加50%。" + }, + [1400203]={ + ["desc"]="熊猫爆竹横向可额外消除4个格。" + }, + [1400204]={ + ["desc"]="潘达普攻时有10%概率附加灼烧效果，2回合。" + }, + [1400205]={ + ["desc"]="熊猫爆竹命中冻结敌人时，为团队附加亢奋效果，3回合。" + }, + [1400206]={ + ["desc"]="潘达攻击提升15%。" + }, + [1400207]={ + ["desc"]="熊猫爆竹链接6个元素及以上时将释放2次。" + }, [2200100]={ ["desc"]="解锁拔刀斩：额外造成一次技能伤害。" }, @@ -323,6 +347,30 @@ local skill_rogue = { [2400107]={ ["desc"]="巨剑轰击将造成双倍伤害。" }, + [2400200]={ + ["desc"]="解锁雷神之锤：额外造成一次大量技能伤害。" + }, + [2400201]={ + ["desc"]="雷神之锤可随机消除4个元素。" + }, + [2400202]={ + ["desc"]="雷神之锤使用后随机增加一种技能的能量2点。" + }, + [2400203]={ + ["desc"]="雷神之锤可随机消除2个元素。" + }, + [2400204]={ + ["desc"]="索尔普攻时有10%概率附加虚弱效果，1回合。" + }, + [2400205]={ + ["desc"]="雷神之锤释放后为团队附加反伤护盾，2回合。" + }, + [2400206]={ + ["desc"]="索尔普攻附加的虚弱效果，回合数+1。" + }, + [2400207]={ + ["desc"]="雷神之锤为团队附加的反伤护盾，反伤效果增加。" + }, [3200100]={ ["desc"]="解锁长枪突刺：额外造成一次技能伤害。" }, @@ -419,6 +467,30 @@ local skill_rogue = { [3400107]={ ["desc"]="流星追月链接4个元素或以上时，流星追月攻击将释放2次。" }, + [3400200]={ + ["desc"]="解锁法老诅咒：额外造成一次技能伤害，附加诅咒效果，1回合。" + }, + [3400201]={ + ["desc"]="法老诅咒纵向可额外消除4格。" + }, + [3400202]={ + ["desc"]="法老诅咒使用时本次普攻伤害提升50%。" + }, + [3400203]={ + ["desc"]="法老诅咒附加的诅咒效果，回合数+1。" + }, + [3400204]={ + ["desc"]="法老诅咒附加的诅咒效果，效果提升。" + }, + [3400205]={ + ["desc"]="艳后普攻有10%概率附加腐败效果，2回合。" + }, + [3400206]={ + ["desc"]="法老诅咒横向可额外消除4格。" + }, + [3400207]={ + ["desc"]="艳后普攻有20%概率附加腐败效果，2回合。" + }, [4200100]={ ["desc"]="解锁元素链接：随机消除3个元素，并造成一次技能伤害。" }, @@ -515,6 +587,30 @@ local skill_rogue = { [4400107]={ ["desc"]="冰霜剑舞附加冻结效果概率提升到70%。" }, + [4400200]={ + ["desc"]="解锁美丽梦魇：额外造成一次大量技能伤害，50%概率附加昏睡效果，2回合。" + }, + [4400201]={ + ["desc"]="美丽梦魇沿X方向可额外消除4格。" + }, + [4400202]={ + ["desc"]="Combo:美丽梦魇对虚弱敌人伤害增加50%。" + }, + [4400203]={ + ["desc"]="美丽梦魇沿X方向可额外消除4格。" + }, + [4400204]={ + ["desc"]="美丽梦魇附加的昏睡效果，概率提升到100%。" + }, + [4400205]={ + ["desc"]="Combo:梦魔普攻昏睡敌人将附加禁锢效果，2回合。" + }, + [4400206]={ + ["desc"]="梦魔攻击提升15%。" + }, + [4400207]={ + ["desc"]="美丽梦魇激活所需能量-2。" + }, [5200100]={ ["desc"]="解锁护盾术：为团队附加一个护盾，1回合。" }, @@ -603,16 +699,40 @@ local skill_rogue = { ["desc"]="蝴蝶攻击提升15%。" }, [5400105]={ - ["desc"]="蝶舞斩激活所需能量-2。" + ["desc"]="蝶舞斩激活所需能量-2。" }, [5400106]={ ["desc"]="蝶舞斩每击杀1个敌人，全体技能伤害提升10%。" }, [5400107]={ ["desc"]="蝶舞斩击杀敌人后将增加蝴蝶技能能量2点。" + }, + [5400200]={ + ["desc"]="解锁脉动反击：随机增加一个技能2点能量，并为团队附加反击效果，1回合。" + }, + [5400201]={ + ["desc"]="脉动反击附加的反击效果，回合数+1。" + }, + [5400202]={ + ["desc"]="Combo:闪烁法师对诅咒敌人额外造成50%伤害。" + }, + [5400203]={ + ["desc"]="脉动反击增加技能的能量扩充到4点。" + }, + [5400204]={ + ["desc"]="脉动反击附加的反击效果，回合数+1。" + }, + [5400205]={ + ["desc"]="闪烁法师造成伤害时有10%概率附加中毒效果，2回合。" + }, + [5400206]={ + ["desc"]="闪烁攻击提升15%。" + }, + [5400207]={ + ["desc"]="Combo:闪烁法师对诅咒敌人额外造成100%伤害。" } } local config = { -data=skill_rogue,count=204 +data=skill_rogue,count=244 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/hero.lua b/lua/app/config/strings/de/hero.lua index fe5b3598..3cbd38bd 100644 --- a/lua/app/config/strings/de/hero.lua +++ b/lua/app/config/strings/de/hero.lua @@ -10,6 +10,9 @@ local hero = { }, [14001]={ + }, + [14002]={ + }, [22001]={ @@ -22,6 +25,9 @@ local hero = { }, [24001]={ + }, + [24002]={ + }, [32001]={ @@ -34,6 +40,9 @@ local hero = { }, [34001]={ + }, + [34002]={ + }, [42001]={ @@ -46,6 +55,9 @@ local hero = { }, [44001]={ + }, + [44002]={ + }, [52001]={ @@ -58,9 +70,12 @@ local hero = { }, [54001]={ + }, + [54002]={ + } } local config = { -data=hero,count=20 +data=hero,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/item.lua b/lua/app/config/strings/de/item.lua index 74d26588..2f8cea60 100644 --- a/lua/app/config/strings/de/item.lua +++ b/lua/app/config/strings/de/item.lua @@ -70,6 +70,9 @@ local item = { }, [14001]={ + }, + [14002]={ + }, [22001]={ @@ -82,6 +85,9 @@ local item = { }, [24001]={ + }, + [24002]={ + }, [32001]={ @@ -94,6 +100,9 @@ local item = { }, [34001]={ + }, + [34002]={ + }, [42001]={ @@ -106,6 +115,9 @@ local item = { }, [44001]={ + }, + [44002]={ + }, [52001]={ @@ -118,9 +130,12 @@ local item = { }, [54001]={ + }, + [54002]={ + } } local config = { -data=item,count=39 +data=item,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/skill.lua b/lua/app/config/strings/de/skill.lua index 9b09cecb..0f224d08 100644 --- a/lua/app/config/strings/de/skill.lua +++ b/lua/app/config/strings/de/skill.lua @@ -10,6 +10,9 @@ local skill = { }, [1400120]={ + }, + [1400220]={ + }, [2200120]={ @@ -22,6 +25,9 @@ local skill = { }, [2400120]={ + }, + [2400220]={ + }, [3200120]={ @@ -34,6 +40,9 @@ local skill = { }, [3400120]={ + }, + [3400220]={ + }, [4200120]={ @@ -46,6 +55,9 @@ local skill = { }, [4400120]={ + }, + [4400220]={ + }, [5200120]={ @@ -58,9 +70,12 @@ local skill = { }, [5400120]={ + }, + [5400220]={ + } } local config = { -data=skill,count=20 +data=skill,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/skill_rogue.lua b/lua/app/config/strings/de/skill_rogue.lua index 36ab85ca..8a4cb99a 100644 --- a/lua/app/config/strings/de/skill_rogue.lua +++ b/lua/app/config/strings/de/skill_rogue.lua @@ -226,6 +226,30 @@ local skill_rogue = { }, [1400107]={ + }, + [1400200]={ + + }, + [1400201]={ + + }, + [1400202]={ + + }, + [1400203]={ + + }, + [1400204]={ + + }, + [1400205]={ + + }, + [1400206]={ + + }, + [1400207]={ + }, [2200100]={ @@ -322,6 +346,30 @@ local skill_rogue = { }, [2400107]={ + }, + [2400200]={ + + }, + [2400201]={ + + }, + [2400202]={ + + }, + [2400203]={ + + }, + [2400204]={ + + }, + [2400205]={ + + }, + [2400206]={ + + }, + [2400207]={ + }, [3200100]={ @@ -418,6 +466,30 @@ local skill_rogue = { }, [3400107]={ + }, + [3400200]={ + + }, + [3400201]={ + + }, + [3400202]={ + + }, + [3400203]={ + + }, + [3400204]={ + + }, + [3400205]={ + + }, + [3400206]={ + + }, + [3400207]={ + }, [4200100]={ @@ -514,6 +586,30 @@ local skill_rogue = { }, [4400107]={ + }, + [4400200]={ + + }, + [4400201]={ + + }, + [4400202]={ + + }, + [4400203]={ + + }, + [4400204]={ + + }, + [4400205]={ + + }, + [4400206]={ + + }, + [4400207]={ + }, [5200100]={ @@ -610,9 +706,33 @@ local skill_rogue = { }, [5400107]={ + }, + [5400200]={ + + }, + [5400201]={ + + }, + [5400202]={ + + }, + [5400203]={ + + }, + [5400204]={ + + }, + [5400205]={ + + }, + [5400206]={ + + }, + [5400207]={ + } } local config = { -data=skill_rogue,count=204 +data=skill_rogue,count=244 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/global.lua b/lua/app/config/strings/en/global.lua index 73d9e108..30ef1458 100644 --- a/lua/app/config/strings/en/global.lua +++ b/lua/app/config/strings/en/global.lua @@ -218,6 +218,7 @@ local localization_global = ["CHAPTER_DESC_2"] = "Mysterious Chest{0}/{1}", ["FIRST_PASS"] = "1st Clear", ["MAIN_CHAPTER"] = "Main Chapter", + ["SMASH"] = "Smash", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/en/hero.lua b/lua/app/config/strings/en/hero.lua index 5999c582..31768f70 100644 --- a/lua/app/config/strings/en/hero.lua +++ b/lua/app/config/strings/en/hero.lua @@ -14,6 +14,9 @@ local hero = { [14001]={ ["name"]="Alexander", ["desc"]="No one can withstand Alexander's heavy blow of steel, and if he bears it, then hit again." + }, + [14002]={ + }, [22001]={ ["name"]="Blade Maid", @@ -30,6 +33,9 @@ local hero = { [24001]={ ["name"]="Claymore Kid", ["desc"]="I may not be able to hold the greatsword, but that doesn't stop me from blasting people with it." + }, + [24002]={ + }, [32001]={ ["name"]="Onion", @@ -46,6 +52,9 @@ local hero = { [34001]={ ["name"]="Mulan", ["desc"]="You may die with this arrow." + }, + [34002]={ + }, [42001]={ ["name"]="Iceheart", @@ -62,6 +71,9 @@ local hero = { [44001]={ ["name"]="Frost Enchantress", ["desc"]="Someone danced with a sword, and Frost Enchantress used the sword to make the enemy dance." + }, + [44002]={ + }, [52001]={ ["name"]="Ninja Lun", @@ -78,9 +90,12 @@ local hero = { [54001]={ ["name"]="Butterfly", ["desc"]="The butterfly emerges from the cocoon, beautiful and tough, not only the heart is tough, but also the beautiful long knife in the hand." + }, + [54002]={ + } } local config = { -data=hero,count=20 +data=hero,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/item.lua b/lua/app/config/strings/en/item.lua index 2942589b..1a828781 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -90,6 +90,9 @@ local item = { [14001]={ ["name"]="Alexander Shard", ["desc"]="Alexander Shard, collect the shards to activate or upgrade." + }, + [14002]={ + }, [22001]={ ["name"]="Blade Maid Shard", @@ -106,6 +109,9 @@ local item = { [24001]={ ["name"]="Claymore Kid Shard", ["desc"]="Claymore Kid Shard, collect the shards to activate or upgrade." + }, + [24002]={ + }, [32001]={ ["name"]="Onion Shard", @@ -122,6 +128,9 @@ local item = { [34001]={ ["name"]="Mulan Shard", ["desc"]="Mulan Shard, collect the shards to activate or upgrade." + }, + [34002]={ + }, [42001]={ ["name"]="Iceheart Shard", @@ -138,6 +147,9 @@ local item = { [44001]={ ["name"]="Frost Enchantress Shard", ["desc"]="Frost Enchantress Shard, collect the shards to activate or upgrade." + }, + [44002]={ + }, [52001]={ ["name"]="Ninja Lun Shard", @@ -154,9 +166,12 @@ local item = { [54001]={ ["name"]="Butterfly Shard", ["desc"]="Butterfly Shard, collect the shards to activate or upgrade." + }, + [54002]={ + } } local config = { -data=item,count=39 +data=item,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/skill.lua b/lua/app/config/strings/en/skill.lua index 57c5f580..5735d576 100644 --- a/lua/app/config/strings/en/skill.lua +++ b/lua/app/config/strings/en/skill.lua @@ -10,6 +10,9 @@ local skill = { }, [1400120]={ ["desc"]="Steel Strike: Change the color of 4 adjacent elements and deal massive skill damage multiple times." + }, + [1400220]={ + }, [2200120]={ ["desc"]="Unsheathe: Deal one additional hit of skill damage." @@ -22,6 +25,9 @@ local skill = { }, [2400120]={ ["desc"]="Claymore Crush: Deal one additional hit of massive skill damage." + }, + [2400220]={ + }, [3200120]={ ["desc"]="Lance Thrust: Deal one additional hit of skill damage." @@ -34,6 +40,9 @@ local skill = { }, [3400120]={ ["desc"]="Moon Chaser: Increase damage and deal significantly skill damage once." + }, + [3400220]={ + }, [4200120]={ ["desc"]="Elemental Link: Clear 3 random elements and deal skill damage once." @@ -46,6 +55,9 @@ local skill = { }, [4400120]={ ["desc"]="Frost Sword Dance: Clear 3 random elements and deal skill damage once. Inflict Freeze for 1 turn." + }, + [4400220]={ + }, [5200120]={ ["desc"]="Shield Art: Apply a shield to the team for 1 turn." @@ -58,9 +70,12 @@ local skill = { }, [5400120]={ ["desc"]="Butterfly Dance Slash: Deal multiple additional hits of skill damage." + }, + [5400220]={ + } } local config = { -data=skill,count=20 +data=skill,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/skill_rogue.lua b/lua/app/config/strings/en/skill_rogue.lua index 30d68898..4af2699f 100644 --- a/lua/app/config/strings/en/skill_rogue.lua +++ b/lua/app/config/strings/en/skill_rogue.lua @@ -226,6 +226,30 @@ local skill_rogue = { }, [1400107]={ ["desc"]="For every 4 elements linked, Steel Strike launches 1 Fireball to deal damage." + }, + [1400200]={ + + }, + [1400201]={ + + }, + [1400202]={ + + }, + [1400203]={ + + }, + [1400204]={ + + }, + [1400205]={ + + }, + [1400206]={ + + }, + [1400207]={ + }, [2200100]={ ["desc"]="Unleashed Unsheathe: Deal one additional hit of skill damage." @@ -322,6 +346,30 @@ local skill_rogue = { }, [2400107]={ ["desc"]="Claymore Crush deals double damage." + }, + [2400200]={ + + }, + [2400201]={ + + }, + [2400202]={ + + }, + [2400203]={ + + }, + [2400204]={ + + }, + [2400205]={ + + }, + [2400206]={ + + }, + [2400207]={ + }, [3200100]={ ["desc"]="Unleashed Lance Thrust: Deal one additional hit of skill damage." @@ -418,6 +466,30 @@ local skill_rogue = { }, [3400107]={ ["desc"]="When Moonchaser links 4 or more elements, it will be cast by 2 times." + }, + [3400200]={ + + }, + [3400201]={ + + }, + [3400202]={ + + }, + [3400203]={ + + }, + [3400204]={ + + }, + [3400205]={ + + }, + [3400206]={ + + }, + [3400207]={ + }, [4200100]={ ["desc"]="Unleashed Elemental Link: Clear 3 random elements and deal skill damage once." @@ -514,6 +586,30 @@ local skill_rogue = { }, [4400107]={ ["desc"]="The chance of Frozen inflicted by Frost Sword Dance increases to 70%." + }, + [4400200]={ + + }, + [4400201]={ + + }, + [4400202]={ + + }, + [4400203]={ + + }, + [4400204]={ + + }, + [4400205]={ + + }, + [4400206]={ + + }, + [4400207]={ + }, [5200100]={ ["desc"]="Unleashed Shield Art: Apply a shield to the team for 1 turn." @@ -610,9 +706,33 @@ local skill_rogue = { }, [5400107]={ ["desc"]="Butterfly Dance Slash will increase Butterfly's skill energy by 2 points after killing an enemy." + }, + [5400200]={ + + }, + [5400201]={ + + }, + [5400202]={ + + }, + [5400203]={ + + }, + [5400204]={ + + }, + [5400205]={ + + }, + [5400206]={ + + }, + [5400207]={ + } } local config = { -data=skill_rogue,count=204 +data=skill_rogue,count=244 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/hero.lua b/lua/app/config/strings/fr/hero.lua index fe5b3598..3cbd38bd 100644 --- a/lua/app/config/strings/fr/hero.lua +++ b/lua/app/config/strings/fr/hero.lua @@ -10,6 +10,9 @@ local hero = { }, [14001]={ + }, + [14002]={ + }, [22001]={ @@ -22,6 +25,9 @@ local hero = { }, [24001]={ + }, + [24002]={ + }, [32001]={ @@ -34,6 +40,9 @@ local hero = { }, [34001]={ + }, + [34002]={ + }, [42001]={ @@ -46,6 +55,9 @@ local hero = { }, [44001]={ + }, + [44002]={ + }, [52001]={ @@ -58,9 +70,12 @@ local hero = { }, [54001]={ + }, + [54002]={ + } } local config = { -data=hero,count=20 +data=hero,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/item.lua b/lua/app/config/strings/fr/item.lua index d1348681..85989bb4 100644 --- a/lua/app/config/strings/fr/item.lua +++ b/lua/app/config/strings/fr/item.lua @@ -70,6 +70,9 @@ local item = { }, [14001]={ + }, + [14002]={ + }, [22001]={ @@ -82,6 +85,9 @@ local item = { }, [24001]={ + }, + [24002]={ + }, [32001]={ @@ -94,6 +100,9 @@ local item = { }, [34001]={ + }, + [34002]={ + }, [42001]={ @@ -106,6 +115,9 @@ local item = { }, [44001]={ + }, + [44002]={ + }, [52001]={ @@ -118,9 +130,12 @@ local item = { }, [54001]={ + }, + [54002]={ + } } local config = { -data=item,count=39 +data=item,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/skill.lua b/lua/app/config/strings/fr/skill.lua index 9b09cecb..0f224d08 100644 --- a/lua/app/config/strings/fr/skill.lua +++ b/lua/app/config/strings/fr/skill.lua @@ -10,6 +10,9 @@ local skill = { }, [1400120]={ + }, + [1400220]={ + }, [2200120]={ @@ -22,6 +25,9 @@ local skill = { }, [2400120]={ + }, + [2400220]={ + }, [3200120]={ @@ -34,6 +40,9 @@ local skill = { }, [3400120]={ + }, + [3400220]={ + }, [4200120]={ @@ -46,6 +55,9 @@ local skill = { }, [4400120]={ + }, + [4400220]={ + }, [5200120]={ @@ -58,9 +70,12 @@ local skill = { }, [5400120]={ + }, + [5400220]={ + } } local config = { -data=skill,count=20 +data=skill,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/skill_rogue.lua b/lua/app/config/strings/fr/skill_rogue.lua index 36ab85ca..8a4cb99a 100644 --- a/lua/app/config/strings/fr/skill_rogue.lua +++ b/lua/app/config/strings/fr/skill_rogue.lua @@ -226,6 +226,30 @@ local skill_rogue = { }, [1400107]={ + }, + [1400200]={ + + }, + [1400201]={ + + }, + [1400202]={ + + }, + [1400203]={ + + }, + [1400204]={ + + }, + [1400205]={ + + }, + [1400206]={ + + }, + [1400207]={ + }, [2200100]={ @@ -322,6 +346,30 @@ local skill_rogue = { }, [2400107]={ + }, + [2400200]={ + + }, + [2400201]={ + + }, + [2400202]={ + + }, + [2400203]={ + + }, + [2400204]={ + + }, + [2400205]={ + + }, + [2400206]={ + + }, + [2400207]={ + }, [3200100]={ @@ -418,6 +466,30 @@ local skill_rogue = { }, [3400107]={ + }, + [3400200]={ + + }, + [3400201]={ + + }, + [3400202]={ + + }, + [3400203]={ + + }, + [3400204]={ + + }, + [3400205]={ + + }, + [3400206]={ + + }, + [3400207]={ + }, [4200100]={ @@ -514,6 +586,30 @@ local skill_rogue = { }, [4400107]={ + }, + [4400200]={ + + }, + [4400201]={ + + }, + [4400202]={ + + }, + [4400203]={ + + }, + [4400204]={ + + }, + [4400205]={ + + }, + [4400206]={ + + }, + [4400207]={ + }, [5200100]={ @@ -610,9 +706,33 @@ local skill_rogue = { }, [5400107]={ + }, + [5400200]={ + + }, + [5400201]={ + + }, + [5400202]={ + + }, + [5400203]={ + + }, + [5400204]={ + + }, + [5400205]={ + + }, + [5400206]={ + + }, + [5400207]={ + } } local config = { -data=skill_rogue,count=204 +data=skill_rogue,count=244 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/hero.lua b/lua/app/config/strings/id/hero.lua index fe5b3598..3cbd38bd 100644 --- a/lua/app/config/strings/id/hero.lua +++ b/lua/app/config/strings/id/hero.lua @@ -10,6 +10,9 @@ local hero = { }, [14001]={ + }, + [14002]={ + }, [22001]={ @@ -22,6 +25,9 @@ local hero = { }, [24001]={ + }, + [24002]={ + }, [32001]={ @@ -34,6 +40,9 @@ local hero = { }, [34001]={ + }, + [34002]={ + }, [42001]={ @@ -46,6 +55,9 @@ local hero = { }, [44001]={ + }, + [44002]={ + }, [52001]={ @@ -58,9 +70,12 @@ local hero = { }, [54001]={ + }, + [54002]={ + } } local config = { -data=hero,count=20 +data=hero,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/item.lua b/lua/app/config/strings/id/item.lua index 59a32f70..e5e27042 100644 --- a/lua/app/config/strings/id/item.lua +++ b/lua/app/config/strings/id/item.lua @@ -70,6 +70,9 @@ local item = { }, [14001]={ + }, + [14002]={ + }, [22001]={ @@ -82,6 +85,9 @@ local item = { }, [24001]={ + }, + [24002]={ + }, [32001]={ @@ -94,6 +100,9 @@ local item = { }, [34001]={ + }, + [34002]={ + }, [42001]={ @@ -106,6 +115,9 @@ local item = { }, [44001]={ + }, + [44002]={ + }, [52001]={ @@ -118,9 +130,12 @@ local item = { }, [54001]={ + }, + [54002]={ + } } local config = { -data=item,count=39 +data=item,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/skill.lua b/lua/app/config/strings/id/skill.lua index 9b09cecb..0f224d08 100644 --- a/lua/app/config/strings/id/skill.lua +++ b/lua/app/config/strings/id/skill.lua @@ -10,6 +10,9 @@ local skill = { }, [1400120]={ + }, + [1400220]={ + }, [2200120]={ @@ -22,6 +25,9 @@ local skill = { }, [2400120]={ + }, + [2400220]={ + }, [3200120]={ @@ -34,6 +40,9 @@ local skill = { }, [3400120]={ + }, + [3400220]={ + }, [4200120]={ @@ -46,6 +55,9 @@ local skill = { }, [4400120]={ + }, + [4400220]={ + }, [5200120]={ @@ -58,9 +70,12 @@ local skill = { }, [5400120]={ + }, + [5400220]={ + } } local config = { -data=skill,count=20 +data=skill,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/skill_rogue.lua b/lua/app/config/strings/id/skill_rogue.lua index 36ab85ca..8a4cb99a 100644 --- a/lua/app/config/strings/id/skill_rogue.lua +++ b/lua/app/config/strings/id/skill_rogue.lua @@ -226,6 +226,30 @@ local skill_rogue = { }, [1400107]={ + }, + [1400200]={ + + }, + [1400201]={ + + }, + [1400202]={ + + }, + [1400203]={ + + }, + [1400204]={ + + }, + [1400205]={ + + }, + [1400206]={ + + }, + [1400207]={ + }, [2200100]={ @@ -322,6 +346,30 @@ local skill_rogue = { }, [2400107]={ + }, + [2400200]={ + + }, + [2400201]={ + + }, + [2400202]={ + + }, + [2400203]={ + + }, + [2400204]={ + + }, + [2400205]={ + + }, + [2400206]={ + + }, + [2400207]={ + }, [3200100]={ @@ -418,6 +466,30 @@ local skill_rogue = { }, [3400107]={ + }, + [3400200]={ + + }, + [3400201]={ + + }, + [3400202]={ + + }, + [3400203]={ + + }, + [3400204]={ + + }, + [3400205]={ + + }, + [3400206]={ + + }, + [3400207]={ + }, [4200100]={ @@ -514,6 +586,30 @@ local skill_rogue = { }, [4400107]={ + }, + [4400200]={ + + }, + [4400201]={ + + }, + [4400202]={ + + }, + [4400203]={ + + }, + [4400204]={ + + }, + [4400205]={ + + }, + [4400206]={ + + }, + [4400207]={ + }, [5200100]={ @@ -610,9 +706,33 @@ local skill_rogue = { }, [5400107]={ + }, + [5400200]={ + + }, + [5400201]={ + + }, + [5400202]={ + + }, + [5400203]={ + + }, + [5400204]={ + + }, + [5400205]={ + + }, + [5400206]={ + + }, + [5400207]={ + } } local config = { -data=skill_rogue,count=204 +data=skill_rogue,count=244 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/hero.lua b/lua/app/config/strings/ja/hero.lua index fe5b3598..3cbd38bd 100644 --- a/lua/app/config/strings/ja/hero.lua +++ b/lua/app/config/strings/ja/hero.lua @@ -10,6 +10,9 @@ local hero = { }, [14001]={ + }, + [14002]={ + }, [22001]={ @@ -22,6 +25,9 @@ local hero = { }, [24001]={ + }, + [24002]={ + }, [32001]={ @@ -34,6 +40,9 @@ local hero = { }, [34001]={ + }, + [34002]={ + }, [42001]={ @@ -46,6 +55,9 @@ local hero = { }, [44001]={ + }, + [44002]={ + }, [52001]={ @@ -58,9 +70,12 @@ local hero = { }, [54001]={ + }, + [54002]={ + } } local config = { -data=hero,count=20 +data=hero,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/item.lua b/lua/app/config/strings/ja/item.lua index 7aef2dab..e933516c 100644 --- a/lua/app/config/strings/ja/item.lua +++ b/lua/app/config/strings/ja/item.lua @@ -70,6 +70,9 @@ local item = { }, [14001]={ + }, + [14002]={ + }, [22001]={ @@ -82,6 +85,9 @@ local item = { }, [24001]={ + }, + [24002]={ + }, [32001]={ @@ -94,6 +100,9 @@ local item = { }, [34001]={ + }, + [34002]={ + }, [42001]={ @@ -106,6 +115,9 @@ local item = { }, [44001]={ + }, + [44002]={ + }, [52001]={ @@ -118,9 +130,12 @@ local item = { }, [54001]={ + }, + [54002]={ + } } local config = { -data=item,count=39 +data=item,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/skill.lua b/lua/app/config/strings/ja/skill.lua index 9b09cecb..0f224d08 100644 --- a/lua/app/config/strings/ja/skill.lua +++ b/lua/app/config/strings/ja/skill.lua @@ -10,6 +10,9 @@ local skill = { }, [1400120]={ + }, + [1400220]={ + }, [2200120]={ @@ -22,6 +25,9 @@ local skill = { }, [2400120]={ + }, + [2400220]={ + }, [3200120]={ @@ -34,6 +40,9 @@ local skill = { }, [3400120]={ + }, + [3400220]={ + }, [4200120]={ @@ -46,6 +55,9 @@ local skill = { }, [4400120]={ + }, + [4400220]={ + }, [5200120]={ @@ -58,9 +70,12 @@ local skill = { }, [5400120]={ + }, + [5400220]={ + } } local config = { -data=skill,count=20 +data=skill,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/skill_rogue.lua b/lua/app/config/strings/ja/skill_rogue.lua index 36ab85ca..8a4cb99a 100644 --- a/lua/app/config/strings/ja/skill_rogue.lua +++ b/lua/app/config/strings/ja/skill_rogue.lua @@ -226,6 +226,30 @@ local skill_rogue = { }, [1400107]={ + }, + [1400200]={ + + }, + [1400201]={ + + }, + [1400202]={ + + }, + [1400203]={ + + }, + [1400204]={ + + }, + [1400205]={ + + }, + [1400206]={ + + }, + [1400207]={ + }, [2200100]={ @@ -322,6 +346,30 @@ local skill_rogue = { }, [2400107]={ + }, + [2400200]={ + + }, + [2400201]={ + + }, + [2400202]={ + + }, + [2400203]={ + + }, + [2400204]={ + + }, + [2400205]={ + + }, + [2400206]={ + + }, + [2400207]={ + }, [3200100]={ @@ -418,6 +466,30 @@ local skill_rogue = { }, [3400107]={ + }, + [3400200]={ + + }, + [3400201]={ + + }, + [3400202]={ + + }, + [3400203]={ + + }, + [3400204]={ + + }, + [3400205]={ + + }, + [3400206]={ + + }, + [3400207]={ + }, [4200100]={ @@ -514,6 +586,30 @@ local skill_rogue = { }, [4400107]={ + }, + [4400200]={ + + }, + [4400201]={ + + }, + [4400202]={ + + }, + [4400203]={ + + }, + [4400204]={ + + }, + [4400205]={ + + }, + [4400206]={ + + }, + [4400207]={ + }, [5200100]={ @@ -610,9 +706,33 @@ local skill_rogue = { }, [5400107]={ + }, + [5400200]={ + + }, + [5400201]={ + + }, + [5400202]={ + + }, + [5400203]={ + + }, + [5400204]={ + + }, + [5400205]={ + + }, + [5400206]={ + + }, + [5400207]={ + } } local config = { -data=skill_rogue,count=204 +data=skill_rogue,count=244 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/hero.lua b/lua/app/config/strings/ko/hero.lua index fe5b3598..3cbd38bd 100644 --- a/lua/app/config/strings/ko/hero.lua +++ b/lua/app/config/strings/ko/hero.lua @@ -10,6 +10,9 @@ local hero = { }, [14001]={ + }, + [14002]={ + }, [22001]={ @@ -22,6 +25,9 @@ local hero = { }, [24001]={ + }, + [24002]={ + }, [32001]={ @@ -34,6 +40,9 @@ local hero = { }, [34001]={ + }, + [34002]={ + }, [42001]={ @@ -46,6 +55,9 @@ local hero = { }, [44001]={ + }, + [44002]={ + }, [52001]={ @@ -58,9 +70,12 @@ local hero = { }, [54001]={ + }, + [54002]={ + } } local config = { -data=hero,count=20 +data=hero,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/item.lua b/lua/app/config/strings/ko/item.lua index d4f3a0f3..7f4c83b2 100644 --- a/lua/app/config/strings/ko/item.lua +++ b/lua/app/config/strings/ko/item.lua @@ -70,6 +70,9 @@ local item = { }, [14001]={ + }, + [14002]={ + }, [22001]={ @@ -82,6 +85,9 @@ local item = { }, [24001]={ + }, + [24002]={ + }, [32001]={ @@ -94,6 +100,9 @@ local item = { }, [34001]={ + }, + [34002]={ + }, [42001]={ @@ -106,6 +115,9 @@ local item = { }, [44001]={ + }, + [44002]={ + }, [52001]={ @@ -118,9 +130,12 @@ local item = { }, [54001]={ + }, + [54002]={ + } } local config = { -data=item,count=39 +data=item,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/skill.lua b/lua/app/config/strings/ko/skill.lua index 9b09cecb..0f224d08 100644 --- a/lua/app/config/strings/ko/skill.lua +++ b/lua/app/config/strings/ko/skill.lua @@ -10,6 +10,9 @@ local skill = { }, [1400120]={ + }, + [1400220]={ + }, [2200120]={ @@ -22,6 +25,9 @@ local skill = { }, [2400120]={ + }, + [2400220]={ + }, [3200120]={ @@ -34,6 +40,9 @@ local skill = { }, [3400120]={ + }, + [3400220]={ + }, [4200120]={ @@ -46,6 +55,9 @@ local skill = { }, [4400120]={ + }, + [4400220]={ + }, [5200120]={ @@ -58,9 +70,12 @@ local skill = { }, [5400120]={ + }, + [5400220]={ + } } local config = { -data=skill,count=20 +data=skill,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/skill_rogue.lua b/lua/app/config/strings/ko/skill_rogue.lua index 36ab85ca..8a4cb99a 100644 --- a/lua/app/config/strings/ko/skill_rogue.lua +++ b/lua/app/config/strings/ko/skill_rogue.lua @@ -226,6 +226,30 @@ local skill_rogue = { }, [1400107]={ + }, + [1400200]={ + + }, + [1400201]={ + + }, + [1400202]={ + + }, + [1400203]={ + + }, + [1400204]={ + + }, + [1400205]={ + + }, + [1400206]={ + + }, + [1400207]={ + }, [2200100]={ @@ -322,6 +346,30 @@ local skill_rogue = { }, [2400107]={ + }, + [2400200]={ + + }, + [2400201]={ + + }, + [2400202]={ + + }, + [2400203]={ + + }, + [2400204]={ + + }, + [2400205]={ + + }, + [2400206]={ + + }, + [2400207]={ + }, [3200100]={ @@ -418,6 +466,30 @@ local skill_rogue = { }, [3400107]={ + }, + [3400200]={ + + }, + [3400201]={ + + }, + [3400202]={ + + }, + [3400203]={ + + }, + [3400204]={ + + }, + [3400205]={ + + }, + [3400206]={ + + }, + [3400207]={ + }, [4200100]={ @@ -514,6 +586,30 @@ local skill_rogue = { }, [4400107]={ + }, + [4400200]={ + + }, + [4400201]={ + + }, + [4400202]={ + + }, + [4400203]={ + + }, + [4400204]={ + + }, + [4400205]={ + + }, + [4400206]={ + + }, + [4400207]={ + }, [5200100]={ @@ -610,9 +706,33 @@ local skill_rogue = { }, [5400107]={ + }, + [5400200]={ + + }, + [5400201]={ + + }, + [5400202]={ + + }, + [5400203]={ + + }, + [5400204]={ + + }, + [5400205]={ + + }, + [5400206]={ + + }, + [5400207]={ + } } local config = { -data=skill_rogue,count=204 +data=skill_rogue,count=244 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/hero.lua b/lua/app/config/strings/pt/hero.lua index fe5b3598..3cbd38bd 100644 --- a/lua/app/config/strings/pt/hero.lua +++ b/lua/app/config/strings/pt/hero.lua @@ -10,6 +10,9 @@ local hero = { }, [14001]={ + }, + [14002]={ + }, [22001]={ @@ -22,6 +25,9 @@ local hero = { }, [24001]={ + }, + [24002]={ + }, [32001]={ @@ -34,6 +40,9 @@ local hero = { }, [34001]={ + }, + [34002]={ + }, [42001]={ @@ -46,6 +55,9 @@ local hero = { }, [44001]={ + }, + [44002]={ + }, [52001]={ @@ -58,9 +70,12 @@ local hero = { }, [54001]={ + }, + [54002]={ + } } local config = { -data=hero,count=20 +data=hero,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/item.lua b/lua/app/config/strings/pt/item.lua index ae06de41..99bd1b45 100644 --- a/lua/app/config/strings/pt/item.lua +++ b/lua/app/config/strings/pt/item.lua @@ -69,6 +69,9 @@ local item = { }, [14001]={ + }, + [14002]={ + }, [22001]={ @@ -81,6 +84,9 @@ local item = { }, [24001]={ + }, + [24002]={ + }, [32001]={ @@ -93,6 +99,9 @@ local item = { }, [34001]={ + }, + [34002]={ + }, [42001]={ @@ -105,6 +114,9 @@ local item = { }, [44001]={ + }, + [44002]={ + }, [52001]={ @@ -117,9 +129,12 @@ local item = { }, [54001]={ + }, + [54002]={ + } } local config = { -data=item,count=39 +data=item,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/skill.lua b/lua/app/config/strings/pt/skill.lua index 9b09cecb..0f224d08 100644 --- a/lua/app/config/strings/pt/skill.lua +++ b/lua/app/config/strings/pt/skill.lua @@ -10,6 +10,9 @@ local skill = { }, [1400120]={ + }, + [1400220]={ + }, [2200120]={ @@ -22,6 +25,9 @@ local skill = { }, [2400120]={ + }, + [2400220]={ + }, [3200120]={ @@ -34,6 +40,9 @@ local skill = { }, [3400120]={ + }, + [3400220]={ + }, [4200120]={ @@ -46,6 +55,9 @@ local skill = { }, [4400120]={ + }, + [4400220]={ + }, [5200120]={ @@ -58,9 +70,12 @@ local skill = { }, [5400120]={ + }, + [5400220]={ + } } local config = { -data=skill,count=20 +data=skill,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/skill_rogue.lua b/lua/app/config/strings/pt/skill_rogue.lua index 36ab85ca..8a4cb99a 100644 --- a/lua/app/config/strings/pt/skill_rogue.lua +++ b/lua/app/config/strings/pt/skill_rogue.lua @@ -226,6 +226,30 @@ local skill_rogue = { }, [1400107]={ + }, + [1400200]={ + + }, + [1400201]={ + + }, + [1400202]={ + + }, + [1400203]={ + + }, + [1400204]={ + + }, + [1400205]={ + + }, + [1400206]={ + + }, + [1400207]={ + }, [2200100]={ @@ -322,6 +346,30 @@ local skill_rogue = { }, [2400107]={ + }, + [2400200]={ + + }, + [2400201]={ + + }, + [2400202]={ + + }, + [2400203]={ + + }, + [2400204]={ + + }, + [2400205]={ + + }, + [2400206]={ + + }, + [2400207]={ + }, [3200100]={ @@ -418,6 +466,30 @@ local skill_rogue = { }, [3400107]={ + }, + [3400200]={ + + }, + [3400201]={ + + }, + [3400202]={ + + }, + [3400203]={ + + }, + [3400204]={ + + }, + [3400205]={ + + }, + [3400206]={ + + }, + [3400207]={ + }, [4200100]={ @@ -514,6 +586,30 @@ local skill_rogue = { }, [4400107]={ + }, + [4400200]={ + + }, + [4400201]={ + + }, + [4400202]={ + + }, + [4400203]={ + + }, + [4400204]={ + + }, + [4400205]={ + + }, + [4400206]={ + + }, + [4400207]={ + }, [5200100]={ @@ -610,9 +706,33 @@ local skill_rogue = { }, [5400107]={ + }, + [5400200]={ + + }, + [5400201]={ + + }, + [5400202]={ + + }, + [5400203]={ + + }, + [5400204]={ + + }, + [5400205]={ + + }, + [5400206]={ + + }, + [5400207]={ + } } local config = { -data=skill_rogue,count=204 +data=skill_rogue,count=244 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/hero.lua b/lua/app/config/strings/ru/hero.lua index fe5b3598..3cbd38bd 100644 --- a/lua/app/config/strings/ru/hero.lua +++ b/lua/app/config/strings/ru/hero.lua @@ -10,6 +10,9 @@ local hero = { }, [14001]={ + }, + [14002]={ + }, [22001]={ @@ -22,6 +25,9 @@ local hero = { }, [24001]={ + }, + [24002]={ + }, [32001]={ @@ -34,6 +40,9 @@ local hero = { }, [34001]={ + }, + [34002]={ + }, [42001]={ @@ -46,6 +55,9 @@ local hero = { }, [44001]={ + }, + [44002]={ + }, [52001]={ @@ -58,9 +70,12 @@ local hero = { }, [54001]={ + }, + [54002]={ + } } local config = { -data=hero,count=20 +data=hero,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/item.lua b/lua/app/config/strings/ru/item.lua index e91740e1..55df060a 100644 --- a/lua/app/config/strings/ru/item.lua +++ b/lua/app/config/strings/ru/item.lua @@ -67,6 +67,9 @@ local item = { }, [14001]={ + }, + [14002]={ + }, [22001]={ @@ -79,6 +82,9 @@ local item = { }, [24001]={ + }, + [24002]={ + }, [32001]={ @@ -91,6 +97,9 @@ local item = { }, [34001]={ + }, + [34002]={ + }, [42001]={ @@ -103,6 +112,9 @@ local item = { }, [44001]={ + }, + [44002]={ + }, [52001]={ @@ -115,9 +127,12 @@ local item = { }, [54001]={ + }, + [54002]={ + } } local config = { -data=item,count=39 +data=item,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/skill.lua b/lua/app/config/strings/ru/skill.lua index 9b09cecb..0f224d08 100644 --- a/lua/app/config/strings/ru/skill.lua +++ b/lua/app/config/strings/ru/skill.lua @@ -10,6 +10,9 @@ local skill = { }, [1400120]={ + }, + [1400220]={ + }, [2200120]={ @@ -22,6 +25,9 @@ local skill = { }, [2400120]={ + }, + [2400220]={ + }, [3200120]={ @@ -34,6 +40,9 @@ local skill = { }, [3400120]={ + }, + [3400220]={ + }, [4200120]={ @@ -46,6 +55,9 @@ local skill = { }, [4400120]={ + }, + [4400220]={ + }, [5200120]={ @@ -58,9 +70,12 @@ local skill = { }, [5400120]={ + }, + [5400220]={ + } } local config = { -data=skill,count=20 +data=skill,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/skill_rogue.lua b/lua/app/config/strings/ru/skill_rogue.lua index 36ab85ca..8a4cb99a 100644 --- a/lua/app/config/strings/ru/skill_rogue.lua +++ b/lua/app/config/strings/ru/skill_rogue.lua @@ -226,6 +226,30 @@ local skill_rogue = { }, [1400107]={ + }, + [1400200]={ + + }, + [1400201]={ + + }, + [1400202]={ + + }, + [1400203]={ + + }, + [1400204]={ + + }, + [1400205]={ + + }, + [1400206]={ + + }, + [1400207]={ + }, [2200100]={ @@ -322,6 +346,30 @@ local skill_rogue = { }, [2400107]={ + }, + [2400200]={ + + }, + [2400201]={ + + }, + [2400202]={ + + }, + [2400203]={ + + }, + [2400204]={ + + }, + [2400205]={ + + }, + [2400206]={ + + }, + [2400207]={ + }, [3200100]={ @@ -418,6 +466,30 @@ local skill_rogue = { }, [3400107]={ + }, + [3400200]={ + + }, + [3400201]={ + + }, + [3400202]={ + + }, + [3400203]={ + + }, + [3400204]={ + + }, + [3400205]={ + + }, + [3400206]={ + + }, + [3400207]={ + }, [4200100]={ @@ -514,6 +586,30 @@ local skill_rogue = { }, [4400107]={ + }, + [4400200]={ + + }, + [4400201]={ + + }, + [4400202]={ + + }, + [4400203]={ + + }, + [4400204]={ + + }, + [4400205]={ + + }, + [4400206]={ + + }, + [4400207]={ + }, [5200100]={ @@ -610,9 +706,33 @@ local skill_rogue = { }, [5400107]={ + }, + [5400200]={ + + }, + [5400201]={ + + }, + [5400202]={ + + }, + [5400203]={ + + }, + [5400204]={ + + }, + [5400205]={ + + }, + [5400206]={ + + }, + [5400207]={ + } } local config = { -data=skill_rogue,count=204 +data=skill_rogue,count=244 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/hero.lua b/lua/app/config/strings/th/hero.lua index fe5b3598..3cbd38bd 100644 --- a/lua/app/config/strings/th/hero.lua +++ b/lua/app/config/strings/th/hero.lua @@ -10,6 +10,9 @@ local hero = { }, [14001]={ + }, + [14002]={ + }, [22001]={ @@ -22,6 +25,9 @@ local hero = { }, [24001]={ + }, + [24002]={ + }, [32001]={ @@ -34,6 +40,9 @@ local hero = { }, [34001]={ + }, + [34002]={ + }, [42001]={ @@ -46,6 +55,9 @@ local hero = { }, [44001]={ + }, + [44002]={ + }, [52001]={ @@ -58,9 +70,12 @@ local hero = { }, [54001]={ + }, + [54002]={ + } } local config = { -data=hero,count=20 +data=hero,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/item.lua b/lua/app/config/strings/th/item.lua index e91740e1..55df060a 100644 --- a/lua/app/config/strings/th/item.lua +++ b/lua/app/config/strings/th/item.lua @@ -67,6 +67,9 @@ local item = { }, [14001]={ + }, + [14002]={ + }, [22001]={ @@ -79,6 +82,9 @@ local item = { }, [24001]={ + }, + [24002]={ + }, [32001]={ @@ -91,6 +97,9 @@ local item = { }, [34001]={ + }, + [34002]={ + }, [42001]={ @@ -103,6 +112,9 @@ local item = { }, [44001]={ + }, + [44002]={ + }, [52001]={ @@ -115,9 +127,12 @@ local item = { }, [54001]={ + }, + [54002]={ + } } local config = { -data=item,count=39 +data=item,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/skill.lua b/lua/app/config/strings/th/skill.lua index 9b09cecb..0f224d08 100644 --- a/lua/app/config/strings/th/skill.lua +++ b/lua/app/config/strings/th/skill.lua @@ -10,6 +10,9 @@ local skill = { }, [1400120]={ + }, + [1400220]={ + }, [2200120]={ @@ -22,6 +25,9 @@ local skill = { }, [2400120]={ + }, + [2400220]={ + }, [3200120]={ @@ -34,6 +40,9 @@ local skill = { }, [3400120]={ + }, + [3400220]={ + }, [4200120]={ @@ -46,6 +55,9 @@ local skill = { }, [4400120]={ + }, + [4400220]={ + }, [5200120]={ @@ -58,9 +70,12 @@ local skill = { }, [5400120]={ + }, + [5400220]={ + } } local config = { -data=skill,count=20 +data=skill,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/skill_rogue.lua b/lua/app/config/strings/th/skill_rogue.lua index 36ab85ca..8a4cb99a 100644 --- a/lua/app/config/strings/th/skill_rogue.lua +++ b/lua/app/config/strings/th/skill_rogue.lua @@ -226,6 +226,30 @@ local skill_rogue = { }, [1400107]={ + }, + [1400200]={ + + }, + [1400201]={ + + }, + [1400202]={ + + }, + [1400203]={ + + }, + [1400204]={ + + }, + [1400205]={ + + }, + [1400206]={ + + }, + [1400207]={ + }, [2200100]={ @@ -322,6 +346,30 @@ local skill_rogue = { }, [2400107]={ + }, + [2400200]={ + + }, + [2400201]={ + + }, + [2400202]={ + + }, + [2400203]={ + + }, + [2400204]={ + + }, + [2400205]={ + + }, + [2400206]={ + + }, + [2400207]={ + }, [3200100]={ @@ -418,6 +466,30 @@ local skill_rogue = { }, [3400107]={ + }, + [3400200]={ + + }, + [3400201]={ + + }, + [3400202]={ + + }, + [3400203]={ + + }, + [3400204]={ + + }, + [3400205]={ + + }, + [3400206]={ + + }, + [3400207]={ + }, [4200100]={ @@ -514,6 +586,30 @@ local skill_rogue = { }, [4400107]={ + }, + [4400200]={ + + }, + [4400201]={ + + }, + [4400202]={ + + }, + [4400203]={ + + }, + [4400204]={ + + }, + [4400205]={ + + }, + [4400206]={ + + }, + [4400207]={ + }, [5200100]={ @@ -610,9 +706,33 @@ local skill_rogue = { }, [5400107]={ + }, + [5400200]={ + + }, + [5400201]={ + + }, + [5400202]={ + + }, + [5400203]={ + + }, + [5400204]={ + + }, + [5400205]={ + + }, + [5400206]={ + + }, + [5400207]={ + } } local config = { -data=skill_rogue,count=204 +data=skill_rogue,count=244 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/hero.lua b/lua/app/config/strings/vi/hero.lua index fe5b3598..3cbd38bd 100644 --- a/lua/app/config/strings/vi/hero.lua +++ b/lua/app/config/strings/vi/hero.lua @@ -10,6 +10,9 @@ local hero = { }, [14001]={ + }, + [14002]={ + }, [22001]={ @@ -22,6 +25,9 @@ local hero = { }, [24001]={ + }, + [24002]={ + }, [32001]={ @@ -34,6 +40,9 @@ local hero = { }, [34001]={ + }, + [34002]={ + }, [42001]={ @@ -46,6 +55,9 @@ local hero = { }, [44001]={ + }, + [44002]={ + }, [52001]={ @@ -58,9 +70,12 @@ local hero = { }, [54001]={ + }, + [54002]={ + } } local config = { -data=hero,count=20 +data=hero,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/item.lua b/lua/app/config/strings/vi/item.lua index 7e03658f..d0e95cd3 100644 --- a/lua/app/config/strings/vi/item.lua +++ b/lua/app/config/strings/vi/item.lua @@ -70,6 +70,9 @@ local item = { }, [14001]={ + }, + [14002]={ + }, [22001]={ @@ -82,6 +85,9 @@ local item = { }, [24001]={ + }, + [24002]={ + }, [32001]={ @@ -94,6 +100,9 @@ local item = { }, [34001]={ + }, + [34002]={ + }, [42001]={ @@ -106,6 +115,9 @@ local item = { }, [44001]={ + }, + [44002]={ + }, [52001]={ @@ -118,9 +130,12 @@ local item = { }, [54001]={ + }, + [54002]={ + } } local config = { -data=item,count=39 +data=item,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/skill.lua b/lua/app/config/strings/vi/skill.lua index 9b09cecb..0f224d08 100644 --- a/lua/app/config/strings/vi/skill.lua +++ b/lua/app/config/strings/vi/skill.lua @@ -10,6 +10,9 @@ local skill = { }, [1400120]={ + }, + [1400220]={ + }, [2200120]={ @@ -22,6 +25,9 @@ local skill = { }, [2400120]={ + }, + [2400220]={ + }, [3200120]={ @@ -34,6 +40,9 @@ local skill = { }, [3400120]={ + }, + [3400220]={ + }, [4200120]={ @@ -46,6 +55,9 @@ local skill = { }, [4400120]={ + }, + [4400220]={ + }, [5200120]={ @@ -58,9 +70,12 @@ local skill = { }, [5400120]={ + }, + [5400220]={ + } } local config = { -data=skill,count=20 +data=skill,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/skill_rogue.lua b/lua/app/config/strings/vi/skill_rogue.lua index 36ab85ca..8a4cb99a 100644 --- a/lua/app/config/strings/vi/skill_rogue.lua +++ b/lua/app/config/strings/vi/skill_rogue.lua @@ -226,6 +226,30 @@ local skill_rogue = { }, [1400107]={ + }, + [1400200]={ + + }, + [1400201]={ + + }, + [1400202]={ + + }, + [1400203]={ + + }, + [1400204]={ + + }, + [1400205]={ + + }, + [1400206]={ + + }, + [1400207]={ + }, [2200100]={ @@ -322,6 +346,30 @@ local skill_rogue = { }, [2400107]={ + }, + [2400200]={ + + }, + [2400201]={ + + }, + [2400202]={ + + }, + [2400203]={ + + }, + [2400204]={ + + }, + [2400205]={ + + }, + [2400206]={ + + }, + [2400207]={ + }, [3200100]={ @@ -418,6 +466,30 @@ local skill_rogue = { }, [3400107]={ + }, + [3400200]={ + + }, + [3400201]={ + + }, + [3400202]={ + + }, + [3400203]={ + + }, + [3400204]={ + + }, + [3400205]={ + + }, + [3400206]={ + + }, + [3400207]={ + }, [4200100]={ @@ -514,6 +586,30 @@ local skill_rogue = { }, [4400107]={ + }, + [4400200]={ + + }, + [4400201]={ + + }, + [4400202]={ + + }, + [4400203]={ + + }, + [4400204]={ + + }, + [4400205]={ + + }, + [4400206]={ + + }, + [4400207]={ + }, [5200100]={ @@ -610,9 +706,33 @@ local skill_rogue = { }, [5400107]={ + }, + [5400200]={ + + }, + [5400201]={ + + }, + [5400202]={ + + }, + [5400203]={ + + }, + [5400204]={ + + }, + [5400205]={ + + }, + [5400206]={ + + }, + [5400207]={ + } } local config = { -data=skill_rogue,count=204 +data=skill_rogue,count=244 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/global.lua b/lua/app/config/strings/zh/global.lua index 7109511b..7ac96024 100644 --- a/lua/app/config/strings/zh/global.lua +++ b/lua/app/config/strings/zh/global.lua @@ -217,6 +217,7 @@ local localization_global = ["PAY_FAILED_DESC_1"] = "訂單異常，請聯繫客服處理", ["CHAPTER_DESC_2"] = "神祕寶箱{0}/{1}", ["MAIN_CHAPTER"] = "主線章節", + ["SMASH"] = "掃蕩", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/zh/hero.lua b/lua/app/config/strings/zh/hero.lua index 596eb3fb..92f9fc41 100644 --- a/lua/app/config/strings/zh/hero.lua +++ b/lua/app/config/strings/zh/hero.lua @@ -14,6 +14,9 @@ local hero = { [14001]={ ["name"]="亞歷山大", ["desc"]="沒人能抗住亞歷山大的鋼鐵重擊，如果扛住了，那就再來一擊。" + }, + [14002]={ + }, [22001]={ ["name"]="刀妹", @@ -30,6 +33,9 @@ local hero = { [24001]={ ["name"]="巨劍魔童", ["desc"]="我可能拿不起巨劍，但不妨礙我用它轟人。" + }, + [24002]={ + }, [32001]={ ["name"]="洋蔥頭", @@ -46,6 +52,9 @@ local hero = { [34001]={ ["name"]="木蘭", ["desc"]="這一箭下去你可能會死。" + }, + [34002]={ + }, [42001]={ ["name"]="冰心", @@ -62,6 +71,9 @@ local hero = { [44001]={ ["name"]="寒冰妖姬", ["desc"]="有人持劍起舞，寒冰妖姬用劍讓敵人起舞。" + }, + [44002]={ + }, [52001]={ ["name"]="忍者倫", @@ -78,9 +90,12 @@ local hero = { [54001]={ ["name"]="胡蝶", ["desc"]="蝴蝶破繭而出，美麗又堅韌，堅韌的不止是內心，還有手裏同樣美麗的長刀。" + }, + [54002]={ + } } local config = { -data=hero,count=20 +data=hero,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/item.lua b/lua/app/config/strings/zh/item.lua index 80b02800..48cd5a2a 100644 --- a/lua/app/config/strings/zh/item.lua +++ b/lua/app/config/strings/zh/item.lua @@ -90,6 +90,9 @@ local item = { [14001]={ ["name"]="亞歷山大碎片", ["desc"]="亞歷山大碎片，湊齊可激活或升級。" + }, + [14002]={ + }, [22001]={ ["name"]="刀妹碎片", @@ -106,6 +109,9 @@ local item = { [24001]={ ["name"]="巨劍魔童碎片", ["desc"]="巨劍魔童碎片，湊齊可激活或升級。" + }, + [24002]={ + }, [32001]={ ["name"]="洋蔥頭碎片", @@ -122,6 +128,9 @@ local item = { [34001]={ ["name"]="木蘭碎片", ["desc"]="木蘭碎片，湊齊可激活或升級。" + }, + [34002]={ + }, [42001]={ ["name"]="冰心碎片", @@ -138,6 +147,9 @@ local item = { [44001]={ ["name"]="寒冰妖姬碎片", ["desc"]="寒冰妖姬碎片，湊齊可激活或升級。" + }, + [44002]={ + }, [52001]={ ["name"]="忍者倫碎片", @@ -154,9 +166,12 @@ local item = { [54001]={ ["name"]="胡蝶碎片", ["desc"]="蝴蝶碎片，湊齊可激活或升級。" + }, + [54002]={ + } } local config = { -data=item,count=39 +data=item,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/skill.lua b/lua/app/config/strings/zh/skill.lua index 12fa8c50..c41ae376 100644 --- a/lua/app/config/strings/zh/skill.lua +++ b/lua/app/config/strings/zh/skill.lua @@ -10,6 +10,9 @@ local skill = { }, [1400120]={ ["desc"]="鋼鐵重擊：將周圍4個元素變色，並造成數次大量技能傷害。" + }, + [1400220]={ + }, [2200120]={ ["desc"]="拔刀斬：額外造成一次技能傷害。" @@ -22,6 +25,9 @@ local skill = { }, [2400120]={ ["desc"]="巨劍轟擊：額外造成一次巨大技能傷害。" + }, + [2400220]={ + }, [3200120]={ ["desc"]="長槍突刺：額外造成一次技能傷害。" @@ -34,6 +40,9 @@ local skill = { }, [3400120]={ ["desc"]="流星追月：使用後本次傷害提高，並造成一次巨大技能傷害。" + }, + [3400220]={ + }, [4200120]={ ["desc"]="元素連接：隨機消除3個元素，並造成一次技能傷害。" @@ -46,6 +55,9 @@ local skill = { }, [4400120]={ ["desc"]="冰霜劍舞：隨機消除3個元素，並造成一次技能傷害，附帶冰霜效果，1回合。" + }, + [4400220]={ + }, [5200120]={ ["desc"]="護盾術：賦予團隊一個護盾，1回合。" @@ -58,9 +70,12 @@ local skill = { }, [5400120]={ ["desc"]="蝶舞斬：額外造成多次技能傷害。" + }, + [5400220]={ + } } local config = { -data=skill,count=20 +data=skill,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/skill_rogue.lua b/lua/app/config/strings/zh/skill_rogue.lua index 1e3dc75b..faf9869b 100644 --- a/lua/app/config/strings/zh/skill_rogue.lua +++ b/lua/app/config/strings/zh/skill_rogue.lua @@ -226,6 +226,30 @@ local skill_rogue = { }, [1400107]={ ["desc"]="鋼鐵重擊每連接4個元素則額外發射1個火球造成傷害。" + }, + [1400200]={ + + }, + [1400201]={ + + }, + [1400202]={ + + }, + [1400203]={ + + }, + [1400204]={ + + }, + [1400205]={ + + }, + [1400206]={ + + }, + [1400207]={ + }, [2200100]={ ["desc"]="解鎖拔刀斬：額外造成一次技能傷害。" @@ -322,6 +346,30 @@ local skill_rogue = { }, [2400107]={ ["desc"]="巨劍轟擊將造成雙倍傷害。" + }, + [2400200]={ + + }, + [2400201]={ + + }, + [2400202]={ + + }, + [2400203]={ + + }, + [2400204]={ + + }, + [2400205]={ + + }, + [2400206]={ + + }, + [2400207]={ + }, [3200100]={ ["desc"]="解鎖長槍突刺：額外造成一次技能傷害。" @@ -418,6 +466,30 @@ local skill_rogue = { }, [3400107]={ ["desc"]="流星追月連接4個元素或以上時，流星追月攻擊將釋放2次。" + }, + [3400200]={ + + }, + [3400201]={ + + }, + [3400202]={ + + }, + [3400203]={ + + }, + [3400204]={ + + }, + [3400205]={ + + }, + [3400206]={ + + }, + [3400207]={ + }, [4200100]={ ["desc"]="解鎖元素連接：隨機消除3個元素，並造成一次技能傷害。" @@ -514,6 +586,30 @@ local skill_rogue = { }, [4400107]={ ["desc"]="冰霜劍舞附帶凍結效果機率提高到70%。" + }, + [4400200]={ + + }, + [4400201]={ + + }, + [4400202]={ + + }, + [4400203]={ + + }, + [4400204]={ + + }, + [4400205]={ + + }, + [4400206]={ + + }, + [4400207]={ + }, [5200100]={ ["desc"]="解鎖護盾術：為團隊增加一個護盾，1回合。" @@ -610,9 +706,33 @@ local skill_rogue = { }, [5400107]={ ["desc"]="蝶舞斬擊殺敵人後將增加蝴蝶技能能量2點。" + }, + [5400200]={ + + }, + [5400201]={ + + }, + [5400202]={ + + }, + [5400203]={ + + }, + [5400204]={ + + }, + [5400205]={ + + }, + [5400206]={ + + }, + [5400207]={ + } } local config = { -data=skill_rogue,count=204 +data=skill_rogue,count=244 } return config \ No newline at end of file diff --git a/lua/app/global/global_func.lua b/lua/app/global/global_func.lua index 00009489..58e86a09 100644 --- a/lua/app/global/global_func.lua +++ b/lua/app/global/global_func.lua @@ -1684,15 +1684,6 @@ function GFunc.recycleTempMap() end end --- 获取table长度 -function GFunc.getTableLength(table) - local length = 0 - for k, v in pairs(table) do - length = length + 1 - end - return length -end - --[[ 设置tabLe只速 出现改写会抛出Lua error 用法locaL readOnlyCfg = GFunc.readOnlyTab(cfg) return readOnlyCfg diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 30cb43e4..8e8b54c0 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -77,6 +77,8 @@ BattleConst.TIME_SCALE = { BattleConst.BATTLE_TYPE = { STAGE = "1", DAILY_CHALLENGE = "2", + DUNGEON_GOLD = "3", + DUNGEON_SHARDS = "4", } BattleConst.TYPEOF_LUA_COMP = { diff --git a/lua/app/module/dungeon.meta b/lua/app/module/dungeon.meta new file mode 100644 index 00000000..74913bc9 --- /dev/null +++ b/lua/app/module/dungeon.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 120307307c2846141b488d71d9d0a672 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/module/dungeon/dungeon_manager.lua b/lua/app/module/dungeon/dungeon_manager.lua new file mode 100644 index 00000000..7230a2d3 --- /dev/null +++ b/lua/app/module/dungeon/dungeon_manager.lua @@ -0,0 +1,206 @@ +local DungeonManager = class("DungeonManager", BaseModule) + +-- 外部接口-------------------------------------------------------------------------- + +-- 挑战 +function DungeonManager:reqChallenge(module, id) + if module == ModuleManager.MODULE_KEY.DUNGEON_GOLD then + self:reqChallengeGold(id) + elseif module == ModuleManager.MODULE_KEY.DUNGEON_SHARDS then + self:reqChallengeShards(id) + end +end + +-- 结算 +function DungeonManager:reqEndChallenge(module, id) + if module == ModuleManager.MODULE_KEY.DUNGEON_GOLD then + self:reqEndChallengeGold(id) + elseif module == ModuleManager.MODULE_KEY.DUNGEON_SHARDS then + self:reqEndChallengeShards(id) + end +end + +-- 扫荡 +function DungeonManager:reqSweep(module, id) + if module == ModuleManager.MODULE_KEY.DUNGEON_GOLD then + self:reqSweepGold(id) + elseif module == ModuleManager.MODULE_KEY.DUNGEON_SHARDS then + self:reqSweepShards(id) + end +end + +-- 内部接口-------------------------------------------------------------------------- + +function DungeonManager:checkDayChange() +end + +-- 请求挑战金币副本 +function DungeonManager:reqChallengeGold(id) + local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD + -- 判断次数 + if not DataManager.DungeonData:getRemainTimes(moduleKey) > 0 then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) + return + end + + -- 判断体力 + if not DataManager.DailyChallengeData:isEnoughHp(moduleKey) then + GFunc.showItemNotEnough(GConst.ItemConst.ITEM_ID_VIT) + ModuleManager.CommerceManager:showBuyVitUI() + return + end + + if not DataManager.DailyChallengeData:isCanChallenge(moduleKey) then + return + end + + local parmas = {} + self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterGoldChallengeStartReq, parmas, {}, self.respChallengeGold, BIReport.ITEM_GET_TYPE.DUNGEON_GOLD_CHALLENGE) +end + +-- 响应挑战金币副本 +function DungeonManager:respChallengeGold(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.DungeonData:onFightCountReduce(ModuleManager.MODULE_KEY.DUNGEON_GOLD) + end +end + +-- 请求结算金币副本 +function DungeonManager:reqEndChallengeGold() + local parmas = { + win = true, + total_damage = nil, + remaining_hp = nil, + chapter_gold_id = nil, + task_stat = nil, + combatReport = nil, + } + self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterGoldChallengeSettlementReq, parmas, {}, self.respEndChallengeGold, BIReport.ITEM_GET_TYPE.DUNGEON_GOLD_END) +end + +-- 响应结算金币副本 +function DungeonManager:respEndChallengeGold(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.DungeonData:initDungeonGold(result.gold_challenge) + ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD, result.rewards, result.reqData.combatReport) + end +end + +-- 请求扫荡金币副本 +function DungeonManager:reqSweepGold(id) + local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD + -- 判断次数 + if not DataManager.DungeonData:getRemainTimes(moduleKey) > 0 then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) + return + end + + -- 判断体力 + if not DataManager.DailyChallengeData:isEnoughHp(moduleKey) then + GFunc.showItemNotEnough(GConst.ItemConst.ITEM_ID_VIT) + ModuleManager.CommerceManager:showBuyVitUI() + return + end + + if not DataManager.DailyChallengeData:isCanChallenge(moduleKey) then + return + end + + local parmas = { + chapter_gold_id = id, + } + self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterGoldChallengeFarmReq, parmas, {}, self.respSweepGold, BIReport.ITEM_GET_TYPE.DUNGEON_GOLD_SWEEP) +end + +-- 响应扫荡金币副本 +function DungeonManager:respSweepGold(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.DungeonData:onFightCountReduce(ModuleManager.MODULE_KEY.DUNGEON_GOLD) + end +end + +-- 请求挑战碎片副本 +function DungeonManager:reqChallengeShards(id) + local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD + -- 判断次数 + if not DataManager.DungeonData:getRemainTimes(moduleKey) > 0 then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) + return + end + + -- 判断体力 + if not DataManager.DailyChallengeData:isEnoughHp(moduleKey) then + GFunc.showItemNotEnough(GConst.ItemConst.ITEM_ID_VIT) + ModuleManager.CommerceManager:showBuyVitUI() + return + end + + if not DataManager.DailyChallengeData:isCanChallenge(moduleKey) then + return + end + + local parmas = {} + self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterShardsChallengeStartReq, parmas, {}, self.respChallengeShards, BIReport.ITEM_GET_TYPE.DUNGEON_SHARDS_CHALLENGE) +end + +-- 响应挑战碎片副本 +function DungeonManager:respChallengeShards(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.DungeonData:onFightCountReduce(ModuleManager.MODULE_KEY.DUNGEON_SHARDS) + end +end + +-- 请求结算碎片副本 +function DungeonManager:reqEndChallengeShards() + local parmas = { + win = true, + total_damage = nil, + chapter_Shards_id = nil, + task_stat = nil, + combatReport = nil, + } + self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterShardsChallengeSettlementReq, parmas, {}, self.respEndChallengeShards, BIReport.ITEM_GET_TYPE.DUNGEON_SHARDS_END) +end + +-- 响应结算碎片副本 +function DungeonManager:respEndChallengeShards(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.DungeonData:initDungeonShards(result.shards_challenge) + ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS, result.rewards, result.reqData.combatReport) + end +end + +-- 请求扫荡碎片副本 +function DungeonManager:reqSweepShards(id) + local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_SHARDS + -- 判断次数 + if not DataManager.DungeonData:getRemainTimes(moduleKey) > 0 then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) + return + end + + -- 判断体力 + if not DataManager.DailyChallengeData:isEnoughHp(moduleKey) then + GFunc.showItemNotEnough(GConst.ItemConst.ITEM_ID_VIT) + ModuleManager.CommerceManager:showBuyVitUI() + return + end + + if not DataManager.DailyChallengeData:isCanChallenge(moduleKey) then + return + end + + local parmas = { + chapter_shards_id = id, + } + self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterShardsChallengeFarmReq, parmas, {}, self.respSweepShards, BIReport.ITEM_GET_TYPE.DUNGEON_SHARDS_SWEEP) +end + +-- 响应扫荡碎片副本 +function DungeonManager:respSweepShards(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.DungeonData:onFightCountReduce(ModuleManager.MODULE_KEY.DUNGEON_SHARDS) + end +end + +return DungeonManager \ No newline at end of file diff --git a/lua/app/module/dungeon/dungeon_manager.lua.meta b/lua/app/module/dungeon/dungeon_manager.lua.meta new file mode 100644 index 00000000..622f4e3f --- /dev/null +++ b/lua/app/module/dungeon/dungeon_manager.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 10cc1e2d34182e345b319afee1686513 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/maincity/maincity_const.lua b/lua/app/module/maincity/maincity_const.lua index 6bf73be7..1bffbd83 100644 --- a/lua/app/module/maincity/maincity_const.lua +++ b/lua/app/module/maincity/maincity_const.lua @@ -18,6 +18,7 @@ MainCityConst.BOTTOM_CLOSE_ICON = { MainCityConst.MAIN_MODULE = { DAILY_CHALLENGE = 1, CHAPTER = 2, + DUNGEON = 3, } MainCityConst.LEFT_SIDE_BARS = { diff --git a/lua/app/proto/proto_msg_type.lua b/lua/app/proto/proto_msg_type.lua index 5a3e7739..5839563d 100644 --- a/lua/app/proto/proto_msg_type.lua +++ b/lua/app/proto/proto_msg_type.lua @@ -7,6 +7,8 @@ local ProtoMsgType = { [132244689] = "ChapterSettlementRsp", [147147672] = "EnergyByADReq", [147149505] = "EnergyByADRsp", + [236190053] = "ChapterShardsChallengeStartReq", + [236191886] = "ChapterShardsChallengeStartRsp", [317272657] = "IdleQuickReq", [317274490] = "IdleQuickRsp", [349009610] = "TriggerGrowUpGiftNtf", @@ -23,16 +25,24 @@ local ProtoMsgType = { [613795629] = "WatchADRsp", [737107384] = "BuyMallIdleReq", [737109217] = "BuyMallIdleRsp", + [834139466] = "ChapterGoldChallengeStartReq", + [834141299] = "ChapterGoldChallengeStartRsp", [1008447203] = "DeleteReq", [1008449036] = "DeleteRsp", [1068769299] = "ReconnectReq", [1068771132] = "ReconnectRsp", [1070841461] = "LoginReq", [1070843294] = "LoginRsp", + [1371198132] = "ChapterShardsChallengeSettlementReq", + [1371199965] = "ChapterShardsChallengeSettlementRsp", [1433352538] = "ChapterDailyChallengeResetReq", [1433354371] = "ChapterDailyChallengeResetRsp", + [1435947790] = "AppStorePaidReq", + [1435949623] = "AppStorePaidRsp", [1471116409] = "BindReq", [1471118242] = "BindRsp", + [1571184475] = "ChapterShardsChallengeFarmReq", + [1571186308] = "ChapterShardsChallengeFarmRsp", [1584689751] = "ActPaidResultReq", [1584691584] = "ActPaidResultRsp", [1646412046] = "ChapterDailyChallengeSettlementReq", @@ -83,6 +93,8 @@ local ProtoMsgType = { [3309820798] = "HeroPutOnReq", [3309822631] = "HeroPutOnRsp", [3341173994] = "BountyBoughtNtf", + [3359969683] = "ChapterGoldChallengeSettlementReq", + [3359971516] = "ChapterGoldChallengeSettlementRsp", [3363939655] = "TaskDailyAdReq", [3363941488] = "TaskDailyAdRsp", [3421550443] = "GlobalGiftReq", @@ -112,6 +124,8 @@ local ProtoMsgType = { [3933877450] = "ChapterStartRsp", [4106156009] = "BountyLevelUnlockReq", [4106157842] = "BountyLevelUnlockRsp", + [4133057746] = "ChapterGoldChallengeFarmReq", + [4133059579] = "ChapterGoldChallengeFarmRsp", [4256333947] = "ExistReq", [4256335780] = "ExistRsp", }, @@ -123,6 +137,8 @@ local ProtoMsgType = { ChapterSettlementRsp = 132244689, EnergyByADReq = 147147672, EnergyByADRsp = 147149505, + ChapterShardsChallengeStartReq = 236190053, + ChapterShardsChallengeStartRsp = 236191886, IdleQuickReq = 317272657, IdleQuickRsp = 317274490, TriggerGrowUpGiftNtf = 349009610, @@ -139,16 +155,24 @@ local ProtoMsgType = { WatchADRsp = 613795629, BuyMallIdleReq = 737107384, BuyMallIdleRsp = 737109217, + ChapterGoldChallengeStartReq = 834139466, + ChapterGoldChallengeStartRsp = 834141299, DeleteReq = 1008447203, DeleteRsp = 1008449036, ReconnectReq = 1068769299, ReconnectRsp = 1068771132, LoginReq = 1070841461, LoginRsp = 1070843294, + ChapterShardsChallengeSettlementReq = 1371198132, + ChapterShardsChallengeSettlementRsp = 1371199965, ChapterDailyChallengeResetReq = 1433352538, ChapterDailyChallengeResetRsp = 1433354371, + AppStorePaidReq = 1435947790, + AppStorePaidRsp = 1435949623, BindReq = 1471116409, BindRsp = 1471118242, + ChapterShardsChallengeFarmReq = 1571184475, + ChapterShardsChallengeFarmRsp = 1571186308, ActPaidResultReq = 1584689751, ActPaidResultRsp = 1584691584, ChapterDailyChallengeSettlementReq = 1646412046, @@ -199,6 +223,8 @@ local ProtoMsgType = { HeroPutOnReq = 3309820798, HeroPutOnRsp = 3309822631, BountyBoughtNtf = 3341173994, + ChapterGoldChallengeSettlementReq = 3359969683, + ChapterGoldChallengeSettlementRsp = 3359971516, TaskDailyAdReq = 3363939655, TaskDailyAdRsp = 3363941488, GlobalGiftReq = 3421550443, @@ -228,6 +254,8 @@ local ProtoMsgType = { ChapterStartRsp = 3933877450, BountyLevelUnlockReq = 4106156009, BountyLevelUnlockRsp = 4106157842, + ChapterGoldChallengeFarmReq = 4133057746, + ChapterGoldChallengeFarmRsp = 4133059579, ExistReq = 4256333947, ExistRsp = 4256335780, }, @@ -239,6 +267,8 @@ local ProtoMsgType = { ChapterSettlementRsp = "ChapterSettlementRsp", EnergyByADReq = "EnergyByADReq", EnergyByADRsp = "EnergyByADRsp", + ChapterShardsChallengeStartReq = "ChapterShardsChallengeStartReq", + ChapterShardsChallengeStartRsp = "ChapterShardsChallengeStartRsp", IdleQuickReq = "IdleQuickReq", IdleQuickRsp = "IdleQuickRsp", TriggerGrowUpGiftNtf = "TriggerGrowUpGiftNtf", @@ -255,16 +285,24 @@ local ProtoMsgType = { WatchADRsp = "WatchADRsp", BuyMallIdleReq = "BuyMallIdleReq", BuyMallIdleRsp = "BuyMallIdleRsp", + ChapterGoldChallengeStartReq = "ChapterGoldChallengeStartReq", + ChapterGoldChallengeStartRsp = "ChapterGoldChallengeStartRsp", DeleteReq = "DeleteReq", DeleteRsp = "DeleteRsp", ReconnectReq = "ReconnectReq", ReconnectRsp = "ReconnectRsp", LoginReq = "LoginReq", LoginRsp = "LoginRsp", + ChapterShardsChallengeSettlementReq = "ChapterShardsChallengeSettlementReq", + ChapterShardsChallengeSettlementRsp = "ChapterShardsChallengeSettlementRsp", ChapterDailyChallengeResetReq = "ChapterDailyChallengeResetReq", ChapterDailyChallengeResetRsp = "ChapterDailyChallengeResetRsp", + AppStorePaidReq = "AppStorePaidReq", + AppStorePaidRsp = "AppStorePaidRsp", BindReq = "BindReq", BindRsp = "BindRsp", + ChapterShardsChallengeFarmReq = "ChapterShardsChallengeFarmReq", + ChapterShardsChallengeFarmRsp = "ChapterShardsChallengeFarmRsp", ActPaidResultReq = "ActPaidResultReq", ActPaidResultRsp = "ActPaidResultRsp", ChapterDailyChallengeSettlementReq = "ChapterDailyChallengeSettlementReq", @@ -315,6 +353,8 @@ local ProtoMsgType = { HeroPutOnReq = "HeroPutOnReq", HeroPutOnRsp = "HeroPutOnRsp", BountyBoughtNtf = "BountyBoughtNtf", + ChapterGoldChallengeSettlementReq = "ChapterGoldChallengeSettlementReq", + ChapterGoldChallengeSettlementRsp = "ChapterGoldChallengeSettlementRsp", TaskDailyAdReq = "TaskDailyAdReq", TaskDailyAdRsp = "TaskDailyAdRsp", GlobalGiftReq = "GlobalGiftReq", @@ -344,6 +384,8 @@ local ProtoMsgType = { ChapterStartRsp = "ChapterStartRsp", BountyLevelUnlockReq = "BountyLevelUnlockReq", BountyLevelUnlockRsp = "BountyLevelUnlockRsp", + ChapterGoldChallengeFarmReq = "ChapterGoldChallengeFarmReq", + ChapterGoldChallengeFarmRsp = "ChapterGoldChallengeFarmRsp", ExistReq = "ExistReq", ExistRsp = "ExistRsp", }, diff --git a/lua/app/ui/dungeon.meta b/lua/app/ui/dungeon.meta new file mode 100644 index 00000000..55309697 --- /dev/null +++ b/lua/app/ui/dungeon.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c079de69e6c30a0438fa6e6a4f405800 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/ui/dungeon/dungeon_board_cell.lua b/lua/app/ui/dungeon/dungeon_board_cell.lua new file mode 100644 index 00000000..f283681c --- /dev/null +++ b/lua/app/ui/dungeon/dungeon_board_cell.lua @@ -0,0 +1,100 @@ +local DungeonBoardCell = class("DungeonBoardCell", BaseCell) + +function DungeonBoardCell:init() + self.uiMap = self:getUIMap() + + self.icon = self.uiMap["dungeon_board_cell.info.icon"] + self.txTitle = self.uiMap["dungeon_board_cell.info.icon.tx_title"] + self.countdown = self.uiMap["dungeon_board_cell.info.countdown"] + self.txCountdown = self.uiMap["dungeon_board_cell.info.countdown.tx_countdown"] + self.txOpen = self.uiMap["dungeon_board_cell.info.tx_open"] + self.lock = self.uiMap["dungeon_board_cell.lock"] + self.lockTxLock = self.uiMap["dungeon_board_cell.lock.desc.tx_lock"] + self.lockTxCountdown = self.uiMap["dungeon_board_cell.lock.countdown.tx_countdown"] + self.btnStart = self.uiMap["dungeon_board_cell.btn_start"] + self.txStart = self.uiMap["dungeon_board_cell.btn_start.tx_btn"] + self.txTimes = self.uiMap["dungeon_board_cell.btn_start.tx_times"] + self.btnHelp = self.uiMap["dungeon_board_cell.btn_help"] + + self.btnStart:addClickListener(function() + -- 打开副本关卡选择界面 + UIManager:showUI("app/ui/dungeon/dungeon_difficulty_ui", {module = self.moduleKey}) + end) + self.btnHelp:addClickListener(function() + -- 展示提示 + ModuleManager.TipsManager:showDescTips(DataManager.DungeonData:getRule(self.moduleKey), self.btnHelp) + end) +end + +function DungeonBoardCell:refresh(moduleKey) + self.moduleKey = moduleKey + self.baseObject:setName(self.moduleKey) + + self:refreshInfo() + self:refreshRewards() +end + +function DungeonBoardCell:refreshInfo() + self.txTitle:setText(DataManager.DungeonData:getTitle(self.moduleKey)) + self.txOpen:setText(DataManager.DungeonData:getOpenTimeDesc(self.moduleKey)) + + if DataManager.DungeonData:isActive(self.moduleKey) then + self.btnStart:setVisible(true) + self.countdown:setVisible(true) + self.lock:setVisible(false) + + -- 红点 + if DataManager.DungeonData:isCanChallenge(self.moduleKey) then + self.btnStart:addRedPoint(65, 35, 0.6) + else + self.btnStart:removeRedPoint() + end + + self.txOpen:setAnchoredPositionY(-115) + self.txStart:setText(I18N:getGlobalText(I18N.GlobalConst.START_DESC)) + self.txTimes:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, DataManager.DungeonData:getRemainTimes(self.moduleKey))) + self:refreshCountdown(self.txCountdown) + else + self.btnStart:setVisible(false) + self.countdown:setVisible(false) + self.lock:setVisible(true) + + self.txOpen:setAnchoredPositionY(-75) + self.lockTxLock:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_OPEN)) + self:refreshCountdown(self.lockTxCountdown) + end +end + +function DungeonBoardCell:refreshRewards() + -- self.rewards = DataManager.DungeonData:getBoardShowRewards() + -- if self.rewards == nil then + -- return + -- end + + self.scrollRect = self.uiMap["dungeon_board_cell.rewards"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.scrollRect:addInitCallback(function() + return GConst.TYPEOF_LUA_CLASS.REWARD_CELL + end) + self.scrollRect:addRefreshCallback(function(index, cell) + cell:refreshItemById(1, 0) + cell:setTouchEnable(false) + end) + self.scrollRect:clearCells() + self.scrollRect:setTotalCount(2) +end + +function DungeonBoardCell:refreshCountdown(txCountdown) + if not self.countdownSid then + self.countdownSid = txCountdown:scheduleGlobal(function() + self:updateTime(txCountdown) + end, 1) + end + self:updateTime(txCountdown) +end + +function DungeonBoardCell:updateTime(txCountdown) + local remainTime = Time:getTodaySurplusTime() + txCountdown:setText(GFunc.getTimeStrWithHMS(remainTime)) +end + +return DungeonBoardCell \ No newline at end of file diff --git a/lua/app/ui/dungeon/dungeon_board_cell.lua.meta b/lua/app/ui/dungeon/dungeon_board_cell.lua.meta new file mode 100644 index 00000000..5eafd3e5 --- /dev/null +++ b/lua/app/ui/dungeon/dungeon_board_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 42e0b145611148845b047bd6359e9f4e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua new file mode 100644 index 00000000..9f2055cb --- /dev/null +++ b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua @@ -0,0 +1,116 @@ +local DungeonDifficultyUI = class("DungeonDifficultyUI", BaseUI) + +function DungeonDifficultyUI:isFullScreen() + return false +end + +function DungeonDifficultyUI:getPrefabPath() + return "assets/prefabs/ui/dungeon/dungeon_difficulty_ui.prefab" +end + +function DungeonDifficultyUI:ctor(params) + self.module = params.module + self.curId = DataManager.DungeonData:getPassedMaxId(self.module) + 1 +end + +function DungeonDifficultyUI:onCover() +end + +function DungeonDifficultyUI:onReshow() +end + +function DungeonDifficultyUI:onClose() +end + +function DungeonDifficultyUI:onLoadRootComplete() + self.uiMap = self.root:genAllChildren() + + self.btnClose = self.uiMap["dungeon_difficulty_ui.bg.close_btn"] + self.btnStart = self.uiMap["dungeon_difficulty_ui.bg.btns.btn_start"] + self.txStart = self.uiMap["dungeon_difficulty_ui.bg.btns.btn_start.tx_start"] + self.txStartCost = self.uiMap["dungeon_difficulty_ui.bg.btns.btn_start.cost.tx_cost"] + self.btnSweep = self.uiMap["dungeon_difficulty_ui.bg.btns.btn_sweep"] + self.txSweep = self.uiMap["dungeon_difficulty_ui.bg.btns.btn_sweep.tx_sweep"] + self.txSweepCost = self.uiMap["dungeon_difficulty_ui.bg.btns.btn_sweep.cost.tx_cost"] + self.txTime = self.uiMap["dungeon_difficulty_ui.bg.btns.tx_time"] + self.txDifficulty = self.uiMap["dungeon_difficulty_ui.bg.select.chapter.tx_difficulty"] + self.txLevel = self.uiMap["dungeon_difficulty_ui.bg.select.chapter.tx_level"] + self.arrowLeft = self.uiMap["dungeon_difficulty_ui.bg.select.chapter.arrow_left"] + self.arrowRight = self.uiMap["dungeon_difficulty_ui.bg.select.chapter.arrow_right"] + self.txDesc = self.uiMap["dungeon_difficulty_ui.bg.tx_desc"] + self.txTitle = self.uiMap["dungeon_difficulty_ui.bg.title.title_text"] + + self.txTitle:setText(DataManager.DungeonData:getTitle(self.module)) + self.txDesc:setText(DataManager.DungeonData:getRule(self.module)) + self.txDifficulty:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_STAGE)) + self.txStart:setText(I18N:getGlobalText(I18N.GlobalConst.START_DESC)) + self.txSweep:setText(I18N:getGlobalText(I18N.GlobalConst.SMASH)) + local cost = DataManager.DungeonData:getChallengeHpCost(self.module) + self.txStartCost:setText("-"..GFunc.getRewardNum(cost)) + self.txSweepCost:setText("-"..GFunc.getRewardNum(cost)) + self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, DataManager.DungeonData:getRemainTimes(self.module))) + -- todo 奖励 + self.scrollRect = self.uiMap[""]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.scrollRect:addInitCallback(function() + return GConst.TYPEOF_LUA_CLASS.REWARD_CELL + end) + self.scrollRect:addRefreshCallback(function(index, cell) + cell:refreshByConfig() + end) + self.scrollRect:clearCells() + self.scrollRect:setTotalCount(0) + + self:refreshDifficulty() + + self.btnClose:addClickListener(function() + self:closeUI() + end) + self.btnStart:addClickListener(function() + -- 开始挑战 + ModuleManager.DungeonManager:reqChallenge(self.module, self.curId) + end) + self.btnSweep:addClickListener(function() + -- 开始扫荡 + ModuleManager.DungeonManager:reqSweep(self.module, self.curId) + end) + self.arrowLeft:addClickListener(function() + if self:isCanChallengeMinId() then + return + end + + self.curId = self.curId - 1 + self:refreshDifficulty() + end) + self.arrowRight:addClickListener(function() + if self:isCanChallengeMaxId() then + return + end + + self.curId = self.curId + 1 + self:refreshDifficulty() + end) +end + +function DungeonDifficultyUI:refreshDifficulty() + self.arrowLeft:setActive(not self:isCanChallengeMinId()) + self.arrowRight:setActive(not self:isCanChallengeMaxId()) + self.btnSweep:setActive(self:isCanSweepId()) + self.txLevel:setText(tostring(self.curId)) +end + +-- 是否是可扫荡关卡 +function DungeonDifficultyUI:isCanSweepId() + return self.curId <= DataManager.DungeonData:getPassedMaxId(self.module) +end + +--是否是能挑战的最大关卡 +function DungeonDifficultyUI:isCanChallengeMaxId() + return self.curId == DataManager.DungeonData:getPassedMaxId(self.module) + 1 +end + +--是否是能挑战的最小关卡 +function DungeonDifficultyUI:isCanChallengeMinId() + return self.curId == 1 +end + +return DungeonDifficultyUI \ No newline at end of file diff --git a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua.meta b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua.meta new file mode 100644 index 00000000..77f4cfb7 --- /dev/null +++ b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 93a0a9d95d4774c49b001c3108e5a61c +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/main_city/component/chapter_comp.lua b/lua/app/ui/main_city/component/chapter_comp.lua index 004f252e..6333701d 100644 --- a/lua/app/ui/main_city/component/chapter_comp.lua +++ b/lua/app/ui/main_city/component/chapter_comp.lua @@ -12,11 +12,11 @@ function ChapterComp:getIsOpen() end function ChapterComp:getEntranceName() - return "主线章节" + return I18N:getGlobalText(I18N.GlobalConst.MAIN_CHAPTER) end function ChapterComp:getEntranceIcon() - return GConst.ATLAS_PATH.COMMON,"common_dec_1" + return GConst.ATLAS_PATH.MAIN,"main_dec_5" end function ChapterComp:getHpCost() diff --git a/lua/app/ui/main_city/component/daily_challenge_comp.lua b/lua/app/ui/main_city/component/daily_challenge_comp.lua index 4c59f52d..3af7c0d7 100644 --- a/lua/app/ui/main_city/component/daily_challenge_comp.lua +++ b/lua/app/ui/main_city/component/daily_challenge_comp.lua @@ -6,7 +6,7 @@ function DailyChallengeComp:getIsOpen() end function DailyChallengeComp:getEntranceName() - return "每日挑战" + return I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE) end function DailyChallengeComp:getEntranceIcon() @@ -137,7 +137,7 @@ end function DailyChallengeComp:updateTime() ModuleManager.DailyChallengeManager:checkDayChange() - local remainTime = DataManager.DailyChallengeData:getTodaySurplusTime() + local remainTime = Time:getTodaySurplusTime() self.countdownTx:setText(GFunc.getTimeStrWithHMS(remainTime)) end diff --git a/lua/app/ui/main_city/component/dungeon_comp.lua b/lua/app/ui/main_city/component/dungeon_comp.lua new file mode 100644 index 00000000..db5c9d59 --- /dev/null +++ b/lua/app/ui/main_city/component/dungeon_comp.lua @@ -0,0 +1,49 @@ +local MainCompBaseCell = require "app/ui/main_city/component/main_comp_base_cell" +local DungeonComp = class("DungeonComp", MainCompBaseCell) + +function DungeonComp:getIsOpen() + return DataManager.DungeonData:isOpenAnyone() +end + +function DungeonComp:getEntranceName() + return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_BTN) +end + +function DungeonComp:getEntranceIcon() + return GConst.ATLAS_PATH.MAIN,"main_dec_2" +end + +function DungeonComp:getShowEntranceRedPoint() + return DataManager.DungeonData:isCanChallengeAnyone() +end + +function DungeonComp:ctor() +end + +function DungeonComp:init() + self.uiMap = self:getBaseObject():genAllChildren() + + self.scrollRect = self.uiMap["dungeon_comp.scrollrect"] + self.scrollRectComp = self.scrollRect:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.scrollRectComp:addInitCallback(function() + return "app/ui/dungeon/dungeon_board_cell" + end) + self.scrollRectComp:addRefreshCallback(function(index, cell) + cell:refresh(self.openDungeons[index]) + end) + self.scrollRectComp:clearCells() + self.scrollRectComp:setTotalCount(0) + self:refreshShow() +end + +function DungeonComp:refreshShow() + self.openDungeons = DataManager.DungeonData:getOpenDungeons() + if self.scrollRectComp:getTotalCount() ~= #self.openDungeons then + self.scrollRectComp:clearCells() + self.scrollRectComp:refillCells(#self.openDungeons) + else + self.scrollRectComp:updateAllCell() + end +end + +return DungeonComp \ No newline at end of file diff --git a/lua/app/ui/main_city/component/dungeon_comp.lua.meta b/lua/app/ui/main_city/component/dungeon_comp.lua.meta new file mode 100644 index 00000000..f7d453b9 --- /dev/null +++ b/lua/app/ui/main_city/component/dungeon_comp.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: eeb42cdacecfcf4468aecedc8d7cd340 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/main_city/component/main_comp.lua b/lua/app/ui/main_city/component/main_comp.lua index 843351c0..6ef4ae5b 100644 --- a/lua/app/ui/main_city/component/main_comp.lua +++ b/lua/app/ui/main_city/component/main_comp.lua @@ -1,15 +1,15 @@ local MainComp = class("MainComp", LuaComponent) local CHAPTER_COMP = "app/ui/main_city/component/chapter_comp" local DAILY_CHALLENGE_COMP = "app/ui/main_city/component/daily_challenge_comp" +local DUNGEON_COMP = "app/ui/main_city/component/dungeon_comp" local BOTTOM_HEIGHT = 120 function MainComp:init() self.uiMap = self:getBaseObject():genAllChildren() - self:refreshModule(ModuleManager.MaincityManager:getCurModule()) self:initStageFormation() - + self:refreshModule(ModuleManager.MaincityManager:getCurModule()) end function MainComp:refreshModule(selectModule) @@ -25,31 +25,36 @@ function MainComp:refreshModule(selectModule) self.dailyChallengeComp = CellManager:addCellComp(dailyChallengeComp, DAILY_CHALLENGE_COMP) self.dailyChallengeComp:initWithParentUI(self) self.moduleMap[GConst.MainCityConst.MAIN_MODULE.DAILY_CHALLENGE] = self.dailyChallengeComp + -- 活动副本 + local dungeonComp = self.uiMap["main_comp.dungeon_comp"] + self.dungeonComp = CellManager:addCellComp(dungeonComp, DUNGEON_COMP) + self.dungeonComp:initWithParentUI(self) + self.moduleMap[GConst.MainCityConst.MAIN_MODULE.DUNGEON] = self.dungeonComp end if self.curModuleType ~= selectModule then self.curModuleType = selectModule ModuleManager.MaincityManager:setCurModule(self.curModuleType) + self:setFormationVisible(true) + if self.curModuleType == GConst.MainCityConst.MAIN_MODULE.CHAPTER then -- 切换到主线章节 - EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_CHAPTER) elseif self.curModuleType == GConst.MainCityConst.MAIN_MODULE.DAILY_CHALLENGE then -- 切换到每日挑战 - EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_DAILY_CHALLENGE) if not DataManager.TutorialData:getIsInTutorial() and DataManager.DailyChallengeData:getIsPopTask() then ModuleManager.DailyChallengeManager:showBattleTaskUI() end + elseif self.curModuleType == GConst.MainCityConst.MAIN_MODULE.DUNGEON then + -- 切换到活动副本 + self:setFormationVisible(false) end + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.CHANGE_MAIN_COMP_MODULE, self.curModuleType) end for idx, cell in pairs(self.moduleMap) do cell:getBaseObject():setActive(self.curModuleType == idx) end - local heroBg = self.uiMap["main_comp.hero_bg"] - local heroBgPosY = heroBg:fastGetAnchoredPositionY() - local sWidth, sHeight = GFunc.getUIExpandScreenSize() - local hSHeight = sHeight / 2 - self.btnPosY = (heroBgPosY + (BOTTOM_HEIGHT / 2 - hSHeight)) / 2 + self:refreshBtns() end @@ -62,17 +67,18 @@ end function MainComp:refreshFightBtn() local moduleCell = self.moduleMap[self.curModuleType] - self.uiMap["main_comp.fight_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.START_DESC)) local cost = moduleCell:getHpCost() if cost then + self.uiMap["main_comp.fight_btn"]:setActive(true) + self.uiMap["main_comp.fight_btn"]:addClickListener(moduleCell.onClickFight) + self.uiMap["main_comp.fight_btn"]:setAnchoredPositionY(self.btnPosY) + self.uiMap["main_comp.fight_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.START_DESC)) self.uiMap["main_comp.fight_btn.desc_2"]:setText(GFunc.getRewardNum(cost)) else - self.uiMap["main_comp.fight_btn.desc_2"]:setText("0") + self.uiMap["main_comp.fight_btn"]:setActive(false) + return end - self.uiMap["main_comp.fight_btn"]:addClickListener(moduleCell.onClickFight) - self.uiMap["main_comp.fight_btn"]:setAnchoredPositionY(self.btnPosY) - local remainCount = moduleCell:getTodayRemainCount() if remainCount >= 0 then self.uiMap["main_comp.fight_btn.num_tx"]:setActive(true) @@ -101,7 +107,9 @@ function MainComp:refreshLeftBtn() self.leftBtn:setActive(true) local iconAtlas, iconName = moduleCell:getEntranceIcon() self.uiMap["main_comp.left_btn.desc"]:setText(moduleCell:getEntranceName()) - self.uiMap["main_comp.left_btn.icon"]:setSprite(iconAtlas, iconName) + self.uiMap["main_comp.left_btn.icon"]:setSprite(iconAtlas, iconName, function() + self.uiMap["main_comp.left_btn.icon"]:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize() + end) self.leftBtn:addClickListener(function() self:refreshModule(leftIdx) end) @@ -131,7 +139,9 @@ function MainComp:refreshRightBtn() self.rightBtn:setActive(true) local iconAtlas, iconName = moduleCell:getEntranceIcon() self.uiMap["main_comp.right_btn.desc"]:setText(moduleCell:getEntranceName()) - self.uiMap["main_comp.right_btn.icon"]:setSprite(iconAtlas, iconName) + self.uiMap["main_comp.right_btn.icon"]:setSprite(iconAtlas, iconName, function() + self.uiMap["main_comp.right_btn.icon"]:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize() + end) self.rightBtn:addClickListener(function() self:refreshModule(rightIdx) end) @@ -151,7 +161,7 @@ function MainComp:getCurLeftModuleIdx() end function MainComp:getCurRightModuleIdx() - local totalModuleNum = GFunc.getTableLength(GConst.MainCityConst.MAIN_MODULE) + local totalModuleNum = table.nums(GConst.MainCityConst.MAIN_MODULE) if self.curModuleType == totalModuleNum then return nil end @@ -167,6 +177,16 @@ function MainComp:initStageFormation() self.uiMap["main_comp.hero_bg.hero_cell_4"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.HERO_CELL), self.uiMap["main_comp.hero_bg.hero_cell_5"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.HERO_CELL), } + + self.heroFormation = self.uiMap["main_comp.hero_bg"] + local heroBgPosY = self.heroFormation:fastGetAnchoredPositionY() + local sWidth, sHeight = GFunc.getUIExpandScreenSize() + local hSHeight = sHeight / 2 + self.btnPosY = (heroBgPosY + (BOTTOM_HEIGHT / 2 - hSHeight)) / 2 +end + +function MainComp:setFormationVisible(visible) + self.heroFormation:setVisible(visible) end function MainComp:refresh() @@ -187,6 +207,11 @@ function MainComp:refreshChallenge() self.dailyChallengeComp:refreshShow() end +function MainComp:refreshDungeon() + self:refreshBtns() + self.dungeonComp:refreshShow() +end + function MainComp:refreshStageFormaion() local formation = DataManager.FormationData:getStageFormation() for i, heroCell in ipairs(self.heroCells) do diff --git a/lua/app/ui/main_city/component/main_comp_base_cell.lua b/lua/app/ui/main_city/component/main_comp_base_cell.lua index 99255a0f..9c43bbbf 100644 --- a/lua/app/ui/main_city/component/main_comp_base_cell.lua +++ b/lua/app/ui/main_city/component/main_comp_base_cell.lua @@ -20,7 +20,7 @@ function MainCompBaseCell:getShowEntranceRedPoint() end function MainCompBaseCell:getHpCost() - return 0 + return nil-- 默认不显示挑战按钮 end function MainCompBaseCell:getTodayRemainCount() diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 16003828..83a183b6 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -19,8 +19,6 @@ MainCityUI.CLICK_BTN_TYPE = { [3] = "SHOP", } -local MAIN_COMP_INDEX = 1 - function MainCityUI:getUIType() return UIManager.UI_TYPE.MAIN end @@ -35,7 +33,7 @@ function MainCityUI:getCurrencyParams() itemIds = {} } end - self.selectedIndex = self.selectedIndex or MAIN_COMP_INDEX + self.selectedIndex = self.selectedIndex or GConst.MainCityConst.BOTTOM_PAGE.MAIN self.currencyParams.showType = GConst.CURRENCY_TYPE.HORIZONTAL for k, v in ipairs(self.currencyParams.itemIds) do table.remove(self.currencyParams.itemIds) @@ -158,18 +156,8 @@ function MainCityUI:_addListeners() end end) - self:addEventListener(EventManager.CUSTOM_EVENT.GO_DAILY_CHALLENGE, function() - if self.selectedIndex ~= GConst.MainCityConst.BOTTOM_PAGE.MAIN then - return - end - self:refreshBounty() - end) - - self:addEventListener(EventManager.CUSTOM_EVENT.GO_CHAPTER, function() - if self.selectedIndex ~= GConst.MainCityConst.BOTTOM_PAGE.MAIN then - return - end - self:refreshBounty() + self:addEventListener(EventManager.CUSTOM_EVENT.CHANGE_MAIN_COMP_MODULE, function(module) + self:switchMainCompModule(module) end) DataManager.MailData:checkNewMail() end @@ -248,6 +236,14 @@ function MainCityUI:_bind() end end end) + + self:bind(DataManager.DailyChallengeData, "isDirty", function() + if self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.MAIN then + if self.subComps[self.selectedIndex] then + self.subComps[self.selectedIndex]:refreshDungeon() + end + end + end) end function MainCityUI:initBottomUI() @@ -319,7 +315,7 @@ function MainCityUI:refreshBottom(selectedIndex, playAnim) return end local oldIndex = self.selectedIndex - self.selectedIndex = selectedIndex and selectedIndex or MAIN_COMP_INDEX + self.selectedIndex = selectedIndex and selectedIndex or GConst.MainCityConst.BOTTOM_PAGE.MAIN self:switchComp() if oldIndex ~= selectedIndex then @@ -703,17 +699,37 @@ function MainCityUI:switchComp(index) end end self:updateCurrencyBar() - if self.selectedIndex == MAIN_COMP_INDEX then + if self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.MAIN then self:checkMainPop() - self:setTopNodeVisible(true) self:refreshTopNode() - self:setSideBarVisible(true) + self:switchMainCompModule() else self:setTopNodeVisible(false) self:setSideBarVisible(false) end end +-- 切换主界面活动模块 +function MainCityUI:switchMainCompModule(moduleKey) + if self.selectedIndex ~= GConst.MainCityConst.BOTTOM_PAGE.MAIN then + return + end + + if moduleKey == nil then + moduleKey = self.subComps[self.selectedIndex]:getCurModuleType() + end + + if moduleKey == GConst.MainCityConst.MAIN_MODULE.DUNGEON then + -- 活动副本切换刷新 + self:setTopNodeVisible(false) + self:setSideBarVisible(false) + else + self:setTopNodeVisible(true) + self:setSideBarVisible(true) + self:refreshBounty() + end +end + function MainCityUI:updateTime() if self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.SHOP and self.subComps[self.selectedIndex] then if self.subComps[self.selectedIndex] then diff --git a/lua/app/userdata/daily_challenge/daily_challenge_data.lua b/lua/app/userdata/daily_challenge/daily_challenge_data.lua index cf1e8d6c..b642af3f 100644 --- a/lua/app/userdata/daily_challenge/daily_challenge_data.lua +++ b/lua/app/userdata/daily_challenge/daily_challenge_data.lua @@ -113,15 +113,6 @@ function DailyChallengeData:getBuffDesc(buffId) return I18N:getText("buff_daily_challenge", buffId, "desc") end --- 获取今日剩余时间 -function DailyChallengeData:getTodaySurplusTime() - local result = Time:getOverOfServerToday() - Time:getServerTime() - if result < 0 then - result = 0 - end - return result -end - -- 获取最终boss配置信息 function DailyChallengeData:getFinalBossInfo() if not self:isOpen() then diff --git a/lua/app/userdata/dungeon.meta b/lua/app/userdata/dungeon.meta new file mode 100644 index 00000000..690af9e8 --- /dev/null +++ b/lua/app/userdata/dungeon.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 256d487279ef573429ce63e3bb5ca819 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/userdata/dungeon/dungeon_data.lua b/lua/app/userdata/dungeon/dungeon_data.lua new file mode 100644 index 00000000..133269b7 --- /dev/null +++ b/lua/app/userdata/dungeon/dungeon_data.lua @@ -0,0 +1,297 @@ +local DungeonData = class("DungeonData", BaseData) + +-- 副本展示权重(由上到下排列) +local DUNGEON_SHOW_WEIGHT = { + [1] = ModuleManager.MODULE_KEY.DUNGEON_SHARDS, + [2] = ModuleManager.MODULE_KEY.DUNGEON_GOLD, +} + +-- 所有活动副本数据 + +function DungeonData:ctor() + self.data.isDirty = false +end + +function DungeonData:clear() +end + +-- 初始化金币副本数据 +function DungeonData:initDungeonGold(data) + if EDITOR_MODE then + data = { + today_challenge_count = 2, + max_chapter_gold_id = 2, + -- latest_chapter_gold_id = 1,-- todo 这是啥数据呢？ + } + end + + self:initAllDataClass() + self.dataDungeons[ModuleManager.MODULE_KEY.DUNGEON_GOLD]:init(data) + self.data.gold = data + self:setDirty() +end + +-- 初始化碎片副本数据 +function DungeonData:initDungeonShards(data) + if EDITOR_MODE then + data = { + today_challenge_count = 2, + max_chapter_shards_id = 2, + -- latest_chapter_shards_id = 1, + } + end + + self:initAllDataClass() + self.dataDungeons[ModuleManager.MODULE_KEY.DUNGEON_SHARDS]:init(data) + self.data.shards = data + self:setDirty() +end + +-- 初始化所有副本数据类 +function DungeonData:initAllDataClass() + if self.dataDungeons == nil then + self.dataDungeons = {} + self.dataDungeons[ModuleManager.MODULE_KEY.DUNGEON_GOLD] = require "app/userdata/dungeon/dungeon_gold_data_comp":create() + self.dataDungeons[ModuleManager.MODULE_KEY.DUNGEON_SHARDS] = require "app/userdata/dungeon/dungeon_shards_data_comp":create() + end +end + +-- 客户端处理副本次数+1的情况 +function DungeonData:onFightCountReduce(moduleKey) + if moduleKey == ModuleManager.MODULE_KEY.DUNGEON_GOLD then + self.data.gold.today_challenge_count = self.data.gold.today_challenge_count + 1 + self:initDungeonGold(self.data.gold) + elseif moduleKey == ModuleManager.MODULE_KEY.DUNGEON_SHARDS then + self.data.shards.today_challenge_count = self.data.shards.today_challenge_count + 1 + self:initDungeonGold(self.data.shards) + end +end + +function DungeonData:setDirty() + self.data.isDirty = not self.data.isDirty +end + +-- 是否开启任意一个副本 +function DungeonData:isOpenAnyone() + for key, value in pairs(self.dataDungeons) do + if self:isOpen(key) then + return true + end + end + return false +end + +-- 某副本是否已开启 +function DungeonData:isOpen(moduleKey) + if not ModuleManager:getIsOpen(moduleKey, true) then + return false + end + return true +end + +-- 返回已开启的副本 +function DungeonData:getOpenDungeons() + local openDungeons = {} + for idx, moduleKey in pairs(DUNGEON_SHOW_WEIGHT) do + if self:isOpen(moduleKey) then + table.insert(openDungeons, moduleKey) + end + end + if EDITOR_MODE then + Logger.logHighlight("已开启副本:") + Logger.printTable(openDungeons) + end + return table.revert(openDungeons) +end + +-- 是否在活动副本时间内 +function DungeonData:isActive(moduleKey) + if not self:isOpen(moduleKey) then + return false + end + + -- 判断周期 + if self:isActiveCycle(moduleKey, Time:getWeekByTimeStamp()) then + return true + else + return false + end +end + +-- 判断是否在活跃周期内 +function DungeonData:isActiveCycle(moduleKey, checkWeek) + if not self.dataDungeons[moduleKey] then + return false + end + + for index, week in ipairs(self.dataDungeons[moduleKey]:getOpenWeekCycle()) do + if week == checkWeek then + return true + end + end + return false +end + +-- 是否任意一个副本可以挑战 +function DungeonData:isCanChallengeAnyone() + for key, value in pairs(self.dataDungeons) do + if self:isCanChallenge(key) then + return true + end + end + return false +end + +-- 副本是否可以挑战 +function DungeonData:isCanChallenge(moduleKey) + if not self:isActive(moduleKey) then + return false + end + if not (self:getRemainTimes(moduleKey) > 0) then + return false + end + if not self:isEnoughHp(moduleKey) then + return false + end + return true +end + +-- 副本是否可以扫荡 +function DungeonData:isCanSweep(moduleKey, id) + if not self:isActive(moduleKey) then + return false + end + if not (self:getRemainTimes(moduleKey) > 0) then + return false + end + if not self:isEnoughHp(moduleKey) then + return false + end + if not self:getPassedMaxId(moduleKey) >= id then + return false + end + return true +end + +-- 获取副本今日剩余次数 +function DungeonData:getRemainTimes(moduleKey) + if not self:isActive(moduleKey) then + return 0 + end + if not self.dataDungeons[moduleKey] then + return 0 + end + + return self.dataDungeons[moduleKey]:getTodayRemainLimitCount() +end + +-- 体力是否足够 +function DungeonData:isEnoughHp(moduleKey) + local const = self:getChallengeHpCost(moduleKey) + local constNum = 0 + if const then + constNum = GFunc.getRewardNum(const) + end + return constNum <= DataManager.BagData.ItemData:getVit() +end + +-- 获取挑战体力消耗 +function DungeonData:getChallengeHpCost(moduleKey) + if not self:isActive(moduleKey) then + return 0 + end + if not self.dataDungeons[moduleKey] then + return 0 + end + + return self.dataDungeons[moduleKey]:getChallengeHpCost() +end + +-- 获取副本开启倒计时 +function DungeonData:getOpenTime(moduleKey) + if not self.dataDungeons[moduleKey] then + return 0 + end + + local isClose = true + local count = 0 + while isClose do + local checkWeek = Time:getWeekByTimeStamp(self:getServerTime() + ((count + 1) * 86400)) + if self:isActiveCycle(moduleKey, checkWeek) then + isClose = false + else + count = count + 1 + end + end + + return Time:getTodaySurplusTime() + (count * 86400) +end + +-- 获取副本关闭倒计时 +function DungeonData:getCloseTime(moduleKey) + if not self.dataDungeons[moduleKey] then + return 0 + end + + local isActive = true + local count = 0 + while isActive do + local checkWeek = Time:getWeekByTimeStamp(self:getServerTime() + ((count + 1) * 86400)) + if not self:isActiveCycle(moduleKey, checkWeek) then + isActive = false + else + count = count + 1 + end + end + + return Time:getTodaySurplusTime() + (count * 86400) +end + +-- 获取看板展示的副本奖励 +function DungeonData:getBoardShowRewards(moduleKey) + return nil +end + +-- 获取展示副本首通奖励 +function DungeonData:getFirstReward(moduleKey, id) + -- 通关后，不展示首通奖励 + return self.dataDungeons[moduleKey]:getFirstReward(id) +end + +-- 获取展示副本通关奖励 +function DungeonData:getPassReward(moduleKey, id) + -- 波次奖励数量==通关+波次奖励数量 + return self.dataDungeons[moduleKey]:getPassReward(id) +end + +--获取副本已通关的最高关卡id +function DungeonData:getPassedMaxId(moduleKey) + return self.dataDungeons[moduleKey]:getPassedMaxId() +end + +-- 获取副本标题文案 +function DungeonData:getTitle(moduleKey) + return self.dataDungeons[moduleKey]:getTitleString() +end + +-- 获取副本规则描述 +function DungeonData:getRule(moduleKey) + return self.dataDungeons[moduleKey]:getRuleString() +end + +-- 获取副本开启时间描述 +function DungeonData:getOpenTimeDesc(moduleKey) + return self.dataDungeons[moduleKey]:getOpenWeekString() +end + +-- 获取副本角标图 +function DungeonData:getIcon(moduleKey) + return self.dataDungeons[moduleKey]:getIcon() +end + +-- 获取副本banner图 +function DungeonData:getBanner(moduleKey) + return self.dataDungeons[moduleKey]:getBanner() +end + +return DungeonData \ No newline at end of file diff --git a/lua/app/userdata/dungeon/dungeon_data.lua.meta b/lua/app/userdata/dungeon/dungeon_data.lua.meta new file mode 100644 index 00000000..27a7e375 --- /dev/null +++ b/lua/app/userdata/dungeon/dungeon_data.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 0dea895676e488b45ac59508224e0564 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/userdata/dungeon/dungeon_data_base_comp.lua b/lua/app/userdata/dungeon/dungeon_data_base_comp.lua new file mode 100644 index 00000000..d4e568e1 --- /dev/null +++ b/lua/app/userdata/dungeon/dungeon_data_base_comp.lua @@ -0,0 +1,92 @@ +local DungeonDataBaseComp = class("DungeonDataBaseComp", LuaComponent) + +-- 需要继承重写的部分 *********************************************************** + +-- 初始化服务器数据 +function DungeonDataBaseComp:init(data) +end + +-- 获取副本模块名，对应ModuleManager.MODULE_KEY +function DungeonDataBaseComp:getModuleKey() + return "" +end + +-- 获取副本开启周期（星期几） +function DungeonDataBaseComp:getOpenWeekCycle() + return {} +end + +-- 获取副本标题文案 +function DungeonDataBaseComp:getTitleString() + return "" +end + +-- 获取副本规则描述 +function DungeonDataBaseComp:getRuleString() + return "" +end + +-- 获取开始时间描述 +function DungeonDataBaseComp:getOpenWeekString() + return "" +end + +-- 获取副本角标图 +function DungeonDataBaseComp:getIcon() + return "" +end + +-- 获取副本banner图 +function DungeonDataBaseComp:getBanner() + return "" +end + +-- 获取今日已挑战次数 +function DungeonDataBaseComp:getTodayChallengeCount() + return 0 +end + +-- 获取已通关的最大副本id +function DungeonDataBaseComp:getPassedMaxId() + return 0 +end + +-- 获取挑战体力消耗 +function DungeonDataBaseComp:getChallengeHpCost() + return 0 +end + +-- 获取每日最大挑战次数 +function DungeonDataBaseComp:getTodayMaxCount() + return 0 +end + +-- 获取看板展示的副本奖励(返回icon) +function DungeonDataBaseComp:getBoardShowRewardIcon() + return nil +end + +-- 获取看板展示的副本奖励（返回id） +function DungeonDataBaseComp:getBoardShowRewardId() + return nil +end + +-- 获取首通奖励 +function DungeonDataBaseComp:getFirstReward() + return nil +end + +-- 获取通关奖励（通关+波次奖励 or 百分比奖励） +function DungeonDataBaseComp:getPassReward() + return nil +end + + +-- 常规逻辑 ********************************************************************* + +-- 获取今日剩余挑战次数 +function DungeonDataBaseComp:getTodayRemainLimitCount() + return self:getTodayMaxCount() - self:getTodayChallengeCount() +end + +return DungeonDataBaseComp \ No newline at end of file diff --git a/lua/app/userdata/dungeon/dungeon_data_base_comp.lua.meta b/lua/app/userdata/dungeon/dungeon_data_base_comp.lua.meta new file mode 100644 index 00000000..76653357 --- /dev/null +++ b/lua/app/userdata/dungeon/dungeon_data_base_comp.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4e42e026c21002845b2e72498b2e2e92 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua b/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua new file mode 100644 index 00000000..4381a039 --- /dev/null +++ b/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua @@ -0,0 +1,67 @@ +local DungeonDataBaseComp = require "app/userdata/dungeon/dungeon_data_base_comp" +local DungeonGoldDataComp = class("DungeonGoldDataComp", DungeonDataBaseComp) + +-- 金币副本数据 + +function DungeonGoldDataComp:init(data) + self.todayChallengeCount = data.today_challenge_count + self.maxPassedId = data.max_chapter_gold_id +end + +function DungeonDataBaseComp:getTodayChallengeCount() + return self.todayChallengeCount +end + +function DungeonDataBaseComp:getPassedMaxId() + return self.maxPassedId +end + +function DungeonGoldDataComp:getModuleKey() + return ModuleManager.MODULE_KEY.DUNGEON_GOLD +end + +function DungeonGoldDataComp:getOpenWeekCycle() + return {2,4,6,7} +end + +function DungeonGoldDataComp:getTitleString() + return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_GOLD_TITLE) +end + +function DungeonGoldDataComp:getRuleString() + return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_GOLD_HELP) +end + +function DungeonGoldDataComp:getOpenWeekString() + return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_GOLD_OPEN) +end + +function DungeonGoldDataComp:getIcon() + return "" +end + +function DungeonGoldDataComp:getBanner() + return "" +end + +function DungeonGoldDataComp:getChallengeHpCost() + return GFunc.getConstReward("dungeon_gold_cost") +end + +function DungeonGoldDataComp:getTodayMaxCount() + return GFunc.getConstIntValue("dungeon_gold_limit") +end + +function DungeonDataBaseComp:getBoardShowRewardId() + return 1 +end + +function DungeonGoldDataComp:getFirstReward(id) + return ConfigManager:getConfig("chapter_dungeon_gold")[id].first_pass_reward +end + +function DungeonGoldDataComp:getPassReward(id) + return ConfigManager:getConfig("chapter_dungeon_gold")[id].percent_reward +end + +return DungeonGoldDataComp \ No newline at end of file diff --git a/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua.meta b/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua.meta new file mode 100644 index 00000000..59bba927 --- /dev/null +++ b/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 962fc33db86976b4cbcd1205a2fbdd82 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua b/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua new file mode 100644 index 00000000..427473f9 --- /dev/null +++ b/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua @@ -0,0 +1,77 @@ +local DungeonDataBaseComp = require "app/userdata/dungeon/dungeon_data_base_comp" +local DungeonShardsDataComp = class("DungeonShardsDataComp", DungeonDataBaseComp) + +-- 碎片副本数据 + +function DungeonShardsDataComp:init(data) + self.todayChallengeCount = data.today_challenge_count + self.maxPassedId = data.max_chapter_shards_id +end + +function DungeonDataBaseComp:getTodayChallengeCount() + return self.todayChallengeCount +end + +function DungeonDataBaseComp:getPassedMaxId() + return self.maxPassedId +end + +function DungeonShardsDataComp:getModuleKey() + return ModuleManager.MODULE_KEY.DUNGEON_SHARDS +end + +function DungeonShardsDataComp:getOpenWeekCycle() + return {1,3,5,7} +end + +function DungeonShardsDataComp:getTitleString() + return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_SHARDS_TITLE) +end + +function DungeonShardsDataComp:getRuleString() + return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_SHARDS_HELP) +end + +function DungeonShardsDataComp:getOpenWeekString() + return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_SHARDS_OPEN) +end + +function DungeonShardsDataComp:getIcon() + return "" +end + +function DungeonShardsDataComp:getBanner() + return "" +end + +function DungeonShardsDataComp:getChallengeHpCost() + return GFunc.getConstReward("dungeon_shards_cost") +end + +function DungeonShardsDataComp:getTodayMaxCount() + return GFunc.getConstIntValue("dungeon_shards_limit") +end + +function DungeonDataBaseComp:getBoardShowRewardIcon() + return { + [1]={ + GConst.ATLAS_PATH.ICON_ITEM,"4" + }, + [2]={ + GConst.ATLAS_PATH.ICON_ITEM,"5" + } + } +end + +function DungeonShardsDataComp:getFirstReward(id) + return ConfigManager:getConfig("chapter_dungeon_shards")[id].first_pass_reward +end + +function DungeonShardsDataComp:getPassReward(id) + local pass = ConfigManager:getConfig("chapter_dungeon_shards")[id].pass_reward + local wave = ConfigManager:getConfig("chapter_dungeon_shards")[id].wave_reward + -- todo 处理奖励结构 + return pass +end + +return DungeonShardsDataComp \ No newline at end of file diff --git a/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua.meta b/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua.meta new file mode 100644 index 00000000..da7d0728 --- /dev/null +++ b/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a6126d3822550ed449313e7bdb7b6fe1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}