From bf1e7b78851a77374ea4be8472415720c6768ce5 Mon Sep 17 00:00:00 2001 From: Fang Date: Thu, 8 Jun 2023 18:36:35 +0800 Subject: [PATCH 01/20] =?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 | 3 + 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 ++ .../localization_global_const.lua | 1 + lua/app/config/strings/cn/global.lua | 1 + lua/app/config/strings/en/global.lua | 1 + lua/app/config/strings/zh/global.lua | 1 + lua/app/module/battle/battle_const.lua | 2 + lua/app/module/dungeon.meta | 8 + lua/app/module/dungeon/dungeon_manager.lua | 88 ++++++ .../module/dungeon/dungeon_manager.lua.meta | 10 + lua/app/module/maincity/maincity_const.lua | 1 + lua/app/proto/proto_msg_type.lua | 24 ++ lua/app/ui/dungeon.meta | 8 + lua/app/ui/dungeon/dungeon_board_cell.lua | 91 ++++++ .../ui/dungeon/dungeon_board_cell.lua.meta | 10 + lua/app/ui/dungeon/dungeon_difficulty_ui.lua | 105 +++++++ .../ui/dungeon/dungeon_difficulty_ui.lua.meta | 10 + .../ui/main_city/component/chapter_comp.lua | 2 +- .../component/daily_challenge_comp.lua | 4 +- .../ui/main_city/component/dungeon_comp.lua | 53 ++++ .../main_city/component/dungeon_comp.lua.meta | 10 + lua/app/ui/main_city/component/main_comp.lua | 44 ++- .../component/main_comp_base_cell.lua | 2 +- lua/app/ui/main_city/main_city_ui.lua | 31 +- .../daily_challenge/daily_challenge_data.lua | 9 - lua/app/userdata/dungeon.meta | 8 + lua/app/userdata/dungeon/dungeon_data.lua | 277 ++++++++++++++++++ .../userdata/dungeon/dungeon_data.lua.meta | 10 + .../dungeon/dungeon_data_base_comp.lua | 87 ++++++ .../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 | 70 +++++ .../dungeon/dungeon_shards_data_comp.lua.meta | 10 + 37 files changed, 1056 insertions(+), 41 deletions(-) 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..ce491e3a 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -96,6 +96,9 @@ 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", -- 金币副本扫荡 } BIReport.ADS_CLICK_TYPE = { diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index d6a0dd4a..e5acc7e5 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() 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/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/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/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/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/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..42357dc9 --- /dev/null +++ b/lua/app/module/dungeon/dungeon_manager.lua @@ -0,0 +1,88 @@ +local DungeonManager = class("DungeonManager", BaseModule) + +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 + 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 + 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 + 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..ab4849b5 100644 --- a/lua/app/proto/proto_msg_type.lua +++ b/lua/app/proto/proto_msg_type.lua @@ -23,6 +23,8 @@ local ProtoMsgType = { [613795629] = "WatchADRsp", [737107384] = "BuyMallIdleReq", [737109217] = "BuyMallIdleRsp", + [834139466] = "ChapterGoldChallengeStartReq", + [834141299] = "ChapterGoldChallengeStartRsp", [1008447203] = "DeleteReq", [1008449036] = "DeleteRsp", [1068769299] = "ReconnectReq", @@ -31,6 +33,8 @@ local ProtoMsgType = { [1070843294] = "LoginRsp", [1433352538] = "ChapterDailyChallengeResetReq", [1433354371] = "ChapterDailyChallengeResetRsp", + [1435947790] = "AppStorePaidReq", + [1435949623] = "AppStorePaidRsp", [1471116409] = "BindReq", [1471118242] = "BindRsp", [1584689751] = "ActPaidResultReq", @@ -83,6 +87,8 @@ local ProtoMsgType = { [3309820798] = "HeroPutOnReq", [3309822631] = "HeroPutOnRsp", [3341173994] = "BountyBoughtNtf", + [3359969683] = "ChapterGoldChallengeSettlementReq", + [3359971516] = "ChapterGoldChallengeSettlementRsp", [3363939655] = "TaskDailyAdReq", [3363941488] = "TaskDailyAdRsp", [3421550443] = "GlobalGiftReq", @@ -112,6 +118,8 @@ local ProtoMsgType = { [3933877450] = "ChapterStartRsp", [4106156009] = "BountyLevelUnlockReq", [4106157842] = "BountyLevelUnlockRsp", + [4133057746] = "ChapterGoldChallengeFarmReq", + [4133059579] = "ChapterGoldChallengeFarmRsp", [4256333947] = "ExistReq", [4256335780] = "ExistRsp", }, @@ -139,6 +147,8 @@ local ProtoMsgType = { WatchADRsp = 613795629, BuyMallIdleReq = 737107384, BuyMallIdleRsp = 737109217, + ChapterGoldChallengeStartReq = 834139466, + ChapterGoldChallengeStartRsp = 834141299, DeleteReq = 1008447203, DeleteRsp = 1008449036, ReconnectReq = 1068769299, @@ -147,6 +157,8 @@ local ProtoMsgType = { LoginRsp = 1070843294, ChapterDailyChallengeResetReq = 1433352538, ChapterDailyChallengeResetRsp = 1433354371, + AppStorePaidReq = 1435947790, + AppStorePaidRsp = 1435949623, BindReq = 1471116409, BindRsp = 1471118242, ActPaidResultReq = 1584689751, @@ -199,6 +211,8 @@ local ProtoMsgType = { HeroPutOnReq = 3309820798, HeroPutOnRsp = 3309822631, BountyBoughtNtf = 3341173994, + ChapterGoldChallengeSettlementReq = 3359969683, + ChapterGoldChallengeSettlementRsp = 3359971516, TaskDailyAdReq = 3363939655, TaskDailyAdRsp = 3363941488, GlobalGiftReq = 3421550443, @@ -228,6 +242,8 @@ local ProtoMsgType = { ChapterStartRsp = 3933877450, BountyLevelUnlockReq = 4106156009, BountyLevelUnlockRsp = 4106157842, + ChapterGoldChallengeFarmReq = 4133057746, + ChapterGoldChallengeFarmRsp = 4133059579, ExistReq = 4256333947, ExistRsp = 4256335780, }, @@ -255,6 +271,8 @@ local ProtoMsgType = { WatchADRsp = "WatchADRsp", BuyMallIdleReq = "BuyMallIdleReq", BuyMallIdleRsp = "BuyMallIdleRsp", + ChapterGoldChallengeStartReq = "ChapterGoldChallengeStartReq", + ChapterGoldChallengeStartRsp = "ChapterGoldChallengeStartRsp", DeleteReq = "DeleteReq", DeleteRsp = "DeleteRsp", ReconnectReq = "ReconnectReq", @@ -263,6 +281,8 @@ local ProtoMsgType = { LoginRsp = "LoginRsp", ChapterDailyChallengeResetReq = "ChapterDailyChallengeResetReq", ChapterDailyChallengeResetRsp = "ChapterDailyChallengeResetRsp", + AppStorePaidReq = "AppStorePaidReq", + AppStorePaidRsp = "AppStorePaidRsp", BindReq = "BindReq", BindRsp = "BindRsp", ActPaidResultReq = "ActPaidResultReq", @@ -315,6 +335,8 @@ local ProtoMsgType = { HeroPutOnReq = "HeroPutOnReq", HeroPutOnRsp = "HeroPutOnRsp", BountyBoughtNtf = "BountyBoughtNtf", + ChapterGoldChallengeSettlementReq = "ChapterGoldChallengeSettlementReq", + ChapterGoldChallengeSettlementRsp = "ChapterGoldChallengeSettlementRsp", TaskDailyAdReq = "TaskDailyAdReq", TaskDailyAdRsp = "TaskDailyAdRsp", GlobalGiftReq = "GlobalGiftReq", @@ -344,6 +366,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..3fabcaee --- /dev/null +++ b/lua/app/ui/dungeon/dungeon_board_cell.lua @@ -0,0 +1,91 @@ +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: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) + + 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[""]: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(self.itemList[index]) + end) + self.scrollRect:clearCells() + self.scrollRect:setTotalCount(0) +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..1bd7422f --- /dev/null +++ b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua @@ -0,0 +1,105 @@ +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:refreshDifficulty() + + self.btnClose:addClickListener(function() + self:closeUI() + end) + self.btnStart:addClickListener(function() + -- 开始挑战 + end) + self.btnSweep:addClickListener(function() + -- 开始扫荡 + 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..98bf0633 100644 --- a/lua/app/ui/main_city/component/chapter_comp.lua +++ b/lua/app/ui/main_city/component/chapter_comp.lua @@ -12,7 +12,7 @@ function ChapterComp:getIsOpen() end function ChapterComp:getEntranceName() - return "主线章节" + return I18N:getGlobalText(I18N.GlobalConst.MAIN_CHAPTER) end function ChapterComp:getEntranceIcon() 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..24dc9cae --- /dev/null +++ b/lua/app/ui/main_city/component/dungeon_comp.lua @@ -0,0 +1,53 @@ +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_1" +end + +function DungeonComp:getShowEntranceRedPoint() + return DataManager.DungeonData:isCanChallengeAnyone() +end + +function DungeonComp:ctor() +end + +function DungeonComp:init() + self.uiMap = self:getBaseObject():genAllChildren() + self:refreshShow() +end + +function DungeonComp:refreshShow() + self.openDungeons = DataManager.DungeonData:getOpenDungeons() + + 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:refreshScrollRect() +end + +function DungeonComp:refreshScrollRect() + 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..9c3750e6 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) @@ -167,6 +173,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() 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..232a707d 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -158,18 +158,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 @@ -714,6 +704,23 @@ function MainCityUI:switchComp(index) end end +-- 切换主界面活动模块 +function MainCityUI:switchMainCompModule(moduleKey) + if self.selectedIndex ~= GConst.MainCityConst.BOTTOM_PAGE.MAIN then + return + 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..a482c51a --- /dev/null +++ b/lua/app/userdata/dungeon/dungeon_data.lua @@ -0,0 +1,277 @@ +local DungeonData = class("DungeonData", BaseData) + +-- 所有活动副本数据 + +function DungeonData:ctor() +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) +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) +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 + + self:updateOpenDungeons() +end + +-- 更新已开启副本 +function DungeonData:updateOpenDungeons() + self.openDungeons = {} + for key, value in pairs(self.dataDungeons) do + if self:isOpen(key) then + table.insert(self.openDungeons, key) + end + end + if EDITOR_MODE then + Logger.logHighlight("已开启副本:") + Logger.printTable(self.openDungeons) + end +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() + return self.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..4d391991 --- /dev/null +++ b/lua/app/userdata/dungeon/dungeon_data_base_comp.lua @@ -0,0 +1,87 @@ +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 + +-- 获取看板展示的副本奖励 +function DungeonDataBaseComp:getBoardShowReward() + 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..9f48acdb --- /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 DungeonGoldDataComp:getBoardShowReward() + return nil +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..4b3661e9 --- /dev/null +++ b/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua @@ -0,0 +1,70 @@ +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 DungeonShardsDataComp:getBoardShowReward() + return nil +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} From 5be91b491cdc64f49e4b1ffa6ff43ac86aa6ea6e Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 12 Jun 2023 15:21:26 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/config_manager.lua | 2 + 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/monster_dungeon_gold.lua | 216 ++ lua/app/config/monster_dungeon_gold.lua.meta | 10 + lua/app/config/skill.lua | 3064 ++++++++++++++--- lua/app/config/skill_rogue.lua | 394 ++- lua/app/module/battle/battle_manager.lua | 2 + .../battle/controller/battle_controller.lua | 157 +- .../battle_controller_daily_challenge.lua | 152 +- .../battle_controller_dungeon_gold.lua | 73 + .../battle_controller_dungeon_gold.lua.meta | 10 + .../controller/battle_controller_stage.lua | 168 +- lua/app/module/dungeon/dungeon_manager.lua | 1 + lua/app/ui/dungeon/dungeon_difficulty_ui.lua | 1 + 17 files changed, 3749 insertions(+), 1191 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/battle/controller/battle_controller_dungeon_gold.lua create mode 100644 lua/app/module/battle/controller/battle_controller_dungeon_gold.lua.meta diff --git a/lua/app/common/config_manager.lua b/lua/app/common/config_manager.lua index 8147541b..58fe120e 100644 --- a/lua/app/common/config_manager.lua +++ b/lua/app/common/config_manager.lua @@ -111,6 +111,8 @@ function ConfigManager:preLoadConfig() end handleMonsterGrow("monster_chapter") handleMonsterGrow("monster_daily_challenge") + handleMonsterGrow("monster_dungeon_gold") + handleMonsterGrow("monster_dungeon_shards") self.configs["monster"] = { data = monsterFullData, diff --git a/lua/app/config/chapter_board_dungeon_gold.lua b/lua/app/config/chapter_board_dungeon_gold.lua index 9828ac71..e4d63461 100644 --- a/lua/app/config/chapter_board_dungeon_gold.lua +++ b/lua/app/config/chapter_board_dungeon_gold.lua @@ -1,6 +1,6 @@ local chapter_board_dungeon_gold = { [1]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -200,7 +200,7 @@ local chapter_board_dungeon_gold = { } }, [2]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -400,7 +400,7 @@ local chapter_board_dungeon_gold = { } }, [3]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -600,7 +600,7 @@ local chapter_board_dungeon_gold = { } }, [4]={ - ["board_daily_challenge"]={ + ["board"]={ { 0, 3 @@ -800,7 +800,7 @@ local chapter_board_dungeon_gold = { } }, [5]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -1000,7 +1000,7 @@ local chapter_board_dungeon_gold = { } }, [6]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -1200,7 +1200,7 @@ local chapter_board_dungeon_gold = { } }, [7]={ - ["board_daily_challenge"]={ + ["board"]={ { 21, 1 @@ -1400,7 +1400,7 @@ local chapter_board_dungeon_gold = { } }, [8]={ - ["board_daily_challenge"]={ + ["board"]={ { 3, 0 @@ -1600,7 +1600,7 @@ local chapter_board_dungeon_gold = { } }, [9]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -1800,7 +1800,7 @@ local chapter_board_dungeon_gold = { } }, [10]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -2000,7 +2000,7 @@ local chapter_board_dungeon_gold = { } }, [11]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -2200,7 +2200,7 @@ local chapter_board_dungeon_gold = { } }, [12]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -2400,7 +2400,7 @@ local chapter_board_dungeon_gold = { } }, [13]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -2600,7 +2600,7 @@ local chapter_board_dungeon_gold = { } }, [14]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -2800,7 +2800,7 @@ local chapter_board_dungeon_gold = { } }, [15]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3000,7 +3000,7 @@ local chapter_board_dungeon_gold = { } }, [16]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3200,7 +3200,7 @@ local chapter_board_dungeon_gold = { } }, [17]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3400,7 +3400,7 @@ local chapter_board_dungeon_gold = { } }, [18]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3600,7 +3600,7 @@ local chapter_board_dungeon_gold = { } }, [19]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3800,7 +3800,7 @@ local chapter_board_dungeon_gold = { } }, [20]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -4000,7 +4000,7 @@ local chapter_board_dungeon_gold = { } }, [21]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -4200,7 +4200,7 @@ local chapter_board_dungeon_gold = { } }, [22]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -4400,7 +4400,7 @@ local chapter_board_dungeon_gold = { } }, [23]={ - ["board_daily_challenge"]={ + ["board"]={ { 32, 0 @@ -4600,7 +4600,7 @@ local chapter_board_dungeon_gold = { } }, [24]={ - ["board_daily_challenge"]={ + ["board"]={ { 31, 0 @@ -4800,7 +4800,7 @@ local chapter_board_dungeon_gold = { } }, [25]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5000,7 +5000,7 @@ local chapter_board_dungeon_gold = { } }, [26]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5200,7 +5200,7 @@ local chapter_board_dungeon_gold = { } }, [27]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5400,7 +5400,7 @@ local chapter_board_dungeon_gold = { } }, [28]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5600,7 +5600,7 @@ local chapter_board_dungeon_gold = { } }, [29]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5800,7 +5800,7 @@ local chapter_board_dungeon_gold = { } }, [30]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 diff --git a/lua/app/config/chapter_board_dungeon_shards.lua b/lua/app/config/chapter_board_dungeon_shards.lua index 94c08151..16852fd8 100644 --- a/lua/app/config/chapter_board_dungeon_shards.lua +++ b/lua/app/config/chapter_board_dungeon_shards.lua @@ -1,6 +1,6 @@ local chapter_board_dungeon_shards = { [1]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -200,7 +200,7 @@ local chapter_board_dungeon_shards = { } }, [2]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -400,7 +400,7 @@ local chapter_board_dungeon_shards = { } }, [3]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -600,7 +600,7 @@ local chapter_board_dungeon_shards = { } }, [4]={ - ["board_daily_challenge"]={ + ["board"]={ { 0, 3 @@ -800,7 +800,7 @@ local chapter_board_dungeon_shards = { } }, [5]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -1000,7 +1000,7 @@ local chapter_board_dungeon_shards = { } }, [6]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -1200,7 +1200,7 @@ local chapter_board_dungeon_shards = { } }, [7]={ - ["board_daily_challenge"]={ + ["board"]={ { 21, 1 @@ -1400,7 +1400,7 @@ local chapter_board_dungeon_shards = { } }, [8]={ - ["board_daily_challenge"]={ + ["board"]={ { 3, 0 @@ -1600,7 +1600,7 @@ local chapter_board_dungeon_shards = { } }, [9]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -1800,7 +1800,7 @@ local chapter_board_dungeon_shards = { } }, [10]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -2000,7 +2000,7 @@ local chapter_board_dungeon_shards = { } }, [11]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -2200,7 +2200,7 @@ local chapter_board_dungeon_shards = { } }, [12]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -2400,7 +2400,7 @@ local chapter_board_dungeon_shards = { } }, [13]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -2600,7 +2600,7 @@ local chapter_board_dungeon_shards = { } }, [14]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -2800,7 +2800,7 @@ local chapter_board_dungeon_shards = { } }, [15]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3000,7 +3000,7 @@ local chapter_board_dungeon_shards = { } }, [16]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3200,7 +3200,7 @@ local chapter_board_dungeon_shards = { } }, [17]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3400,7 +3400,7 @@ local chapter_board_dungeon_shards = { } }, [18]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3600,7 +3600,7 @@ local chapter_board_dungeon_shards = { } }, [19]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -3800,7 +3800,7 @@ local chapter_board_dungeon_shards = { } }, [20]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -4000,7 +4000,7 @@ local chapter_board_dungeon_shards = { } }, [21]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -4200,7 +4200,7 @@ local chapter_board_dungeon_shards = { } }, [22]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -4400,7 +4400,7 @@ local chapter_board_dungeon_shards = { } }, [23]={ - ["board_daily_challenge"]={ + ["board"]={ { 32, 0 @@ -4600,7 +4600,7 @@ local chapter_board_dungeon_shards = { } }, [24]={ - ["board_daily_challenge"]={ + ["board"]={ { 31, 0 @@ -4800,7 +4800,7 @@ local chapter_board_dungeon_shards = { } }, [25]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5000,7 +5000,7 @@ local chapter_board_dungeon_shards = { } }, [26]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5200,7 +5200,7 @@ local chapter_board_dungeon_shards = { } }, [27]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5400,7 +5400,7 @@ local chapter_board_dungeon_shards = { } }, [28]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5600,7 +5600,7 @@ local chapter_board_dungeon_shards = { } }, [29]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -5800,7 +5800,7 @@ local chapter_board_dungeon_shards = { } }, [30]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -6000,7 +6000,7 @@ local chapter_board_dungeon_shards = { } }, [31]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -6200,7 +6200,7 @@ local chapter_board_dungeon_shards = { } }, [32]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -6400,7 +6400,7 @@ local chapter_board_dungeon_shards = { } }, [33]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -6600,7 +6600,7 @@ local chapter_board_dungeon_shards = { } }, [34]={ - ["board_daily_challenge"]={ + ["board"]={ { 0, 3 @@ -6800,7 +6800,7 @@ local chapter_board_dungeon_shards = { } }, [35]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -7000,7 +7000,7 @@ local chapter_board_dungeon_shards = { } }, [36]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -7200,7 +7200,7 @@ local chapter_board_dungeon_shards = { } }, [37]={ - ["board_daily_challenge"]={ + ["board"]={ { 21, 1 @@ -7400,7 +7400,7 @@ local chapter_board_dungeon_shards = { } }, [38]={ - ["board_daily_challenge"]={ + ["board"]={ { 3, 0 @@ -7600,7 +7600,7 @@ local chapter_board_dungeon_shards = { } }, [39]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -7800,7 +7800,7 @@ local chapter_board_dungeon_shards = { } }, [40]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -8000,7 +8000,7 @@ local chapter_board_dungeon_shards = { } }, [41]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -8200,7 +8200,7 @@ local chapter_board_dungeon_shards = { } }, [42]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -8400,7 +8400,7 @@ local chapter_board_dungeon_shards = { } }, [43]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -8600,7 +8600,7 @@ local chapter_board_dungeon_shards = { } }, [44]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -8800,7 +8800,7 @@ local chapter_board_dungeon_shards = { } }, [45]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -9000,7 +9000,7 @@ local chapter_board_dungeon_shards = { } }, [46]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -9200,7 +9200,7 @@ local chapter_board_dungeon_shards = { } }, [47]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -9400,7 +9400,7 @@ local chapter_board_dungeon_shards = { } }, [48]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -9600,7 +9600,7 @@ local chapter_board_dungeon_shards = { } }, [49]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -9800,7 +9800,7 @@ local chapter_board_dungeon_shards = { } }, [50]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -10000,7 +10000,7 @@ local chapter_board_dungeon_shards = { } }, [51]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -10200,7 +10200,7 @@ local chapter_board_dungeon_shards = { } }, [52]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -10400,7 +10400,7 @@ local chapter_board_dungeon_shards = { } }, [53]={ - ["board_daily_challenge"]={ + ["board"]={ { 32, 0 @@ -10600,7 +10600,7 @@ local chapter_board_dungeon_shards = { } }, [54]={ - ["board_daily_challenge"]={ + ["board"]={ { 31, 0 @@ -10800,7 +10800,7 @@ local chapter_board_dungeon_shards = { } }, [55]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -11000,7 +11000,7 @@ local chapter_board_dungeon_shards = { } }, [56]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -11200,7 +11200,7 @@ local chapter_board_dungeon_shards = { } }, [57]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -11400,7 +11400,7 @@ local chapter_board_dungeon_shards = { } }, [58]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -11600,7 +11600,7 @@ local chapter_board_dungeon_shards = { } }, [59]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -11800,7 +11800,7 @@ local chapter_board_dungeon_shards = { } }, [60]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -12000,7 +12000,7 @@ local chapter_board_dungeon_shards = { } }, [61]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -12200,7 +12200,7 @@ local chapter_board_dungeon_shards = { } }, [62]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -12400,7 +12400,7 @@ local chapter_board_dungeon_shards = { } }, [63]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -12600,7 +12600,7 @@ local chapter_board_dungeon_shards = { } }, [64]={ - ["board_daily_challenge"]={ + ["board"]={ { 0, 3 @@ -12800,7 +12800,7 @@ local chapter_board_dungeon_shards = { } }, [65]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -13000,7 +13000,7 @@ local chapter_board_dungeon_shards = { } }, [66]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -13200,7 +13200,7 @@ local chapter_board_dungeon_shards = { } }, [67]={ - ["board_daily_challenge"]={ + ["board"]={ { 21, 1 @@ -13400,7 +13400,7 @@ local chapter_board_dungeon_shards = { } }, [68]={ - ["board_daily_challenge"]={ + ["board"]={ { 3, 0 @@ -13600,7 +13600,7 @@ local chapter_board_dungeon_shards = { } }, [69]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -13800,7 +13800,7 @@ local chapter_board_dungeon_shards = { } }, [70]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -14000,7 +14000,7 @@ local chapter_board_dungeon_shards = { } }, [71]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -14200,7 +14200,7 @@ local chapter_board_dungeon_shards = { } }, [72]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -14400,7 +14400,7 @@ local chapter_board_dungeon_shards = { } }, [73]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -14600,7 +14600,7 @@ local chapter_board_dungeon_shards = { } }, [74]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -14800,7 +14800,7 @@ local chapter_board_dungeon_shards = { } }, [75]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -15000,7 +15000,7 @@ local chapter_board_dungeon_shards = { } }, [76]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -15200,7 +15200,7 @@ local chapter_board_dungeon_shards = { } }, [77]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -15400,7 +15400,7 @@ local chapter_board_dungeon_shards = { } }, [78]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -15600,7 +15600,7 @@ local chapter_board_dungeon_shards = { } }, [79]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -15800,7 +15800,7 @@ local chapter_board_dungeon_shards = { } }, [80]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -16000,7 +16000,7 @@ local chapter_board_dungeon_shards = { } }, [81]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -16200,7 +16200,7 @@ local chapter_board_dungeon_shards = { } }, [82]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -16400,7 +16400,7 @@ local chapter_board_dungeon_shards = { } }, [83]={ - ["board_daily_challenge"]={ + ["board"]={ { 32, 0 @@ -16600,7 +16600,7 @@ local chapter_board_dungeon_shards = { } }, [84]={ - ["board_daily_challenge"]={ + ["board"]={ { 31, 0 @@ -16800,7 +16800,7 @@ local chapter_board_dungeon_shards = { } }, [85]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -17000,7 +17000,7 @@ local chapter_board_dungeon_shards = { } }, [86]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -17200,7 +17200,7 @@ local chapter_board_dungeon_shards = { } }, [87]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -17400,7 +17400,7 @@ local chapter_board_dungeon_shards = { } }, [88]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -17600,7 +17600,7 @@ local chapter_board_dungeon_shards = { } }, [89]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -17800,7 +17800,7 @@ local chapter_board_dungeon_shards = { } }, [90]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -18000,7 +18000,7 @@ local chapter_board_dungeon_shards = { } }, [91]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -18200,7 +18200,7 @@ local chapter_board_dungeon_shards = { } }, [92]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -18400,7 +18400,7 @@ local chapter_board_dungeon_shards = { } }, [93]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -18600,7 +18600,7 @@ local chapter_board_dungeon_shards = { } }, [94]={ - ["board_daily_challenge"]={ + ["board"]={ { 0, 3 @@ -18800,7 +18800,7 @@ local chapter_board_dungeon_shards = { } }, [95]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -19000,7 +19000,7 @@ local chapter_board_dungeon_shards = { } }, [96]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -19200,7 +19200,7 @@ local chapter_board_dungeon_shards = { } }, [97]={ - ["board_daily_challenge"]={ + ["board"]={ { 21, 1 @@ -19400,7 +19400,7 @@ local chapter_board_dungeon_shards = { } }, [98]={ - ["board_daily_challenge"]={ + ["board"]={ { 3, 0 @@ -19600,7 +19600,7 @@ local chapter_board_dungeon_shards = { } }, [99]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -19800,7 +19800,7 @@ local chapter_board_dungeon_shards = { } }, [100]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -20000,7 +20000,7 @@ local chapter_board_dungeon_shards = { } }, [101]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -20200,7 +20200,7 @@ local chapter_board_dungeon_shards = { } }, [102]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -20400,7 +20400,7 @@ local chapter_board_dungeon_shards = { } }, [103]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -20600,7 +20600,7 @@ local chapter_board_dungeon_shards = { } }, [104]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -20800,7 +20800,7 @@ local chapter_board_dungeon_shards = { } }, [105]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -21000,7 +21000,7 @@ local chapter_board_dungeon_shards = { } }, [106]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -21200,7 +21200,7 @@ local chapter_board_dungeon_shards = { } }, [107]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -21400,7 +21400,7 @@ local chapter_board_dungeon_shards = { } }, [108]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -21600,7 +21600,7 @@ local chapter_board_dungeon_shards = { } }, [109]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -21800,7 +21800,7 @@ local chapter_board_dungeon_shards = { } }, [110]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -22000,7 +22000,7 @@ local chapter_board_dungeon_shards = { } }, [111]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -22200,7 +22200,7 @@ local chapter_board_dungeon_shards = { } }, [112]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -22400,7 +22400,7 @@ local chapter_board_dungeon_shards = { } }, [113]={ - ["board_daily_challenge"]={ + ["board"]={ { 32, 0 @@ -22600,7 +22600,7 @@ local chapter_board_dungeon_shards = { } }, [114]={ - ["board_daily_challenge"]={ + ["board"]={ { 31, 0 @@ -22800,7 +22800,7 @@ local chapter_board_dungeon_shards = { } }, [115]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -23000,7 +23000,7 @@ local chapter_board_dungeon_shards = { } }, [116]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -23200,7 +23200,7 @@ local chapter_board_dungeon_shards = { } }, [117]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -23400,7 +23400,7 @@ local chapter_board_dungeon_shards = { } }, [118]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -23600,7 +23600,7 @@ local chapter_board_dungeon_shards = { } }, [119]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -23800,7 +23800,7 @@ local chapter_board_dungeon_shards = { } }, [120]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -24000,7 +24000,7 @@ local chapter_board_dungeon_shards = { } }, [121]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -24200,7 +24200,7 @@ local chapter_board_dungeon_shards = { } }, [122]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -24400,7 +24400,7 @@ local chapter_board_dungeon_shards = { } }, [123]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -24600,7 +24600,7 @@ local chapter_board_dungeon_shards = { } }, [124]={ - ["board_daily_challenge"]={ + ["board"]={ { 0, 3 @@ -24800,7 +24800,7 @@ local chapter_board_dungeon_shards = { } }, [125]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -25000,7 +25000,7 @@ local chapter_board_dungeon_shards = { } }, [126]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -25200,7 +25200,7 @@ local chapter_board_dungeon_shards = { } }, [127]={ - ["board_daily_challenge"]={ + ["board"]={ { 21, 1 @@ -25400,7 +25400,7 @@ local chapter_board_dungeon_shards = { } }, [128]={ - ["board_daily_challenge"]={ + ["board"]={ { 3, 0 @@ -25600,7 +25600,7 @@ local chapter_board_dungeon_shards = { } }, [129]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -25800,7 +25800,7 @@ local chapter_board_dungeon_shards = { } }, [130]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -26000,7 +26000,7 @@ local chapter_board_dungeon_shards = { } }, [131]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -26200,7 +26200,7 @@ local chapter_board_dungeon_shards = { } }, [132]={ - ["board_daily_challenge"]={ + ["board"]={ { 20, 0 @@ -26400,7 +26400,7 @@ local chapter_board_dungeon_shards = { } }, [133]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -26600,7 +26600,7 @@ local chapter_board_dungeon_shards = { } }, [134]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -26800,7 +26800,7 @@ local chapter_board_dungeon_shards = { } }, [135]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -27000,7 +27000,7 @@ local chapter_board_dungeon_shards = { } }, [136]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -27200,7 +27200,7 @@ local chapter_board_dungeon_shards = { } }, [137]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -27400,7 +27400,7 @@ local chapter_board_dungeon_shards = { } }, [138]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -27600,7 +27600,7 @@ local chapter_board_dungeon_shards = { } }, [139]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -27800,7 +27800,7 @@ local chapter_board_dungeon_shards = { } }, [140]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -28000,7 +28000,7 @@ local chapter_board_dungeon_shards = { } }, [141]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -28200,7 +28200,7 @@ local chapter_board_dungeon_shards = { } }, [142]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -28400,7 +28400,7 @@ local chapter_board_dungeon_shards = { } }, [143]={ - ["board_daily_challenge"]={ + ["board"]={ { 32, 0 @@ -28600,7 +28600,7 @@ local chapter_board_dungeon_shards = { } }, [144]={ - ["board_daily_challenge"]={ + ["board"]={ { 31, 0 @@ -28800,7 +28800,7 @@ local chapter_board_dungeon_shards = { } }, [145]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -29000,7 +29000,7 @@ local chapter_board_dungeon_shards = { } }, [146]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -29200,7 +29200,7 @@ local chapter_board_dungeon_shards = { } }, [147]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -29400,7 +29400,7 @@ local chapter_board_dungeon_shards = { } }, [148]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -29600,7 +29600,7 @@ local chapter_board_dungeon_shards = { } }, [149]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 @@ -29800,7 +29800,7 @@ local chapter_board_dungeon_shards = { } }, [150]={ - ["board_daily_challenge"]={ + ["board"]={ { 1, 0 diff --git a/lua/app/config/chapter_dungeon_gold.lua b/lua/app/config/chapter_dungeon_gold.lua index 0b66bbbd..36ce6388 100644 --- a/lua/app/config/chapter_dungeon_gold.lua +++ b/lua/app/config/chapter_dungeon_gold.lua @@ -3,9 +3,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=1, - ["monster_base"]=20003, - ["hp"]=8000000, + ["board"]={ + 1 + }, + ["monster"]={ + 105 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -27,9 +30,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=2, - ["monster_base"]=20003, - ["hp"]=11000000, + ["board"]={ + 2 + }, + ["monster"]={ + 205 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -51,9 +57,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=3, - ["monster_base"]=20003, - ["hp"]=12000000, + ["board"]={ + 3 + }, + ["monster"]={ + 305 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -75,9 +84,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=4, - ["monster_base"]=20003, - ["hp"]=15000000, + ["board"]={ + 4 + }, + ["monster"]={ + 405 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -99,9 +111,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=5, - ["monster_base"]=20003, - ["hp"]=23000000, + ["board"]={ + 5 + }, + ["monster"]={ + 505 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -123,9 +138,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=6, - ["monster_base"]=20003, - ["hp"]=15000000, + ["board"]={ + 6 + }, + ["monster"]={ + 605 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -147,9 +165,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=7, - ["monster_base"]=20003, - ["hp"]=17000000, + ["board"]={ + 7 + }, + ["monster"]={ + 705 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -171,9 +192,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=8, - ["monster_base"]=20003, - ["hp"]=20000000, + ["board"]={ + 8 + }, + ["monster"]={ + 805 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -195,9 +219,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=9, - ["monster_base"]=20003, - ["hp"]=22000000, + ["board"]={ + 9 + }, + ["monster"]={ + 905 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -219,9 +246,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=10, - ["monster_base"]=20003, - ["hp"]=42000000, + ["board"]={ + 10 + }, + ["monster"]={ + 1005 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -243,9 +273,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=11, - ["monster_base"]=20003, - ["hp"]=23000000, + ["board"]={ + 11 + }, + ["monster"]={ + 1105 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -267,9 +300,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=12, - ["monster_base"]=20003, - ["hp"]=28000000, + ["board"]={ + 12 + }, + ["monster"]={ + 1205 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -291,9 +327,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=13, - ["monster_base"]=20003, - ["hp"]=31000000, + ["board"]={ + 13 + }, + ["monster"]={ + 1305 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -315,9 +354,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=14, - ["monster_base"]=20003, - ["hp"]=35000000, + ["board"]={ + 14 + }, + ["monster"]={ + 1405 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -339,9 +381,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=15, - ["monster_base"]=20003, - ["hp"]=52000000, + ["board"]={ + 15 + }, + ["monster"]={ + 1505 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -363,9 +408,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=16, - ["monster_base"]=20003, - ["hp"]=40000000, + ["board"]={ + 16 + }, + ["monster"]={ + 1605 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -387,9 +435,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=17, - ["monster_base"]=20003, - ["hp"]=44000000, + ["board"]={ + 17 + }, + ["monster"]={ + 1705 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -411,9 +462,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=18, - ["monster_base"]=20003, - ["hp"]=50000000, + ["board"]={ + 18 + }, + ["monster"]={ + 1805 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -435,9 +489,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=19, - ["monster_base"]=20003, - ["hp"]=54000000, + ["board"]={ + 19 + }, + ["monster"]={ + 1905 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -459,9 +516,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=20, - ["monster_base"]=20003, - ["hp"]=90000000, + ["board"]={ + 20 + }, + ["monster"]={ + 2005 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -483,9 +543,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=21, - ["monster_base"]=20003, - ["hp"]=8000000, + ["board"]={ + 21 + }, + ["monster"]={ + 2105 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -507,9 +570,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=22, - ["monster_base"]=20003, - ["hp"]=11000000, + ["board"]={ + 22 + }, + ["monster"]={ + 2205 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -531,9 +597,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=23, - ["monster_base"]=20003, - ["hp"]=12000000, + ["board"]={ + 23 + }, + ["monster"]={ + 2305 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -555,9 +624,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=24, - ["monster_base"]=20003, - ["hp"]=15000000, + ["board"]={ + 24 + }, + ["monster"]={ + 2405 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -579,9 +651,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=25, - ["monster_base"]=20003, - ["hp"]=23000000, + ["board"]={ + 25 + }, + ["monster"]={ + 2505 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -603,9 +678,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=26, - ["monster_base"]=20003, - ["hp"]=15000000, + ["board"]={ + 26 + }, + ["monster"]={ + 2605 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -627,9 +705,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=27, - ["monster_base"]=20003, - ["hp"]=17000000, + ["board"]={ + 27 + }, + ["monster"]={ + 2705 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -651,9 +732,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=28, - ["monster_base"]=20003, - ["hp"]=20000000, + ["board"]={ + 28 + }, + ["monster"]={ + 2805 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -675,9 +759,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=29, - ["monster_base"]=20003, - ["hp"]=22000000, + ["board"]={ + 29 + }, + ["monster"]={ + 2905 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", @@ -699,9 +786,12 @@ local chapter_dungeon_gold = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_gold"]=30, - ["monster_base"]=20003, - ["hp"]=42000000, + ["board"]={ + 30 + }, + ["monster"]={ + 3005 + }, ["percent_reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", diff --git a/lua/app/config/chapter_dungeon_shards.lua b/lua/app/config/chapter_dungeon_shards.lua index 01720577..56a01e75 100644 --- a/lua/app/config/chapter_dungeon_shards.lua +++ b/lua/app/config/chapter_dungeon_shards.lua @@ -3,7 +3,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 1, 2, 3, @@ -101,7 +101,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 6, 7, 8, @@ -199,7 +199,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 11, 12, 13, @@ -297,7 +297,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 16, 17, 18, @@ -395,7 +395,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 21, 22, 23, @@ -493,7 +493,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 26, 27, 28, @@ -591,7 +591,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 31, 32, 33, @@ -689,7 +689,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 36, 37, 38, @@ -787,7 +787,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 41, 42, 43, @@ -885,7 +885,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 46, 47, 48, @@ -983,7 +983,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 51, 52, 53, @@ -1081,7 +1081,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 56, 57, 58, @@ -1179,7 +1179,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 61, 62, 63, @@ -1277,7 +1277,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 66, 67, 68, @@ -1375,7 +1375,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 71, 72, 73, @@ -1473,7 +1473,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 76, 77, 78, @@ -1571,7 +1571,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 81, 82, 83, @@ -1669,7 +1669,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 86, 87, 88, @@ -1767,7 +1767,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 91, 92, 93, @@ -1865,7 +1865,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 96, 97, 98, @@ -1963,7 +1963,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 101, 102, 103, @@ -2061,7 +2061,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 106, 107, 108, @@ -2159,7 +2159,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 111, 112, 113, @@ -2257,7 +2257,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 116, 117, 118, @@ -2355,7 +2355,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 121, 122, 123, @@ -2453,7 +2453,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 126, 127, 128, @@ -2551,7 +2551,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 131, 132, 133, @@ -2649,7 +2649,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 136, 137, 138, @@ -2747,7 +2747,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 141, 142, 143, @@ -2845,7 +2845,7 @@ local chapter_dungeon_shards = { ["scene"]="bg_11", ["block_icon"]="battle_hinder_7", ["chess_board"]="chessboard_2", - ["chapter_board_dungeon_shards"]={ + ["board"]={ 146, 147, 148, diff --git a/lua/app/config/monster_dungeon_gold.lua b/lua/app/config/monster_dungeon_gold.lua new file mode 100644 index 00000000..45a7477e --- /dev/null +++ b/lua/app/config/monster_dungeon_gold.lua @@ -0,0 +1,216 @@ +local monster_dungeon_gold = { + [105]={ + ["monster_base"]=20003, + ["hp"]=90000000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [205]={ + ["monster_base"]=20003, + ["hp"]=90200000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [305]={ + ["monster_base"]=20003, + ["hp"]=90400000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [405]={ + ["monster_base"]=20003, + ["hp"]=90600000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [505]={ + ["monster_base"]=20003, + ["hp"]=90800000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [605]={ + ["monster_base"]=20003, + ["hp"]=91000000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [705]={ + ["monster_base"]=20003, + ["hp"]=91200000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [805]={ + ["monster_base"]=20003, + ["hp"]=91400000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [905]={ + ["monster_base"]=20003, + ["hp"]=91600000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1005]={ + ["monster_base"]=20003, + ["hp"]=91800000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1105]={ + ["monster_base"]=20003, + ["hp"]=92000000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1205]={ + ["monster_base"]=20003, + ["hp"]=92200000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1305]={ + ["monster_base"]=20003, + ["hp"]=92400000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1405]={ + ["monster_base"]=20003, + ["hp"]=92600000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1505]={ + ["monster_base"]=20003, + ["hp"]=92800000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1605]={ + ["monster_base"]=20003, + ["hp"]=93000000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1705]={ + ["monster_base"]=20003, + ["hp"]=93200000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1805]={ + ["monster_base"]=20003, + ["hp"]=93400000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [1905]={ + ["monster_base"]=20003, + ["hp"]=93600000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2005]={ + ["monster_base"]=20003, + ["hp"]=93800000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2105]={ + ["monster_base"]=20003, + ["hp"]=94000000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2205]={ + ["monster_base"]=20003, + ["hp"]=94200000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2305]={ + ["monster_base"]=20003, + ["hp"]=94400000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2405]={ + ["monster_base"]=20003, + ["hp"]=94600000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2505]={ + ["monster_base"]=20003, + ["hp"]=94800000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2605]={ + ["monster_base"]=20003, + ["hp"]=95000000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2705]={ + ["monster_base"]=20003, + ["hp"]=95200000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2805]={ + ["monster_base"]=20003, + ["hp"]=95400000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [2905]={ + ["monster_base"]=20003, + ["hp"]=95600000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + }, + [3005]={ + ["monster_base"]=20003, + ["hp"]=95800000, + ["atk"]=0, + ["atk_times"]=0, + ["monster_exp"]=440000 + } +} +local config = { +data=monster_dungeon_gold,count=30 +} +return config \ No newline at end of file diff --git a/lua/app/config/monster_dungeon_gold.lua.meta b/lua/app/config/monster_dungeon_gold.lua.meta new file mode 100644 index 00000000..4d0e5e24 --- /dev/null +++ b/lua/app/config/monster_dungeon_gold.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4154138c3cd0f0147b333237de79e966 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 1ff6f078..e174009d 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -11,7 +11,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [9]={ ["effect_type"]=2, @@ -52,7 +55,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [12]={ ["effect_type"]=2, @@ -66,7 +72,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [13]={ ["effect_type"]=2, @@ -107,7 +116,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -129,7 +141,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -151,7 +166,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -173,7 +191,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -210,7 +231,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -237,7 +261,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=1 + ["skill_position"]={ + 1, + 0 + } }, [1200122]={ ["position"]=1, @@ -258,7 +285,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=1 + ["skill_position"]={ + 1, + 0 + } }, [1200123]={ ["position"]=1, @@ -290,7 +320,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=1 + ["skill_position"]={ + 1, + 0 + } }, [1200124]={ ["effect_type"]=2, @@ -318,7 +351,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -340,7 +376,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -362,7 +401,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -384,7 +426,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -427,7 +472,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -522,7 +570,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -607,7 +658,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -629,7 +683,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -651,7 +708,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -673,7 +733,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -747,7 +810,10 @@ local skill = { 4, 6 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -861,7 +927,10 @@ local skill = { 4, 6 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -892,7 +961,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -914,7 +986,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -936,7 +1011,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=4, ["sound_hit"]={ @@ -958,7 +1036,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1034,7 +1115,10 @@ local skill = { 4, 5 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -1101,20 +1185,6 @@ local skill = { }, ["obj"]=2 }, - [1400124]={ - ["position"]=1, - ["effect_type"]=2, - ["trigger"]=6, - ["effect"]={ - { - ["type"]="stun", - ["num"]=0, - ["ratio"]=10000, - ["round"]=2 - } - }, - ["obj"]=2 - }, [1400125]={ ["position"]=1, ["effect_type"]=2, @@ -1144,6 +1214,292 @@ local skill = { ["obj"]=2, ["fx_target"]=4 }, + [1400210]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound_hit"]={ + 1000011 + }, + ["name_act"]="attack01", + ["fx_self"]=300045 + }, + [1400211]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound_hit"]={ + 1000012 + }, + ["name_act"]="attack02", + ["fx_self"]=300046 + }, + [1400212]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=4, + ["sound_hit"]={ + 1000013 + }, + ["name_act"]="attack03", + ["fx_self"]=300047 + }, + [1400213]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000014 + }, + ["name_act"]="attack04", + ["fx_self"]=300048 + }, + [1400220]={ + ["energy"]=10, + ["link"]=1, + ["position"]=1, + ["method"]=1, + ["skill_type"]=0, + ["battle_icon"]="20", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=60000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound_hit"]={ + 54001201 + }, + ["name_act"]="skill01", + ["fx_self"]=300089, + ["bullet_time"]={ + 1800, + 3000, + 400 + } + }, + [1400221]={ + ["position"]=1, + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="burn", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + } + }, + [1400222]={ + ["position"]=1, + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="frozen", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, + ["condition_rel"]={ + { + 1, + 1 + } + }, + ["effect_type"]=2, + ["trigger"]=7, + ["effect"]={ + { + ["type"]="dmg_addition_yellow_add", + ["num"]=2000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 140 + } + }, + [1400223]={ + ["energy"]=10, + ["link"]=1, + ["position"]=1, + ["method"]=1, + ["skill_type"]=4, + ["boardrange"]={ + { + ["type"]=3, + ["range"]=2 + }, + { + ["type"]=4, + ["range"]=2 + } + }, + ["battle_icon"]="20", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=60000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound_hit"]={ + 54001201 + }, + ["name_act"]="skill01", + ["fx_self"]=300089, + ["bullet_time"]={ + 1800, + 3000, + 400 + } + }, + [1400224]={ + ["position"]=1, + ["effect_type"]=2, + ["trigger"]=5, + ["effect"]={ + { + ["type"]="burn", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + } + }, + [1400225]={ + ["position"]=1, + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="frozen", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, + ["condition_rel"]={ + { + 1, + 1 + } + }, + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="normal_attack_add", + ["num"]=2, + ["ratio"]=10000, + ["round"]=3 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 140 + } + }, [2200110]={ ["position"]=2, ["effect_type"]=1, @@ -1157,7 +1513,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1179,7 +1538,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1201,7 +1563,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1223,7 +1588,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1249,7 +1617,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -1293,7 +1664,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [2200122]={ ["position"]=2, @@ -1308,7 +1682,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [2200123]={ ["energy"]=10, @@ -1338,7 +1715,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -1365,7 +1745,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1387,7 +1770,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1409,7 +1795,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1431,7 +1820,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1482,7 +1874,10 @@ local skill = { 3, 4 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -1552,7 +1947,10 @@ local skill = { 3, 4 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -1669,7 +2067,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1691,7 +2092,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1713,7 +2117,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1735,7 +2142,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1791,7 +2201,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -1877,7 +2290,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1899,7 +2315,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1921,7 +2340,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -1943,7 +2365,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -1973,7 +2398,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -1998,35 +2426,7 @@ local skill = { ["v"]=0, ["side"]=2 } - } - }, - ["condition_rel"]={ - { - 2, - 1 - } - }, - ["effect_type"]=2, - ["trigger"]=6, - ["effect"]={ - { - ["type"]="hurt_yellow", - ["num"]=30000, - ["ratio"]=10000, - ["round"]=0 }, - { - ["type"]="stun", - ["num"]=0, - ["ratio"]=3000, - ["round"]=2 - } - }, - ["obj"]=2 - }, - [2400122]={ - ["position"]=2, - ["buff_condition"]={ { { ["type"]="state", @@ -2038,6 +2438,10 @@ local skill = { } }, ["condition_rel"]={ + { + 1, + 1 + }, { 2, 1 @@ -2061,6 +2465,56 @@ local skill = { }, ["obj"]=2 }, + [2400122]={ + ["position"]=2, + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="frozen", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + }, + { + { + ["type"]="state", + ["attr"]="frozen", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, + ["condition_rel"]={ + { + 1, + 1 + }, + { + 2, + 1 + } + }, + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=30000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="stun", + ["num"]=0, + ["ratio"]=7000, + ["round"]=2 + } + }, + ["obj"]=2 + }, [2400123]={ ["energy"]=10, ["link"]=1, @@ -2083,12 +2537,15 @@ local skill = { { ["type"]="imprison", ["num"]=0, - ["ratio"]=5000, + ["ratio"]=7000, ["round"]=2 } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -2129,7 +2586,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -2157,6 +2617,176 @@ local skill = { }, ["obj"]=1 }, + [2400210]={ + ["position"]=2, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1 + }, + [2400211]={ + ["position"]=2, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1 + }, + [2400212]={ + ["position"]=2, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1 + }, + [2400213]={ + ["position"]=2, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=100, + ["shake_type"]=1 + }, + [2400220]={ + ["energy"]=10, + ["link"]=1, + ["position"]=2, + ["method"]=1, + ["skill_type"]=1, + ["boardrange"]={ + + }, + ["battle_icon"]="17", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=60000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 140 + }, + ["shake_time"]=200, + ["shake_type"]=6 + }, + [2400221]={ + ["skill_type"]=11, + ["skill_type_parameter"]={ + 0, + 2 + }, + ["effect_type"]=2, + ["trigger"]=3, + ["obj"]=1 + }, + [2400222]={ + ["effect_type"]=2, + ["trigger"]=5, + ["effect"]={ + { + ["type"]="weaken", + ["num"]=2500, + ["ratio"]=1000, + ["round"]=1 + } + }, + ["obj"]=2 + }, + [2400223]={ + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="shield_rebound_200", + ["num"]=1000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=1 + }, + [2400224]={ + ["effect_type"]=2, + ["trigger"]=5, + ["effect"]={ + { + ["type"]="weaken", + ["num"]=2500, + ["ratio"]=1000, + ["round"]=2 + } + }, + ["obj"]=2 + }, + [2400225]={ + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="shield_rebound_400", + ["num"]=1000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=1 + }, [3200110]={ ["position"]=3, ["effect_type"]=1, @@ -2170,7 +2800,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2192,7 +2825,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2214,7 +2850,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -2236,7 +2875,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2266,7 +2908,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -2366,7 +3011,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -2388,7 +3036,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2410,7 +3061,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -2432,7 +3086,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -2458,7 +3115,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["sound_hit"]={ 3300120 }, @@ -2549,7 +3209,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["sound_hit"]={ 3300120 }, @@ -2569,7 +3232,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2591,7 +3257,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -2613,7 +3282,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2635,7 +3307,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -2687,7 +3362,10 @@ local skill = { 2, 3 }, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -2780,7 +3458,10 @@ local skill = { 2, 4 }, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -2860,7 +3541,10 @@ local skill = { 2, 4 }, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -2887,7 +3571,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2909,7 +3596,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2931,7 +3621,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -2953,7 +3646,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3006,7 +3702,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -3130,7 +3829,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -3157,7 +3859,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -3179,7 +3884,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3201,7 +3909,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3223,7 +3934,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -3256,7 +3970,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -3359,7 +4076,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -3381,7 +4101,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3403,7 +4126,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3425,7 +4151,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3458,7 +4187,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -3504,7 +4236,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [4300122]={ ["position"]=4, @@ -3519,7 +4254,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [4300123]={ ["position"]=4, @@ -3534,7 +4272,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [4300124]={ ["position"]=4, @@ -3549,7 +4290,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [4300125]={ ["energy"]=10, @@ -3585,7 +4329,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -3614,7 +4361,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3636,7 +4386,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3658,7 +4411,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3680,7 +4436,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3733,7 +4492,10 @@ local skill = { 2, 4 }, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -3850,7 +4612,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3872,7 +4637,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3894,7 +4662,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3916,7 +4687,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -3955,7 +4729,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ @@ -4003,12 +4780,12 @@ local skill = { [4400122]={ ["position"]=4, ["effect_type"]=2, - ["trigger"]=6, + ["trigger"]=5, ["effect"]={ { ["type"]="frozen", ["num"]=0, - ["ratio"]=5000, + ["ratio"]=1000, ["round"]=2 } }, @@ -4017,12 +4794,12 @@ local skill = { [4400123]={ ["position"]=4, ["effect_type"]=2, - ["trigger"]=6, + ["trigger"]=5, ["effect"]={ { ["type"]="frozen", ["num"]=0, - ["ratio"]=7000, + ["ratio"]=2000, ["round"]=2 } }, @@ -4041,7 +4818,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4063,7 +4843,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4085,7 +4868,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4107,7 +4893,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4137,7 +4926,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["sound_hit"]={ 5200120 }, @@ -4165,7 +4957,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["sound_hit"]={ 5200120 }, @@ -4193,7 +4988,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["sound_hit"]={ 5200120 }, @@ -4226,7 +5024,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4248,7 +5049,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4270,7 +5074,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4292,7 +5099,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4343,7 +5153,10 @@ local skill = { 3, 4 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -4451,7 +5264,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4473,7 +5289,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4495,7 +5314,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4517,7 +5339,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4560,7 +5385,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -4711,7 +5539,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -4740,7 +5571,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4762,7 +5596,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4784,7 +5621,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4806,7 +5646,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ @@ -4850,7 +5693,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -4921,7 +5767,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -4972,7 +5821,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -4992,7 +5844,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -5012,7 +5867,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -5032,7 +5890,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -5052,7 +5913,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -5072,7 +5936,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -5092,7 +5959,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -5112,7 +5982,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [10009]={ ["effect_type"]=2, @@ -5126,7 +5999,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [10010]={ ["effect_type"]=2, @@ -5140,7 +6016,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [10011]={ ["effect_type"]=2, @@ -5154,7 +6033,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [10012]={ ["effect_type"]=2, @@ -5168,7 +6050,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [10013]={ ["effect_type"]=2, @@ -5182,7 +6067,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2 + ["skill_position"]={ + 2, + 140 + } }, [10014]={ ["effect_type"]=2, @@ -5209,7 +6097,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["sound_hit"]={ @@ -5229,7 +6120,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5263,7 +6157,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5302,7 +6199,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5336,7 +6236,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5370,7 +6273,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5404,7 +6310,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5434,7 +6343,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0 }, @@ -5455,7 +6367,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5504,7 +6419,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5563,7 +6481,10 @@ local skill = { 4, 5 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5597,7 +6518,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0 }, @@ -5617,7 +6541,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5657,7 +6584,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5708,7 +6638,10 @@ local skill = { 2, 4 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5739,7 +6672,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5767,7 +6703,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["sound_hit"]={ @@ -5793,7 +6732,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5851,7 +6793,10 @@ local skill = { 3, 5 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5901,7 +6846,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5969,7 +6917,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -6038,7 +6989,10 @@ local skill = { 4, 6 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -6070,7 +7024,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["sound_hit"]={ @@ -6126,7 +7083,10 @@ local skill = { 3, 5 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6248,7 +7208,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -6296,7 +7259,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6357,7 +7323,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6417,7 +7386,10 @@ local skill = { 3, 5 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=1, ["shake_time"]=200, @@ -6451,7 +7423,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["name_act"]="skill01", @@ -6475,7 +7450,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6531,7 +7509,10 @@ local skill = { 3, 4 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=1, ["shake_time"]=200, @@ -6617,7 +7598,10 @@ local skill = { 3, 4 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6690,7 +7674,10 @@ local skill = { 5, 6 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, @@ -6746,7 +7733,10 @@ local skill = { 2, 4 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6787,7 +7777,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, @@ -6816,7 +7809,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["name_act"]="skill01" @@ -6859,7 +7855,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -6893,7 +7892,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6933,7 +7935,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6972,7 +7977,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -7000,7 +8008,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0 }, @@ -7033,7 +8044,10 @@ local skill = { 2, 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -7061,7 +8075,10 @@ local skill = { } }, ["obj"]=1, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0 }, @@ -7106,7 +8123,10 @@ local skill = { 2, 5 }, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -7134,7 +8154,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -7174,7 +8197,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -7197,7 +8223,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7218,7 +8247,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7239,7 +8271,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7260,7 +8295,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7281,7 +8319,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7302,7 +8343,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7323,7 +8367,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7344,7 +8391,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7365,7 +8415,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7386,7 +8439,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7407,7 +8463,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7428,7 +8487,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7449,7 +8511,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7470,7 +8535,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7491,7 +8559,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7512,7 +8583,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7533,7 +8607,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7554,7 +8631,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7575,7 +8655,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7596,7 +8679,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7617,7 +8703,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7638,7 +8727,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7659,7 +8751,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7680,7 +8775,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7701,7 +8799,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7722,7 +8823,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7743,7 +8847,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7764,7 +8871,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7785,7 +8895,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7806,7 +8919,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7827,7 +8943,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7848,7 +8967,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7869,7 +8991,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7890,7 +9015,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7911,7 +9039,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7932,7 +9063,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7953,7 +9087,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7974,7 +9111,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -7995,7 +9135,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8016,7 +9159,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8037,7 +9183,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8058,7 +9207,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8079,7 +9231,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8100,7 +9255,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8121,7 +9279,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8142,7 +9303,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8163,7 +9327,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8184,7 +9351,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8205,7 +9375,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8226,7 +9399,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8247,7 +9423,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8268,7 +9447,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8289,7 +9471,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8310,7 +9495,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8331,7 +9519,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8352,7 +9543,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8373,7 +9567,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8394,7 +9591,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8415,7 +9615,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8436,7 +9639,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8457,7 +9663,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8478,7 +9687,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8499,7 +9711,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8520,7 +9735,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8541,7 +9759,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8562,7 +9783,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8583,7 +9807,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8604,7 +9831,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8625,7 +9855,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8646,7 +9879,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8667,7 +9903,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8688,7 +9927,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8709,7 +9951,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8730,7 +9975,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8751,7 +9999,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8772,7 +10023,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8793,7 +10047,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8814,7 +10071,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8835,7 +10095,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8856,7 +10119,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8877,7 +10143,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8898,7 +10167,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8919,7 +10191,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8940,7 +10215,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8961,7 +10239,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -8982,7 +10263,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9003,7 +10287,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9024,7 +10311,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9045,7 +10335,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9066,7 +10359,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9087,7 +10383,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9108,7 +10407,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9129,7 +10431,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9150,7 +10455,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9171,7 +10479,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9192,7 +10503,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9213,7 +10527,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9234,7 +10551,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9255,7 +10575,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9276,7 +10599,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9297,7 +10623,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9318,7 +10647,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9339,7 +10671,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9360,7 +10695,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9381,7 +10719,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9402,7 +10743,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9423,7 +10767,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9444,7 +10791,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9465,7 +10815,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9486,7 +10839,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9507,7 +10863,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9528,7 +10887,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9549,7 +10911,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9570,7 +10935,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9591,7 +10959,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9612,7 +10983,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9633,7 +11007,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9654,7 +11031,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9675,7 +11055,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9696,7 +11079,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9717,7 +11103,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9738,7 +11127,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9759,7 +11151,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9780,7 +11175,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9801,7 +11199,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9822,7 +11223,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9843,7 +11247,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9864,7 +11271,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9885,7 +11295,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9906,7 +11319,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9927,7 +11343,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9948,7 +11367,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9969,7 +11391,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -9990,7 +11415,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10011,7 +11439,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10032,7 +11463,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10053,7 +11487,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10074,7 +11511,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10095,7 +11535,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10116,7 +11559,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10137,7 +11583,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10158,7 +11607,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10179,7 +11631,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10200,7 +11655,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10221,7 +11679,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10242,7 +11703,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10263,7 +11727,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10284,7 +11751,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10305,7 +11775,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10326,7 +11799,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10347,7 +11823,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10368,7 +11847,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10389,7 +11871,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10410,7 +11895,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10431,7 +11919,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10452,7 +11943,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10473,7 +11967,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10494,7 +11991,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10515,7 +12015,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10536,7 +12039,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10557,7 +12063,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10578,7 +12087,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10599,7 +12111,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10620,7 +12135,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10641,7 +12159,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10662,7 +12183,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10683,7 +12207,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10704,7 +12231,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10725,7 +12255,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10746,7 +12279,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10767,7 +12303,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10788,7 +12327,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10809,7 +12351,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10830,7 +12375,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10851,7 +12399,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10872,7 +12423,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10893,7 +12447,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10914,7 +12471,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10935,7 +12495,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10956,7 +12519,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10977,7 +12543,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -10998,7 +12567,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11019,7 +12591,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11040,7 +12615,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11061,7 +12639,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11082,7 +12663,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11103,7 +12687,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11124,7 +12711,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11145,7 +12735,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11166,7 +12759,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11187,7 +12783,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11208,7 +12807,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11229,7 +12831,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11250,7 +12855,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11271,7 +12879,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11292,7 +12903,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11313,7 +12927,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11334,7 +12951,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11355,7 +12975,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11376,7 +12999,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11397,7 +13023,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11418,7 +13047,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11439,7 +13071,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11460,7 +13095,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11481,7 +13119,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11502,7 +13143,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11523,7 +13167,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11544,7 +13191,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11565,7 +13215,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11586,7 +13239,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11607,7 +13263,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11628,7 +13287,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11649,7 +13311,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11670,7 +13335,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11691,7 +13359,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11712,7 +13383,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11733,7 +13407,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11754,7 +13431,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11775,7 +13455,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11796,7 +13479,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11817,7 +13503,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11838,7 +13527,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11859,7 +13551,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11880,7 +13575,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11901,7 +13599,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11922,7 +13623,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11943,7 +13647,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11964,7 +13671,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -11985,7 +13695,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12006,7 +13719,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12027,7 +13743,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12048,7 +13767,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12069,7 +13791,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12090,7 +13815,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12111,7 +13839,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12132,7 +13863,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12153,7 +13887,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12174,7 +13911,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12195,7 +13935,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12216,7 +13959,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12237,7 +13983,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12258,7 +14007,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12279,7 +14031,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12300,7 +14055,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12321,7 +14079,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12342,7 +14103,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12363,7 +14127,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12384,7 +14151,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12405,7 +14175,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12426,7 +14199,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12447,7 +14223,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12468,7 +14247,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12489,7 +14271,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12510,7 +14295,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12531,7 +14319,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12552,7 +14343,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12573,7 +14367,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12594,7 +14391,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12615,7 +14415,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12636,7 +14439,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12657,7 +14463,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12678,7 +14487,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12699,7 +14511,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12720,7 +14535,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12741,7 +14559,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12762,7 +14583,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12783,7 +14607,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12804,7 +14631,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12825,7 +14655,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12846,7 +14679,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12867,7 +14703,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12888,7 +14727,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12909,7 +14751,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12930,7 +14775,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12951,7 +14799,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12972,7 +14823,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -12993,7 +14847,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13014,7 +14871,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13035,7 +14895,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13056,7 +14919,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13077,7 +14943,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13098,7 +14967,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13119,7 +14991,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13140,7 +15015,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13161,7 +15039,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13182,7 +15063,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13203,7 +15087,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13224,7 +15111,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13245,7 +15135,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13266,7 +15159,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13287,7 +15183,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13308,7 +15207,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13329,7 +15231,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13350,7 +15255,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13371,7 +15279,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13392,7 +15303,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13413,7 +15327,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13434,7 +15351,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13455,7 +15375,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13476,7 +15399,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13497,7 +15423,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13518,7 +15447,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13539,7 +15471,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13560,7 +15495,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13581,7 +15519,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13602,7 +15543,10 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]={ + 1, + 0 + }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ @@ -13613,7 +15557,10 @@ local skill = { }, [110001]={ ["skill_type"]=5, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" @@ -13623,14 +15570,20 @@ local skill = { ["skill_type_parameter"]={ 1 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" }, [110003]={ ["skill_type"]=7, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" @@ -13640,7 +15593,10 @@ local skill = { ["skill_type_parameter"]={ 1 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" @@ -13650,7 +15606,10 @@ local skill = { ["skill_type_parameter"]={ 3 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" @@ -13661,7 +15620,10 @@ local skill = { 1, 2 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" @@ -13672,7 +15634,10 @@ local skill = { 1, 1 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" @@ -13682,13 +15647,16 @@ local skill = { ["skill_type_parameter"]={ 10000 }, - ["skill_position"]=2, + ["skill_position"]={ + 2, + 140 + }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" } } local config = { -data=skill,count=577 +data=skill,count=596 } return config \ No newline at end of file diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 0fd20214..20fd7300 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -1131,22 +1131,15 @@ local skill_rogue = { ["icon"]="138" }, [1400104]={ - ["unlock"]=1400102, - ["cover_unlock"]=1400102, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, - ["type"]=12, - ["skill_position"]=1, - ["effect"]={ - { - ["type"]="add_skill", - ["num"]=1400124, - ["ratio"]=10000, - ["round"]=1 - } + ["type"]=7, + ["parameter"]={ + 1, + 6000 }, - ["obj"]=3, + ["skill_position"]=1, ["icon"]="139" }, [1400105]={ @@ -1205,6 +1198,136 @@ local skill_rogue = { ["obj"]=3, ["icon"]="142" }, + [1400200]={ + ["limit_times"]=1, + ["weight"]=100000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=1, + ["icon"]="186" + }, + [1400201]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=12, + ["skill_position"]=1, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=1400221, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=3, + ["icon"]="136" + }, + [1400202]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=12, + ["skill_position"]=1, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=1400222, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=3, + ["icon"]="137" + }, + [1400203]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=1, + ["parameter"]={ + 1400223 + }, + ["skill_position"]=1, + ["icon"]="138" + }, + [1400204]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=9, + ["skill_position"]=1, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=1400224, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=3, + ["icon"]="139" + }, + [1400205]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=12, + ["skill_position"]=1, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=1400225, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=3, + ["icon"]="140" + }, + [1400206]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=9, + ["skill_position"]=1, + ["effect"]={ + { + ["type"]="atkp_red_add", + ["num"]=1500, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=3, + ["icon"]="141" + }, + [1400207]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=15, + ["parameter"]={ + 6 + }, + ["skill_position"]=1, + ["effect"]={ + { + ["type"]="skill_fire_times", + ["num"]=1400220, + ["ratio"]=10000, + ["round"]=1 + }, + { + ["type"]="skill_fire_times", + ["num"]=1400223, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=3, + ["icon"]="142" + }, [2200100]={ ["limit_times"]=1, ["weight"]=100000, @@ -1737,6 +1860,132 @@ local skill_rogue = { ["obj"]=4, ["icon"]="149" }, + [2400200]={ + ["limit_times"]=1, + ["weight"]=100000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=2, + ["icon"]="187" + }, + [2400201]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=2, + ["skill_position"]=2, + ["boardrange"]={ + { + ["type"]=0, + ["range"]=4 + } + }, + ["icon"]="143" + }, + [2400202]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=12, + ["skill_position"]=2, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=2400221, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=4, + ["icon"]="144" + }, + [2400203]={ + ["unlock"]=2400201, + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=2, + ["skill_position"]=2, + ["boardrange"]={ + { + ["type"]=0, + ["range"]=2 + } + }, + ["icon"]="145" + }, + [2400204]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=12, + ["skill_position"]=2, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=2400222, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=4, + ["icon"]="146" + }, + [2400205]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=12, + ["skill_position"]=2, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=2400223, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=4, + ["icon"]="147" + }, + [2400206]={ + ["unlock"]=2400204, + ["cover_unlock"]=2400206, + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=12, + ["skill_position"]=2, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=2400224, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=4, + ["icon"]="148" + }, + [2400207]={ + ["unlock"]=2400205, + ["cover_unlock"]=2400205, + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=12, + ["skill_position"]=2, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=2400225, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=4, + ["icon"]="149" + }, [3200100]={ ["limit_times"]=1, ["weight"]=100000, @@ -2229,6 +2478,83 @@ local skill_rogue = { ["obj"]=5, ["icon"]="156" }, + [3400200]={ + ["limit_times"]=1, + ["weight"]=100000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=3, + ["icon"]="188" + }, + [3400201]={ + ["limit_times"]=1, + ["weight"]=3000, + ["type"]=1, + ["icon"]="150" + }, + [3400202]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=3, + ["skill_position"]=3, + ["effect"]={ + { + ["type"]="atkp", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["icon"]="151" + }, + [3400203]={ + ["limit_times"]=1, + ["weight"]=3000, + ["type"]=8, + ["icon"]="152" + }, + [3400204]={ + ["limit_times"]=1, + ["weight"]=3000, + ["type"]=7, + ["icon"]="153" + }, + [3400205]={ + ["limit_times"]=1, + ["weight"]=3000, + ["type"]=12, + ["obj"]=5, + ["icon"]="154" + }, + [3400206]={ + ["unlock"]=3400201, + ["limit_times"]=1, + ["weight"]=3000, + ["type"]=2, + ["skill_position"]=3, + ["boardrange"]={ + { + ["type"]=3, + ["range"]=2 + }, + { + ["type"]=4, + ["range"]=2 + } + }, + ["icon"]="155" + }, + [3400207]={ + ["unlock"]=3400205, + ["cover_unlock"]=3400205, + ["limit_times"]=1, + ["weight"]=3000, + ["type"]=12, + ["obj"]=5, + ["icon"]="156" + }, [4200100]={ ["limit_times"]=1, ["weight"]=100000, @@ -2659,14 +2985,14 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, - ["type"]=12, + ["type"]=9, ["skill_position"]=4, ["effect"]={ { ["type"]="add_skill", ["num"]=4400122, ["ratio"]=10000, - ["round"]=1 + ["round"]=999 } }, ["obj"]=6, @@ -2695,14 +3021,14 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, - ["type"]=12, + ["type"]=9, ["skill_position"]=4, ["effect"]={ { ["type"]="add_skill", ["num"]=4400123, ["ratio"]=10000, - ["round"]=1 + ["round"]=999 } }, ["obj"]=6, @@ -3003,23 +3329,6 @@ local skill_rogue = { ["icon"]="131" }, [5300204]={ - ["limit_times"]=1, - ["weight"]=3000, - ["qlt"]=3, - ["type"]=9, - ["skill_position"]=5, - ["effect"]={ - { - ["type"]="atkp_purple_add", - ["num"]=1500, - ["ratio"]=10000, - ["round"]=999 - } - }, - ["obj"]=7, - ["icon"]="132" - }, - [5300205]={ ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -3036,6 +3345,23 @@ local skill_rogue = { ["obj"]=7, ["icon"]="133" }, + [5300205]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, + ["type"]=9, + ["skill_position"]=5, + ["effect"]={ + { + ["type"]="atkp_purple_add", + ["num"]=1500, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=7, + ["icon"]="132" + }, [5300206]={ ["unlock"]=5300202, ["cover_unlock"]=5300202, @@ -3192,6 +3518,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=204 +data=skill_rogue,count=228 } return config \ No newline at end of file diff --git a/lua/app/module/battle/battle_manager.lua b/lua/app/module/battle/battle_manager.lua index 080c39c3..cd2ea012 100644 --- a/lua/app/module/battle/battle_manager.lua +++ b/lua/app/module/battle/battle_manager.lua @@ -9,6 +9,8 @@ local BATTLE_CONTROLLER_BASE = "app/module/battle/controller/battle_controller" local BATTLE_CONTROLLER = { [BattleConst.BATTLE_TYPE.STAGE] = "app/module/battle/controller/battle_controller_stage", [BattleConst.BATTLE_TYPE.DAILY_CHALLENGE] = "app/module/battle/controller/battle_controller_daily_challenge", + [BattleConst.BATTLE_TYPE.DUNGEON_GOLD] = "app/module/battle/controller/battle_controller_dungeon_gold", + [BattleConst.BATTLE_TYPE.DUNGEON_SHARDS] = "app/module/battle/controller/battle_controller_dungeon_shards", } function BattleManager:showPauseUI(battleType) diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index a80e0eb5..1686077b 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -19,24 +19,80 @@ local BUFF_NAME_TO_ATTR = BattleConst.BUFF_NAME_TO_ATTR local GRID_BREAK_CONDITION = BattleConst.GRID_BREAK_CONDITION -- *************各个子模块的战斗需要重写的方法 START************* +function BattleController:getBoardConfig() + return {} +end + +function BattleController:getChapterConfig() + return {} +end + function BattleController:getChapterId() return 0 end function BattleController:getInitBoard() - return {} + if not self.boradList then + self.boradList = {} + self.fixedRandomGrid = {} + self.mysteryBoxIndexMap = {} + + local config = self:getChapterConfig()[self.chapterId] + local boardCfg = self:getBoardConfig() + for _, boardId in ipairs(config.board) do + local cfg = boardCfg[boardId] + if cfg then + table.insert(self.boradList, {board = GFunc.getTable(cfg.board), mysteryBoard = GFunc.getTable(cfg.mystery_box_board)}) + table.insert(self.fixedRandomGrid, GFunc.getTable(cfg.control_element)) + end + end + + if config.mystery_box and config.mystery_box_reward then + for i, index in ipairs(config.mystery_box) do + if not DataManager.ChapterData:getChapterMysteryBoxIsGot(self.chapterId, i) then + self.mysteryBoxIndexMap[index] = config.mystery_box_reward[i] + end + end + end + end + + return self.boradList, self.fixedRandomGrid, self.mysteryBoxIndexMap end function BattleController:getNotInvolvedSkills() - return {} + if not self.notInvolvedSkills then + self.notInvolvedSkills = {} + local config = self:getchapterConfig()[self.chapterId] + if config.not_involved_skill then + for _, skillId in ipairs(config.not_involved_skill) do + self.notInvolvedSkills[skillId] = true + end + end + end + + return self.notInvolvedSkills end function BattleController:getFixedRogueSkill() - return {} + if not self.fixedRogueSkill then + self.fixedRogueSkill = {} + end + + return self.fixedRogueSkill end function BattleController:getSealElementType() - return {} + if not self.sealElementType then + self.sealElementType = {} + local config = self:getchapterConfig()[self.chapterId] + if config.seal_element then + for _, elementType in ipairs(config.seal_element) do + self.sealElementType[elementType] = true + end + end + end + + return self.sealElementType end function BattleController:getBuffs() @@ -112,7 +168,11 @@ end -- 一共有多少波 function BattleController:getMaxWave() - return 1 + local config = self:getChapterConfig()[self.chapterId] + if not config or not config.monster then + return 0 + end + return #config.monster end function BattleController:getMinEliminationCount() @@ -123,11 +183,82 @@ function BattleController:getMinEliminationCount() end function BattleController:initDefUnits(callback) - callback() + local config = self:getChapterConfig()[self.chapterId] + self.battleUI:loadBg(config.scene) + local unitEntity = DataManager.BattleData:addMonster(config.monster[1]) + local modelId = unitEntity:getModelId() + BattleHelper:loadBattleHeroModel(modelId, self.battleUI:getBattleNode(), function(spineObject) + local monsterComp = spineObject:addLuaComponent(GConst.BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT) + monsterComp:initWithEntity(modelId, unitEntity, self) + self.defTeam:addUnit(monsterComp, true) + self.battleUI:refreshDefHp(unitEntity:getHp(), unitEntity:getHpPercent()) + callback() + end) +end + +function BattleController:generateNextMonster() + local config = self:getchapterConfig()[self.chapterId] + local monsterId = config.monster[self.waveIndex + 1] + if monsterId == nil then + return self:enterNextWave() + end + local isBoss = self.defTeam:getIsBoss() + local unitEntity = DataManager.BattleData:addMonster(monsterId, true) + local modelId = unitEntity:getModelId() + BattleHelper:loadBattleHeroModel(modelId, self.battleUI:getBattleNode(), function(spineObject) + self.defTeam:removeAllUnits() + local monsterComp = spineObject:addLuaComponent(GConst.BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT) + monsterComp:initWithEntity(modelId, unitEntity, self) + self.defTeam:addUnit(monsterComp, true) + self:handleBuffs(GConst.BattleConst.SIDE_DEF) + self.battleUI:refreshDefHp(unitEntity:getHp(), unitEntity:getHpPercent()) + local bornTime = monsterComp:getAnimationDuration(GConst.BattleConst.SPINE_ANIMATION_NAME.BORN) + if isBoss then -- 如果是boss就跑过去 + local count = 0 + local function onFinish() + count = count + 1 + if count == 2 then + self.atkTeam:stopRunAction() + self:onRoundEnd(true) + end + end + self.atkTeam:playRunAction() + self.atkTeam:recoverHpOnWaveOver(onFinish) + + isBoss = self.defTeam:getIsBoss() + if isBoss then + local monsterInfo = ConfigManager:getConfig("monster")[monsterId] + self.battleUI:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() + monsterComp:playEnterBattlefield(true, onFinish) + end) + else + monsterComp:playEnterBattlefield(true, onFinish) + end + else + local count = 0 + local function onFinish() + count = count + 1 + if count == 2 then + self:onRoundEnd(true) + end + end + self.atkTeam:recoverHpOnWaveOver(onFinish) + + isBoss = self.defTeam:getIsBoss() + if isBoss then + local monsterInfo = ConfigManager:getConfig("monster")[monsterId] + self.battleUI:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() + monsterComp:playEnterBattlefield(false, onFinish) + end) + else + monsterComp:playEnterBattlefield(false, onFinish) + end + end + end) end function BattleController:findNextDefUnit() - self:enterRoundEnd() + self:generateNextMonster() end function BattleController:onDefDead(callback) @@ -239,11 +370,19 @@ end ---- 障碍格子图片 function BattleController:getBlockIcon() - return "battle_hinder_4" + local chapterInfo = self:getChapterConfig()[self.chapterId] + if not chapterInfo then + return "battle_hinder_4" + end + return chapterInfo.block_icon end function BattleController:getChessBoardBgName() - return "chessboard_1" + local chapterInfo = self:getChapterConfig()[self.chapterId] + if not chapterInfo then + return "chessboard_1" + end + return chapterInfo.chess_board end -- *************各个子模块的战斗需要重写的方法 END************* diff --git a/lua/app/module/battle/controller/battle_controller_daily_challenge.lua b/lua/app/module/battle/controller/battle_controller_daily_challenge.lua index c0051ace..7427b8ed 100644 --- a/lua/app/module/battle/controller/battle_controller_daily_challenge.lua +++ b/lua/app/module/battle/controller/battle_controller_daily_challenge.lua @@ -1,28 +1,20 @@ local BattleHelper = require "app/module/battle/helper/battle_helper" local BattleController = require "app/module/battle/controller/battle_controller" local BattleControllerDailyChallenge = class("BattleControllerDailyChallenge", BattleController) -local CHAPTER_CFG = ConfigManager:getConfig("chapter_daily_challenge") local BattleBuffEntity = require "app/userdata/battle/skill/battle_buff_entity" +function BattleControllerDailyChallenge:getBoardConfig() + return ConfigManager:getConfig("chapter_board_daily_challenge") +end + +function BattleControllerDailyChallenge:getChapterConfig() + return ConfigManager:getConfig("chapter_daily_challenge") +end + function BattleControllerDailyChallenge:getChapterId() return DataManager.DailyChallengeData:getChapterDailyId() end -function BattleControllerDailyChallenge:getMaxWave() - if CHAPTER_CFG[self.chapterId] then - return #CHAPTER_CFG[self.chapterId].monster - end - return 0 -end - -function BattleControllerDailyChallenge:getChessBoardBgName() - local chapterInfo = CHAPTER_CFG[self.chapterId] - if not chapterInfo then - return "chessboard_1" - end - return chapterInfo.chess_board -end - function BattleControllerDailyChallenge:getBuffs() if not self.initBuffs then self.initBuffs = {} @@ -50,8 +42,8 @@ function BattleControllerDailyChallenge:onLoadComplete(...) end function BattleControllerDailyChallenge:initOther() - local ChapterId = DataManager.DailyChallengeData:getFixedChapterId() - local cfg = ConfigManager:getConfig("chapter")[ChapterId] + local chapterId = DataManager.DailyChallengeData:getFixedChapterId() + local cfg = ConfigManager:getConfig("chapter")[chapterId] self.monsterAtkAddition = 0 self.monsterHpAddition = 0 if cfg and cfg.daily_challenge_difficulty then @@ -70,89 +62,14 @@ function BattleControllerDailyChallenge:getMonsterHpAddition() return self.monsterHpAddition end -function BattleControllerDailyChallenge:initDefUnits(callback) - local config = CHAPTER_CFG[self.chapterId] - self.battleUI:loadBg(config.scene) - local unitEntity = DataManager.BattleData:addMonster(config.monster[1], nil, self) - local modelId = unitEntity:getModelId() - BattleHelper:loadBattleHeroModel(modelId, self.battleUI:getBattleNode(), function(spineObject) - local monsterComp = spineObject:addLuaComponent(GConst.BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT) - monsterComp:initWithEntity(modelId, unitEntity, self) - self.defTeam:addUnit(monsterComp, true) - self.battleUI:refreshDefHp(unitEntity:getHp(), unitEntity:getHpPercent()) - callback() - end) -end - -function BattleControllerDailyChallenge:_stageGenerateNextMonster() - local config = CHAPTER_CFG[self.chapterId] - local monsterId = config.monster[self.waveIndex + 1] - if monsterId == nil then - return self:enterNextWave() - end - local isBoss = self.defTeam:getIsBoss() - local unitEntity = DataManager.BattleData:addMonster(monsterId, true, self) - local modelId = unitEntity:getModelId() - BattleHelper:loadBattleHeroModel(modelId, self.battleUI:getBattleNode(), function(spineObject) - self.defTeam:removeAllUnits() - local monsterComp = spineObject:addLuaComponent(GConst.BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT) - monsterComp:initWithEntity(modelId, unitEntity, self) - self.defTeam:addUnit(monsterComp, true) - self:handleBuffs(GConst.BattleConst.SIDE_DEF) - self.battleUI:refreshDefHp(unitEntity:getHp(), unitEntity:getHpPercent()) - local bornTime = monsterComp:getAnimationDuration(GConst.BattleConst.SPINE_ANIMATION_NAME.BORN) - if isBoss then -- 如果是boss就跑过去 - local count = 0 - local function onFinish() - count = count + 1 - if count == 2 then - self.atkTeam:stopRunAction() - self:onRoundEnd(true) - end - end - self.atkTeam:playRunAction() - self.atkTeam:recoverHpOnWaveOver(onFinish) - - isBoss = self.defTeam:getIsBoss() - if isBoss then - local monsterInfo = ConfigManager:getConfig("monster")[monsterId] - self.battleUI:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() - monsterComp:playEnterBattlefield(true, onFinish) - end) - else - monsterComp:playEnterBattlefield(true, onFinish) - end - else - local count = 0 - local function onFinish() - count = count + 1 - if count == 2 then - self:onRoundEnd(true) - end - end - self.atkTeam:recoverHpOnWaveOver(onFinish) - - isBoss = self.defTeam:getIsBoss() - if isBoss then - local monsterInfo = ConfigManager:getConfig("monster")[monsterId] - self.battleUI:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() - monsterComp:playEnterBattlefield(false, onFinish) - end) - else - monsterComp:playEnterBattlefield(false, onFinish) - end - end - end) -end - function BattleControllerDailyChallenge:getInitBoard() if not self.boradList then self.boradList = {} self.fixedRandomGrid = {} self.mysteryBoxIndexMap = {} - local config = CHAPTER_CFG[self.chapterId] - local boardCfg = ConfigManager:getConfig("chapter_board_daily_challenge") + local config = self:getChapterConfig()[self.chapterId] + local boardCfg = self:getBoardConfig() for _, boardId in ipairs(config.chapter_board_daily_challenge) do local cfg = boardCfg[boardId] if cfg then @@ -164,51 +81,6 @@ function BattleControllerDailyChallenge:getInitBoard() return self.boradList, self.fixedRandomGrid, self.mysteryBoxIndexMap end -function BattleControllerDailyChallenge:getSealElementType() - if not self.sealElementType then - self.sealElementType = {} - local config = CHAPTER_CFG[self.chapterId] - if config.seal_element then - for _, elementType in ipairs(config.seal_element) do - self.sealElementType[elementType] = true - end - end - end - - return self.sealElementType -end - -function BattleControllerDailyChallenge:getNotInvolvedSkills() - if not self.notInvolvedSkills then - self.notInvolvedSkills = {} - local config = CHAPTER_CFG[self.chapterId] - if config.not_involved_skill then - for _, skillId in ipairs(config.not_involved_skill) do - self.notInvolvedSkills[skillId] = true - end - end - end - - return self.notInvolvedSkills -end - -function BattleControllerDailyChallenge:getFixedRogueSkill() - if not self.fixedRogueSkill then - local config = CHAPTER_CFG[self.chapterId] - if config.involved_skill then - self.fixedRogueSkill = GFunc.getTable(config.involved_skill) - else - self.fixedRogueSkill = {} - end - end - - return self.fixedRogueSkill -end - -function BattleControllerDailyChallenge:findNextDefUnit() - self:_stageGenerateNextMonster() -end - function BattleControllerDailyChallenge:controllBattleEnd() self.combatReport = { battleType = GConst.BattleConst.BATTLE_TYPE.DAILY_CHALLENGE, diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua new file mode 100644 index 00000000..26153854 --- /dev/null +++ b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua @@ -0,0 +1,73 @@ +local BattleController = require "app/module/battle/controller/battle_controller" +local BattleControllerDungeonGold = class("BattleControllerDungeonGold", BattleController) + +function BattleControllerDungeonGold:getBoardConfig() + return ConfigManager:getConfig("chapter_board_dungeon_gold") +end + +function BattleControllerDungeonGold:getChapterConfig() + return ConfigManager:getConfig("chapter_dungeon_gold") +end + +function BattleControllerDungeonGold:getChapterId() + return 1 -- Todo +end + +function BattleControllerDungeonGold:controllBattleEnd() + self.combatReport = { + battleType = GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD, + wave = self.waveIndex, + victory = self.victory, + } + local atkReport = {} + local teamEntity = DataManager.BattleData:getAtkTeam() + local members = teamEntity:getAllMembers() + for k, v in pairs(members) do + local report = { + heroId = v:getId(), + dmg = v:getDamageCount(), + } + table.insert(atkReport, report) + end + self.combatReport.atkReport = atkReport + if not self.victory then + self.combatReport.wave = self.combatReport.wave - 1 + end + -- ModuleManager.ChapterManager:endFight(self.chapterId, self.combatReport, self.gotMysteryBoxIndexs, self.taskProgress) +end + +function BattleControllerDungeonGold:postWaveOver(atkDead, isQuit) + -- local deathType = BIReport.FIGHT_DEATH_TYPE.SURVIVE + -- local waveEndType = BIReport.FIGHT_WAVE_END_TYPE.WIN + -- if atkDead then + -- if self.isBossWave then + -- deathType = BIReport.FIGHT_DEATH_TYPE.BOSS_FAIL + -- else + -- deathType = BIReport.FIGHT_DEATH_TYPE.NORMAL_FAIL + -- end + -- waveEndType = BIReport.FIGHT_WAVE_END_TYPE.FAIL + -- end + + -- if isQuit then + -- waveEndType = BIReport.FIGHT_WAVE_END_TYPE.QUIT + -- end + + -- local duration = self.waveDurationTime + -- local totalTime = self.totalDurationTime + -- local startTimes = DataManager.ChapterData:getChapterFightCount(self.chapterId) + -- local isFirstWin = false + -- if not DataManager.ChapterData:getChapterPassed(self.chapterId) and self.victory then + -- isFirstWin = true + -- end + + -- local isFianlStep = self.waveIndex >= self.maxWaveIndex + + -- BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.STAGE, self.chapterId, self.waveIndex, duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) +end + +function BattleControllerDungeonGold:postFightStart() + -- local unlockMaxChapter = DataManager.ChapterData:getNewChapterId() + -- BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.STAGE, self.waveIndex, self.chapterId, unlockMaxChapter, DataManager.ChapterData:getChapterFightCount(self.chapterId)) +end + +return BattleControllerDungeonGold \ No newline at end of file diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua.meta b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua.meta new file mode 100644 index 00000000..17c51a60 --- /dev/null +++ b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f918b2e0ce7132d4bb9f23da30447f0d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/battle/controller/battle_controller_stage.lua b/lua/app/module/battle/controller/battle_controller_stage.lua index f0f21360..fb4a15b2 100644 --- a/lua/app/module/battle/controller/battle_controller_stage.lua +++ b/lua/app/module/battle/controller/battle_controller_stage.lua @@ -3,166 +3,18 @@ local BattleHelper = require "app/module/battle/helper/battle_helper" local BattleController = require "app/module/battle/controller/battle_controller" local BattleControllerStage = class("BattleControllerStage", BattleController) +function BattleControllerStage:getBoardConfig() + return ConfigManager:getConfig("chapter_board") +end + +function BattleControllerStage:getChapterConfig() + return ConfigManager:getConfig("chapter") +end + function BattleControllerStage:getChapterId() return DataManager.ChapterData:getChapterId() end -function BattleControllerStage:getMaxWave() - return DataManager.ChapterData:getChapterCfgMaxWave(self.chapterId) -end - -function BattleControllerStage:getBlockIcon() - local chapterInfo = ConfigManager:getConfig("chapter")[self.chapterId] - if not chapterInfo then - return "battle_hinder_4" - end - return chapterInfo.block_icon -end - -function BattleControllerStage:getChessBoardBgName() - local chapterInfo = ConfigManager:getConfig("chapter")[self.chapterId] - if not chapterInfo then - return "chessboard_1" - end - return chapterInfo.chess_board -end - - -function BattleControllerStage:initOther() - -end - -function BattleControllerStage:initDefUnits(callback) - local config = ConfigManager:getConfig("chapter")[self.chapterId] - self.battleUI:loadBg(config.scene) - local unitEntity = DataManager.BattleData:addMonster(config.monster[1]) - local modelId = unitEntity:getModelId() - BattleHelper:loadBattleHeroModel(modelId, self.battleUI:getBattleNode(), function(spineObject) - local monsterComp = spineObject:addLuaComponent(GConst.BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT) - monsterComp:initWithEntity(modelId, unitEntity, self) - self.defTeam:addUnit(monsterComp, true) - self.battleUI:refreshDefHp(unitEntity:getHp(), unitEntity:getHpPercent()) - callback() - end) -end - -function BattleControllerStage:_stageGenerateNextMonster() - local config = ConfigManager:getConfig("chapter")[self.chapterId] - local monsterId = config.monster[self.waveIndex + 1] - if monsterId == nil then - return self:enterNextWave() - end - local isBoss = self.defTeam:getIsBoss() - local unitEntity = DataManager.BattleData:addMonster(monsterId, true) - local modelId = unitEntity:getModelId() - BattleHelper:loadBattleHeroModel(modelId, self.battleUI:getBattleNode(), function(spineObject) - self.defTeam:removeAllUnits() - local monsterComp = spineObject:addLuaComponent(GConst.BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT) - monsterComp:initWithEntity(modelId, unitEntity, self) - self.defTeam:addUnit(monsterComp, true) - self:handleBuffs(GConst.BattleConst.SIDE_DEF) - self.battleUI:refreshDefHp(unitEntity:getHp(), unitEntity:getHpPercent()) - local bornTime = monsterComp:getAnimationDuration(GConst.BattleConst.SPINE_ANIMATION_NAME.BORN) - if isBoss then -- 如果是boss就跑过去 - local count = 0 - local function onFinish() - count = count + 1 - if count == 2 then - self.atkTeam:stopRunAction() - self:onRoundEnd(true) - end - end - self.atkTeam:playRunAction() - self.atkTeam:recoverHpOnWaveOver(onFinish) - - isBoss = self.defTeam:getIsBoss() - if isBoss then - local monsterInfo = ConfigManager:getConfig("monster")[monsterId] - self.battleUI:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() - monsterComp:playEnterBattlefield(true, onFinish) - end) - else - monsterComp:playEnterBattlefield(true, onFinish) - end - else - local count = 0 - local function onFinish() - count = count + 1 - if count == 2 then - self:onRoundEnd(true) - end - end - self.atkTeam:recoverHpOnWaveOver(onFinish) - - isBoss = self.defTeam:getIsBoss() - if isBoss then - local monsterInfo = ConfigManager:getConfig("monster")[monsterId] - self.battleUI:showBossEnterAni(bornTime, ModuleManager.HeroManager:getMonsterName(monsterInfo.monster_base), monsterComp, function() - monsterComp:playEnterBattlefield(false, onFinish) - end) - else - monsterComp:playEnterBattlefield(false, onFinish) - end - end - end) -end - -function BattleControllerStage:getInitBoard() - if not self.boradList then - self.boradList = {} - self.fixedRandomGrid = {} - self.mysteryBoxIndexMap = {} - - local config = ConfigManager:getConfig("chapter")[self.chapterId] - local boardCfg = ConfigManager:getConfig("chapter_board") - for _, boardId in ipairs(config.board) do - local cfg = boardCfg[boardId] - if cfg then - table.insert(self.boradList, {board = GFunc.getTable(cfg.board), mysteryBoard = GFunc.getTable(cfg.mystery_box_board)}) - table.insert(self.fixedRandomGrid, GFunc.getTable(cfg.control_element)) - end - end - - if config.mystery_box and config.mystery_box_reward then - for i, index in ipairs(config.mystery_box) do - if not DataManager.ChapterData:getChapterMysteryBoxIsGot(self.chapterId, i) then - self.mysteryBoxIndexMap[index] = config.mystery_box_reward[i] - end - end - end - end - - return self.boradList, self.fixedRandomGrid, self.mysteryBoxIndexMap -end - -function BattleControllerStage:getSealElementType() - if not self.sealElementType then - self.sealElementType = {} - local config = ConfigManager:getConfig("chapter")[self.chapterId] - if config.seal_element then - for _, elementType in ipairs(config.seal_element) do - self.sealElementType[elementType] = true - end - end - end - - return self.sealElementType -end - -function BattleControllerStage:getNotInvolvedSkills() - if not self.notInvolvedSkills then - self.notInvolvedSkills = {} - local config = ConfigManager:getConfig("chapter")[self.chapterId] - if config.not_involved_skill then - for _, skillId in ipairs(config.not_involved_skill) do - self.notInvolvedSkills[skillId] = true - end - end - end - - return self.notInvolvedSkills -end - function BattleControllerStage:getFixedRogueSkill() if not self.fixedRogueSkill then local config = ConfigManager:getConfig("chapter")[self.chapterId] @@ -176,10 +28,6 @@ function BattleControllerStage:getFixedRogueSkill() return self.fixedRogueSkill end -function BattleControllerStage:findNextDefUnit() - self:_stageGenerateNextMonster() -end - function BattleControllerStage:controllBattleEnd() self.combatReport = { battleType = GConst.BattleConst.BATTLE_TYPE.STAGE, diff --git a/lua/app/module/dungeon/dungeon_manager.lua b/lua/app/module/dungeon/dungeon_manager.lua index 42357dc9..0864dd12 100644 --- a/lua/app/module/dungeon/dungeon_manager.lua +++ b/lua/app/module/dungeon/dungeon_manager.lua @@ -30,6 +30,7 @@ end -- 响应挑战副本 function DungeonManager:respChallengeGold(result) if result.err_code == GConst.ERROR_STR.SUCCESS then + ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD) end end diff --git a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua index 1bd7422f..8950cbb7 100644 --- a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua +++ b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua @@ -58,6 +58,7 @@ function DungeonDifficultyUI:onLoadRootComplete() end) self.btnStart:addClickListener(function() -- 开始挑战 + ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD) end) self.btnSweep:addClickListener(function() -- 开始扫荡 From 1c46acc4256a25e143ef0f4876d3156c67ffb8f7 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 12 Jun 2023 15:30:00 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E7=89=88?= =?UTF-8?q?=E6=88=98=E6=96=97=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battle/controller/battle_controller.lua | 8 ----- .../controller/battle_controller_stage.lua | 30 +++++++++++++++++-- lua/app/ui/dungeon/dungeon_difficulty_ui.lua | 1 - 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 1686077b..52912c29 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -46,14 +46,6 @@ function BattleController:getInitBoard() table.insert(self.fixedRandomGrid, GFunc.getTable(cfg.control_element)) end end - - if config.mystery_box and config.mystery_box_reward then - for i, index in ipairs(config.mystery_box) do - if not DataManager.ChapterData:getChapterMysteryBoxIsGot(self.chapterId, i) then - self.mysteryBoxIndexMap[index] = config.mystery_box_reward[i] - end - end - end end return self.boradList, self.fixedRandomGrid, self.mysteryBoxIndexMap diff --git a/lua/app/module/battle/controller/battle_controller_stage.lua b/lua/app/module/battle/controller/battle_controller_stage.lua index fb4a15b2..928b61e3 100644 --- a/lua/app/module/battle/controller/battle_controller_stage.lua +++ b/lua/app/module/battle/controller/battle_controller_stage.lua @@ -1,5 +1,3 @@ -local BattleHelper = require "app/module/battle/helper/battle_helper" - local BattleController = require "app/module/battle/controller/battle_controller" local BattleControllerStage = class("BattleControllerStage", BattleController) @@ -15,6 +13,34 @@ function BattleControllerStage:getChapterId() return DataManager.ChapterData:getChapterId() end +function BattleControllerStage:getInitBoard() + if not self.boradList then + self.boradList = {} + self.fixedRandomGrid = {} + self.mysteryBoxIndexMap = {} + + local config = self:getChapterConfig()[self.chapterId] + local boardCfg = self:getBoardConfig() + for _, boardId in ipairs(config.board) do + local cfg = boardCfg[boardId] + if cfg then + table.insert(self.boradList, {board = GFunc.getTable(cfg.board), mysteryBoard = GFunc.getTable(cfg.mystery_box_board)}) + table.insert(self.fixedRandomGrid, GFunc.getTable(cfg.control_element)) + end + end + + if config.mystery_box and config.mystery_box_reward then + for i, index in ipairs(config.mystery_box) do + if not DataManager.ChapterData:getChapterMysteryBoxIsGot(self.chapterId, i) then + self.mysteryBoxIndexMap[index] = config.mystery_box_reward[i] + end + end + end + end + + return self.boradList, self.fixedRandomGrid, self.mysteryBoxIndexMap +end + function BattleControllerStage:getFixedRogueSkill() if not self.fixedRogueSkill then local config = ConfigManager:getConfig("chapter")[self.chapterId] diff --git a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua index 8950cbb7..1bd7422f 100644 --- a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua +++ b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua @@ -58,7 +58,6 @@ function DungeonDifficultyUI:onLoadRootComplete() end) self.btnStart:addClickListener(function() -- 开始挑战 - ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD) end) self.btnSweep:addClickListener(function() -- 开始扫荡 From 7a0efdbe0918157845a55f1e59e2d4f75caba85d Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 12 Jun 2023 15:38:32 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battle_controller_dungeon_gold.lua | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua index 26153854..06d30f39 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua @@ -37,20 +37,20 @@ function BattleControllerDungeonGold:controllBattleEnd() end function BattleControllerDungeonGold:postWaveOver(atkDead, isQuit) - -- local deathType = BIReport.FIGHT_DEATH_TYPE.SURVIVE - -- local waveEndType = BIReport.FIGHT_WAVE_END_TYPE.WIN - -- if atkDead then - -- if self.isBossWave then - -- deathType = BIReport.FIGHT_DEATH_TYPE.BOSS_FAIL - -- else - -- deathType = BIReport.FIGHT_DEATH_TYPE.NORMAL_FAIL - -- end - -- waveEndType = BIReport.FIGHT_WAVE_END_TYPE.FAIL - -- end + local deathType = BIReport.FIGHT_DEATH_TYPE.SURVIVE + local waveEndType = BIReport.FIGHT_WAVE_END_TYPE.WIN + if atkDead then + if self.isBossWave then + deathType = BIReport.FIGHT_DEATH_TYPE.BOSS_FAIL + else + deathType = BIReport.FIGHT_DEATH_TYPE.NORMAL_FAIL + end + waveEndType = BIReport.FIGHT_WAVE_END_TYPE.FAIL + end - -- if isQuit then - -- waveEndType = BIReport.FIGHT_WAVE_END_TYPE.QUIT - -- end + if isQuit then + waveEndType = BIReport.FIGHT_WAVE_END_TYPE.QUIT + end -- local duration = self.waveDurationTime -- local totalTime = self.totalDurationTime From e4dad61f521b5d382b7efde962f3a9c3464e2cd4 Mon Sep 17 00:00:00 2001 From: Fang Date: Thu, 8 Jun 2023 18:36:35 +0800 Subject: [PATCH 05/20] =?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} From f07822161f97c3237a3c253b1c8de5c1a8c97561 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 12 Jun 2023 16:05:58 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E6=88=98=E6=96=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battle_controller_dungeon_shards.lua | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 lua/app/module/battle/controller/battle_controller_dungeon_shards.lua diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua b/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua new file mode 100644 index 00000000..0345bc54 --- /dev/null +++ b/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua @@ -0,0 +1,73 @@ +local BattleController = require "app/module/battle/controller/battle_controller" +local BattleControllerDungeonShards = class("BattleControllerDungeonShards", BattleController) + +function BattleControllerDungeonShards:getBoardConfig() + return ConfigManager:getConfig("chapter_board_dungeon_shards") +end + +function BattleControllerDungeonShards:getChapterConfig() + return ConfigManager:getConfig("chapter_dungeon_shards") +end + +function BattleControllerDungeonShards:getChapterId() + return 1 -- Todo +end + +function BattleControllerDungeonShards:controllBattleEnd() + self.combatReport = { + battleType = GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD, + wave = self.waveIndex, + victory = self.victory, + } + local atkReport = {} + local teamEntity = DataManager.BattleData:getAtkTeam() + local members = teamEntity:getAllMembers() + for k, v in pairs(members) do + local report = { + heroId = v:getId(), + dmg = v:getDamageCount(), + } + table.insert(atkReport, report) + end + self.combatReport.atkReport = atkReport + if not self.victory then + self.combatReport.wave = self.combatReport.wave - 1 + end + -- ModuleManager.ChapterManager:endFight(self.chapterId, self.combatReport, self.gotMysteryBoxIndexs, self.taskProgress) +end + +function BattleControllerDungeonShards:postWaveOver(atkDead, isQuit) + local deathType = BIReport.FIGHT_DEATH_TYPE.SURVIVE + local waveEndType = BIReport.FIGHT_WAVE_END_TYPE.WIN + if atkDead then + if self.isBossWave then + deathType = BIReport.FIGHT_DEATH_TYPE.BOSS_FAIL + else + deathType = BIReport.FIGHT_DEATH_TYPE.NORMAL_FAIL + end + waveEndType = BIReport.FIGHT_WAVE_END_TYPE.FAIL + end + + if isQuit then + waveEndType = BIReport.FIGHT_WAVE_END_TYPE.QUIT + end + + -- local duration = self.waveDurationTime + -- local totalTime = self.totalDurationTime + -- local startTimes = DataManager.ChapterData:getChapterFightCount(self.chapterId) + -- local isFirstWin = false + -- if not DataManager.ChapterData:getChapterPassed(self.chapterId) and self.victory then + -- isFirstWin = true + -- end + + -- local isFianlStep = self.waveIndex >= self.maxWaveIndex + + -- BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.STAGE, self.chapterId, self.waveIndex, duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) +end + +function BattleControllerDungeonShards:postFightStart() + -- local unlockMaxChapter = DataManager.ChapterData:getNewChapterId() + -- BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.STAGE, self.waveIndex, self.chapterId, unlockMaxChapter, DataManager.ChapterData:getChapterFightCount(self.chapterId)) +end + +return BattleControllerDungeonShards \ No newline at end of file From 87fe40ed94cad5588819694d25bb09a0a35e8ff4 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 12 Jun 2023 16:46:55 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E9=87=91=E5=B8=81=E5=89=AF=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/battle_controller_dungeon_gold.lua | 5 ++++- .../battle_controller_dungeon_shards.lua.meta | 10 ++++++++++ lua/app/module/dungeon/dungeon_manager.lua | 14 +++++++------- 3 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 lua/app/module/battle/controller/battle_controller_dungeon_shards.lua.meta diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua index 06d30f39..4732ba80 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua @@ -22,18 +22,21 @@ function BattleControllerDungeonGold:controllBattleEnd() local atkReport = {} local teamEntity = DataManager.BattleData:getAtkTeam() local members = teamEntity:getAllMembers() + local totalDamage = 0 for k, v in pairs(members) do local report = { heroId = v:getId(), dmg = v:getDamageCount(), } + totalDamage = totalDamage + v:getDamageCount() table.insert(atkReport, report) end self.combatReport.atkReport = atkReport if not self.victory then self.combatReport.wave = self.combatReport.wave - 1 end - -- ModuleManager.ChapterManager:endFight(self.chapterId, self.combatReport, self.gotMysteryBoxIndexs, self.taskProgress) + local remainingHp = self.defTeam:getMainUnit().unitEntity:getHp() + ModuleManager.DungeonManager:reqEndChallengeGold(self.chapterId, self.combatReport, self.taskProgress, totalDamage, remainingHp) end function BattleControllerDungeonGold:postWaveOver(atkDead, isQuit) diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua.meta b/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua.meta new file mode 100644 index 00000000..c77a89f0 --- /dev/null +++ b/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f7a7f047a4373bb409eb65b4af05fa01 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/dungeon/dungeon_manager.lua b/lua/app/module/dungeon/dungeon_manager.lua index 7230a2d3..7d625dcd 100644 --- a/lua/app/module/dungeon/dungeon_manager.lua +++ b/lua/app/module/dungeon/dungeon_manager.lua @@ -66,14 +66,14 @@ function DungeonManager:respChallengeGold(result) end -- 请求结算金币副本 -function DungeonManager:reqEndChallengeGold() +function DungeonManager:reqEndChallengeGold(id, combatReport, taskProgress, totalDamage, remainingHp) local parmas = { - win = true, - total_damage = nil, - remaining_hp = nil, - chapter_gold_id = nil, - task_stat = nil, - combatReport = nil, + win = combatReport.victory, + total_damage = totalDamage, + remaining_hp = remainingHp, + chapter_gold_id = id, + task_stat = taskProgress, + combatReport = combatReport, } self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterGoldChallengeSettlementReq, parmas, {}, self.respEndChallengeGold, BIReport.ITEM_GET_TYPE.DUNGEON_GOLD_END) end From 9d648fb45006861144dd37336976c2bfd667ffe7 Mon Sep 17 00:00:00 2001 From: Fang Date: Mon, 12 Jun 2023 17:13:53 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E8=A1=A5=E5=85=85=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/common/cell/reward_cell.lua | 12 +++++ lua/app/ui/dungeon/dungeon_board_cell.lua | 32 +++++++++---- lua/app/ui/dungeon/dungeon_difficulty_ui.lua | 6 +-- lua/app/userdata/dungeon/dungeon_data.lua | 24 ++++++++++ .../dungeon/dungeon_data_base_comp.lua | 46 +++++++++++++------ .../dungeon/dungeon_gold_data_comp.lua | 19 ++++++-- .../dungeon/dungeon_shards_data_comp.lua | 21 ++++++--- 7 files changed, 123 insertions(+), 37 deletions(-) diff --git a/lua/app/ui/common/cell/reward_cell.lua b/lua/app/ui/common/cell/reward_cell.lua index c423dfd5..28862b3d 100644 --- a/lua/app/ui/common/cell/reward_cell.lua +++ b/lua/app/ui/common/cell/reward_cell.lua @@ -96,6 +96,18 @@ function RewardCell:_refreshItem(info, count) end end +function RewardCell:setVisibleFragment(isShow) + self.fragment:setVisible(isShow) +end + +function RewardCell:setVisibleS(isShow) + self.sImg:setVisible(isShow) +end + +function RewardCell:setRewardIcon(atlas, name) + self.icon:setSprite(atlas, name) +end + function RewardCell:setNumTx(str) self.numTx:setText(str) end diff --git a/lua/app/ui/dungeon/dungeon_board_cell.lua b/lua/app/ui/dungeon/dungeon_board_cell.lua index f283681c..df732427 100644 --- a/lua/app/ui/dungeon/dungeon_board_cell.lua +++ b/lua/app/ui/dungeon/dungeon_board_cell.lua @@ -37,6 +37,9 @@ end function DungeonBoardCell:refreshInfo() self.txTitle:setText(DataManager.DungeonData:getTitle(self.moduleKey)) self.txOpen:setText(DataManager.DungeonData:getOpenTimeDesc(self.moduleKey)) + self.icon:setSprite(DataManager.DungeonData:getIcon(self.moduleKey)) + -- self.baseObject:setTexture("assets/arts/textures/background/fund/fund_bg_1.png") + -- self.iconBuff:setSprite(GConst.ATLAS_PATH.ICON_BUFF, "") if DataManager.DungeonData:isActive(self.moduleKey) then self.btnStart:setVisible(true) @@ -66,21 +69,30 @@ function DungeonBoardCell:refreshInfo() 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) + + local rewards = DataManager.DungeonData:getBoardShowRewardId(self.moduleKey) + if rewards ~= nil then + -- 展示实际item + self.scrollRect:addRefreshCallback(function(index, cell) + cell:refreshItemById(rewards[index], 0) + end) + self.scrollRect:setTotalCount(#rewards) + else + rewards = DataManager.DungeonData:getBoardShowRewardIcon(self.moduleKey) + -- 展示icon图片 + self.scrollRect:addRefreshCallback(function(index, cell) + cell:setRewardIcon(rewards[index][1], rewards[index][2]) + cell:setVisibleS(false) + cell:setVisibleFragment(false) + cell:setTouchEnable(false) + end) + self.scrollRect:setTotalCount(#rewards) + end end function DungeonBoardCell:refreshCountdown(txCountdown) diff --git a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua index 9f2055cb..49bb1de7 100644 --- a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua +++ b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua @@ -10,7 +10,7 @@ end function DungeonDifficultyUI:ctor(params) self.module = params.module - self.curId = DataManager.DungeonData:getPassedMaxId(self.module) + 1 + self.curId = DataManager.DungeonData:getUnlockMaxId(self.module) end function DungeonDifficultyUI:onCover() @@ -100,12 +100,12 @@ end -- 是否是可扫荡关卡 function DungeonDifficultyUI:isCanSweepId() - return self.curId <= DataManager.DungeonData:getPassedMaxId(self.module) + return self.curId < DataManager.DungeonData:getUnlockMaxId(self.module) end --是否是能挑战的最大关卡 function DungeonDifficultyUI:isCanChallengeMaxId() - return self.curId == DataManager.DungeonData:getPassedMaxId(self.module) + 1 + return self.curId == DataManager.DungeonData:getUnlockMaxId(self.module) end --是否是能挑战的最小关卡 diff --git a/lua/app/userdata/dungeon/dungeon_data.lua b/lua/app/userdata/dungeon/dungeon_data.lua index 133269b7..41e633a6 100644 --- a/lua/app/userdata/dungeon/dungeon_data.lua +++ b/lua/app/userdata/dungeon/dungeon_data.lua @@ -173,6 +173,11 @@ function DungeonData:isCanSweep(moduleKey, id) return true end +-- 获取副本挑战总次数 +function DungeonData:getTotalCount(moduleKey) + return self.dataDungeons[moduleKey]:getTotalChallengeCount() +end + -- 获取副本今日剩余次数 function DungeonData:getRemainTimes(moduleKey) if not self:isActive(moduleKey) then @@ -252,6 +257,16 @@ function DungeonData:getBoardShowRewards(moduleKey) return nil end +-- 获取看板展示的副本奖励(返回icon) +function DungeonData:getBoardShowRewardIcon(moduleKey) + return self.dataDungeons[moduleKey]:getBoardShowRewardIcon() +end + +-- 获取看板展示的副本奖励（返回item id list） +function DungeonData:getBoardShowRewardId(moduleKey) + return self.dataDungeons[moduleKey]:getBoardShowRewardId() +end + -- 获取展示副本首通奖励 function DungeonData:getFirstReward(moduleKey, id) -- 通关后，不展示首通奖励 @@ -264,6 +279,15 @@ function DungeonData:getPassReward(moduleKey, id) return self.dataDungeons[moduleKey]:getPassReward(id) end +--获取副本已解锁最大id +function DungeonData:getUnlockMaxId(moduleKey) + local id = self.dataDungeons[moduleKey]:getPassedMaxId() + 1 + if id > #self.dataDungeons[moduleKey]:getConfig() then + id = id - 1 + end + return id +end + --获取副本已通关的最高关卡id function DungeonData:getPassedMaxId(moduleKey) return self.dataDungeons[moduleKey]:getPassedMaxId() diff --git a/lua/app/userdata/dungeon/dungeon_data_base_comp.lua b/lua/app/userdata/dungeon/dungeon_data_base_comp.lua index d4e568e1..12bc448d 100644 --- a/lua/app/userdata/dungeon/dungeon_data_base_comp.lua +++ b/lua/app/userdata/dungeon/dungeon_data_base_comp.lua @@ -8,57 +8,72 @@ end -- 获取副本模块名，对应ModuleManager.MODULE_KEY function DungeonDataBaseComp:getModuleKey() - return "" + return nil end -- 获取副本开启周期（星期几） function DungeonDataBaseComp:getOpenWeekCycle() - return {} + return nil +end + +-- 获取副本配置名称 +function DungeonDataBaseComp:getConfigName() + return nil end -- 获取副本标题文案 function DungeonDataBaseComp:getTitleString() - return "" + return nil end --- 获取副本规则描述 +-- 获取副本规则描述(金币副本) function DungeonDataBaseComp:getRuleString() - return "" + return nil +end + +-- 获取副本boss抗性描述(碎片副本) +function DungeonDataBaseComp:getBossBuffString() + return nil end -- 获取开始时间描述 function DungeonDataBaseComp:getOpenWeekString() - return "" + return nil end -- 获取副本角标图 function DungeonDataBaseComp:getIcon() - return "" + return nil end -- 获取副本banner图 function DungeonDataBaseComp:getBanner() - return "" + return nil +end + +-- 获取总挑战次数 +function DungeonDataBaseComp:getTotalChallengeCount() + return nil end -- 获取今日已挑战次数 function DungeonDataBaseComp:getTodayChallengeCount() - return 0 + return nil end -- 获取已通关的最大副本id function DungeonDataBaseComp:getPassedMaxId() - return 0 + return nil end -- 获取挑战体力消耗 function DungeonDataBaseComp:getChallengeHpCost() - return 0 + return nil end -- 获取每日最大挑战次数 function DungeonDataBaseComp:getTodayMaxCount() - return 0 + return nil end -- 获取看板展示的副本奖励(返回icon) @@ -66,7 +81,7 @@ function DungeonDataBaseComp:getBoardShowRewardIcon() return nil end --- 获取看板展示的副本奖励（返回id） +-- 获取看板展示的副本奖励（返回id list） function DungeonDataBaseComp:getBoardShowRewardId() return nil end @@ -89,4 +104,9 @@ function DungeonDataBaseComp:getTodayRemainLimitCount() return self:getTodayMaxCount() - self:getTodayChallengeCount() end +-- 获取副本配置 +function DungeonDataBaseComp:getConfig() + return ConfigManager:getConfig(self:getConfigName()) +end + return DungeonDataBaseComp \ No newline at end of file diff --git a/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua b/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua index 4381a039..0225dce5 100644 --- a/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua +++ b/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua @@ -4,15 +4,20 @@ local DungeonGoldDataComp = class("DungeonGoldDataComp", DungeonDataBaseComp) -- 金币副本数据 function DungeonGoldDataComp:init(data) + self.totalChallengeCount = data.total_challenge_count self.todayChallengeCount = data.today_challenge_count self.maxPassedId = data.max_chapter_gold_id end -function DungeonDataBaseComp:getTodayChallengeCount() +function DungeonGoldDataComp:getTotalChallengeCount() + return self.totalChallengeCount +end + +function DungeonGoldDataComp:getTodayChallengeCount() return self.todayChallengeCount end -function DungeonDataBaseComp:getPassedMaxId() +function DungeonGoldDataComp:getPassedMaxId() return self.maxPassedId end @@ -24,6 +29,10 @@ function DungeonGoldDataComp:getOpenWeekCycle() return {2,4,6,7} end +function DungeonGoldDataComp:getConfigName() + return "chapter_dungeon_gold" +end + function DungeonGoldDataComp:getTitleString() return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_GOLD_TITLE) end @@ -37,7 +46,7 @@ function DungeonGoldDataComp:getOpenWeekString() end function DungeonGoldDataComp:getIcon() - return "" + return GConst.ATLAS_PATH.COMMON,"common_chest_1" end function DungeonGoldDataComp:getBanner() @@ -52,8 +61,8 @@ function DungeonGoldDataComp:getTodayMaxCount() return GFunc.getConstIntValue("dungeon_gold_limit") end -function DungeonDataBaseComp:getBoardShowRewardId() - return 1 +function DungeonGoldDataComp:getBoardShowRewardId() + return {1} end function DungeonGoldDataComp:getFirstReward(id) diff --git a/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua b/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua index 427473f9..06c5b925 100644 --- a/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua +++ b/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua @@ -4,15 +4,20 @@ local DungeonShardsDataComp = class("DungeonShardsDataComp", DungeonDataBaseComp -- 碎片副本数据 function DungeonShardsDataComp:init(data) + self.totalChallengeCount = data.total_challenge_count self.todayChallengeCount = data.today_challenge_count self.maxPassedId = data.max_chapter_shards_id end -function DungeonDataBaseComp:getTodayChallengeCount() +function DungeonShardsDataComp:getTotalChallengeCount() + return self.totalChallengeCount +end + +function DungeonShardsDataComp:getTodayChallengeCount() return self.todayChallengeCount end -function DungeonDataBaseComp:getPassedMaxId() +function DungeonShardsDataComp:getPassedMaxId() return self.maxPassedId end @@ -24,12 +29,16 @@ function DungeonShardsDataComp:getOpenWeekCycle() return {1,3,5,7} end +function DungeonShardsDataComp:getConfigName() + return "chapter_dungeon_shards" +end + function DungeonShardsDataComp:getTitleString() return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_SHARDS_TITLE) end -function DungeonShardsDataComp:getRuleString() - return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_SHARDS_HELP) +function DungeonShardsDataComp:getBossBuffString() + return I18N:getText("buff", buffId, "desc") end function DungeonShardsDataComp:getOpenWeekString() @@ -37,7 +46,7 @@ function DungeonShardsDataComp:getOpenWeekString() end function DungeonShardsDataComp:getIcon() - return "" + return GConst.ATLAS_PATH.COMMON,"common_dec_3" end function DungeonShardsDataComp:getBanner() @@ -52,7 +61,7 @@ function DungeonShardsDataComp:getTodayMaxCount() return GFunc.getConstIntValue("dungeon_shards_limit") end -function DungeonDataBaseComp:getBoardShowRewardIcon() +function DungeonShardsDataComp:getBoardShowRewardIcon() return { [1]={ GConst.ATLAS_PATH.ICON_ITEM,"4" From 59289536d1070edf1f69e17d03ff513af95d033d Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 12 Jun 2023 17:58:40 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E5=89=AF=E6=9C=AC=E6=88=98=E6=96=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battle_controller_dungeon_gold.lua | 24 ++++++++-------- .../battle_controller_dungeon_shards.lua | 28 +++++++++---------- lua/app/module/dungeon/dungeon_manager.lua | 18 +++++++----- lua/app/userdata/dungeon/dungeon_data.lua | 8 ++++++ 4 files changed, 45 insertions(+), 33 deletions(-) diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua index 4732ba80..a57a8395 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua @@ -10,7 +10,7 @@ function BattleControllerDungeonGold:getChapterConfig() end function BattleControllerDungeonGold:getChapterId() - return 1 -- Todo + return ModuleManager.DungeonData:getCurFightChapterId() end function BattleControllerDungeonGold:controllBattleEnd() @@ -55,22 +55,22 @@ function BattleControllerDungeonGold:postWaveOver(atkDead, isQuit) waveEndType = BIReport.FIGHT_WAVE_END_TYPE.QUIT end - -- local duration = self.waveDurationTime - -- local totalTime = self.totalDurationTime - -- local startTimes = DataManager.ChapterData:getChapterFightCount(self.chapterId) - -- local isFirstWin = false - -- if not DataManager.ChapterData:getChapterPassed(self.chapterId) and self.victory then - -- isFirstWin = true - -- end + local duration = self.waveDurationTime + local totalTime = self.totalDurationTime + local startTimes = DataManager.DungeonData:getTotalCount(ModuleManager.MODULE_KEY.DUNGEON_GOLD, self.chapterId) + local isFirstWin = false + if DataManager.DungeonData:getPassedMaxId(ModuleManager.MODULE_KEY.DUNGEON_GOLD) < self.chapterId and self.victory then + isFirstWin = true + end - -- local isFianlStep = self.waveIndex >= self.maxWaveIndex + local isFianlStep = self.waveIndex >= self.maxWaveIndex - -- BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.STAGE, self.chapterId, self.waveIndex, duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) + BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD, self.chapterId, self.waveIndex, duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) end function BattleControllerDungeonGold:postFightStart() - -- local unlockMaxChapter = DataManager.ChapterData:getNewChapterId() - -- BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.STAGE, self.waveIndex, self.chapterId, unlockMaxChapter, DataManager.ChapterData:getChapterFightCount(self.chapterId)) + local unlockMaxChapter = DataManager.DungeonData:getUnlockMaxId(ModuleManager.MODULE_KEY.DUNGEON_GOLD) + BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD, self.waveIndex, self.chapterId, unlockMaxChapter, DataManager.DungeonData:getTotalCount(ModuleManager.MODULE_KEY.DUNGEON_GOLD, self.chapterId)) end return BattleControllerDungeonGold \ No newline at end of file diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua b/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua index 0345bc54..5cf37214 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua @@ -10,12 +10,12 @@ function BattleControllerDungeonShards:getChapterConfig() end function BattleControllerDungeonShards:getChapterId() - return 1 -- Todo + return ModuleManager.DungeonData:getCurFightChapterId() end function BattleControllerDungeonShards:controllBattleEnd() self.combatReport = { - battleType = GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD, + battleType = GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS, wave = self.waveIndex, victory = self.victory, } @@ -33,7 +33,7 @@ function BattleControllerDungeonShards:controllBattleEnd() if not self.victory then self.combatReport.wave = self.combatReport.wave - 1 end - -- ModuleManager.ChapterManager:endFight(self.chapterId, self.combatReport, self.gotMysteryBoxIndexs, self.taskProgress) + ModuleManager.ChapterManager:reqEndChallengeShards(self.chapterId, self.combatReport, self.gotMysteryBoxIndexs, self.taskProgress) end function BattleControllerDungeonShards:postWaveOver(atkDead, isQuit) @@ -52,22 +52,22 @@ function BattleControllerDungeonShards:postWaveOver(atkDead, isQuit) waveEndType = BIReport.FIGHT_WAVE_END_TYPE.QUIT end - -- local duration = self.waveDurationTime - -- local totalTime = self.totalDurationTime - -- local startTimes = DataManager.ChapterData:getChapterFightCount(self.chapterId) - -- local isFirstWin = false - -- if not DataManager.ChapterData:getChapterPassed(self.chapterId) and self.victory then - -- isFirstWin = true - -- end + local duration = self.waveDurationTime + local totalTime = self.totalDurationTime + local startTimes = DataManager.DungeonData:getTotalCount(ModuleManager.MODULE_KEY.DUNGEON_SHARDS, self.chapterId) + local isFirstWin = false + if DataManager.DungeonData:getPassedMaxId(ModuleManager.MODULE_KEY.DUNGEON_SHARDS) < self.chapterId and self.victory then + isFirstWin = true + end - -- local isFianlStep = self.waveIndex >= self.maxWaveIndex + local isFianlStep = self.waveIndex >= self.maxWaveIndex - -- BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.STAGE, self.chapterId, self.waveIndex, duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) + BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS, self.chapterId, self.waveIndex, duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) end function BattleControllerDungeonShards:postFightStart() - -- local unlockMaxChapter = DataManager.ChapterData:getNewChapterId() - -- BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.STAGE, self.waveIndex, self.chapterId, unlockMaxChapter, DataManager.ChapterData:getChapterFightCount(self.chapterId)) + local unlockMaxChapter = DataManager.DungeonData:getUnlockMaxId(ModuleManager.MODULE_KEY.DUNGEON_SHARDS) + BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS, self.waveIndex, self.chapterId, unlockMaxChapter, DataManager.DungeonData:getTotalCount(ModuleManager.MODULE_KEY.DUNGEON_SHARDS, self.chapterId)) end return BattleControllerDungeonShards \ No newline at end of file diff --git a/lua/app/module/dungeon/dungeon_manager.lua b/lua/app/module/dungeon/dungeon_manager.lua index 7d625dcd..8c4e58a4 100644 --- a/lua/app/module/dungeon/dungeon_manager.lua +++ b/lua/app/module/dungeon/dungeon_manager.lua @@ -54,7 +54,7 @@ function DungeonManager:reqChallengeGold(id) return end - local parmas = {} + local parmas = {chapter_gold_id = id} self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterGoldChallengeStartReq, parmas, {}, self.respChallengeGold, BIReport.ITEM_GET_TYPE.DUNGEON_GOLD_CHALLENGE) end @@ -62,6 +62,8 @@ end function DungeonManager:respChallengeGold(result) if result.err_code == GConst.ERROR_STR.SUCCESS then DataManager.DungeonData:onFightCountReduce(ModuleManager.MODULE_KEY.DUNGEON_GOLD) + DataManager.DungeonData:setCurFightChapterId(result.reqData.chapter_gold_id) + ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD) end end @@ -139,7 +141,7 @@ function DungeonManager:reqChallengeShards(id) return end - local parmas = {} + local parmas = {chapter_shards_id = id} self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterShardsChallengeStartReq, parmas, {}, self.respChallengeShards, BIReport.ITEM_GET_TYPE.DUNGEON_SHARDS_CHALLENGE) end @@ -147,17 +149,19 @@ end function DungeonManager:respChallengeShards(result) if result.err_code == GConst.ERROR_STR.SUCCESS then DataManager.DungeonData:onFightCountReduce(ModuleManager.MODULE_KEY.DUNGEON_SHARDS) + DataManager.DungeonData:setCurFightChapterId(result.reqData.chapter_shards_id) + ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS) end end -- 请求结算碎片副本 -function DungeonManager:reqEndChallengeShards() +function DungeonManager:reqEndChallengeShards(id, combatReport, taskProgress, totalDamage, remainingHp) local parmas = { win = true, - total_damage = nil, - chapter_Shards_id = nil, - task_stat = nil, - combatReport = nil, + total_damage = totalDamage, + chapter_shards_id = id, + task_stat = taskProgress, + combatReport = combatReport, } self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterShardsChallengeSettlementReq, parmas, {}, self.respEndChallengeShards, BIReport.ITEM_GET_TYPE.DUNGEON_SHARDS_END) end diff --git a/lua/app/userdata/dungeon/dungeon_data.lua b/lua/app/userdata/dungeon/dungeon_data.lua index 41e633a6..d773b316 100644 --- a/lua/app/userdata/dungeon/dungeon_data.lua +++ b/lua/app/userdata/dungeon/dungeon_data.lua @@ -318,4 +318,12 @@ function DungeonData:getBanner(moduleKey) return self.dataDungeons[moduleKey]:getBanner() end +function DungeonData:setCurFightChapterId(chapterId) + self.curFightchapterId = chapterId or 1 +end + +function DungeonData:getCurFightChapterId() + return self.curFightchapterId or 1 +end + return DungeonData \ No newline at end of file From decabd89ee1203dcef1ad8a7a6eb8454a33429a4 Mon Sep 17 00:00:00 2001 From: Fang Date: Mon, 12 Jun 2023 18:47:01 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=A5=96=E5=8A=B1?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/chapter_dungeon_gold.lua | 90 +- lua/app/config/chapter_dungeon_shards.lua | 570 ++--- lua/app/config/monster_dungeon_gold.lua | 420 +++- lua/app/config/monster_dungeon_shards.lua | 450 ++-- lua/app/config/skill.lua | 1836 ++++++++++++----- lua/app/config/skill_rogue.lua | 294 ++- lua/app/module/dungeon/dungeon_manager.lua | 8 +- lua/app/ui/dungeon/dungeon_board_cell.lua | 4 +- lua/app/ui/dungeon/dungeon_difficulty_ui.lua | 46 +- lua/app/userdata/dungeon/dungeon_data.lua | 5 + .../dungeon/dungeon_data_base_comp.lua | 4 +- .../dungeon/dungeon_gold_data_comp.lua | 2 +- .../dungeon/dungeon_shards_data_comp.lua | 11 +- 13 files changed, 2557 insertions(+), 1183 deletions(-) diff --git a/lua/app/config/chapter_dungeon_gold.lua b/lua/app/config/chapter_dungeon_gold.lua index 36ce6388..93faee1f 100644 --- a/lua/app/config/chapter_dungeon_gold.lua +++ b/lua/app/config/chapter_dungeon_gold.lua @@ -24,7 +24,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [2]={ ["scene"]="bg_11", @@ -51,7 +52,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [3]={ ["scene"]="bg_11", @@ -78,7 +80,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [4]={ ["scene"]="bg_11", @@ -105,7 +108,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [5]={ ["scene"]="bg_11", @@ -132,7 +136,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [6]={ ["scene"]="bg_11", @@ -159,7 +164,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [7]={ ["scene"]="bg_11", @@ -186,7 +192,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [8]={ ["scene"]="bg_11", @@ -213,7 +220,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [9]={ ["scene"]="bg_11", @@ -240,7 +248,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [10]={ ["scene"]="bg_11", @@ -267,7 +276,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [11]={ ["scene"]="bg_11", @@ -294,7 +304,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [12]={ ["scene"]="bg_11", @@ -321,7 +332,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [13]={ ["scene"]="bg_11", @@ -348,7 +360,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [14]={ ["scene"]="bg_11", @@ -375,7 +388,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [15]={ ["scene"]="bg_11", @@ -402,7 +416,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [16]={ ["scene"]="bg_11", @@ -429,7 +444,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [17]={ ["scene"]="bg_11", @@ -456,7 +472,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [18]={ ["scene"]="bg_11", @@ -483,7 +500,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [19]={ ["scene"]="bg_11", @@ -510,7 +528,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [20]={ ["scene"]="bg_11", @@ -537,7 +556,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [21]={ ["scene"]="bg_11", @@ -564,7 +584,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [22]={ ["scene"]="bg_11", @@ -591,7 +612,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [23]={ ["scene"]="bg_11", @@ -618,7 +640,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [24]={ ["scene"]="bg_11", @@ -645,7 +668,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [25]={ ["scene"]="bg_11", @@ -672,7 +696,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [26]={ ["scene"]="bg_11", @@ -699,7 +724,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [27]={ ["scene"]="bg_11", @@ -726,7 +752,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [28]={ ["scene"]="bg_11", @@ -753,7 +780,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [29]={ ["scene"]="bg_11", @@ -780,7 +808,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 }, [30]={ ["scene"]="bg_11", @@ -807,7 +836,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=15 } } local config = { diff --git a/lua/app/config/chapter_dungeon_shards.lua b/lua/app/config/chapter_dungeon_shards.lua index 56a01e75..0a59a4c6 100644 --- a/lua/app/config/chapter_dungeon_shards.lua +++ b/lua/app/config/chapter_dungeon_shards.lua @@ -17,21 +17,12 @@ local chapter_dungeon_shards = { 404, 504 }, - ["buff_id"]={ + ["effect"]={ { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 + ["type"]="dec_dmg_red_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -115,21 +106,12 @@ local chapter_dungeon_shards = { 904, 1004 }, - ["buff_id"]={ + ["effect"]={ { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 + ["type"]="dec_dmg_yellow_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -213,21 +195,12 @@ local chapter_dungeon_shards = { 1404, 1504 }, - ["buff_id"]={ + ["effect"]={ { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 + ["type"]="dec_dmg_green_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -311,21 +284,12 @@ local chapter_dungeon_shards = { 1904, 2004 }, - ["buff_id"]={ + ["effect"]={ { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 + ["type"]="dec_dmg_blue_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -409,21 +373,12 @@ local chapter_dungeon_shards = { 2404, 2504 }, - ["buff_id"]={ + ["effect"]={ { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 + ["type"]="dec_dmg_purple_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -507,21 +462,12 @@ local chapter_dungeon_shards = { 2904, 3004 }, - ["buff_id"]={ + ["effect"]={ { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 + ["type"]="dec_dmg_red_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -605,21 +551,12 @@ local chapter_dungeon_shards = { 3404, 3504 }, - ["buff_id"]={ + ["effect"]={ { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 + ["type"]="dec_dmg_yellow_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -703,21 +640,12 @@ local chapter_dungeon_shards = { 3904, 4004 }, - ["buff_id"]={ + ["effect"]={ { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 + ["type"]="dec_dmg_green_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -801,21 +729,12 @@ local chapter_dungeon_shards = { 4404, 4504 }, - ["buff_id"]={ + ["effect"]={ { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 + ["type"]="dec_dmg_blue_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -899,21 +818,12 @@ local chapter_dungeon_shards = { 4904, 5004 }, - ["buff_id"]={ + ["effect"]={ { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 + ["type"]="dec_dmg_purple_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -997,21 +907,12 @@ local chapter_dungeon_shards = { 5404, 5504 }, - ["buff_id"]={ + ["effect"]={ { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 + ["type"]="dec_dmg_red_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1095,21 +996,12 @@ local chapter_dungeon_shards = { 5904, 6004 }, - ["buff_id"]={ + ["effect"]={ { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 + ["type"]="dec_dmg_yellow_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1193,21 +1085,12 @@ local chapter_dungeon_shards = { 6404, 6504 }, - ["buff_id"]={ + ["effect"]={ { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 + ["type"]="dec_dmg_green_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1291,21 +1174,12 @@ local chapter_dungeon_shards = { 6904, 7004 }, - ["buff_id"]={ + ["effect"]={ { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 + ["type"]="dec_dmg_blue_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1389,21 +1263,12 @@ local chapter_dungeon_shards = { 7404, 7504 }, - ["buff_id"]={ + ["effect"]={ { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 + ["type"]="dec_dmg_purple_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1487,21 +1352,12 @@ local chapter_dungeon_shards = { 7904, 8004 }, - ["buff_id"]={ + ["effect"]={ { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 + ["type"]="dec_dmg_red_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1585,21 +1441,12 @@ local chapter_dungeon_shards = { 8404, 8504 }, - ["buff_id"]={ + ["effect"]={ { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 + ["type"]="dec_dmg_yellow_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1683,21 +1530,12 @@ local chapter_dungeon_shards = { 8904, 9004 }, - ["buff_id"]={ + ["effect"]={ { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 + ["type"]="dec_dmg_green_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1781,21 +1619,12 @@ local chapter_dungeon_shards = { 9404, 9504 }, - ["buff_id"]={ + ["effect"]={ { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 + ["type"]="dec_dmg_blue_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1879,21 +1708,12 @@ local chapter_dungeon_shards = { 9904, 10004 }, - ["buff_id"]={ + ["effect"]={ { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 + ["type"]="dec_dmg_purple_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1977,21 +1797,12 @@ local chapter_dungeon_shards = { 10404, 10504 }, - ["buff_id"]={ + ["effect"]={ { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 + ["type"]="dec_dmg_red_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -2075,21 +1886,12 @@ local chapter_dungeon_shards = { 10904, 11004 }, - ["buff_id"]={ + ["effect"]={ { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 + ["type"]="dec_dmg_yellow_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -2173,21 +1975,12 @@ local chapter_dungeon_shards = { 11404, 11504 }, - ["buff_id"]={ + ["effect"]={ { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 + ["type"]="dec_dmg_green_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -2271,21 +2064,12 @@ local chapter_dungeon_shards = { 11904, 12004 }, - ["buff_id"]={ + ["effect"]={ { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 + ["type"]="dec_dmg_blue_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -2369,21 +2153,12 @@ local chapter_dungeon_shards = { 12404, 12504 }, - ["buff_id"]={ + ["effect"]={ { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 + ["type"]="dec_dmg_purple_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -2467,21 +2242,12 @@ local chapter_dungeon_shards = { 12904, 13004 }, - ["buff_id"]={ + ["effect"]={ { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 + ["type"]="dec_dmg_red_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -2565,21 +2331,12 @@ local chapter_dungeon_shards = { 13404, 13504 }, - ["buff_id"]={ + ["effect"]={ { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 + ["type"]="dec_dmg_yellow_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -2663,21 +2420,12 @@ local chapter_dungeon_shards = { 13904, 14004 }, - ["buff_id"]={ + ["effect"]={ { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 + ["type"]="dec_dmg_green_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -2761,21 +2509,12 @@ local chapter_dungeon_shards = { 14404, 14504 }, - ["buff_id"]={ + ["effect"]={ { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 + ["type"]="dec_dmg_blue_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -2859,21 +2598,12 @@ local chapter_dungeon_shards = { 14904, 15004 }, - ["buff_id"]={ + ["effect"]={ { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 + ["type"]="dec_dmg_purple_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ diff --git a/lua/app/config/monster_dungeon_gold.lua b/lua/app/config/monster_dungeon_gold.lua index 45a7477e..3b062ceb 100644 --- a/lua/app/config/monster_dungeon_gold.lua +++ b/lua/app/config/monster_dungeon_gold.lua @@ -4,210 +4,570 @@ local monster_dungeon_gold = { ["hp"]=90000000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [205]={ ["monster_base"]=20003, ["hp"]=90200000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [305]={ ["monster_base"]=20003, ["hp"]=90400000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [405]={ ["monster_base"]=20003, ["hp"]=90600000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [505]={ ["monster_base"]=20003, ["hp"]=90800000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [605]={ ["monster_base"]=20003, ["hp"]=91000000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [705]={ ["monster_base"]=20003, ["hp"]=91200000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [805]={ ["monster_base"]=20003, ["hp"]=91400000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [905]={ ["monster_base"]=20003, ["hp"]=91600000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1005]={ ["monster_base"]=20003, ["hp"]=91800000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1105]={ ["monster_base"]=20003, ["hp"]=92000000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1205]={ ["monster_base"]=20003, ["hp"]=92200000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1305]={ ["monster_base"]=20003, ["hp"]=92400000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1405]={ ["monster_base"]=20003, ["hp"]=92600000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1505]={ ["monster_base"]=20003, ["hp"]=92800000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1605]={ ["monster_base"]=20003, ["hp"]=93000000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1705]={ ["monster_base"]=20003, ["hp"]=93200000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1805]={ ["monster_base"]=20003, ["hp"]=93400000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1905]={ ["monster_base"]=20003, ["hp"]=93600000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2005]={ ["monster_base"]=20003, ["hp"]=93800000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2105]={ ["monster_base"]=20003, ["hp"]=94000000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2205]={ ["monster_base"]=20003, ["hp"]=94200000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2305]={ ["monster_base"]=20003, ["hp"]=94400000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2405]={ ["monster_base"]=20003, ["hp"]=94600000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2505]={ ["monster_base"]=20003, ["hp"]=94800000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2605]={ ["monster_base"]=20003, ["hp"]=95000000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2705]={ ["monster_base"]=20003, ["hp"]=95200000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2805]={ ["monster_base"]=20003, ["hp"]=95400000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2905]={ ["monster_base"]=20003, ["hp"]=95600000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [3005]={ ["monster_base"]=20003, ["hp"]=95800000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } } } local config = { diff --git a/lua/app/config/monster_dungeon_shards.lua b/lua/app/config/monster_dungeon_shards.lua index b3079a89..d90835cb 100644 --- a/lua/app/config/monster_dungeon_shards.lua +++ b/lua/app/config/monster_dungeon_shards.lua @@ -15,7 +15,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -35,7 +36,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -55,7 +57,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -75,7 +78,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -95,7 +99,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -115,7 +120,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -135,7 +141,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -155,7 +162,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -175,7 +183,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -195,7 +204,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -215,7 +225,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -235,7 +246,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -255,7 +267,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -275,7 +288,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -295,7 +309,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -315,7 +330,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -335,7 +351,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -355,7 +372,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -375,7 +393,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -395,7 +414,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -415,7 +435,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -435,7 +456,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -455,7 +477,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -475,7 +498,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -495,7 +519,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -515,7 +540,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -535,7 +561,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -555,7 +582,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -575,7 +603,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -595,7 +624,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -615,7 +645,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -635,7 +666,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -655,7 +687,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -675,7 +708,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -695,7 +729,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -715,7 +750,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -735,7 +771,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -755,7 +792,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -775,7 +813,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -795,7 +834,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -815,7 +855,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -835,7 +876,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -855,7 +897,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -875,7 +918,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -895,7 +939,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -915,7 +960,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -935,7 +981,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -955,7 +1002,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -975,7 +1023,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -995,7 +1044,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1015,7 +1065,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1035,7 +1086,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1055,7 +1107,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1075,7 +1128,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1095,7 +1149,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1115,7 +1170,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1135,7 +1191,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1155,7 +1212,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1175,7 +1233,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1195,7 +1254,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1215,7 +1275,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1235,7 +1296,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1255,7 +1317,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1275,7 +1338,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1295,7 +1359,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1315,7 +1380,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1335,7 +1401,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1355,7 +1422,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1375,7 +1443,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1395,7 +1464,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1415,7 +1485,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1435,7 +1506,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1455,7 +1527,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1475,7 +1548,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1495,7 +1569,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1515,7 +1590,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1535,7 +1611,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1555,7 +1632,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1575,7 +1653,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1595,7 +1674,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1615,7 +1695,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1635,7 +1716,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1655,7 +1737,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1675,7 +1758,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1695,7 +1779,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1715,7 +1800,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1735,7 +1821,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1755,7 +1842,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1775,7 +1863,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1795,7 +1884,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1815,7 +1905,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1835,7 +1926,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1855,7 +1947,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1875,7 +1968,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1895,7 +1989,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1915,7 +2010,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1935,7 +2031,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1955,7 +2052,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1975,7 +2073,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1995,7 +2094,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2015,7 +2115,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2035,7 +2136,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2055,7 +2157,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2075,7 +2178,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2095,7 +2199,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2115,7 +2220,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2135,7 +2241,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2155,7 +2262,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2175,7 +2283,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2195,7 +2304,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2215,7 +2325,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2235,7 +2346,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2255,7 +2367,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2275,7 +2388,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2295,7 +2409,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2315,7 +2430,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2335,7 +2451,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2355,7 +2472,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2375,7 +2493,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2395,7 +2514,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2415,7 +2535,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2435,7 +2556,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2455,7 +2577,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2475,7 +2598,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2495,7 +2619,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2515,7 +2640,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2535,7 +2661,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2555,7 +2682,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2575,7 +2703,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2595,7 +2724,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2615,7 +2745,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2635,7 +2766,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2655,7 +2787,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2675,7 +2808,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2695,7 +2829,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2715,7 +2850,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2735,7 +2871,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2755,7 +2892,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2775,7 +2913,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2795,7 +2934,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2815,7 +2955,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2835,7 +2976,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2855,7 +2997,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2875,7 +3018,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2895,7 +3039,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2915,7 +3060,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2935,7 +3081,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2955,7 +3102,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2975,7 +3123,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2995,7 +3144,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 } diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index e174009d..7dce5959 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -13,7 +13,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [9]={ @@ -57,7 +57,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [12]={ @@ -74,7 +74,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [13]={ @@ -118,7 +118,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -143,7 +143,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -168,7 +168,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -193,7 +193,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -233,7 +233,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=200, ["shake_type"]=5, @@ -263,7 +263,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 1, - 0 + 140 } }, [1200122]={ @@ -287,7 +287,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 1, - 0 + 140 } }, [1200123]={ @@ -322,7 +322,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 1, - 0 + 140 } }, [1200124]={ @@ -353,7 +353,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -378,7 +378,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -403,7 +403,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -428,7 +428,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -474,7 +474,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -572,7 +572,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -660,7 +660,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -685,7 +685,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -710,7 +710,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -735,7 +735,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -812,7 +812,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -929,7 +929,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -963,7 +963,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -988,7 +988,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -1013,7 +1013,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=4, @@ -1038,7 +1038,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -1117,7 +1117,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -1229,7 +1229,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -1254,7 +1254,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -1279,7 +1279,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=4, @@ -1304,7 +1304,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -1334,7 +1334,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -1364,7 +1364,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 } }, [1400222]={ @@ -1391,7 +1391,7 @@ local skill = { ["effect"]={ { ["type"]="dmg_addition_yellow_add", - ["num"]=2000, + ["num"]=5000, ["ratio"]=10000, ["round"]=1 } @@ -1399,7 +1399,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [1400223]={ @@ -1432,7 +1432,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -1462,7 +1462,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 } }, [1400225]={ @@ -1497,7 +1497,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [2200110]={ @@ -1515,7 +1515,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -1540,7 +1540,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -1565,7 +1565,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -1590,7 +1590,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -1619,7 +1619,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -1666,7 +1666,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [2200122]={ @@ -1684,7 +1684,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [2200123]={ @@ -1717,7 +1717,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -1747,7 +1747,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -1772,7 +1772,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -1797,7 +1797,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -1822,7 +1822,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -1876,7 +1876,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -1949,7 +1949,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -2069,7 +2069,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -2094,7 +2094,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -2119,7 +2119,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -2144,7 +2144,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -2203,7 +2203,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -2292,7 +2292,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -2317,7 +2317,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -2342,7 +2342,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -2367,7 +2367,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -2400,7 +2400,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -2544,7 +2544,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -2588,7 +2588,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -2632,10 +2632,15 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, - ["shake_type"]=1 + ["shake_type"]=1, + ["sound_hit"]={ + 1000011 + }, + ["name_act"]="attack01", + ["fx_self"]=300028 }, [2400211]={ ["position"]=2, @@ -2652,10 +2657,15 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, - ["shake_type"]=1 + ["shake_type"]=1, + ["sound_hit"]={ + 1000012 + }, + ["name_act"]="attack02", + ["fx_self"]=300029 }, [2400212]={ ["position"]=2, @@ -2672,10 +2682,15 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, - ["shake_type"]=1 + ["shake_type"]=1, + ["sound_hit"]={ + 1000013 + }, + ["name_act"]="attack03", + ["fx_self"]=300030 }, [2400213]={ ["position"]=2, @@ -2692,10 +2707,15 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, - ["shake_type"]=1 + ["shake_type"]=1, + ["sound_hit"]={ + 1000014 + }, + ["name_act"]="attack04", + ["fx_self"]=300031 }, [2400220]={ ["energy"]=10, @@ -2720,10 +2740,20 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, - ["shake_type"]=6 + ["shake_type"]=6, + ["sound_hit"]={ + 2400120 + }, + ["name_act"]="skill01", + ["fx_self"]=300032, + ["bullet_time"]={ + 2033, + 3000, + 400 + } }, [2400221]={ ["skill_type"]=11, @@ -2802,7 +2832,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -2827,7 +2857,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -2852,7 +2882,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=2, @@ -2877,7 +2907,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -2910,7 +2940,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=200, ["shake_type"]=6, @@ -3013,7 +3043,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -3038,7 +3068,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3063,7 +3093,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -3088,7 +3118,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -3117,7 +3147,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["sound_hit"]={ 3300120 @@ -3211,7 +3241,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["sound_hit"]={ 3300120 @@ -3234,7 +3264,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3259,7 +3289,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=2, @@ -3284,7 +3314,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3309,7 +3339,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=2, @@ -3364,7 +3394,7 @@ local skill = { }, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=200, ["shake_type"]=5, @@ -3460,7 +3490,7 @@ local skill = { }, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=200, ["shake_type"]=5, @@ -3543,7 +3573,7 @@ local skill = { }, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=200, ["shake_type"]=5, @@ -3573,7 +3603,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3598,7 +3628,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3623,7 +3653,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3648,7 +3678,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3704,7 +3734,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -3831,7 +3861,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -3846,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, @@ -3861,7 +4111,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -3886,7 +4136,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3911,7 +4161,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3936,7 +4186,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -3972,7 +4222,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -4078,7 +4328,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -4103,7 +4353,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4128,7 +4378,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4153,7 +4403,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4189,7 +4439,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -4238,7 +4488,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [4300122]={ @@ -4256,7 +4506,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 } }, [4300123]={ @@ -4274,7 +4524,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [4300124]={ @@ -4292,7 +4542,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [4300125]={ @@ -4331,7 +4581,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -4363,7 +4613,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4388,7 +4638,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4413,7 +4663,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4438,7 +4688,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4494,7 +4744,7 @@ local skill = { }, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=200, ["shake_type"]=6, @@ -4614,7 +4864,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4639,7 +4889,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4664,7 +4914,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4689,7 +4939,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4731,7 +4981,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -4805,6 +5055,244 @@ local skill = { }, ["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, @@ -4820,7 +5308,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4845,7 +5333,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4870,7 +5358,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4895,7 +5383,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4928,7 +5416,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["sound_hit"]={ 5200120 @@ -4959,7 +5447,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["sound_hit"]={ 5200120 @@ -4990,7 +5478,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["sound_hit"]={ 5200120 @@ -5026,7 +5514,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -5051,7 +5539,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5076,7 +5564,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -5101,7 +5589,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -5155,7 +5643,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -5266,7 +5754,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -5291,7 +5779,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -5316,7 +5804,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5341,7 +5829,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5387,7 +5875,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -5541,7 +6029,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -5573,7 +6061,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -5598,7 +6086,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -5623,7 +6111,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5648,7 +6136,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -5695,7 +6183,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -5769,7 +6257,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -5809,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, @@ -5823,7 +6530,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5846,7 +6553,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5869,7 +6576,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5892,7 +6599,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5915,7 +6622,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5938,7 +6645,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5961,7 +6668,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5984,7 +6691,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [10009]={ @@ -6001,7 +6708,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [10010]={ @@ -6018,7 +6725,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [10011]={ @@ -6035,7 +6742,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [10012]={ @@ -6052,7 +6759,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [10013]={ @@ -6069,7 +6776,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [10014]={ @@ -6099,7 +6806,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -6122,7 +6829,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["cd"]=2, ["cd_start"]=0, @@ -6159,7 +6866,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["cd"]=3, ["cd_start"]=0, @@ -6201,7 +6908,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["cd"]=3, ["cd_start"]=0, @@ -6238,7 +6945,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["cd"]=3, ["cd_start"]=0, @@ -6275,7 +6982,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["cd"]=3, ["cd_start"]=0, @@ -6312,7 +7019,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -6345,7 +7052,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0 @@ -6369,7 +7076,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -6421,7 +7128,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -6483,7 +7190,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -6520,7 +7227,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0 @@ -6543,7 +7250,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -6586,7 +7293,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["cd"]=3, ["cd_start"]=0, @@ -6640,7 +7347,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -6674,7 +7381,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -6705,7 +7412,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -6734,7 +7441,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -6795,7 +7502,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -6848,7 +7555,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -6919,7 +7626,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -6991,7 +7698,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -7026,7 +7733,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7085,7 +7792,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7210,7 +7917,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -7261,7 +7968,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7325,7 +8032,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7388,7 +8095,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=1, @@ -7425,7 +8132,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7452,7 +8159,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7511,7 +8218,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=1, @@ -7600,7 +8307,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7676,7 +8383,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=2, @@ -7735,7 +8442,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7779,7 +8486,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=2, @@ -7811,7 +8518,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -7857,7 +8564,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -7894,7 +8601,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7937,7 +8644,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7979,7 +8686,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["cd"]=3, ["cd_start"]=0, @@ -8010,7 +8717,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0 @@ -8046,7 +8753,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -8077,7 +8784,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0 @@ -8125,7 +8832,7 @@ local skill = { }, ["skill_position"]={ 1, - 0 + 140 }, ["cd"]=3, ["cd_start"]=0, @@ -8156,7 +8863,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["cd"]=2, ["cd_start"]=0, @@ -8199,7 +8906,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -8225,7 +8932,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8249,7 +8956,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8273,7 +8980,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8297,7 +9004,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8321,7 +9028,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8345,7 +9052,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8369,7 +9076,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8393,7 +9100,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8417,7 +9124,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8441,7 +9148,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8465,7 +9172,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8489,7 +9196,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8513,7 +9220,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8537,7 +9244,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8561,7 +9268,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8585,7 +9292,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8609,7 +9316,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8633,7 +9340,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8657,7 +9364,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8681,7 +9388,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8705,7 +9412,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8729,7 +9436,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8753,7 +9460,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8777,7 +9484,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8801,7 +9508,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8825,7 +9532,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8849,7 +9556,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8873,7 +9580,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8897,7 +9604,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8921,7 +9628,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8945,7 +9652,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8969,7 +9676,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8993,7 +9700,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9017,7 +9724,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9041,7 +9748,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9065,7 +9772,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9089,7 +9796,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9113,7 +9820,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9137,7 +9844,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9161,7 +9868,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9185,7 +9892,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9209,7 +9916,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9233,7 +9940,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9257,7 +9964,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9281,7 +9988,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9305,7 +10012,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9329,7 +10036,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9353,7 +10060,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9377,7 +10084,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9401,7 +10108,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9425,7 +10132,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9449,7 +10156,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9473,7 +10180,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9497,7 +10204,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9521,7 +10228,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9545,7 +10252,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9569,7 +10276,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9593,7 +10300,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9617,7 +10324,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9641,7 +10348,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9665,7 +10372,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9689,7 +10396,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9713,7 +10420,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9737,7 +10444,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9761,7 +10468,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9785,7 +10492,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9809,7 +10516,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9833,7 +10540,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9857,7 +10564,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9881,7 +10588,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9905,7 +10612,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9929,7 +10636,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9953,7 +10660,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9977,7 +10684,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10001,7 +10708,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10025,7 +10732,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10049,7 +10756,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10073,7 +10780,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10097,7 +10804,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10121,7 +10828,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10145,7 +10852,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10169,7 +10876,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10193,7 +10900,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10217,7 +10924,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10241,7 +10948,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10265,7 +10972,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10289,7 +10996,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10313,7 +11020,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10337,7 +11044,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10361,7 +11068,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10385,7 +11092,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10409,7 +11116,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10433,7 +11140,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10457,7 +11164,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10481,7 +11188,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10505,7 +11212,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10529,7 +11236,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10553,7 +11260,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10577,7 +11284,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10601,7 +11308,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10625,7 +11332,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10649,7 +11356,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10673,7 +11380,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10697,7 +11404,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10721,7 +11428,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10745,7 +11452,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10769,7 +11476,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10793,7 +11500,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10817,7 +11524,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10841,7 +11548,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10865,7 +11572,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10889,7 +11596,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10913,7 +11620,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10937,7 +11644,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10961,7 +11668,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10985,7 +11692,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11009,7 +11716,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11033,7 +11740,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11057,7 +11764,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11081,7 +11788,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11105,7 +11812,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11129,7 +11836,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11153,7 +11860,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11177,7 +11884,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11201,7 +11908,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11225,7 +11932,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11249,7 +11956,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11273,7 +11980,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11297,7 +12004,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11321,7 +12028,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11345,7 +12052,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11369,7 +12076,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11393,7 +12100,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11417,7 +12124,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11441,7 +12148,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11465,7 +12172,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11489,7 +12196,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11513,7 +12220,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11537,7 +12244,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11561,7 +12268,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11585,7 +12292,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11609,7 +12316,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11633,7 +12340,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11657,7 +12364,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11681,7 +12388,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11705,7 +12412,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11729,7 +12436,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11753,7 +12460,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11777,7 +12484,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11801,7 +12508,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11825,7 +12532,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11849,7 +12556,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11873,7 +12580,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11897,7 +12604,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11921,7 +12628,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11945,7 +12652,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11969,7 +12676,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11993,7 +12700,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12017,7 +12724,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12041,7 +12748,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12065,7 +12772,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12089,7 +12796,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12113,7 +12820,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12137,7 +12844,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12161,7 +12868,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12185,7 +12892,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12209,7 +12916,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12233,7 +12940,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12257,7 +12964,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12281,7 +12988,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12305,7 +13012,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12329,7 +13036,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12353,7 +13060,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12377,7 +13084,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12401,7 +13108,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12425,7 +13132,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12449,7 +13156,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12473,7 +13180,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12497,7 +13204,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12521,7 +13228,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12545,7 +13252,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12569,7 +13276,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12593,7 +13300,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12617,7 +13324,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12641,7 +13348,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12665,7 +13372,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12689,7 +13396,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12713,7 +13420,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12737,7 +13444,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12761,7 +13468,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12785,7 +13492,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12809,7 +13516,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12833,7 +13540,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12857,7 +13564,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12881,7 +13588,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12905,7 +13612,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12929,7 +13636,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12953,7 +13660,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12977,7 +13684,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13001,7 +13708,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13025,7 +13732,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13049,7 +13756,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13073,7 +13780,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13097,7 +13804,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13121,7 +13828,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13145,7 +13852,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13169,7 +13876,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13193,7 +13900,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13217,7 +13924,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13241,7 +13948,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13265,7 +13972,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13289,7 +13996,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13313,7 +14020,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13337,7 +14044,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13361,7 +14068,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13385,7 +14092,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13409,7 +14116,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13433,7 +14140,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13457,7 +14164,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13481,7 +14188,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13505,7 +14212,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13529,7 +14236,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13553,7 +14260,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13577,7 +14284,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13601,7 +14308,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13625,7 +14332,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13649,7 +14356,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13673,7 +14380,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13697,7 +14404,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13721,7 +14428,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13745,7 +14452,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13769,7 +14476,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13793,7 +14500,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13817,7 +14524,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13841,7 +14548,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13865,7 +14572,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13889,7 +14596,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13913,7 +14620,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13937,7 +14644,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13961,7 +14668,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13985,7 +14692,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14009,7 +14716,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14033,7 +14740,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14057,7 +14764,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14081,7 +14788,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14105,7 +14812,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14129,7 +14836,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14153,7 +14860,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14177,7 +14884,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14201,7 +14908,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14225,7 +14932,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14249,7 +14956,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14273,7 +14980,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14297,7 +15004,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14321,7 +15028,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14345,7 +15052,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14369,7 +15076,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14393,7 +15100,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14417,7 +15124,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14441,7 +15148,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14465,7 +15172,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14489,7 +15196,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14513,7 +15220,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14537,7 +15244,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14561,7 +15268,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14585,7 +15292,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14609,7 +15316,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14633,7 +15340,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14657,7 +15364,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14681,7 +15388,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14705,7 +15412,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14729,7 +15436,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14753,7 +15460,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14777,7 +15484,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14801,7 +15508,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14825,7 +15532,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14849,7 +15556,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14873,7 +15580,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14897,7 +15604,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14921,7 +15628,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14945,7 +15652,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14969,7 +15676,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14993,7 +15700,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15017,7 +15724,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15041,7 +15748,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15065,7 +15772,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15089,7 +15796,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15113,7 +15820,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15137,7 +15844,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15161,7 +15868,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15185,7 +15892,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15209,7 +15916,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15233,7 +15940,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15257,7 +15964,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15281,7 +15988,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15305,7 +16012,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15329,7 +16036,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15353,7 +16060,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15377,7 +16084,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15401,7 +16108,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15425,7 +16132,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15449,7 +16156,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15473,7 +16180,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15497,7 +16204,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15521,7 +16228,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15545,7 +16252,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15559,7 +16266,7 @@ local skill = { ["skill_type"]=5, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=1, @@ -15572,7 +16279,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=1, @@ -15582,7 +16289,7 @@ local skill = { ["skill_type"]=7, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=1, @@ -15595,7 +16302,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=1, @@ -15608,7 +16315,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=1, @@ -15622,7 +16329,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=1, @@ -15636,7 +16343,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=1, @@ -15649,14 +16356,99 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" + }, + [10401]={ + ["effect_type"]=2, + ["trigger"]=2, + ["effect"]={ + { + ["type"]="dec_dmg_red_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 0 + } + }, + [10402]={ + ["effect_type"]=2, + ["trigger"]=2, + ["effect"]={ + { + ["type"]="dec_dmg_yellow_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 0 + } + }, + [10403]={ + ["effect_type"]=2, + ["trigger"]=2, + ["effect"]={ + { + ["type"]="dec_dmg_green_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 0 + } + }, + [10404]={ + ["effect_type"]=2, + ["trigger"]=2, + ["effect"]={ + { + ["type"]="dec_dmg_blue_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 0 + } + }, + [10405]={ + ["effect_type"]=2, + ["trigger"]=2, + ["effect"]={ + { + ["type"]="dec_dmg_purple_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 0 + } } } local config = { -data=skill,count=596 +data=skill,count=626 } 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 20fd7300..e4e1e462 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -1885,7 +1885,7 @@ local skill_rogue = { [2400202]={ ["limit_times"]=1, ["weight"]=3000, - ["qlt"]=3, + ["qlt"]=4, ["type"]=12, ["skill_position"]=2, ["effect"]={ @@ -1900,7 +1900,6 @@ local skill_rogue = { ["icon"]="144" }, [2400203]={ - ["unlock"]=2400201, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -2489,7 +2488,12 @@ local skill_rogue = { [3400201]={ ["limit_times"]=1, ["weight"]=3000, + ["qlt"]=3, ["type"]=1, + ["parameter"]={ + 3400221 + }, + ["skill_position"]=3, ["icon"]="150" }, [3400202]={ @@ -2512,19 +2516,41 @@ local skill_rogue = { [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, - ["type"]=12, + ["qlt"]=4, + ["type"]=9, + ["skill_position"]=3, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=3400222, + ["ratio"]=10000, + ["round"]=999 + } + }, ["obj"]=5, ["icon"]="154" }, @@ -2532,6 +2558,7 @@ local skill_rogue = { ["unlock"]=3400201, ["limit_times"]=1, ["weight"]=3000, + ["qlt"]=3, ["type"]=2, ["skill_position"]=3, ["boardrange"]={ @@ -2551,7 +2578,17 @@ local skill_rogue = { ["cover_unlock"]=3400205, ["limit_times"]=1, ["weight"]=3000, - ["type"]=12, + ["qlt"]=3, + ["type"]=9, + ["skill_position"]=3, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=3400223, + ["ratio"]=10000, + ["round"]=999 + } + }, ["obj"]=5, ["icon"]="156" }, @@ -3034,6 +3071,140 @@ local skill_rogue = { ["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]={ ["limit_times"]=1, ["weight"]=100000, @@ -3515,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=228 +data=skill_rogue,count=244 } return config \ No newline at end of file diff --git a/lua/app/module/dungeon/dungeon_manager.lua b/lua/app/module/dungeon/dungeon_manager.lua index 8c4e58a4..22238e54 100644 --- a/lua/app/module/dungeon/dungeon_manager.lua +++ b/lua/app/module/dungeon/dungeon_manager.lua @@ -38,7 +38,7 @@ end function DungeonManager:reqChallengeGold(id) local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD -- 判断次数 - if not DataManager.DungeonData:getRemainTimes(moduleKey) > 0 then + if not (DataManager.DungeonData:getRemainTimes(moduleKey) > 0) then GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) return end @@ -92,7 +92,7 @@ end function DungeonManager:reqSweepGold(id) local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD -- 判断次数 - if not DataManager.DungeonData:getRemainTimes(moduleKey) > 0 then + if not (DataManager.DungeonData:getRemainTimes(moduleKey) > 0) then GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) return end @@ -125,7 +125,7 @@ end function DungeonManager:reqChallengeShards(id) local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD -- 判断次数 - if not DataManager.DungeonData:getRemainTimes(moduleKey) > 0 then + if not (DataManager.DungeonData:getRemainTimes(moduleKey) > 0) then GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) return end @@ -178,7 +178,7 @@ end function DungeonManager:reqSweepShards(id) local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_SHARDS -- 判断次数 - if not DataManager.DungeonData:getRemainTimes(moduleKey) > 0 then + if not (DataManager.DungeonData:getRemainTimes(moduleKey) > 0) then GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) return end diff --git a/lua/app/ui/dungeon/dungeon_board_cell.lua b/lua/app/ui/dungeon/dungeon_board_cell.lua index df732427..1b1e3616 100644 --- a/lua/app/ui/dungeon/dungeon_board_cell.lua +++ b/lua/app/ui/dungeon/dungeon_board_cell.lua @@ -39,7 +39,6 @@ function DungeonBoardCell:refreshInfo() self.txOpen:setText(DataManager.DungeonData:getOpenTimeDesc(self.moduleKey)) self.icon:setSprite(DataManager.DungeonData:getIcon(self.moduleKey)) -- self.baseObject:setTexture("assets/arts/textures/background/fund/fund_bg_1.png") - -- self.iconBuff:setSprite(GConst.ATLAS_PATH.ICON_BUFF, "") if DataManager.DungeonData:isActive(self.moduleKey) then self.btnStart:setVisible(true) @@ -81,7 +80,6 @@ function DungeonBoardCell:refreshRewards() self.scrollRect:addRefreshCallback(function(index, cell) cell:refreshItemById(rewards[index], 0) end) - self.scrollRect:setTotalCount(#rewards) else rewards = DataManager.DungeonData:getBoardShowRewardIcon(self.moduleKey) -- 展示icon图片 @@ -91,8 +89,8 @@ function DungeonBoardCell:refreshRewards() cell:setVisibleFragment(false) cell:setTouchEnable(false) end) - self.scrollRect:setTotalCount(#rewards) end + self.scrollRect:setTotalCount(#rewards) end function DungeonBoardCell:refreshCountdown(txCountdown) diff --git a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua index 49bb1de7..b9964299 100644 --- a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua +++ b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua @@ -39,9 +39,14 @@ function DungeonDifficultyUI:onLoadRootComplete() 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.buffObj = self.uiMap["dungeon_difficulty_ui.bg.boss_buff"] + self.txbuff = self.uiMap["dungeon_difficulty_ui.bg.boss_buff.tx_buff"] + self.iconBuff = self.uiMap["dungeon_difficulty_ui.bg.boss_buff.icon_buff"] + self.rewardFirst = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) + self.rewardPass = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_pass"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) + self.txFrist = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first.tx_first"] 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)) @@ -49,16 +54,7 @@ function DungeonDifficultyUI:onLoadRootComplete() 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.txFrist:setText(I18N:getGlobalText(I18N.GlobalConst.FIRST_PASS)) self:refreshDifficulty() @@ -96,6 +92,34 @@ function DungeonDifficultyUI:refreshDifficulty() self.arrowRight:setActive(not self:isCanChallengeMaxId()) self.btnSweep:setActive(self:isCanSweepId()) self.txLevel:setText(tostring(self.curId)) + + -- buff or desc + local buff = DataManager.DungeonData:getBossBuff(self.module, self.curId) + local desc = DataManager.DungeonData:getRule(self.module) + if buff then + self.txDesc:setActive(false) + self.buffObj:setActive(true) + self.txbuff:setText("") + self.iconBuff:setSprite("","") + elseif desc then + self.txDesc:setActive(true) + self.buffObj:setActive(false) + self.txDesc:setText(desc) + else + self.txDesc:setActive(false) + self.buffObj:setActive(false) + end + + -- 奖励 + local rewardFirst = DataManager.DungeonData:getFirstReward(self.module, self.curId) + local rewardPass = DataManager.DungeonData:getPassReward(self.module, self.curId) + if not self:isCanSweepId() and rewardFirst then + self.rewardFirst:setVisible(true) + self.rewardFirst:refreshByConfig(rewardFirst) + else + self.rewardFirst:setVisible(false) + end + self.rewardPass:refreshByConfig(rewardPass) end -- 是否是可扫荡关卡 diff --git a/lua/app/userdata/dungeon/dungeon_data.lua b/lua/app/userdata/dungeon/dungeon_data.lua index d773b316..87c5e44c 100644 --- a/lua/app/userdata/dungeon/dungeon_data.lua +++ b/lua/app/userdata/dungeon/dungeon_data.lua @@ -303,6 +303,11 @@ function DungeonData:getRule(moduleKey) return self.dataDungeons[moduleKey]:getRuleString() end +-- 获取副本当前关卡buff +function DungeonData:getBossBuff(moduleKey, id) + return self.dataDungeons[moduleKey]:getBossBuff(id) +end + -- 获取副本开启时间描述 function DungeonData:getOpenTimeDesc(moduleKey) return self.dataDungeons[moduleKey]:getOpenWeekString() diff --git a/lua/app/userdata/dungeon/dungeon_data_base_comp.lua b/lua/app/userdata/dungeon/dungeon_data_base_comp.lua index 12bc448d..a06cf744 100644 --- a/lua/app/userdata/dungeon/dungeon_data_base_comp.lua +++ b/lua/app/userdata/dungeon/dungeon_data_base_comp.lua @@ -31,8 +31,8 @@ function DungeonDataBaseComp:getRuleString() return nil end --- 获取副本boss抗性描述(碎片副本) -function DungeonDataBaseComp:getBossBuffString() +-- 获取副本boss抗性(碎片副本) +function DungeonDataBaseComp:getBossBuff(id) return nil end diff --git a/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua b/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua index 0225dce5..b1230bfd 100644 --- a/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua +++ b/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua @@ -26,7 +26,7 @@ function DungeonGoldDataComp:getModuleKey() end function DungeonGoldDataComp:getOpenWeekCycle() - return {2,4,6,7} + return {1,2,3,4,5,6,7} end function DungeonGoldDataComp:getConfigName() diff --git a/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua b/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua index 06c5b925..6831d648 100644 --- a/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua +++ b/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua @@ -26,7 +26,7 @@ function DungeonShardsDataComp:getModuleKey() end function DungeonShardsDataComp:getOpenWeekCycle() - return {1,3,5,7} + return {1,2,3,4,5,6,7} end function DungeonShardsDataComp:getConfigName() @@ -37,14 +37,15 @@ function DungeonShardsDataComp:getTitleString() return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_SHARDS_TITLE) end -function DungeonShardsDataComp:getBossBuffString() - return I18N:getText("buff", buffId, "desc") -end - function DungeonShardsDataComp:getOpenWeekString() return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_SHARDS_OPEN) end +function DungeonShardsDataComp:getBossBuff(id) + Logger.printTable(self:getConfig()[id]) + return self:getConfig()[id].effect +end + function DungeonShardsDataComp:getIcon() return GConst.ATLAS_PATH.COMMON,"common_dec_3" end From 30bfbb5476a960c5a8827017f5c6272d8bc0433b Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 12 Jun 2023 18:49:59 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E6=88=98=E6=96=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/chapter_dungeon_gold.lua | 90 +- lua/app/config/chapter_dungeon_shards.lua | 570 ++--- lua/app/config/monster_dungeon_gold.lua | 420 +++- lua/app/config/monster_dungeon_shards.lua | 450 ++-- lua/app/config/skill.lua | 1836 ++++++++++++----- lua/app/config/skill_rogue.lua | 294 ++- .../battle/controller/battle_controller.lua | 6 +- .../battle_controller_dungeon_gold.lua | 20 +- .../battle_controller_dungeon_shards.lua | 2 +- lua/app/module/dungeon/dungeon_manager.lua | 24 +- lua/app/userdata/dungeon/dungeon_data.lua | 14 +- 11 files changed, 2545 insertions(+), 1181 deletions(-) diff --git a/lua/app/config/chapter_dungeon_gold.lua b/lua/app/config/chapter_dungeon_gold.lua index 36ce6388..e41c0bcd 100644 --- a/lua/app/config/chapter_dungeon_gold.lua +++ b/lua/app/config/chapter_dungeon_gold.lua @@ -24,7 +24,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [2]={ ["scene"]="bg_11", @@ -51,7 +52,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [3]={ ["scene"]="bg_11", @@ -78,7 +80,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [4]={ ["scene"]="bg_11", @@ -105,7 +108,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [5]={ ["scene"]="bg_11", @@ -132,7 +136,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [6]={ ["scene"]="bg_11", @@ -159,7 +164,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [7]={ ["scene"]="bg_11", @@ -186,7 +192,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [8]={ ["scene"]="bg_11", @@ -213,7 +220,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [9]={ ["scene"]="bg_11", @@ -240,7 +248,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [10]={ ["scene"]="bg_11", @@ -267,7 +276,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [11]={ ["scene"]="bg_11", @@ -294,7 +304,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [12]={ ["scene"]="bg_11", @@ -321,7 +332,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [13]={ ["scene"]="bg_11", @@ -348,7 +360,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [14]={ ["scene"]="bg_11", @@ -375,7 +388,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [15]={ ["scene"]="bg_11", @@ -402,7 +416,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [16]={ ["scene"]="bg_11", @@ -429,7 +444,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [17]={ ["scene"]="bg_11", @@ -456,7 +472,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [18]={ ["scene"]="bg_11", @@ -483,7 +500,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [19]={ ["scene"]="bg_11", @@ -510,7 +528,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [20]={ ["scene"]="bg_11", @@ -537,7 +556,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [21]={ ["scene"]="bg_11", @@ -564,7 +584,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [22]={ ["scene"]="bg_11", @@ -591,7 +612,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [23]={ ["scene"]="bg_11", @@ -618,7 +640,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [24]={ ["scene"]="bg_11", @@ -645,7 +668,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [25]={ ["scene"]="bg_11", @@ -672,7 +696,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [26]={ ["scene"]="bg_11", @@ -699,7 +724,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [27]={ ["scene"]="bg_11", @@ -726,7 +752,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [28]={ ["scene"]="bg_11", @@ -753,7 +780,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [29]={ ["scene"]="bg_11", @@ -780,7 +808,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 }, [30]={ ["scene"]="bg_11", @@ -807,7 +836,8 @@ local chapter_dungeon_gold = { ["id_for_nothing"]="Vw==", ["num"]=1000, ["num_for_nothing"]="VwhcAw==" - } + }, + ["wave_limit"]=5 } } local config = { diff --git a/lua/app/config/chapter_dungeon_shards.lua b/lua/app/config/chapter_dungeon_shards.lua index 56a01e75..0a59a4c6 100644 --- a/lua/app/config/chapter_dungeon_shards.lua +++ b/lua/app/config/chapter_dungeon_shards.lua @@ -17,21 +17,12 @@ local chapter_dungeon_shards = { 404, 504 }, - ["buff_id"]={ + ["effect"]={ { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 + ["type"]="dec_dmg_red_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -115,21 +106,12 @@ local chapter_dungeon_shards = { 904, 1004 }, - ["buff_id"]={ + ["effect"]={ { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 + ["type"]="dec_dmg_yellow_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -213,21 +195,12 @@ local chapter_dungeon_shards = { 1404, 1504 }, - ["buff_id"]={ + ["effect"]={ { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 + ["type"]="dec_dmg_green_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -311,21 +284,12 @@ local chapter_dungeon_shards = { 1904, 2004 }, - ["buff_id"]={ + ["effect"]={ { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 + ["type"]="dec_dmg_blue_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -409,21 +373,12 @@ local chapter_dungeon_shards = { 2404, 2504 }, - ["buff_id"]={ + ["effect"]={ { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 + ["type"]="dec_dmg_purple_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -507,21 +462,12 @@ local chapter_dungeon_shards = { 2904, 3004 }, - ["buff_id"]={ + ["effect"]={ { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 + ["type"]="dec_dmg_red_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -605,21 +551,12 @@ local chapter_dungeon_shards = { 3404, 3504 }, - ["buff_id"]={ + ["effect"]={ { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 + ["type"]="dec_dmg_yellow_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -703,21 +640,12 @@ local chapter_dungeon_shards = { 3904, 4004 }, - ["buff_id"]={ + ["effect"]={ { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 + ["type"]="dec_dmg_green_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -801,21 +729,12 @@ local chapter_dungeon_shards = { 4404, 4504 }, - ["buff_id"]={ + ["effect"]={ { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 + ["type"]="dec_dmg_blue_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -899,21 +818,12 @@ local chapter_dungeon_shards = { 4904, 5004 }, - ["buff_id"]={ + ["effect"]={ { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 + ["type"]="dec_dmg_purple_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -997,21 +907,12 @@ local chapter_dungeon_shards = { 5404, 5504 }, - ["buff_id"]={ + ["effect"]={ { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 + ["type"]="dec_dmg_red_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1095,21 +996,12 @@ local chapter_dungeon_shards = { 5904, 6004 }, - ["buff_id"]={ + ["effect"]={ { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 + ["type"]="dec_dmg_yellow_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1193,21 +1085,12 @@ local chapter_dungeon_shards = { 6404, 6504 }, - ["buff_id"]={ + ["effect"]={ { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 + ["type"]="dec_dmg_green_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1291,21 +1174,12 @@ local chapter_dungeon_shards = { 6904, 7004 }, - ["buff_id"]={ + ["effect"]={ { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 + ["type"]="dec_dmg_blue_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1389,21 +1263,12 @@ local chapter_dungeon_shards = { 7404, 7504 }, - ["buff_id"]={ + ["effect"]={ { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 + ["type"]="dec_dmg_purple_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1487,21 +1352,12 @@ local chapter_dungeon_shards = { 7904, 8004 }, - ["buff_id"]={ + ["effect"]={ { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 + ["type"]="dec_dmg_red_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1585,21 +1441,12 @@ local chapter_dungeon_shards = { 8404, 8504 }, - ["buff_id"]={ + ["effect"]={ { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 + ["type"]="dec_dmg_yellow_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1683,21 +1530,12 @@ local chapter_dungeon_shards = { 8904, 9004 }, - ["buff_id"]={ + ["effect"]={ { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 + ["type"]="dec_dmg_green_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1781,21 +1619,12 @@ local chapter_dungeon_shards = { 9404, 9504 }, - ["buff_id"]={ + ["effect"]={ { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 + ["type"]="dec_dmg_blue_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1879,21 +1708,12 @@ local chapter_dungeon_shards = { 9904, 10004 }, - ["buff_id"]={ + ["effect"]={ { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 + ["type"]="dec_dmg_purple_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -1977,21 +1797,12 @@ local chapter_dungeon_shards = { 10404, 10504 }, - ["buff_id"]={ + ["effect"]={ { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 + ["type"]="dec_dmg_red_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -2075,21 +1886,12 @@ local chapter_dungeon_shards = { 10904, 11004 }, - ["buff_id"]={ + ["effect"]={ { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 + ["type"]="dec_dmg_yellow_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -2173,21 +1975,12 @@ local chapter_dungeon_shards = { 11404, 11504 }, - ["buff_id"]={ + ["effect"]={ { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 + ["type"]="dec_dmg_green_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -2271,21 +2064,12 @@ local chapter_dungeon_shards = { 11904, 12004 }, - ["buff_id"]={ + ["effect"]={ { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 + ["type"]="dec_dmg_blue_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -2369,21 +2153,12 @@ local chapter_dungeon_shards = { 12404, 12504 }, - ["buff_id"]={ + ["effect"]={ { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 + ["type"]="dec_dmg_purple_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -2467,21 +2242,12 @@ local chapter_dungeon_shards = { 12904, 13004 }, - ["buff_id"]={ + ["effect"]={ { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 - }, - { - 7 + ["type"]="dec_dmg_red_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -2565,21 +2331,12 @@ local chapter_dungeon_shards = { 13404, 13504 }, - ["buff_id"]={ + ["effect"]={ { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 - }, - { - 8 + ["type"]="dec_dmg_yellow_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -2663,21 +2420,12 @@ local chapter_dungeon_shards = { 13904, 14004 }, - ["buff_id"]={ + ["effect"]={ { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 - }, - { - 9 + ["type"]="dec_dmg_green_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -2761,21 +2509,12 @@ local chapter_dungeon_shards = { 14404, 14504 }, - ["buff_id"]={ + ["effect"]={ { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 - }, - { - 10 + ["type"]="dec_dmg_blue_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ @@ -2859,21 +2598,12 @@ local chapter_dungeon_shards = { 14904, 15004 }, - ["buff_id"]={ + ["effect"]={ { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 - }, - { - 11 + ["type"]="dec_dmg_purple_add", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=999 } }, ["wave_reward"]={ diff --git a/lua/app/config/monster_dungeon_gold.lua b/lua/app/config/monster_dungeon_gold.lua index 45a7477e..3b062ceb 100644 --- a/lua/app/config/monster_dungeon_gold.lua +++ b/lua/app/config/monster_dungeon_gold.lua @@ -4,210 +4,570 @@ local monster_dungeon_gold = { ["hp"]=90000000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [205]={ ["monster_base"]=20003, ["hp"]=90200000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [305]={ ["monster_base"]=20003, ["hp"]=90400000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [405]={ ["monster_base"]=20003, ["hp"]=90600000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [505]={ ["monster_base"]=20003, ["hp"]=90800000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [605]={ ["monster_base"]=20003, ["hp"]=91000000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [705]={ ["monster_base"]=20003, ["hp"]=91200000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [805]={ ["monster_base"]=20003, ["hp"]=91400000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [905]={ ["monster_base"]=20003, ["hp"]=91600000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1005]={ ["monster_base"]=20003, ["hp"]=91800000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1105]={ ["monster_base"]=20003, ["hp"]=92000000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1205]={ ["monster_base"]=20003, ["hp"]=92200000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1305]={ ["monster_base"]=20003, ["hp"]=92400000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1405]={ ["monster_base"]=20003, ["hp"]=92600000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1505]={ ["monster_base"]=20003, ["hp"]=92800000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1605]={ ["monster_base"]=20003, ["hp"]=93000000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1705]={ ["monster_base"]=20003, ["hp"]=93200000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1805]={ ["monster_base"]=20003, ["hp"]=93400000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [1905]={ ["monster_base"]=20003, ["hp"]=93600000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2005]={ ["monster_base"]=20003, ["hp"]=93800000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2105]={ ["monster_base"]=20003, ["hp"]=94000000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2205]={ ["monster_base"]=20003, ["hp"]=94200000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2305]={ ["monster_base"]=20003, ["hp"]=94400000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2405]={ ["monster_base"]=20003, ["hp"]=94600000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2505]={ ["monster_base"]=20003, ["hp"]=94800000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2605]={ ["monster_base"]=20003, ["hp"]=95000000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2705]={ ["monster_base"]=20003, ["hp"]=95200000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2805]={ ["monster_base"]=20003, ["hp"]=95400000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [2905]={ ["monster_base"]=20003, ["hp"]=95600000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } }, [3005]={ ["monster_base"]=20003, ["hp"]=95800000, ["atk"]=0, ["atk_times"]=0, - ["monster_exp"]=440000 + ["monster_exp"]=440000, + ["monster_hp"]={ + 10000, + 7000, + 4000, + 2000 + }, + ["monster_hp_skin"]={ + "1", + "2", + "3", + "4" + } } } local config = { diff --git a/lua/app/config/monster_dungeon_shards.lua b/lua/app/config/monster_dungeon_shards.lua index b3079a89..d90835cb 100644 --- a/lua/app/config/monster_dungeon_shards.lua +++ b/lua/app/config/monster_dungeon_shards.lua @@ -15,7 +15,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -35,7 +36,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -55,7 +57,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -75,7 +78,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -95,7 +99,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -115,7 +120,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -135,7 +141,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -155,7 +162,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -175,7 +183,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -195,7 +204,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -215,7 +225,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -235,7 +246,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -255,7 +267,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -275,7 +288,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -295,7 +309,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -315,7 +330,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -335,7 +351,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -355,7 +372,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -375,7 +393,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -395,7 +414,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -415,7 +435,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -435,7 +456,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -455,7 +477,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -475,7 +498,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -495,7 +519,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -515,7 +540,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -535,7 +561,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -555,7 +582,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -575,7 +603,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -595,7 +624,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -615,7 +645,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -635,7 +666,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -655,7 +687,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -675,7 +708,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -695,7 +729,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -715,7 +750,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -735,7 +771,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -755,7 +792,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -775,7 +813,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -795,7 +834,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -815,7 +855,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -835,7 +876,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -855,7 +897,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -875,7 +918,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -895,7 +939,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -915,7 +960,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -935,7 +981,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -955,7 +1002,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -975,7 +1023,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -995,7 +1044,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1015,7 +1065,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1035,7 +1086,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1055,7 +1107,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1075,7 +1128,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1095,7 +1149,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1115,7 +1170,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1135,7 +1191,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1155,7 +1212,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1175,7 +1233,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1195,7 +1254,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1215,7 +1275,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1235,7 +1296,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1255,7 +1317,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1275,7 +1338,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1295,7 +1359,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1315,7 +1380,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1335,7 +1401,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1355,7 +1422,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1375,7 +1443,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1395,7 +1464,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1415,7 +1485,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1435,7 +1506,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1455,7 +1527,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1475,7 +1548,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1495,7 +1569,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1515,7 +1590,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1535,7 +1611,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1555,7 +1632,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1575,7 +1653,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1595,7 +1674,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1615,7 +1695,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1635,7 +1716,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1655,7 +1737,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1675,7 +1758,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1695,7 +1779,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1715,7 +1800,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1735,7 +1821,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1755,7 +1842,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1775,7 +1863,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1795,7 +1884,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1815,7 +1905,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1835,7 +1926,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1855,7 +1947,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1875,7 +1968,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1895,7 +1989,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1915,7 +2010,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1935,7 +2031,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1955,7 +2052,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1975,7 +2073,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -1995,7 +2094,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2015,7 +2115,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2035,7 +2136,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2055,7 +2157,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2075,7 +2178,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2095,7 +2199,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2115,7 +2220,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2135,7 +2241,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2155,7 +2262,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2175,7 +2283,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2195,7 +2304,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2215,7 +2325,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2235,7 +2346,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2255,7 +2367,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2275,7 +2388,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2295,7 +2409,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2315,7 +2430,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2335,7 +2451,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2355,7 +2472,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2375,7 +2493,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2395,7 +2514,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2415,7 +2535,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2435,7 +2556,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2455,7 +2577,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2475,7 +2598,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2495,7 +2619,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2515,7 +2640,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2535,7 +2661,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2555,7 +2682,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2575,7 +2703,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2595,7 +2724,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2615,7 +2745,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2635,7 +2766,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2655,7 +2787,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2675,7 +2808,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2695,7 +2829,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2715,7 +2850,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2735,7 +2871,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2755,7 +2892,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2775,7 +2913,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2795,7 +2934,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2815,7 +2955,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2835,7 +2976,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2855,7 +2997,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2875,7 +3018,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2895,7 +3039,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2915,7 +3060,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2935,7 +3081,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2955,7 +3102,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2975,7 +3123,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 }, @@ -2995,7 +3144,8 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10013, 10008, - 10011 + 10011, + 10401 }, ["monster_exp"]=22000 } diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index e174009d..7dce5959 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -13,7 +13,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [9]={ @@ -57,7 +57,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [12]={ @@ -74,7 +74,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [13]={ @@ -118,7 +118,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -143,7 +143,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -168,7 +168,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -193,7 +193,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -233,7 +233,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=200, ["shake_type"]=5, @@ -263,7 +263,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 1, - 0 + 140 } }, [1200122]={ @@ -287,7 +287,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 1, - 0 + 140 } }, [1200123]={ @@ -322,7 +322,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 1, - 0 + 140 } }, [1200124]={ @@ -353,7 +353,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -378,7 +378,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -403,7 +403,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -428,7 +428,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -474,7 +474,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -572,7 +572,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -660,7 +660,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -685,7 +685,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -710,7 +710,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -735,7 +735,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -812,7 +812,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -929,7 +929,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -963,7 +963,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -988,7 +988,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -1013,7 +1013,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=4, @@ -1038,7 +1038,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -1117,7 +1117,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -1229,7 +1229,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -1254,7 +1254,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -1279,7 +1279,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=4, @@ -1304,7 +1304,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -1334,7 +1334,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -1364,7 +1364,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 } }, [1400222]={ @@ -1391,7 +1391,7 @@ local skill = { ["effect"]={ { ["type"]="dmg_addition_yellow_add", - ["num"]=2000, + ["num"]=5000, ["ratio"]=10000, ["round"]=1 } @@ -1399,7 +1399,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [1400223]={ @@ -1432,7 +1432,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -1462,7 +1462,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 } }, [1400225]={ @@ -1497,7 +1497,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [2200110]={ @@ -1515,7 +1515,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -1540,7 +1540,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -1565,7 +1565,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -1590,7 +1590,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -1619,7 +1619,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -1666,7 +1666,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [2200122]={ @@ -1684,7 +1684,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [2200123]={ @@ -1717,7 +1717,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -1747,7 +1747,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -1772,7 +1772,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -1797,7 +1797,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -1822,7 +1822,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -1876,7 +1876,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -1949,7 +1949,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -2069,7 +2069,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -2094,7 +2094,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -2119,7 +2119,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -2144,7 +2144,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -2203,7 +2203,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -2292,7 +2292,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -2317,7 +2317,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -2342,7 +2342,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -2367,7 +2367,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -2400,7 +2400,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -2544,7 +2544,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -2588,7 +2588,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -2632,10 +2632,15 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, - ["shake_type"]=1 + ["shake_type"]=1, + ["sound_hit"]={ + 1000011 + }, + ["name_act"]="attack01", + ["fx_self"]=300028 }, [2400211]={ ["position"]=2, @@ -2652,10 +2657,15 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, - ["shake_type"]=1 + ["shake_type"]=1, + ["sound_hit"]={ + 1000012 + }, + ["name_act"]="attack02", + ["fx_self"]=300029 }, [2400212]={ ["position"]=2, @@ -2672,10 +2682,15 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, - ["shake_type"]=1 + ["shake_type"]=1, + ["sound_hit"]={ + 1000013 + }, + ["name_act"]="attack03", + ["fx_self"]=300030 }, [2400213]={ ["position"]=2, @@ -2692,10 +2707,15 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, - ["shake_type"]=1 + ["shake_type"]=1, + ["sound_hit"]={ + 1000014 + }, + ["name_act"]="attack04", + ["fx_self"]=300031 }, [2400220]={ ["energy"]=10, @@ -2720,10 +2740,20 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, - ["shake_type"]=6 + ["shake_type"]=6, + ["sound_hit"]={ + 2400120 + }, + ["name_act"]="skill01", + ["fx_self"]=300032, + ["bullet_time"]={ + 2033, + 3000, + 400 + } }, [2400221]={ ["skill_type"]=11, @@ -2802,7 +2832,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -2827,7 +2857,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -2852,7 +2882,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=2, @@ -2877,7 +2907,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -2910,7 +2940,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=200, ["shake_type"]=6, @@ -3013,7 +3043,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -3038,7 +3068,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3063,7 +3093,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -3088,7 +3118,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -3117,7 +3147,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["sound_hit"]={ 3300120 @@ -3211,7 +3241,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["sound_hit"]={ 3300120 @@ -3234,7 +3264,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3259,7 +3289,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=2, @@ -3284,7 +3314,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3309,7 +3339,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=2, @@ -3364,7 +3394,7 @@ local skill = { }, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=200, ["shake_type"]=5, @@ -3460,7 +3490,7 @@ local skill = { }, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=200, ["shake_type"]=5, @@ -3543,7 +3573,7 @@ local skill = { }, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=200, ["shake_type"]=5, @@ -3573,7 +3603,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3598,7 +3628,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3623,7 +3653,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3648,7 +3678,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3704,7 +3734,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -3831,7 +3861,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -3846,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, @@ -3861,7 +4111,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -3886,7 +4136,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3911,7 +4161,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3936,7 +4186,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -3972,7 +4222,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -4078,7 +4328,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -4103,7 +4353,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4128,7 +4378,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4153,7 +4403,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4189,7 +4439,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -4238,7 +4488,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [4300122]={ @@ -4256,7 +4506,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 } }, [4300123]={ @@ -4274,7 +4524,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [4300124]={ @@ -4292,7 +4542,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [4300125]={ @@ -4331,7 +4581,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -4363,7 +4613,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4388,7 +4638,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4413,7 +4663,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4438,7 +4688,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4494,7 +4744,7 @@ local skill = { }, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=200, ["shake_type"]=6, @@ -4614,7 +4864,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4639,7 +4889,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4664,7 +4914,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4689,7 +4939,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4731,7 +4981,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -4805,6 +5055,244 @@ local skill = { }, ["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, @@ -4820,7 +5308,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4845,7 +5333,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4870,7 +5358,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4895,7 +5383,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4928,7 +5416,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["sound_hit"]={ 5200120 @@ -4959,7 +5447,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["sound_hit"]={ 5200120 @@ -4990,7 +5478,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["sound_hit"]={ 5200120 @@ -5026,7 +5514,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -5051,7 +5539,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5076,7 +5564,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -5101,7 +5589,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -5155,7 +5643,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -5266,7 +5754,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -5291,7 +5779,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -5316,7 +5804,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5341,7 +5829,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5387,7 +5875,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -5541,7 +6029,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -5573,7 +6061,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -5598,7 +6086,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -5623,7 +6111,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5648,7 +6136,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -5695,7 +6183,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -5769,7 +6257,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -5809,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, @@ -5823,7 +6530,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5846,7 +6553,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5869,7 +6576,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5892,7 +6599,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5915,7 +6622,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5938,7 +6645,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5961,7 +6668,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5984,7 +6691,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [10009]={ @@ -6001,7 +6708,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [10010]={ @@ -6018,7 +6725,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [10011]={ @@ -6035,7 +6742,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [10012]={ @@ -6052,7 +6759,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [10013]={ @@ -6069,7 +6776,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 } }, [10014]={ @@ -6099,7 +6806,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -6122,7 +6829,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["cd"]=2, ["cd_start"]=0, @@ -6159,7 +6866,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["cd"]=3, ["cd_start"]=0, @@ -6201,7 +6908,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["cd"]=3, ["cd_start"]=0, @@ -6238,7 +6945,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["cd"]=3, ["cd_start"]=0, @@ -6275,7 +6982,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["cd"]=3, ["cd_start"]=0, @@ -6312,7 +7019,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -6345,7 +7052,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0 @@ -6369,7 +7076,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -6421,7 +7128,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -6483,7 +7190,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -6520,7 +7227,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0 @@ -6543,7 +7250,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -6586,7 +7293,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["cd"]=3, ["cd_start"]=0, @@ -6640,7 +7347,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -6674,7 +7381,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -6705,7 +7412,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -6734,7 +7441,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -6795,7 +7502,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -6848,7 +7555,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -6919,7 +7626,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -6991,7 +7698,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -7026,7 +7733,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7085,7 +7792,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7210,7 +7917,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -7261,7 +7968,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7325,7 +8032,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7388,7 +8095,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=1, @@ -7425,7 +8132,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7452,7 +8159,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7511,7 +8218,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=1, @@ -7600,7 +8307,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7676,7 +8383,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=2, @@ -7735,7 +8442,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7779,7 +8486,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=2, @@ -7811,7 +8518,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -7857,7 +8564,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -7894,7 +8601,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7937,7 +8644,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -7979,7 +8686,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["cd"]=3, ["cd_start"]=0, @@ -8010,7 +8717,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0 @@ -8046,7 +8753,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -8077,7 +8784,7 @@ local skill = { ["obj"]=1, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0 @@ -8125,7 +8832,7 @@ local skill = { }, ["skill_position"]={ 1, - 0 + 140 }, ["cd"]=3, ["cd_start"]=0, @@ -8156,7 +8863,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["cd"]=2, ["cd_start"]=0, @@ -8199,7 +8906,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -8225,7 +8932,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8249,7 +8956,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8273,7 +8980,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8297,7 +9004,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8321,7 +9028,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8345,7 +9052,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8369,7 +9076,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8393,7 +9100,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8417,7 +9124,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8441,7 +9148,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8465,7 +9172,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8489,7 +9196,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8513,7 +9220,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8537,7 +9244,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8561,7 +9268,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8585,7 +9292,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8609,7 +9316,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8633,7 +9340,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8657,7 +9364,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8681,7 +9388,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8705,7 +9412,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8729,7 +9436,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8753,7 +9460,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8777,7 +9484,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8801,7 +9508,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8825,7 +9532,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8849,7 +9556,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8873,7 +9580,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8897,7 +9604,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8921,7 +9628,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8945,7 +9652,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8969,7 +9676,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -8993,7 +9700,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9017,7 +9724,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9041,7 +9748,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9065,7 +9772,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9089,7 +9796,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9113,7 +9820,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9137,7 +9844,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9161,7 +9868,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9185,7 +9892,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9209,7 +9916,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9233,7 +9940,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9257,7 +9964,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9281,7 +9988,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9305,7 +10012,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9329,7 +10036,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9353,7 +10060,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9377,7 +10084,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9401,7 +10108,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9425,7 +10132,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9449,7 +10156,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9473,7 +10180,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9497,7 +10204,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9521,7 +10228,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9545,7 +10252,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9569,7 +10276,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9593,7 +10300,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9617,7 +10324,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9641,7 +10348,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9665,7 +10372,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9689,7 +10396,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9713,7 +10420,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9737,7 +10444,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9761,7 +10468,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9785,7 +10492,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9809,7 +10516,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9833,7 +10540,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9857,7 +10564,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9881,7 +10588,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9905,7 +10612,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9929,7 +10636,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9953,7 +10660,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9977,7 +10684,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10001,7 +10708,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10025,7 +10732,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10049,7 +10756,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10073,7 +10780,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10097,7 +10804,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10121,7 +10828,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10145,7 +10852,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10169,7 +10876,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10193,7 +10900,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10217,7 +10924,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10241,7 +10948,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10265,7 +10972,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10289,7 +10996,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10313,7 +11020,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10337,7 +11044,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10361,7 +11068,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10385,7 +11092,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10409,7 +11116,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10433,7 +11140,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10457,7 +11164,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10481,7 +11188,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10505,7 +11212,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10529,7 +11236,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10553,7 +11260,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10577,7 +11284,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10601,7 +11308,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10625,7 +11332,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10649,7 +11356,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10673,7 +11380,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10697,7 +11404,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10721,7 +11428,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10745,7 +11452,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10769,7 +11476,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10793,7 +11500,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10817,7 +11524,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10841,7 +11548,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10865,7 +11572,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10889,7 +11596,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10913,7 +11620,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10937,7 +11644,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10961,7 +11668,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -10985,7 +11692,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11009,7 +11716,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11033,7 +11740,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11057,7 +11764,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11081,7 +11788,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11105,7 +11812,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11129,7 +11836,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11153,7 +11860,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11177,7 +11884,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11201,7 +11908,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11225,7 +11932,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11249,7 +11956,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11273,7 +11980,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11297,7 +12004,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11321,7 +12028,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11345,7 +12052,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11369,7 +12076,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11393,7 +12100,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11417,7 +12124,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11441,7 +12148,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11465,7 +12172,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11489,7 +12196,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11513,7 +12220,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11537,7 +12244,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11561,7 +12268,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11585,7 +12292,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11609,7 +12316,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11633,7 +12340,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11657,7 +12364,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11681,7 +12388,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11705,7 +12412,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11729,7 +12436,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11753,7 +12460,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11777,7 +12484,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11801,7 +12508,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11825,7 +12532,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11849,7 +12556,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11873,7 +12580,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11897,7 +12604,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11921,7 +12628,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11945,7 +12652,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11969,7 +12676,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -11993,7 +12700,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12017,7 +12724,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12041,7 +12748,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12065,7 +12772,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12089,7 +12796,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12113,7 +12820,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12137,7 +12844,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12161,7 +12868,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12185,7 +12892,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12209,7 +12916,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12233,7 +12940,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12257,7 +12964,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12281,7 +12988,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12305,7 +13012,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12329,7 +13036,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12353,7 +13060,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12377,7 +13084,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12401,7 +13108,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12425,7 +13132,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12449,7 +13156,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12473,7 +13180,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12497,7 +13204,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12521,7 +13228,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12545,7 +13252,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12569,7 +13276,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12593,7 +13300,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12617,7 +13324,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12641,7 +13348,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12665,7 +13372,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12689,7 +13396,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12713,7 +13420,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12737,7 +13444,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12761,7 +13468,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12785,7 +13492,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12809,7 +13516,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12833,7 +13540,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12857,7 +13564,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12881,7 +13588,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12905,7 +13612,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12929,7 +13636,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12953,7 +13660,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -12977,7 +13684,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13001,7 +13708,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13025,7 +13732,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13049,7 +13756,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13073,7 +13780,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13097,7 +13804,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13121,7 +13828,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13145,7 +13852,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13169,7 +13876,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13193,7 +13900,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13217,7 +13924,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13241,7 +13948,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13265,7 +13972,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13289,7 +13996,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13313,7 +14020,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13337,7 +14044,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13361,7 +14068,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13385,7 +14092,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13409,7 +14116,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13433,7 +14140,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13457,7 +14164,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13481,7 +14188,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13505,7 +14212,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13529,7 +14236,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13553,7 +14260,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13577,7 +14284,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13601,7 +14308,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13625,7 +14332,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13649,7 +14356,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13673,7 +14380,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13697,7 +14404,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13721,7 +14428,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13745,7 +14452,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13769,7 +14476,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13793,7 +14500,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13817,7 +14524,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13841,7 +14548,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13865,7 +14572,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13889,7 +14596,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13913,7 +14620,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13937,7 +14644,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13961,7 +14668,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -13985,7 +14692,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14009,7 +14716,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14033,7 +14740,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14057,7 +14764,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14081,7 +14788,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14105,7 +14812,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14129,7 +14836,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14153,7 +14860,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14177,7 +14884,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14201,7 +14908,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14225,7 +14932,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14249,7 +14956,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14273,7 +14980,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14297,7 +15004,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14321,7 +15028,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14345,7 +15052,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14369,7 +15076,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14393,7 +15100,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14417,7 +15124,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14441,7 +15148,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14465,7 +15172,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14489,7 +15196,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14513,7 +15220,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14537,7 +15244,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14561,7 +15268,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14585,7 +15292,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14609,7 +15316,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14633,7 +15340,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14657,7 +15364,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14681,7 +15388,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14705,7 +15412,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14729,7 +15436,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14753,7 +15460,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14777,7 +15484,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14801,7 +15508,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14825,7 +15532,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14849,7 +15556,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14873,7 +15580,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14897,7 +15604,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14921,7 +15628,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14945,7 +15652,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14969,7 +15676,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -14993,7 +15700,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15017,7 +15724,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15041,7 +15748,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15065,7 +15772,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15089,7 +15796,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15113,7 +15820,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15137,7 +15844,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15161,7 +15868,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15185,7 +15892,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15209,7 +15916,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15233,7 +15940,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15257,7 +15964,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15281,7 +15988,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15305,7 +16012,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15329,7 +16036,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15353,7 +16060,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15377,7 +16084,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15401,7 +16108,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15425,7 +16132,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15449,7 +16156,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 2, - 140 + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15473,7 +16180,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15497,7 +16204,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15521,7 +16228,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15545,7 +16252,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 0 + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -15559,7 +16266,7 @@ local skill = { ["skill_type"]=5, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=1, @@ -15572,7 +16279,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=1, @@ -15582,7 +16289,7 @@ local skill = { ["skill_type"]=7, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=1, @@ -15595,7 +16302,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=1, @@ -15608,7 +16315,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=1, @@ -15622,7 +16329,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=1, @@ -15636,7 +16343,7 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=1, @@ -15649,14 +16356,99 @@ local skill = { }, ["skill_position"]={ 2, - 140 + 0 }, ["cd"]=2, ["cd_start"]=1, ["name_act"]="skill01" + }, + [10401]={ + ["effect_type"]=2, + ["trigger"]=2, + ["effect"]={ + { + ["type"]="dec_dmg_red_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 0 + } + }, + [10402]={ + ["effect_type"]=2, + ["trigger"]=2, + ["effect"]={ + { + ["type"]="dec_dmg_yellow_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 0 + } + }, + [10403]={ + ["effect_type"]=2, + ["trigger"]=2, + ["effect"]={ + { + ["type"]="dec_dmg_green_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 0 + } + }, + [10404]={ + ["effect_type"]=2, + ["trigger"]=2, + ["effect"]={ + { + ["type"]="dec_dmg_blue_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 0 + } + }, + [10405]={ + ["effect_type"]=2, + ["trigger"]=2, + ["effect"]={ + { + ["type"]="dec_dmg_purple_add", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 0 + } } } local config = { -data=skill,count=596 +data=skill,count=626 } 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 20fd7300..e4e1e462 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -1885,7 +1885,7 @@ local skill_rogue = { [2400202]={ ["limit_times"]=1, ["weight"]=3000, - ["qlt"]=3, + ["qlt"]=4, ["type"]=12, ["skill_position"]=2, ["effect"]={ @@ -1900,7 +1900,6 @@ local skill_rogue = { ["icon"]="144" }, [2400203]={ - ["unlock"]=2400201, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -2489,7 +2488,12 @@ local skill_rogue = { [3400201]={ ["limit_times"]=1, ["weight"]=3000, + ["qlt"]=3, ["type"]=1, + ["parameter"]={ + 3400221 + }, + ["skill_position"]=3, ["icon"]="150" }, [3400202]={ @@ -2512,19 +2516,41 @@ local skill_rogue = { [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, - ["type"]=12, + ["qlt"]=4, + ["type"]=9, + ["skill_position"]=3, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=3400222, + ["ratio"]=10000, + ["round"]=999 + } + }, ["obj"]=5, ["icon"]="154" }, @@ -2532,6 +2558,7 @@ local skill_rogue = { ["unlock"]=3400201, ["limit_times"]=1, ["weight"]=3000, + ["qlt"]=3, ["type"]=2, ["skill_position"]=3, ["boardrange"]={ @@ -2551,7 +2578,17 @@ local skill_rogue = { ["cover_unlock"]=3400205, ["limit_times"]=1, ["weight"]=3000, - ["type"]=12, + ["qlt"]=3, + ["type"]=9, + ["skill_position"]=3, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=3400223, + ["ratio"]=10000, + ["round"]=999 + } + }, ["obj"]=5, ["icon"]="156" }, @@ -3034,6 +3071,140 @@ local skill_rogue = { ["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]={ ["limit_times"]=1, ["weight"]=100000, @@ -3515,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=228 +data=skill_rogue,count=244 } return config \ No newline at end of file diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 9b297e79..1fee1af8 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -54,7 +54,7 @@ end function BattleController:getNotInvolvedSkills() if not self.notInvolvedSkills then self.notInvolvedSkills = {} - local config = self:getchapterConfig()[self.chapterId] + local config = self:getChapterConfig()[self.chapterId] if config.not_involved_skill then for _, skillId in ipairs(config.not_involved_skill) do self.notInvolvedSkills[skillId] = true @@ -76,7 +76,7 @@ end function BattleController:getSealElementType() if not self.sealElementType then self.sealElementType = {} - local config = self:getchapterConfig()[self.chapterId] + local config = self:getChapterConfig()[self.chapterId] if config.seal_element then for _, elementType in ipairs(config.seal_element) do self.sealElementType[elementType] = true @@ -189,7 +189,7 @@ function BattleController:initDefUnits(callback) end function BattleController:generateNextMonster() - local config = self:getchapterConfig()[self.chapterId] + local config = self:getChapterConfig()[self.chapterId] local monsterId = config.monster[self.waveIndex + 1] if monsterId == nil then return self:enterNextWave() diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua index a57a8395..532e0b5a 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua @@ -10,7 +10,25 @@ function BattleControllerDungeonGold:getChapterConfig() end function BattleControllerDungeonGold:getChapterId() - return ModuleManager.DungeonData:getCurFightChapterId() + return DataManager.DungeonData:getCurFightChapterId() +end + +function BattleControllerDungeonGold:enterRoundBegin(...) + if self.dungeonGoldMaxRoundCount then + local nextWaveRound = (self.waveRoundCount[self.waveIndex] or 0) + 1 + if self.dungeonGoldMaxRoundCount < nextWaveRound then -- 超过最大回合, 直接结算 + self.victory = false + self:postWaveOver(false) + self:battleEnd() + return + end + end + BattleController.enterRoundBegin(self, ...) +end + +-- 不同模块的战斗需要初始化的东西 +function BattleControllerDungeonGold:initOther() + self.dungeonGoldMaxRoundCount = self:getBoardConfig()[self.chapterId].wave_limit or 1 end function BattleControllerDungeonGold:controllBattleEnd() diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua b/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua index 5cf37214..17bf58dc 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua @@ -10,7 +10,7 @@ function BattleControllerDungeonShards:getChapterConfig() end function BattleControllerDungeonShards:getChapterId() - return ModuleManager.DungeonData:getCurFightChapterId() + return DataManager.DungeonData:getCurFightChapterId() end function BattleControllerDungeonShards:controllBattleEnd() diff --git a/lua/app/module/dungeon/dungeon_manager.lua b/lua/app/module/dungeon/dungeon_manager.lua index 8c4e58a4..2ddbc261 100644 --- a/lua/app/module/dungeon/dungeon_manager.lua +++ b/lua/app/module/dungeon/dungeon_manager.lua @@ -38,19 +38,19 @@ end function DungeonManager:reqChallengeGold(id) local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD -- 判断次数 - if not DataManager.DungeonData:getRemainTimes(moduleKey) > 0 then + if 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 + if not DataManager.DungeonData:isEnoughHp(moduleKey) then GFunc.showItemNotEnough(GConst.ItemConst.ITEM_ID_VIT) ModuleManager.CommerceManager:showBuyVitUI() return end - if not DataManager.DailyChallengeData:isCanChallenge(moduleKey) then + if not DataManager.DungeonData:isCanChallenge(moduleKey) then return end @@ -92,19 +92,19 @@ end function DungeonManager:reqSweepGold(id) local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD -- 判断次数 - if not DataManager.DungeonData:getRemainTimes(moduleKey) > 0 then + if 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 + if not DataManager.DungeonData:isEnoughHp(moduleKey) then GFunc.showItemNotEnough(GConst.ItemConst.ITEM_ID_VIT) ModuleManager.CommerceManager:showBuyVitUI() return end - if not DataManager.DailyChallengeData:isCanChallenge(moduleKey) then + if not DataManager.DungeonData:isCanChallenge(moduleKey) then return end @@ -125,19 +125,19 @@ end function DungeonManager:reqChallengeShards(id) local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD -- 判断次数 - if not DataManager.DungeonData:getRemainTimes(moduleKey) > 0 then + if 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 + if not DataManager.DungeonData:isEnoughHp(moduleKey) then GFunc.showItemNotEnough(GConst.ItemConst.ITEM_ID_VIT) ModuleManager.CommerceManager:showBuyVitUI() return end - if not DataManager.DailyChallengeData:isCanChallenge(moduleKey) then + if not DataManager.DungeonData:isCanChallenge(moduleKey) then return end @@ -178,19 +178,19 @@ end function DungeonManager:reqSweepShards(id) local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_SHARDS -- 判断次数 - if not DataManager.DungeonData:getRemainTimes(moduleKey) > 0 then + if 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 + if not DataManager.DungeonData:isEnoughHp(moduleKey) then GFunc.showItemNotEnough(GConst.ItemConst.ITEM_ID_VIT) ModuleManager.CommerceManager:showBuyVitUI() return end - if not DataManager.DailyChallengeData:isCanChallenge(moduleKey) then + if not DataManager.DungeonData:isCanChallenge(moduleKey) then return end diff --git a/lua/app/userdata/dungeon/dungeon_data.lua b/lua/app/userdata/dungeon/dungeon_data.lua index d773b316..e75b3db3 100644 --- a/lua/app/userdata/dungeon/dungeon_data.lua +++ b/lua/app/userdata/dungeon/dungeon_data.lua @@ -17,13 +17,13 @@ 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 + -- 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) From 5def9aed8a489a92fdab004273dd936283c644c5 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 12 Jun 2023 18:54:27 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E6=88=98=E6=96=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/battle/controller/battle_controller_dungeon_gold.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua index 532e0b5a..9f8c1d89 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua @@ -28,7 +28,7 @@ end -- 不同模块的战斗需要初始化的东西 function BattleControllerDungeonGold:initOther() - self.dungeonGoldMaxRoundCount = self:getBoardConfig()[self.chapterId].wave_limit or 1 + self.dungeonGoldMaxRoundCount = self:getChapterConfig()[self.chapterId].wave_limit or 1 end function BattleControllerDungeonGold:controllBattleEnd() From 43826faab8928693d938356e1b1fba350bd2f8e2 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 13 Jun 2023 10:16:58 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/battle/controller/battle_controller.lua | 11 ++++++++--- .../controller/battle_controller_dungeon_gold.lua | 14 +++++++++++++- lua/app/ui/battle/battle_result_ui.lua | 12 ++++++++++++ lua/app/ui/battle/battle_ui.lua | 6 +++++- 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 1fee1af8..71296f28 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -377,6 +377,13 @@ function BattleController:getChessBoardBgName() return chapterInfo.chess_board end +function BattleController:refreshWave() + if not self.battleUI then + return + end + self.battleUI:refreshWave(self.waveIndex) +end + -- *************各个子模块的战斗需要重写的方法 END************* function BattleController:ctor() @@ -660,9 +667,7 @@ function BattleController:enterNextWave() end self.waveIndex = self.waveIndex + 1 - if self.battleUI then - self.battleUI:refreshWave(self.waveIndex) - end + self:refreshWave(self.waveIndex) if self.waveIndex == 1 then -- 第一波 self.needWaitingBoardOver = true self:generateBoard(true) diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua index 9f8c1d89..549fd367 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua @@ -13,9 +13,13 @@ function BattleControllerDungeonGold:getChapterId() return DataManager.DungeonData:getCurFightChapterId() end +function BattleControllerDungeonGold:refreshWave() +end + function BattleControllerDungeonGold:enterRoundBegin(...) + local nextWaveRound = 0 if self.dungeonGoldMaxRoundCount then - local nextWaveRound = (self.waveRoundCount[self.waveIndex] or 0) + 1 + nextWaveRound = (self.waveRoundCount[self.waveIndex] or 0) + 1 if self.dungeonGoldMaxRoundCount < nextWaveRound then -- 超过最大回合, 直接结算 self.victory = false self:postWaveOver(false) @@ -23,12 +27,19 @@ function BattleControllerDungeonGold:enterRoundBegin(...) return end end + if self.battleUI then + self.battleUI:refreshWave(nextWaveRound, GConst.ATLAS_PATH.COMMON, "common_dec_15") + end BattleController.enterRoundBegin(self, ...) end -- 不同模块的战斗需要初始化的东西 function BattleControllerDungeonGold:initOther() self.dungeonGoldMaxRoundCount = self:getChapterConfig()[self.chapterId].wave_limit or 1 + + if self.battleUI then + self.battleUI:refreshWave(1, GConst.ATLAS_PATH.COMMON, "common_dec_15") + end end function BattleControllerDungeonGold:controllBattleEnd() @@ -36,6 +47,7 @@ function BattleControllerDungeonGold:controllBattleEnd() battleType = GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD, wave = self.waveIndex, victory = self.victory, + waveRoundCount = self.waveRoundCount, } local atkReport = {} local teamEntity = DataManager.BattleData:getAtkTeam() diff --git a/lua/app/ui/battle/battle_result_ui.lua b/lua/app/ui/battle/battle_result_ui.lua index b61b9086..562552f8 100644 --- a/lua/app/ui/battle/battle_result_ui.lua +++ b/lua/app/ui/battle/battle_result_ui.lua @@ -95,6 +95,18 @@ function BattleResultUI:refreshFixedInfo() desc3:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_7, GFunc.num2Str(self.totalDmg))) rewardTitle:setText(I18N:getGlobalText(I18N.GlobalConst.REWARD_DESC)) continue:setText(I18N:getGlobalText(I18N.GlobalConst.CONTINUE_DESC)) + + local iconName = "common_dec_3" + if self.battleType == GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD then + iconName = "common_dec_15" + local round = 0 + if self.combatReport.waveRoundCount then + round = self.combatReport.waveRoundCount[1] or 0 + end + desc2:setText(round) + end + icon:setSprite(GConst.ATLAS_PATH.COMMON, iconName) + GFunc.centerImgAndTx(icon, desc2, 7) end diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index 9a558fa6..6e179293 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -1644,12 +1644,16 @@ function BattleUI:refreshLv() self.lastLv = lv end -function BattleUI:refreshWave(wave) +function BattleUI:refreshWave(wave, iconAtlas, iconName) local uiMap = self.root:genAllChildren() local icon = uiMap["battle_ui.top_node.wave_icon"] local desc = uiMap["battle_ui.top_node.wave_desc"] desc:setText(wave) GFunc.centerImgAndTx(icon, desc, 10) + + iconAtlas = iconAtlas or GConst.ATLAS_PATH.COMMON + iconName = iconName or "common_dec_3" + icon:setSprite(iconAtlas, iconName) end function BattleUI:getSfxLine(index, func) From 90bd77a4b7c4e2aa7b86d32cba8e8d51d74d4648 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 13 Jun 2023 10:36:44 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battle/controller/battle_controller_dungeon_gold.lua | 7 ++++--- lua/app/ui/battle/battle_result_ui.lua | 5 +---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua index 549fd367..3b1746da 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua @@ -28,7 +28,7 @@ function BattleControllerDungeonGold:enterRoundBegin(...) end end if self.battleUI then - self.battleUI:refreshWave(nextWaveRound, GConst.ATLAS_PATH.COMMON, "common_dec_15") + self.battleUI:refreshWave(self.dungeonGoldMaxRoundCount - nextWaveRound + 1, GConst.ATLAS_PATH.COMMON, "common_dec_15") end BattleController.enterRoundBegin(self, ...) end @@ -38,16 +38,17 @@ function BattleControllerDungeonGold:initOther() self.dungeonGoldMaxRoundCount = self:getChapterConfig()[self.chapterId].wave_limit or 1 if self.battleUI then - self.battleUI:refreshWave(1, GConst.ATLAS_PATH.COMMON, "common_dec_15") + self.battleUI:refreshWave(self.dungeonGoldMaxRoundCount, GConst.ATLAS_PATH.COMMON, "common_dec_15") end end function BattleControllerDungeonGold:controllBattleEnd() + local remainRound = self.dungeonGoldMaxRoundCount - (self.waveRoundCount[1] or 0) self.combatReport = { battleType = GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD, wave = self.waveIndex, victory = self.victory, - waveRoundCount = self.waveRoundCount, + remainRound = remainRound, } local atkReport = {} local teamEntity = DataManager.BattleData:getAtkTeam() diff --git a/lua/app/ui/battle/battle_result_ui.lua b/lua/app/ui/battle/battle_result_ui.lua index 562552f8..5e20ad50 100644 --- a/lua/app/ui/battle/battle_result_ui.lua +++ b/lua/app/ui/battle/battle_result_ui.lua @@ -99,10 +99,7 @@ function BattleResultUI:refreshFixedInfo() local iconName = "common_dec_3" if self.battleType == GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD then iconName = "common_dec_15" - local round = 0 - if self.combatReport.waveRoundCount then - round = self.combatReport.waveRoundCount[1] or 0 - end + local round = self.combatReport.remainRound or 0 desc2:setText(round) end icon:setSprite(GConst.ATLAS_PATH.COMMON, iconName) From a788b1cb8ce68f7b4ee5299f14a0a0dcb72cc948 Mon Sep 17 00:00:00 2001 From: Fang Date: Tue, 13 Jun 2023 15:45:38 +0800 Subject: [PATCH 15/20] =?UTF-8?q?ui=E8=B5=84=E6=BA=90=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/act_growup_gift.lua | 60 +- lua/app/config/avatar.lua | 21 + lua/app/config/avatar.lua.meta | 10 + lua/app/config/avatar_frame.lua | 9 + lua/app/config/avatar_frame.lua.meta | 10 + lua/app/config/chapter.lua | 1097 ++- lua/app/config/chapter_board.lua | 5982 ++++++++++++++++- lua/app/config/const.lua | 12 +- lua/app/config/grid_type.lua | 36 +- lua/app/config/item.lua | 7 +- .../localization_global_const.lua | 1 + lua/app/config/monster_chapter.lua | 1347 +++- lua/app/config/strings/cn/avatar.lua | 18 + lua/app/config/strings/cn/avatar.lua.meta | 10 + lua/app/config/strings/cn/avatar_frame.lua | 9 + .../config/strings/cn/avatar_frame.lua.meta | 10 + lua/app/config/strings/cn/chapter.lua | 17 +- lua/app/config/strings/cn/global.lua | 1 + lua/app/config/strings/cn/item.lua | 6 +- lua/app/config/strings/de/avatar.lua | 18 + lua/app/config/strings/de/avatar.lua.meta | 10 + lua/app/config/strings/de/avatar_frame.lua | 9 + .../config/strings/de/avatar_frame.lua.meta | 10 + lua/app/config/strings/de/chapter.lua | 17 +- lua/app/config/strings/de/item.lua | 5 +- lua/app/config/strings/en/avatar.lua | 18 + lua/app/config/strings/en/avatar.lua.meta | 10 + lua/app/config/strings/en/avatar_frame.lua | 9 + .../config/strings/en/avatar_frame.lua.meta | 10 + lua/app/config/strings/en/chapter.lua | 17 +- lua/app/config/strings/en/item.lua | 5 +- lua/app/config/strings/fr/avatar.lua | 18 + lua/app/config/strings/fr/avatar.lua.meta | 10 + lua/app/config/strings/fr/avatar_frame.lua | 9 + .../config/strings/fr/avatar_frame.lua.meta | 10 + lua/app/config/strings/fr/chapter.lua | 17 +- lua/app/config/strings/fr/item.lua | 5 +- lua/app/config/strings/id/avatar.lua | 18 + lua/app/config/strings/id/avatar.lua.meta | 10 + lua/app/config/strings/id/avatar_frame.lua | 9 + .../config/strings/id/avatar_frame.lua.meta | 10 + lua/app/config/strings/id/chapter.lua | 17 +- lua/app/config/strings/id/item.lua | 5 +- lua/app/config/strings/ja/avatar.lua | 18 + lua/app/config/strings/ja/avatar.lua.meta | 10 + lua/app/config/strings/ja/avatar_frame.lua | 9 + .../config/strings/ja/avatar_frame.lua.meta | 10 + lua/app/config/strings/ja/chapter.lua | 17 +- lua/app/config/strings/ja/item.lua | 5 +- lua/app/config/strings/ko/avatar.lua | 18 + lua/app/config/strings/ko/avatar.lua.meta | 10 + lua/app/config/strings/ko/avatar_frame.lua | 9 + .../config/strings/ko/avatar_frame.lua.meta | 10 + lua/app/config/strings/ko/chapter.lua | 17 +- lua/app/config/strings/ko/item.lua | 5 +- lua/app/config/strings/pt/avatar.lua | 18 + lua/app/config/strings/pt/avatar.lua.meta | 10 + lua/app/config/strings/pt/avatar_frame.lua | 9 + .../config/strings/pt/avatar_frame.lua.meta | 10 + lua/app/config/strings/pt/chapter.lua | 17 +- lua/app/config/strings/pt/item.lua | 5 +- lua/app/config/strings/ru/avatar.lua | 18 + lua/app/config/strings/ru/avatar.lua.meta | 10 + lua/app/config/strings/ru/avatar_frame.lua | 9 + .../config/strings/ru/avatar_frame.lua.meta | 10 + lua/app/config/strings/ru/chapter.lua | 17 +- lua/app/config/strings/ru/item.lua | 5 +- lua/app/config/strings/th/avatar.lua | 18 + lua/app/config/strings/th/avatar.lua.meta | 10 + lua/app/config/strings/th/avatar_frame.lua | 9 + .../config/strings/th/avatar_frame.lua.meta | 10 + lua/app/config/strings/th/chapter.lua | 17 +- lua/app/config/strings/th/item.lua | 5 +- lua/app/config/strings/vi/avatar.lua | 18 + lua/app/config/strings/vi/avatar.lua.meta | 10 + lua/app/config/strings/vi/avatar_frame.lua | 9 + .../config/strings/vi/avatar_frame.lua.meta | 10 + lua/app/config/strings/vi/chapter.lua | 17 +- lua/app/config/strings/vi/item.lua | 5 +- lua/app/config/strings/zh/avatar.lua | 18 + lua/app/config/strings/zh/avatar.lua.meta | 10 + lua/app/config/strings/zh/avatar_frame.lua | 9 + .../config/strings/zh/avatar_frame.lua.meta | 10 + lua/app/config/strings/zh/chapter.lua | 17 +- lua/app/config/strings/zh/item.lua | 5 +- lua/app/global/global_const.lua | 1 + lua/app/ui/common/cell/reward_cell.lua | 12 - lua/app/ui/dungeon/dungeon_board_cell.lua | 53 +- lua/app/ui/dungeon/dungeon_difficulty_ui.lua | 100 +- .../ui/main_city/component/chapter_comp.lua | 4 + .../component/daily_challenge_comp.lua | 4 + .../ui/main_city/component/dungeon_comp.lua | 4 + lua/app/ui/main_city/component/main_comp.lua | 4 + .../component/main_comp_base_cell.lua | 4 + lua/app/userdata/dungeon/dungeon_data.lua | 20 +- .../dungeon/dungeon_data_base_comp.lua | 8 +- .../dungeon/dungeon_gold_data_comp.lua | 14 +- .../dungeon/dungeon_shards_data_comp.lua | 36 +- 98 files changed, 9527 insertions(+), 159 deletions(-) create mode 100644 lua/app/config/avatar.lua create mode 100644 lua/app/config/avatar.lua.meta create mode 100644 lua/app/config/avatar_frame.lua create mode 100644 lua/app/config/avatar_frame.lua.meta create mode 100644 lua/app/config/strings/cn/avatar.lua create mode 100644 lua/app/config/strings/cn/avatar.lua.meta create mode 100644 lua/app/config/strings/cn/avatar_frame.lua create mode 100644 lua/app/config/strings/cn/avatar_frame.lua.meta create mode 100644 lua/app/config/strings/de/avatar.lua create mode 100644 lua/app/config/strings/de/avatar.lua.meta create mode 100644 lua/app/config/strings/de/avatar_frame.lua create mode 100644 lua/app/config/strings/de/avatar_frame.lua.meta create mode 100644 lua/app/config/strings/en/avatar.lua create mode 100644 lua/app/config/strings/en/avatar.lua.meta create mode 100644 lua/app/config/strings/en/avatar_frame.lua create mode 100644 lua/app/config/strings/en/avatar_frame.lua.meta create mode 100644 lua/app/config/strings/fr/avatar.lua create mode 100644 lua/app/config/strings/fr/avatar.lua.meta create mode 100644 lua/app/config/strings/fr/avatar_frame.lua create mode 100644 lua/app/config/strings/fr/avatar_frame.lua.meta create mode 100644 lua/app/config/strings/id/avatar.lua create mode 100644 lua/app/config/strings/id/avatar.lua.meta create mode 100644 lua/app/config/strings/id/avatar_frame.lua create mode 100644 lua/app/config/strings/id/avatar_frame.lua.meta create mode 100644 lua/app/config/strings/ja/avatar.lua create mode 100644 lua/app/config/strings/ja/avatar.lua.meta create mode 100644 lua/app/config/strings/ja/avatar_frame.lua create mode 100644 lua/app/config/strings/ja/avatar_frame.lua.meta create mode 100644 lua/app/config/strings/ko/avatar.lua create mode 100644 lua/app/config/strings/ko/avatar.lua.meta create mode 100644 lua/app/config/strings/ko/avatar_frame.lua create mode 100644 lua/app/config/strings/ko/avatar_frame.lua.meta create mode 100644 lua/app/config/strings/pt/avatar.lua create mode 100644 lua/app/config/strings/pt/avatar.lua.meta create mode 100644 lua/app/config/strings/pt/avatar_frame.lua create mode 100644 lua/app/config/strings/pt/avatar_frame.lua.meta create mode 100644 lua/app/config/strings/ru/avatar.lua create mode 100644 lua/app/config/strings/ru/avatar.lua.meta create mode 100644 lua/app/config/strings/ru/avatar_frame.lua create mode 100644 lua/app/config/strings/ru/avatar_frame.lua.meta create mode 100644 lua/app/config/strings/th/avatar.lua create mode 100644 lua/app/config/strings/th/avatar.lua.meta create mode 100644 lua/app/config/strings/th/avatar_frame.lua create mode 100644 lua/app/config/strings/th/avatar_frame.lua.meta create mode 100644 lua/app/config/strings/vi/avatar.lua create mode 100644 lua/app/config/strings/vi/avatar.lua.meta create mode 100644 lua/app/config/strings/vi/avatar_frame.lua create mode 100644 lua/app/config/strings/vi/avatar_frame.lua.meta create mode 100644 lua/app/config/strings/zh/avatar.lua create mode 100644 lua/app/config/strings/zh/avatar.lua.meta create mode 100644 lua/app/config/strings/zh/avatar_frame.lua create mode 100644 lua/app/config/strings/zh/avatar_frame.lua.meta diff --git a/lua/app/config/act_growup_gift.lua b/lua/app/config/act_growup_gift.lua index c56d5715..dbbb6300 100644 --- a/lua/app/config/act_growup_gift.lua +++ b/lua/app/config/act_growup_gift.lua @@ -1,5 +1,5 @@ local act_growup_gift = { - [1014]={ + [10104]={ ["hero_id"]=14001, ["recharge_id"]=7, ["reward"]={ @@ -34,7 +34,7 @@ local act_growup_gift = { ["limit"]=1, ["value"]=800 }, - [1024]={ + [10204]={ ["hero_id"]=14001, ["recharge_id"]=10, ["reward"]={ @@ -69,7 +69,7 @@ local act_growup_gift = { ["limit"]=1, ["value"]=800 }, - [1034]={ + [10304]={ ["hero_id"]=14001, ["recharge_id"]=13, ["reward"]={ @@ -104,7 +104,7 @@ local act_growup_gift = { ["limit"]=1, ["value"]=800 }, - [1044]={ + [10404]={ ["hero_id"]=14001, ["recharge_id"]=15, ["reward"]={ @@ -139,7 +139,7 @@ local act_growup_gift = { ["limit"]=1, ["value"]=800 }, - [1054]={ + [10504]={ ["hero_id"]=14001, ["recharge_id"]=17, ["reward"]={ @@ -174,7 +174,7 @@ local act_growup_gift = { ["limit"]=1, ["value"]=800 }, - [1064]={ + [10604]={ ["hero_id"]=14001, ["recharge_id"]=18, ["reward"]={ @@ -210,7 +210,7 @@ local act_growup_gift = { ["value"]=800, ["last"]=1 }, - [2014]={ + [11104]={ ["hero_id"]=24001, ["recharge_id"]=7, ["reward"]={ @@ -246,7 +246,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [2024]={ + [11204]={ ["hero_id"]=24001, ["recharge_id"]=10, ["reward"]={ @@ -282,7 +282,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [2034]={ + [11304]={ ["hero_id"]=24001, ["recharge_id"]=13, ["reward"]={ @@ -318,7 +318,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [2044]={ + [11404]={ ["hero_id"]=24001, ["recharge_id"]=15, ["reward"]={ @@ -354,7 +354,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [2054]={ + [11504]={ ["hero_id"]=24001, ["recharge_id"]=17, ["reward"]={ @@ -390,7 +390,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [2064]={ + [11604]={ ["hero_id"]=24001, ["recharge_id"]=18, ["reward"]={ @@ -427,7 +427,7 @@ local act_growup_gift = { ["value_2"]=1, ["last"]=1 }, - [3014]={ + [12104]={ ["hero_id"]=34001, ["recharge_id"]=7, ["reward"]={ @@ -463,7 +463,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [3024]={ + [12204]={ ["hero_id"]=34001, ["recharge_id"]=10, ["reward"]={ @@ -499,7 +499,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [3034]={ + [12304]={ ["hero_id"]=34001, ["recharge_id"]=13, ["reward"]={ @@ -535,7 +535,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [3044]={ + [12404]={ ["hero_id"]=34001, ["recharge_id"]=15, ["reward"]={ @@ -571,7 +571,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [3054]={ + [12504]={ ["hero_id"]=34001, ["recharge_id"]=17, ["reward"]={ @@ -607,7 +607,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [3064]={ + [12604]={ ["hero_id"]=34001, ["recharge_id"]=18, ["reward"]={ @@ -644,7 +644,7 @@ local act_growup_gift = { ["value_2"]=1, ["last"]=1 }, - [4014]={ + [13104]={ ["hero_id"]=44001, ["recharge_id"]=7, ["reward"]={ @@ -680,7 +680,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [4024]={ + [13204]={ ["hero_id"]=44001, ["recharge_id"]=10, ["reward"]={ @@ -716,7 +716,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [4034]={ + [13304]={ ["hero_id"]=44001, ["recharge_id"]=13, ["reward"]={ @@ -752,7 +752,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [4044]={ + [13404]={ ["hero_id"]=44001, ["recharge_id"]=15, ["reward"]={ @@ -788,7 +788,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [4054]={ + [13504]={ ["hero_id"]=44001, ["recharge_id"]=17, ["reward"]={ @@ -824,7 +824,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [4064]={ + [13604]={ ["hero_id"]=44001, ["recharge_id"]=18, ["reward"]={ @@ -861,7 +861,7 @@ local act_growup_gift = { ["value_2"]=1, ["last"]=1 }, - [5014]={ + [14104]={ ["hero_id"]=54001, ["recharge_id"]=7, ["reward"]={ @@ -897,7 +897,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [5024]={ + [14204]={ ["hero_id"]=54001, ["recharge_id"]=10, ["reward"]={ @@ -933,7 +933,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [5034]={ + [14304]={ ["hero_id"]=54001, ["recharge_id"]=13, ["reward"]={ @@ -969,7 +969,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [5044]={ + [14404]={ ["hero_id"]=54001, ["recharge_id"]=15, ["reward"]={ @@ -1005,7 +1005,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [5054]={ + [14504]={ ["hero_id"]=54001, ["recharge_id"]=17, ["reward"]={ @@ -1041,7 +1041,7 @@ local act_growup_gift = { ["value"]=800, ["value_2"]=1 }, - [5064]={ + [14604]={ ["hero_id"]=54001, ["recharge_id"]=18, ["reward"]={ diff --git a/lua/app/config/avatar.lua b/lua/app/config/avatar.lua new file mode 100644 index 00000000..bcd711b1 --- /dev/null +++ b/lua/app/config/avatar.lua @@ -0,0 +1,21 @@ +local avatar = { + [1001]={ + ["hero"]=12001 + }, + [2001]={ + ["hero"]=22001, + ["unlock"]=1 + }, + [3001]={ + ["hero"]=32001, + ["unlock"]=1 + }, + [4001]={ + ["hero"]=42001, + ["unlock"]=1 + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/avatar.lua.meta b/lua/app/config/avatar.lua.meta new file mode 100644 index 00000000..541470ef --- /dev/null +++ b/lua/app/config/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fe59ab7c592d4c141b9fa28289bc898d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/avatar_frame.lua b/lua/app/config/avatar_frame.lua new file mode 100644 index 00000000..584db941 --- /dev/null +++ b/lua/app/config/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["unlock"]=1 + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/avatar_frame.lua.meta b/lua/app/config/avatar_frame.lua.meta new file mode 100644 index 00000000..68879273 --- /dev/null +++ b/lua/app/config/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8d387a3ff3bff68488370d1ca79c39d5 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 4c84a2f7..fb2ededa 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -6070,6 +6070,7 @@ local chapter = { }, [30]={ ["before_chapter"]=29, + ["next_chapter"]=31, ["icon"]="chapter_25", ["scene"]="bg_25", ["block_icon"]="battle_hinder_25", @@ -6285,9 +6286,1103 @@ local chapter = { 56635, 101640 } + }, + [31]={ + ["before_chapter"]=30, + ["next_chapter"]=32, + ["icon"]="chapter_25", + ["scene"]="bg_25", + ["block_icon"]="battle_hinder_25", + ["chess_board"]="chessboard_3", + ["board"]={ + 115, + 116, + 117, + 118 + }, + ["monster"]={ + 57201, + 57301, + 57401, + 57501, + 57601, + 57701, + 57801, + 57901, + 58001, + 58101, + 58201, + 58301, + 58401, + 58501, + 58601, + 58701, + 58801, + 58901, + 59001, + 59101 + }, + ["mystery_box"]={ + 1, + 4 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + ["wave_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=12, + ["id_for_nothing"]="Vwo=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + ["boss_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=12, + ["id_for_nothing"]="Vwo=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + ["finish_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["box_num"]={ + 10, + 15, + 20 + }, + ["box_reward_1"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + ["box_reward_2"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + } + }, + ["box_reward_3"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14, + ["id_for_nothing"]="Vww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["idle_exp"]=30, + ["idle_gold"]=20, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=4, + ["num"]=1, + ["weight"]=65 + }, + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=35 + } + }, + ["daily_challenge_difficulty"]={ + 56635, + 101640 + } + }, + [32]={ + ["before_chapter"]=31, + ["next_chapter"]=33, + ["icon"]="chapter_25", + ["scene"]="bg_25", + ["block_icon"]="battle_hinder_25", + ["chess_board"]="chessboard_3", + ["board"]={ + 119, + 120, + 121, + 122 + }, + ["monster"]={ + 59201, + 59301, + 59401, + 59501, + 59601, + 59701, + 59801, + 59901, + 60001, + 60101, + 60201, + 60301, + 60401, + 60501, + 60601, + 60701, + 60801, + 60901, + 61001, + 61101 + }, + ["mystery_box"]={ + 3, + 4 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + ["wave_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=12, + ["id_for_nothing"]="Vwo=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + ["boss_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=12, + ["id_for_nothing"]="Vwo=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + ["finish_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["box_num"]={ + 10, + 15, + 20 + }, + ["box_reward_1"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + ["box_reward_2"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + } + }, + ["box_reward_3"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14, + ["id_for_nothing"]="Vww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["idle_exp"]=30, + ["idle_gold"]=20, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=4, + ["num"]=1, + ["weight"]=65 + }, + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=35 + } + }, + ["daily_challenge_difficulty"]={ + 56635, + 101640 + } + }, + [33]={ + ["before_chapter"]=32, + ["next_chapter"]=34, + ["icon"]="chapter_25", + ["scene"]="bg_25", + ["block_icon"]="battle_hinder_25", + ["chess_board"]="chessboard_3", + ["board"]={ + 123, + 124, + 125, + 126 + }, + ["monster"]={ + 61201, + 61301, + 61401, + 61501, + 61601, + 61701, + 61801, + 61901, + 62001, + 62101, + 62201, + 62301, + 62401, + 62501, + 62601, + 62701, + 62801, + 62901, + 63001, + 63101 + }, + ["mystery_box"]={ + 1, + 3 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + ["wave_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=12, + ["id_for_nothing"]="Vwo=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + ["boss_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=12, + ["id_for_nothing"]="Vwo=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + ["finish_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["box_num"]={ + 10, + 15, + 20 + }, + ["box_reward_1"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + ["box_reward_2"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + } + }, + ["box_reward_3"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14, + ["id_for_nothing"]="Vww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["idle_exp"]=30, + ["idle_gold"]=20, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=4, + ["num"]=1, + ["weight"]=65 + }, + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=35 + } + }, + ["daily_challenge_difficulty"]={ + 56635, + 101640 + } + }, + [34]={ + ["before_chapter"]=33, + ["next_chapter"]=35, + ["icon"]="chapter_25", + ["scene"]="bg_25", + ["block_icon"]="battle_hinder_25", + ["chess_board"]="chessboard_3", + ["board"]={ + 127, + 128, + 129, + 130 + }, + ["monster"]={ + 63201, + 63301, + 63401, + 63501, + 63601, + 63701, + 63801, + 63901, + 64001, + 64101, + 64201, + 64301, + 64401, + 64501, + 64601, + 64701, + 64801, + 64901, + 65001, + 65101 + }, + ["mystery_box"]={ + 1, + 2 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + ["wave_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=12, + ["id_for_nothing"]="Vwo=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + ["boss_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=12, + ["id_for_nothing"]="Vwo=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + ["finish_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["box_num"]={ + 10, + 15, + 20 + }, + ["box_reward_1"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + ["box_reward_2"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + } + }, + ["box_reward_3"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14, + ["id_for_nothing"]="Vww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["idle_exp"]=30, + ["idle_gold"]=20, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=4, + ["num"]=1, + ["weight"]=65 + }, + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=35 + } + }, + ["daily_challenge_difficulty"]={ + 56635, + 101640 + } + }, + [35]={ + ["before_chapter"]=34, + ["icon"]="chapter_25", + ["scene"]="bg_25", + ["block_icon"]="battle_hinder_25", + ["chess_board"]="chessboard_3", + ["board"]={ + 131, + 132, + 133, + 134 + }, + ["monster"]={ + 65201, + 65301, + 65401, + 65501, + 65601, + 65701, + 65801, + 65901, + 66001, + 66101, + 66201, + 66301, + 66401, + 66501, + 66601, + 66701, + 66801, + 66901, + 67001, + 67101 + }, + ["mystery_box"]={ + 2, + 4 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + ["wave_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=12, + ["id_for_nothing"]="Vwo=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + ["boss_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=12, + ["id_for_nothing"]="Vwo=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + ["finish_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["box_num"]={ + 10, + 15, + 20 + }, + ["box_reward_1"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + ["box_reward_2"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + } + }, + ["box_reward_3"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14, + ["id_for_nothing"]="Vww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["idle_exp"]=30, + ["idle_gold"]=20, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=4, + ["num"]=1, + ["weight"]=65 + }, + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=35 + } + }, + ["daily_challenge_difficulty"]={ + 56635, + 101640 + } } } local config = { -data=chapter,count=30 +data=chapter,count=35 } return config \ No newline at end of file diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index 32e29d7c..63acb462 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -33509,9 +33509,5989 @@ local chapter_board = { 5 } } + }, + [115]={ + ["board"]={ + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 36, + 0 + }, + { + 36, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 14, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 36, + 0 + }, + { + 36, + 0 + }, + { + 36, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 36, + 0 + }, + { + 36, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 17, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 36, + 0 + }, + { + 36, + 0 + }, + { + 36, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + } + }, + [116]={ + ["board"]={ + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 36, + 0 + }, + { + 3, + 0 + }, + { + 36, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 14, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [117]={ + ["board"]={ + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 36, + 0 + }, + { + 0, + 0 + }, + { + 36, + 0 + }, + { + 0, + 0 + }, + { + 36, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 14, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + } + }, + [118]={ + ["board"]={ + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 36, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 36, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 36, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 36, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 14, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 36, + 0 + } + }, + ["mystery_box_board"]={ + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 36, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 36, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 36, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 36, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 17, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 36, + 0 + } + } + }, + [119]={ + ["board"]={ + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 36, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 36, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 36, + 0 + }, + { + 0, + 3 + }, + { + 14, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + } + }, + [120]={ + ["board"]={ + { + 1, + 0 + }, + { + 36, + 0 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 36, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 36, + 0 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 14, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 36, + 0 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 36, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 36, + 0 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 17, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + } + } + }, + [121]={ + ["board"]={ + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 36, + 0 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 36, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 36, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 36, + 0 + }, + { + 0, + 0 + }, + { + 14, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 36, + 0 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 36, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 36, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 36, + 0 + }, + { + 0, + 0 + }, + { + 17, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + } + }, + [122]={ + ["board"]={ + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 36, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 36, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 36, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 36, + 0 + }, + { + 14, + 0 + }, + { + 36, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + } + }, + [123]={ + ["board"]={ + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 5 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 14, + 0 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 5 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 17, + 0 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + } + } + }, + [124]={ + ["board"]={ + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, + { + 5, + 3 + }, + { + 1, + 0 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 5 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 1 + }, + { + 4, + 5 + }, + { + 5, + 5 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 5 + }, + { + 1, + 0 + }, + { + 5, + 1 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 1, + 0 + }, + { + 14, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + } + }, + [125]={ + ["board"]={ + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 5, + 3 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, + { + 4, + 2 + }, + { + 5, + 2 + }, + { + 1, + 3 + }, + { + 5, + 3 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 5, + 5 + }, + { + 5, + 4 + }, + { + 5, + 5 + }, + { + 5, + 4 + }, + { + 5, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 3 + }, + { + 5, + 2 + }, + { + 5, + 3 + }, + { + 5, + 1 + }, + { + 5, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, + { + 5, + 1 + }, + { + 14, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 5, + 3 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, + { + 4, + 2 + }, + { + 5, + 2 + }, + { + 1, + 3 + }, + { + 5, + 3 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 5, + 5 + }, + { + 5, + 4 + }, + { + 5, + 5 + }, + { + 5, + 4 + }, + { + 5, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 3 + }, + { + 5, + 2 + }, + { + 5, + 3 + }, + { + 5, + 1 + }, + { + 5, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, + { + 5, + 1 + }, + { + 17, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 1, + 0 + } + } + }, + [126]={ + ["board"]={ + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 4, + 4 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 1, + 0 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 1, + 0 + }, + { + 4, + 2 + }, + { + 1, + 0 + }, + { + 4, + 2 + }, + { + 1, + 0 + }, + { + 4, + 4 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 4, + 2 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 1, + 0 + }, + { + 14, + 0 + }, + { + 1, + 0 + }, + { + 5, + 3 + }, + { + 5, + 3 + } + } + }, + [127]={ + ["board"]={ + { + 21, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 21, + 4 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 37, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 21, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 21, + 5 + }, + { + 14, + 0 + }, + { + 21, + 5 + }, + { + 0, + 0 + }, + { + 37, + 0 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 2 + }, + { + 21, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 1, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 2 + }, + { + 1, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + } + }, + ["mystery_box_board"]={ + { + 21, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 21, + 4 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 37, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 21, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 21, + 5 + }, + { + 17, + 0 + }, + { + 21, + 5 + }, + { + 0, + 0 + }, + { + 37, + 0 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 2 + }, + { + 21, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 1, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 2 + }, + { + 1, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + } + } + }, + [128]={ + ["board"]={ + { + 21, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 5, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 21, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 5, + 2 + }, + { + 37, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 5, + 5 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 21, + 0 + }, + { + 0, + 5 + }, + { + 5, + 5 + }, + { + 5, + 1 + }, + { + 5, + 4 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 14, + 0 + }, + { + 5, + 3 + }, + { + 37, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 0, + 0 + } + }, + ["mystery_box_board"]={ + { + 21, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 5, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 21, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 5, + 2 + }, + { + 37, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 5, + 5 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 21, + 0 + }, + { + 0, + 5 + }, + { + 5, + 5 + }, + { + 5, + 1 + }, + { + 5, + 4 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 17, + 0 + }, + { + 5, + 3 + }, + { + 37, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 0, + 0 + } + } + }, + [129]={ + ["board"]={ + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 37, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 1, + 0 + }, + { + 21, + 0 + }, + { + 21, + 0 + }, + { + 21, + 0 + }, + { + 21, + 0 + }, + { + 21, + 0 + }, + { + 21, + 0 + }, + { + 14, + 0 + }, + { + 1, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 1, + 0 + }, + { + 21, + 4 + }, + { + 21, + 4 + }, + { + 21, + 4 + }, + { + 21, + 1 + }, + { + 21, + 1 + }, + { + 21, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 1, + 0 + } + } + }, + [130]={ + ["board"]={ + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 5 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 5 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 1, + 0 + }, + { + 37, + 0 + }, + { + 21, + 1 + }, + { + 1, + 0 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 21, + 1 + }, + { + 1, + 0 + }, + { + 14, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 37, + 0 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 37, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 1, + 0 + } + } + }, + [131]={ + ["board"]={ + { + 37, + 0 + }, + { + 0, + 3 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 0, + 5 + }, + { + 37, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 14, + 0 + }, + { + 1, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 21, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 21, + 3 + }, + { + 21, + 3 + }, + { + 1, + 0 + }, + { + 21, + 5 + }, + { + 21, + 5 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [132]={ + ["board"]={ + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 1 + }, + { + 1, + 0 + }, + { + 21, + 3 + }, + { + 5, + 4 + }, + { + 37, + 0 + }, + { + 5, + 3 + }, + { + 21, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 4 + }, + { + 14, + 0 + }, + { + 5, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 5, + 5 + }, + { + 5, + 3 + }, + { + 0, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 1 + }, + { + 1, + 0 + }, + { + 21, + 3 + }, + { + 5, + 4 + }, + { + 37, + 0 + }, + { + 5, + 3 + }, + { + 21, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 4 + }, + { + 17, + 0 + }, + { + 5, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 5, + 5 + }, + { + 5, + 3 + }, + { + 0, + 0 + }, + { + 1, + 0 + } + } + }, + [133]={ + ["board"]={ + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 1 + }, + { + 37, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 37, + 0 + }, + { + 1, + 0 + }, + { + 5, + 1 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 21, + 5 + }, + { + 5, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, + { + 14, + 0 + }, + { + 5, + 4 + }, + { + 21, + 5 + }, + { + 5, + 3 + }, + { + 21, + 4 + }, + { + 37, + 0 + }, + { + 5, + 2 + }, + { + 1, + 0 + }, + { + 5, + 4 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 1, + 0 + } + } + }, + [134]={ + ["board"]={ + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 37, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 37, + 0 + }, + { + 14, + 0 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 1 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 1 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 1 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 1, + 0 + }, + { + 21, + 2 + }, + { + 21, + 2 + }, + { + 21, + 1 + }, + { + 21, + 1 + }, + { + 21, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 37, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 37, + 0 + }, + { + 17, + 0 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 1 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 1 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 1 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 1, + 0 + }, + { + 21, + 2 + }, + { + 21, + 2 + }, + { + 21, + 1 + }, + { + 21, + 1 + }, + { + 21, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + } } } local config = { -data=chapter_board,count=114 +data=chapter_board,count=134 } return config \ No newline at end of file diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index 2929248d..efc50829 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -223,9 +223,19 @@ local const = { }, ["dungeon_shards_limit"]={ ["value"]=2 + }, + ["change_name_cost"]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } } } local config = { -data=const,count=47 +data=const,count=48 } return config \ No newline at end of file diff --git a/lua/app/config/grid_type.lua b/lua/app/config/grid_type.lua index 9dbacbdf..79a63d0e 100644 --- a/lua/app/config/grid_type.lua +++ b/lua/app/config/grid_type.lua @@ -475,9 +475,43 @@ local grid_type = { ["can_fall"]=1, ["cant_link"]=1, ["break_sfx"]="sfx_piece_caocong_b01" + }, + [36]={ + ["icon"]="battle_obstacle_lava", + ["next_type"]=0, + ["break_condition"]={ + 1, + 3 + }, + ["break_count"]=1, + ["break_stay_element"]=1, + ["can_fall"]=1, + ["cant_link"]=1, + ["element_invalid"]=1, + ["break_sfx"]="sfx_piece_rongyan_b01", + ["effect"]=6, + ["effect_sfx"]="sfx_piece_rongyan_b02", + ["effect_trigger"]=1 + }, + [37]={ + ["icon"]="battle_obstacle_poisonous_mist", + ["next_type"]=0, + ["break_condition"]={ + 1, + 3 + }, + ["break_count"]=1, + ["break_stay_element"]=1, + ["can_fall"]=1, + ["cant_link"]=1, + ["element_invalid"]=1, + ["break_sfx"]="sfx_piece_duwu_b01", + ["effect"]=6, + ["effect_sfx"]="sfx_piece_duwu_b02", + ["effect_trigger"]=1 } } local config = { -data=grid_type,count=36 +data=grid_type,count=38 } return config \ No newline at end of file diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index aadb914e..a0253f85 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -346,6 +346,11 @@ local item = { ["qlt"]=1, ["icon"]="19" }, + [20]={ + ["type"]=1, + ["qlt"]=5, + ["icon"]="20" + }, [12001]={ ["type"]=5, ["parameter"]=12001, @@ -495,6 +500,6 @@ local item = { } } local config = { -data=item,count=44 +data=item,count=45 } 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 2388e36d..0f288b1f 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -229,6 +229,7 @@ local LocalizationGlobalConst = DUNGEON_SHARDS_OPEN = "DUNGEON_SHARDS_OPEN", MAIN_CHAPTER = "MAIN_CHAPTER", SMASH = "SMASH", + DUNGEON_DESC = "DUNGEON_DESC", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index 00521437..cf0471ac 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -7639,9 +7639,1354 @@ local monster_chapter = { 10013 }, ["monster_exp"]=22000 + }, + [57201]={ + ["monster_base"]=10056, + ["hp"]=53300000, + ["atk"]=3310000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20163, + 20164, + 20165 + }, + ["monster_exp"]=11000 + }, + [57301]={ + ["monster_base"]=10009, + ["hp"]=73200000, + ["atk"]=3450000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20025, + 20026, + 20027 + }, + ["monster_exp"]=11000 + }, + [57401]={ + ["monster_base"]=10010, + ["hp"]=82400000, + ["atk"]=3560000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20028, + 20029, + 20030 + }, + ["monster_exp"]=17000 + }, + [57501]={ + ["monster_base"]=10039, + ["hp"]=108700000, + ["atk"]=3660000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20112, + 20113, + 20114 + }, + ["monster_exp"]=19000 + }, + [57601]={ + ["monster_base"]=20012, + ["is_boss"]=1, + ["hp"]=150200000, + ["atk"]=3690000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30034, + 30035, + 30036 + }, + ["skill"]={ + 10017 + }, + ["monster_exp"]=18000 + }, + [57701]={ + ["monster_base"]=10009, + ["hp"]=103800000, + ["atk"]=3790000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20025, + 20026, + 20027 + }, + ["monster_exp"]=9000 + }, + [57801]={ + ["monster_base"]=10055, + ["hp"]=115100000, + ["atk"]=4150000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20160, + 20161, + 20162 + }, + ["monster_exp"]=10000 + }, + [57901]={ + ["monster_base"]=10046, + ["hp"]=133300000, + ["atk"]=3910000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20133, + 20134, + 20135 + }, + ["monster_exp"]=11000 + }, + [58001]={ + ["monster_base"]=10057, + ["hp"]=150900000, + ["atk"]=4250000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20166, + 20167, + 20168 + }, + ["monster_exp"]=12000 + }, + [58101]={ + ["monster_base"]=20030, + ["is_boss"]=1, + ["hp"]=283600000, + ["atk"]=3990000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30088, + 30089, + 30090 + }, + ["skill"]={ + 10056, + 10057 + }, + ["passive_skill"]={ + 10014 + }, + ["monster_exp"]=12000 + }, + [58201]={ + ["monster_base"]=10058, + ["hp"]=164900000, + ["atk"]=4060000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20169, + 20170, + 20171 + }, + ["monster_exp"]=16000 + }, + [58301]={ + ["monster_base"]=10051, + ["hp"]=186100000, + ["atk"]=4190000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20148, + 20149, + 20150 + }, + ["monster_exp"]=18000 + }, + [58401]={ + ["monster_base"]=10053, + ["hp"]=196400000, + ["atk"]=4290000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20154, + 20155, + 20156 + }, + ["monster_exp"]=21000 + }, + [58501]={ + ["monster_base"]=10055, + ["hp"]=213100000, + ["atk"]=4410000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20160, + 20161, + 20162 + }, + ["monster_exp"]=22000 + }, + [58601]={ + ["monster_base"]=20029, + ["is_boss"]=1, + ["hp"]=385700000, + ["atk"]=4100000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30085, + 30086, + 30087 + }, + ["skill"]={ + 10065 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=24000 + }, + [58701]={ + ["monster_base"]=10058, + ["hp"]=256100000, + ["atk"]=4480000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20169, + 20170, + 20171 + }, + ["monster_exp"]=15000 + }, + [58801]={ + ["monster_base"]=10051, + ["hp"]=272300000, + ["atk"]=4600000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20148, + 20149, + 20150 + }, + ["monster_exp"]=16000 + }, + [58901]={ + ["monster_base"]=10055, + ["hp"]=299500000, + ["atk"]=4730000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20160, + 20161, + 20162 + }, + ["monster_exp"]=17000 + }, + [59001]={ + ["monster_base"]=10057, + ["hp"]=326800000, + ["atk"]=4810000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20166, + 20167, + 20168 + }, + ["monster_exp"]=17000 + }, + [59101]={ + ["monster_base"]=20031, + ["is_boss"]=2, + ["hp"]=514600000, + ["atk"]=5830000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30091, + 30092, + 30093 + }, + ["skill"]={ + 10058, + 10059 + }, + ["passive_skill"]={ + 10008, + 10011, + 10013 + }, + ["monster_exp"]=22000 + }, + [59201]={ + ["monster_base"]=10056, + ["hp"]=53300000, + ["atk"]=3310000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20163, + 20164, + 20165 + }, + ["monster_exp"]=11000 + }, + [59301]={ + ["monster_base"]=10009, + ["hp"]=73200000, + ["atk"]=3450000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20025, + 20026, + 20027 + }, + ["monster_exp"]=11000 + }, + [59401]={ + ["monster_base"]=10010, + ["hp"]=82400000, + ["atk"]=3560000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20028, + 20029, + 20030 + }, + ["monster_exp"]=17000 + }, + [59501]={ + ["monster_base"]=10039, + ["hp"]=108700000, + ["atk"]=3660000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20112, + 20113, + 20114 + }, + ["monster_exp"]=19000 + }, + [59601]={ + ["monster_base"]=20012, + ["is_boss"]=1, + ["hp"]=150200000, + ["atk"]=3690000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30034, + 30035, + 30036 + }, + ["skill"]={ + 10017 + }, + ["monster_exp"]=18000 + }, + [59701]={ + ["monster_base"]=10009, + ["hp"]=103800000, + ["atk"]=3790000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20025, + 20026, + 20027 + }, + ["monster_exp"]=9000 + }, + [59801]={ + ["monster_base"]=10055, + ["hp"]=115100000, + ["atk"]=4150000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20160, + 20161, + 20162 + }, + ["monster_exp"]=10000 + }, + [59901]={ + ["monster_base"]=10046, + ["hp"]=133300000, + ["atk"]=3910000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20133, + 20134, + 20135 + }, + ["monster_exp"]=11000 + }, + [60001]={ + ["monster_base"]=10057, + ["hp"]=150900000, + ["atk"]=4250000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20166, + 20167, + 20168 + }, + ["monster_exp"]=12000 + }, + [60101]={ + ["monster_base"]=20030, + ["is_boss"]=1, + ["hp"]=283600000, + ["atk"]=3990000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30088, + 30089, + 30090 + }, + ["skill"]={ + 10056, + 10057 + }, + ["passive_skill"]={ + 10014 + }, + ["monster_exp"]=12000 + }, + [60201]={ + ["monster_base"]=10058, + ["hp"]=164900000, + ["atk"]=4060000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20169, + 20170, + 20171 + }, + ["monster_exp"]=16000 + }, + [60301]={ + ["monster_base"]=10051, + ["hp"]=186100000, + ["atk"]=4190000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20148, + 20149, + 20150 + }, + ["monster_exp"]=18000 + }, + [60401]={ + ["monster_base"]=10053, + ["hp"]=196400000, + ["atk"]=4290000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20154, + 20155, + 20156 + }, + ["monster_exp"]=21000 + }, + [60501]={ + ["monster_base"]=10055, + ["hp"]=213100000, + ["atk"]=4410000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20160, + 20161, + 20162 + }, + ["monster_exp"]=22000 + }, + [60601]={ + ["monster_base"]=20029, + ["is_boss"]=1, + ["hp"]=385700000, + ["atk"]=4100000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30085, + 30086, + 30087 + }, + ["skill"]={ + 10065 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=24000 + }, + [60701]={ + ["monster_base"]=10058, + ["hp"]=256100000, + ["atk"]=4480000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20169, + 20170, + 20171 + }, + ["monster_exp"]=15000 + }, + [60801]={ + ["monster_base"]=10051, + ["hp"]=272300000, + ["atk"]=4600000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20148, + 20149, + 20150 + }, + ["monster_exp"]=16000 + }, + [60901]={ + ["monster_base"]=10055, + ["hp"]=299500000, + ["atk"]=4730000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20160, + 20161, + 20162 + }, + ["monster_exp"]=17000 + }, + [61001]={ + ["monster_base"]=10057, + ["hp"]=326800000, + ["atk"]=4810000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20166, + 20167, + 20168 + }, + ["monster_exp"]=17000 + }, + [61101]={ + ["monster_base"]=20031, + ["is_boss"]=2, + ["hp"]=514600000, + ["atk"]=5830000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30091, + 30092, + 30093 + }, + ["skill"]={ + 10058, + 10059 + }, + ["passive_skill"]={ + 10008, + 10011, + 10013 + }, + ["monster_exp"]=22000 + }, + [61201]={ + ["monster_base"]=10056, + ["hp"]=53300000, + ["atk"]=3310000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20163, + 20164, + 20165 + }, + ["monster_exp"]=11000 + }, + [61301]={ + ["monster_base"]=10009, + ["hp"]=73200000, + ["atk"]=3450000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20025, + 20026, + 20027 + }, + ["monster_exp"]=11000 + }, + [61401]={ + ["monster_base"]=10010, + ["hp"]=82400000, + ["atk"]=3560000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20028, + 20029, + 20030 + }, + ["monster_exp"]=17000 + }, + [61501]={ + ["monster_base"]=10039, + ["hp"]=108700000, + ["atk"]=3660000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20112, + 20113, + 20114 + }, + ["monster_exp"]=19000 + }, + [61601]={ + ["monster_base"]=20012, + ["is_boss"]=1, + ["hp"]=150200000, + ["atk"]=3690000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30034, + 30035, + 30036 + }, + ["skill"]={ + 10017 + }, + ["monster_exp"]=18000 + }, + [61701]={ + ["monster_base"]=10009, + ["hp"]=103800000, + ["atk"]=3790000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20025, + 20026, + 20027 + }, + ["monster_exp"]=9000 + }, + [61801]={ + ["monster_base"]=10055, + ["hp"]=115100000, + ["atk"]=4150000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20160, + 20161, + 20162 + }, + ["monster_exp"]=10000 + }, + [61901]={ + ["monster_base"]=10046, + ["hp"]=133300000, + ["atk"]=3910000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20133, + 20134, + 20135 + }, + ["monster_exp"]=11000 + }, + [62001]={ + ["monster_base"]=10057, + ["hp"]=150900000, + ["atk"]=4250000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20166, + 20167, + 20168 + }, + ["monster_exp"]=12000 + }, + [62101]={ + ["monster_base"]=20030, + ["is_boss"]=1, + ["hp"]=283600000, + ["atk"]=3990000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30088, + 30089, + 30090 + }, + ["skill"]={ + 10056, + 10057 + }, + ["passive_skill"]={ + 10014 + }, + ["monster_exp"]=12000 + }, + [62201]={ + ["monster_base"]=10058, + ["hp"]=164900000, + ["atk"]=4060000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20169, + 20170, + 20171 + }, + ["monster_exp"]=16000 + }, + [62301]={ + ["monster_base"]=10051, + ["hp"]=186100000, + ["atk"]=4190000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20148, + 20149, + 20150 + }, + ["monster_exp"]=18000 + }, + [62401]={ + ["monster_base"]=10053, + ["hp"]=196400000, + ["atk"]=4290000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20154, + 20155, + 20156 + }, + ["monster_exp"]=21000 + }, + [62501]={ + ["monster_base"]=10055, + ["hp"]=213100000, + ["atk"]=4410000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20160, + 20161, + 20162 + }, + ["monster_exp"]=22000 + }, + [62601]={ + ["monster_base"]=20029, + ["is_boss"]=1, + ["hp"]=385700000, + ["atk"]=4100000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30085, + 30086, + 30087 + }, + ["skill"]={ + 10065 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=24000 + }, + [62701]={ + ["monster_base"]=10058, + ["hp"]=256100000, + ["atk"]=4480000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20169, + 20170, + 20171 + }, + ["monster_exp"]=15000 + }, + [62801]={ + ["monster_base"]=10051, + ["hp"]=272300000, + ["atk"]=4600000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20148, + 20149, + 20150 + }, + ["monster_exp"]=16000 + }, + [62901]={ + ["monster_base"]=10055, + ["hp"]=299500000, + ["atk"]=4730000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20160, + 20161, + 20162 + }, + ["monster_exp"]=17000 + }, + [63001]={ + ["monster_base"]=10057, + ["hp"]=326800000, + ["atk"]=4810000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20166, + 20167, + 20168 + }, + ["monster_exp"]=17000 + }, + [63101]={ + ["monster_base"]=20031, + ["is_boss"]=2, + ["hp"]=514600000, + ["atk"]=5830000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30091, + 30092, + 30093 + }, + ["skill"]={ + 10058, + 10059 + }, + ["passive_skill"]={ + 10008, + 10011, + 10013 + }, + ["monster_exp"]=22000 + }, + [63201]={ + ["monster_base"]=10056, + ["hp"]=53300000, + ["atk"]=3310000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20163, + 20164, + 20165 + }, + ["monster_exp"]=11000 + }, + [63301]={ + ["monster_base"]=10009, + ["hp"]=73200000, + ["atk"]=3450000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20025, + 20026, + 20027 + }, + ["monster_exp"]=11000 + }, + [63401]={ + ["monster_base"]=10010, + ["hp"]=82400000, + ["atk"]=3560000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20028, + 20029, + 20030 + }, + ["monster_exp"]=17000 + }, + [63501]={ + ["monster_base"]=10039, + ["hp"]=108700000, + ["atk"]=3660000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20112, + 20113, + 20114 + }, + ["monster_exp"]=19000 + }, + [63601]={ + ["monster_base"]=20012, + ["is_boss"]=1, + ["hp"]=150200000, + ["atk"]=3690000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30034, + 30035, + 30036 + }, + ["skill"]={ + 10017 + }, + ["monster_exp"]=18000 + }, + [63701]={ + ["monster_base"]=10009, + ["hp"]=103800000, + ["atk"]=3790000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20025, + 20026, + 20027 + }, + ["monster_exp"]=9000 + }, + [63801]={ + ["monster_base"]=10055, + ["hp"]=115100000, + ["atk"]=4150000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20160, + 20161, + 20162 + }, + ["monster_exp"]=10000 + }, + [63901]={ + ["monster_base"]=10046, + ["hp"]=133300000, + ["atk"]=3910000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20133, + 20134, + 20135 + }, + ["monster_exp"]=11000 + }, + [64001]={ + ["monster_base"]=10057, + ["hp"]=150900000, + ["atk"]=4250000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20166, + 20167, + 20168 + }, + ["monster_exp"]=12000 + }, + [64101]={ + ["monster_base"]=20030, + ["is_boss"]=1, + ["hp"]=283600000, + ["atk"]=3990000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30088, + 30089, + 30090 + }, + ["skill"]={ + 10056, + 10057 + }, + ["passive_skill"]={ + 10014 + }, + ["monster_exp"]=12000 + }, + [64201]={ + ["monster_base"]=10058, + ["hp"]=164900000, + ["atk"]=4060000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20169, + 20170, + 20171 + }, + ["monster_exp"]=16000 + }, + [64301]={ + ["monster_base"]=10051, + ["hp"]=186100000, + ["atk"]=4190000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20148, + 20149, + 20150 + }, + ["monster_exp"]=18000 + }, + [64401]={ + ["monster_base"]=10053, + ["hp"]=196400000, + ["atk"]=4290000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20154, + 20155, + 20156 + }, + ["monster_exp"]=21000 + }, + [64501]={ + ["monster_base"]=10055, + ["hp"]=213100000, + ["atk"]=4410000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20160, + 20161, + 20162 + }, + ["monster_exp"]=22000 + }, + [64601]={ + ["monster_base"]=20029, + ["is_boss"]=1, + ["hp"]=385700000, + ["atk"]=4100000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30085, + 30086, + 30087 + }, + ["skill"]={ + 10065 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=24000 + }, + [64701]={ + ["monster_base"]=10058, + ["hp"]=256100000, + ["atk"]=4480000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20169, + 20170, + 20171 + }, + ["monster_exp"]=15000 + }, + [64801]={ + ["monster_base"]=10051, + ["hp"]=272300000, + ["atk"]=4600000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20148, + 20149, + 20150 + }, + ["monster_exp"]=16000 + }, + [64901]={ + ["monster_base"]=10055, + ["hp"]=299500000, + ["atk"]=4730000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20160, + 20161, + 20162 + }, + ["monster_exp"]=17000 + }, + [65001]={ + ["monster_base"]=10057, + ["hp"]=326800000, + ["atk"]=4810000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20166, + 20167, + 20168 + }, + ["monster_exp"]=17000 + }, + [65101]={ + ["monster_base"]=20031, + ["is_boss"]=2, + ["hp"]=514600000, + ["atk"]=5830000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30091, + 30092, + 30093 + }, + ["skill"]={ + 10058, + 10059 + }, + ["passive_skill"]={ + 10008, + 10011, + 10013 + }, + ["monster_exp"]=22000 + }, + [65201]={ + ["monster_base"]=10056, + ["hp"]=53300000, + ["atk"]=3310000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20163, + 20164, + 20165 + }, + ["monster_exp"]=11000 + }, + [65301]={ + ["monster_base"]=10009, + ["hp"]=73200000, + ["atk"]=3450000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20025, + 20026, + 20027 + }, + ["monster_exp"]=11000 + }, + [65401]={ + ["monster_base"]=10010, + ["hp"]=82400000, + ["atk"]=3560000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20028, + 20029, + 20030 + }, + ["monster_exp"]=17000 + }, + [65501]={ + ["monster_base"]=10039, + ["hp"]=108700000, + ["atk"]=3660000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20112, + 20113, + 20114 + }, + ["monster_exp"]=19000 + }, + [65601]={ + ["monster_base"]=20012, + ["is_boss"]=1, + ["hp"]=150200000, + ["atk"]=3690000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30034, + 30035, + 30036 + }, + ["skill"]={ + 10017 + }, + ["monster_exp"]=18000 + }, + [65701]={ + ["monster_base"]=10009, + ["hp"]=103800000, + ["atk"]=3790000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20025, + 20026, + 20027 + }, + ["monster_exp"]=9000 + }, + [65801]={ + ["monster_base"]=10055, + ["hp"]=115100000, + ["atk"]=4150000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20160, + 20161, + 20162 + }, + ["monster_exp"]=10000 + }, + [65901]={ + ["monster_base"]=10046, + ["hp"]=133300000, + ["atk"]=3910000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20133, + 20134, + 20135 + }, + ["monster_exp"]=11000 + }, + [66001]={ + ["monster_base"]=10057, + ["hp"]=150900000, + ["atk"]=4250000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20166, + 20167, + 20168 + }, + ["monster_exp"]=12000 + }, + [66101]={ + ["monster_base"]=20030, + ["is_boss"]=1, + ["hp"]=283600000, + ["atk"]=3990000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30088, + 30089, + 30090 + }, + ["skill"]={ + 10056, + 10057 + }, + ["passive_skill"]={ + 10014 + }, + ["monster_exp"]=12000 + }, + [66201]={ + ["monster_base"]=10058, + ["hp"]=164900000, + ["atk"]=4060000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20169, + 20170, + 20171 + }, + ["monster_exp"]=16000 + }, + [66301]={ + ["monster_base"]=10051, + ["hp"]=186100000, + ["atk"]=4190000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20148, + 20149, + 20150 + }, + ["monster_exp"]=18000 + }, + [66401]={ + ["monster_base"]=10053, + ["hp"]=196400000, + ["atk"]=4290000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20154, + 20155, + 20156 + }, + ["monster_exp"]=21000 + }, + [66501]={ + ["monster_base"]=10055, + ["hp"]=213100000, + ["atk"]=4410000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20160, + 20161, + 20162 + }, + ["monster_exp"]=22000 + }, + [66601]={ + ["monster_base"]=20029, + ["is_boss"]=1, + ["hp"]=385700000, + ["atk"]=4100000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30085, + 30086, + 30087 + }, + ["skill"]={ + 10065 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=24000 + }, + [66701]={ + ["monster_base"]=10058, + ["hp"]=256100000, + ["atk"]=4480000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20169, + 20170, + 20171 + }, + ["monster_exp"]=15000 + }, + [66801]={ + ["monster_base"]=10051, + ["hp"]=272300000, + ["atk"]=4600000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20148, + 20149, + 20150 + }, + ["monster_exp"]=16000 + }, + [66901]={ + ["monster_base"]=10055, + ["hp"]=299500000, + ["atk"]=4730000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20160, + 20161, + 20162 + }, + ["monster_exp"]=17000 + }, + [67001]={ + ["monster_base"]=10057, + ["hp"]=326800000, + ["atk"]=4810000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20166, + 20167, + 20168 + }, + ["monster_exp"]=17000 + }, + [67101]={ + ["monster_base"]=20031, + ["is_boss"]=2, + ["hp"]=514600000, + ["atk"]=5830000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30091, + 30092, + 30093 + }, + ["skill"]={ + 10058, + 10059 + }, + ["passive_skill"]={ + 10008, + 10011, + 10013 + }, + ["monster_exp"]=22000 } } local config = { -data=monster_chapter,count=573 +data=monster_chapter,count=673 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/avatar.lua b/lua/app/config/strings/cn/avatar.lua new file mode 100644 index 00000000..a287f2de --- /dev/null +++ b/lua/app/config/strings/cn/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + ["desc"]="解锁舞女后获得。" + }, + [2001]={ + ["desc"]="刀妹的头像。" + }, + [3001]={ + ["desc"]="洋葱头的头像。" + }, + [4001]={ + ["desc"]="冰心的头像。" + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/avatar.lua.meta b/lua/app/config/strings/cn/avatar.lua.meta new file mode 100644 index 00000000..15a5659a --- /dev/null +++ b/lua/app/config/strings/cn/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e550b6c1888c8c54a983504aadc97dd9 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/cn/avatar_frame.lua b/lua/app/config/strings/cn/avatar_frame.lua new file mode 100644 index 00000000..d951a5a2 --- /dev/null +++ b/lua/app/config/strings/cn/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="初始头像框" + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/avatar_frame.lua.meta b/lua/app/config/strings/cn/avatar_frame.lua.meta new file mode 100644 index 00000000..c845fedc --- /dev/null +++ b/lua/app/config/strings/cn/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7ebdcf5eea9b5744b93b6a66a8a3a4ac +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/cn/chapter.lua b/lua/app/config/strings/cn/chapter.lua index ad475aea..d3aef2ba 100644 --- a/lua/app/config/strings/cn/chapter.lua +++ b/lua/app/config/strings/cn/chapter.lua @@ -88,9 +88,24 @@ local chapter = { }, [30]={ ["name"]="30.魔都出口" + }, + [31]={ + ["name"]="31.熔岩火山" + }, + [32]={ + ["name"]="32.火山之下" + }, + [33]={ + ["name"]="33.炙热海岸" + }, + [34]={ + ["name"]="34.远古潜艇" + }, + [35]={ + ["name"]="35.潜艇控制室" } } local config = { -data=chapter,count=30 +data=chapter,count=35 } 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 b188bea5..e44d4880 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -229,6 +229,7 @@ local localization_global = ["DUNGEON_SHARDS_OPEN"] = "开启时间：周一、周三、周五、周日", ["MAIN_CHAPTER"] = "主线章节", ["SMASH"] = "扫荡", + ["DUNGEON_DESC"] = "BOSS抗性：", } return localization_global \ 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 3e377f88..b32f73a1 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -75,6 +75,10 @@ local item = { ["name"]="随机碎片", ["desc"]="挂机可获得随机碎片，领取后数量和品质将根据关卡提升。" }, + [20]={ + ["name"]="高级随机碎片", + ["desc"]="有概率随机获得优秀，稀有或史诗英雄碎片。" + }, [12001]={ ["name"]="舞娘碎片", ["desc"]="舞娘碎片，凑齐可激活或升级。" @@ -177,6 +181,6 @@ local item = { } } local config = { -data=item,count=44 +data=item,count=45 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/avatar.lua b/lua/app/config/strings/de/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/de/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/de/avatar.lua.meta b/lua/app/config/strings/de/avatar.lua.meta new file mode 100644 index 00000000..35f44d0c --- /dev/null +++ b/lua/app/config/strings/de/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9dc40103a0748db44a9f1b68cf0aa638 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/de/avatar_frame.lua b/lua/app/config/strings/de/avatar_frame.lua new file mode 100644 index 00000000..ef3a097e --- /dev/null +++ b/lua/app/config/strings/de/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="Rundes Avatar, automatisch verfügbar." + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/de/avatar_frame.lua.meta b/lua/app/config/strings/de/avatar_frame.lua.meta new file mode 100644 index 00000000..cd3295fd --- /dev/null +++ b/lua/app/config/strings/de/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 45e62fba12275294c9ca0781541e898f +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/de/chapter.lua b/lua/app/config/strings/de/chapter.lua index 9b628142..248d88f8 100644 --- a/lua/app/config/strings/de/chapter.lua +++ b/lua/app/config/strings/de/chapter.lua @@ -88,9 +88,24 @@ local chapter = { }, [30]={ + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + } } local config = { -data=chapter,count=30 +data=chapter,count=35 } 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 2f8cea60..409e1865 100644 --- a/lua/app/config/strings/de/item.lua +++ b/lua/app/config/strings/de/item.lua @@ -58,6 +58,9 @@ local item = { }, [19]={ + }, + [20]={ + }, [12001]={ @@ -136,6 +139,6 @@ local item = { } } local config = { -data=item,count=44 +data=item,count=45 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/avatar.lua b/lua/app/config/strings/en/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/en/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/en/avatar.lua.meta b/lua/app/config/strings/en/avatar.lua.meta new file mode 100644 index 00000000..8bea9922 --- /dev/null +++ b/lua/app/config/strings/en/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2efd30882537bcf4d85d41874b20a5d1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/en/avatar_frame.lua b/lua/app/config/strings/en/avatar_frame.lua new file mode 100644 index 00000000..34811851 --- /dev/null +++ b/lua/app/config/strings/en/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="The default avatar frame." + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/en/avatar_frame.lua.meta b/lua/app/config/strings/en/avatar_frame.lua.meta new file mode 100644 index 00000000..a78ecf24 --- /dev/null +++ b/lua/app/config/strings/en/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: feee83113a5ebf648b61119b6ea67052 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/en/chapter.lua b/lua/app/config/strings/en/chapter.lua index fbab83ed..318412e7 100644 --- a/lua/app/config/strings/en/chapter.lua +++ b/lua/app/config/strings/en/chapter.lua @@ -88,9 +88,24 @@ local chapter = { }, [30]={ ["name"]="30. Demon City Exit" + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + } } local config = { -data=chapter,count=30 +data=chapter,count=35 } 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 1a828781..035d24ee 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -74,6 +74,9 @@ local item = { [19]={ ["name"]="Random Shard", ["desc"]="AFK rewards include random shards. The quantity and quality will increase with the progress of the stages." + }, + [20]={ + }, [12001]={ ["name"]="Dancer Shard", @@ -172,6 +175,6 @@ local item = { } } local config = { -data=item,count=44 +data=item,count=45 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/avatar.lua b/lua/app/config/strings/fr/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/fr/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/avatar.lua.meta b/lua/app/config/strings/fr/avatar.lua.meta new file mode 100644 index 00000000..748f5bf0 --- /dev/null +++ b/lua/app/config/strings/fr/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 1b7f9b5c90bd55244adec4028f50f7ae +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/fr/avatar_frame.lua b/lua/app/config/strings/fr/avatar_frame.lua new file mode 100644 index 00000000..bcfbcb72 --- /dev/null +++ b/lua/app/config/strings/fr/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="Cadre de tête arrondie, disponible au tout début." + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/avatar_frame.lua.meta b/lua/app/config/strings/fr/avatar_frame.lua.meta new file mode 100644 index 00000000..804746aa --- /dev/null +++ b/lua/app/config/strings/fr/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 91626068ba5bf40478d4c5f990dd336c +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/fr/chapter.lua b/lua/app/config/strings/fr/chapter.lua index 9b628142..248d88f8 100644 --- a/lua/app/config/strings/fr/chapter.lua +++ b/lua/app/config/strings/fr/chapter.lua @@ -88,9 +88,24 @@ local chapter = { }, [30]={ + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + } } local config = { -data=chapter,count=30 +data=chapter,count=35 } 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 85989bb4..5da817c3 100644 --- a/lua/app/config/strings/fr/item.lua +++ b/lua/app/config/strings/fr/item.lua @@ -58,6 +58,9 @@ local item = { }, [19]={ + }, + [20]={ + }, [12001]={ @@ -136,6 +139,6 @@ local item = { } } local config = { -data=item,count=44 +data=item,count=45 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/avatar.lua b/lua/app/config/strings/id/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/id/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/id/avatar.lua.meta b/lua/app/config/strings/id/avatar.lua.meta new file mode 100644 index 00000000..79497262 --- /dev/null +++ b/lua/app/config/strings/id/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: be940f5ccbf143143bcb35878aa85b20 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/id/avatar_frame.lua b/lua/app/config/strings/id/avatar_frame.lua new file mode 100644 index 00000000..859f1807 --- /dev/null +++ b/lua/app/config/strings/id/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="Bingkai Avatar bulat, dimiliki dari awal." + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/id/avatar_frame.lua.meta b/lua/app/config/strings/id/avatar_frame.lua.meta new file mode 100644 index 00000000..50329b86 --- /dev/null +++ b/lua/app/config/strings/id/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9b782692fe3bc8046acedd1c14447f80 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/id/chapter.lua b/lua/app/config/strings/id/chapter.lua index 9b628142..248d88f8 100644 --- a/lua/app/config/strings/id/chapter.lua +++ b/lua/app/config/strings/id/chapter.lua @@ -88,9 +88,24 @@ local chapter = { }, [30]={ + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + } } local config = { -data=chapter,count=30 +data=chapter,count=35 } 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 e5e27042..6d7aa323 100644 --- a/lua/app/config/strings/id/item.lua +++ b/lua/app/config/strings/id/item.lua @@ -58,6 +58,9 @@ local item = { }, [19]={ + }, + [20]={ + }, [12001]={ @@ -136,6 +139,6 @@ local item = { } } local config = { -data=item,count=44 +data=item,count=45 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/avatar.lua b/lua/app/config/strings/ja/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/ja/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/avatar.lua.meta b/lua/app/config/strings/ja/avatar.lua.meta new file mode 100644 index 00000000..7d1b2d2e --- /dev/null +++ b/lua/app/config/strings/ja/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4e211405289be9d4fb6973d27e4c0454 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ja/avatar_frame.lua b/lua/app/config/strings/ja/avatar_frame.lua new file mode 100644 index 00000000..f7ef47d4 --- /dev/null +++ b/lua/app/config/strings/ja/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="丸いフレーム、デフォルト獲得可能。" + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/avatar_frame.lua.meta b/lua/app/config/strings/ja/avatar_frame.lua.meta new file mode 100644 index 00000000..d60f8e6b --- /dev/null +++ b/lua/app/config/strings/ja/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e19cdea5919e19a4b8bb6538c8b11347 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ja/chapter.lua b/lua/app/config/strings/ja/chapter.lua index 9b628142..248d88f8 100644 --- a/lua/app/config/strings/ja/chapter.lua +++ b/lua/app/config/strings/ja/chapter.lua @@ -88,9 +88,24 @@ local chapter = { }, [30]={ + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + } } local config = { -data=chapter,count=30 +data=chapter,count=35 } 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 e933516c..f3e20bfc 100644 --- a/lua/app/config/strings/ja/item.lua +++ b/lua/app/config/strings/ja/item.lua @@ -58,6 +58,9 @@ local item = { }, [19]={ + }, + [20]={ + }, [12001]={ @@ -136,6 +139,6 @@ local item = { } } local config = { -data=item,count=44 +data=item,count=45 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/avatar.lua b/lua/app/config/strings/ko/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/ko/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/avatar.lua.meta b/lua/app/config/strings/ko/avatar.lua.meta new file mode 100644 index 00000000..5032167e --- /dev/null +++ b/lua/app/config/strings/ko/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 845ceb9424b01974aa158e74309a0190 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ko/avatar_frame.lua b/lua/app/config/strings/ko/avatar_frame.lua new file mode 100644 index 00000000..3de6c655 --- /dev/null +++ b/lua/app/config/strings/ko/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="둥글고 윤택한 아이콘 프레임이며 기본으로 제공됩니다." + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/avatar_frame.lua.meta b/lua/app/config/strings/ko/avatar_frame.lua.meta new file mode 100644 index 00000000..b7eaf6e4 --- /dev/null +++ b/lua/app/config/strings/ko/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 76981286f85df2347a2124c248246121 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ko/chapter.lua b/lua/app/config/strings/ko/chapter.lua index 9b628142..248d88f8 100644 --- a/lua/app/config/strings/ko/chapter.lua +++ b/lua/app/config/strings/ko/chapter.lua @@ -88,9 +88,24 @@ local chapter = { }, [30]={ + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + } } local config = { -data=chapter,count=30 +data=chapter,count=35 } 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 7f4c83b2..f70da70b 100644 --- a/lua/app/config/strings/ko/item.lua +++ b/lua/app/config/strings/ko/item.lua @@ -58,6 +58,9 @@ local item = { }, [19]={ + }, + [20]={ + }, [12001]={ @@ -136,6 +139,6 @@ local item = { } } local config = { -data=item,count=44 +data=item,count=45 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/avatar.lua b/lua/app/config/strings/pt/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/pt/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/avatar.lua.meta b/lua/app/config/strings/pt/avatar.lua.meta new file mode 100644 index 00000000..96bb6418 --- /dev/null +++ b/lua/app/config/strings/pt/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 0b2a3b866e0802941977489faf1a38fb +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/pt/avatar_frame.lua b/lua/app/config/strings/pt/avatar_frame.lua new file mode 100644 index 00000000..d08a5a21 --- /dev/null +++ b/lua/app/config/strings/pt/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="Uma moldura do avatar redonda e lisa. Está em sua posse por padrão." + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/avatar_frame.lua.meta b/lua/app/config/strings/pt/avatar_frame.lua.meta new file mode 100644 index 00000000..14125ba1 --- /dev/null +++ b/lua/app/config/strings/pt/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b9d9a6866f4d1ab4887e52bd0917cdc2 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/pt/chapter.lua b/lua/app/config/strings/pt/chapter.lua index 9b628142..248d88f8 100644 --- a/lua/app/config/strings/pt/chapter.lua +++ b/lua/app/config/strings/pt/chapter.lua @@ -88,9 +88,24 @@ local chapter = { }, [30]={ + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + } } local config = { -data=chapter,count=30 +data=chapter,count=35 } 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 99bd1b45..02564356 100644 --- a/lua/app/config/strings/pt/item.lua +++ b/lua/app/config/strings/pt/item.lua @@ -57,6 +57,9 @@ local item = { }, [19]={ + }, + [20]={ + }, [12001]={ @@ -135,6 +138,6 @@ local item = { } } local config = { -data=item,count=44 +data=item,count=45 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/avatar.lua b/lua/app/config/strings/ru/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/ru/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/avatar.lua.meta b/lua/app/config/strings/ru/avatar.lua.meta new file mode 100644 index 00000000..b3abce46 --- /dev/null +++ b/lua/app/config/strings/ru/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ff8547e7031a5194d8b1d50552114e6e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ru/avatar_frame.lua b/lua/app/config/strings/ru/avatar_frame.lua new file mode 100644 index 00000000..bc6ad48a --- /dev/null +++ b/lua/app/config/strings/ru/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="Закругленная рамка аватара принадлежит по умолчанию." + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/avatar_frame.lua.meta b/lua/app/config/strings/ru/avatar_frame.lua.meta new file mode 100644 index 00000000..9ac28a23 --- /dev/null +++ b/lua/app/config/strings/ru/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b6be5004e7718fd47bff83daa57c7d73 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ru/chapter.lua b/lua/app/config/strings/ru/chapter.lua index 9b628142..248d88f8 100644 --- a/lua/app/config/strings/ru/chapter.lua +++ b/lua/app/config/strings/ru/chapter.lua @@ -88,9 +88,24 @@ local chapter = { }, [30]={ + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + } } local config = { -data=chapter,count=30 +data=chapter,count=35 } 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 55df060a..41f371b7 100644 --- a/lua/app/config/strings/ru/item.lua +++ b/lua/app/config/strings/ru/item.lua @@ -55,6 +55,9 @@ local item = { }, [19]={ + }, + [20]={ + }, [12001]={ @@ -133,6 +136,6 @@ local item = { } } local config = { -data=item,count=44 +data=item,count=45 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/avatar.lua b/lua/app/config/strings/th/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/th/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/th/avatar.lua.meta b/lua/app/config/strings/th/avatar.lua.meta new file mode 100644 index 00000000..5de6792d --- /dev/null +++ b/lua/app/config/strings/th/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f47e3fc3edf30dc49b517e1f6d62d4f2 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/th/avatar_frame.lua b/lua/app/config/strings/th/avatar_frame.lua new file mode 100644 index 00000000..6a7a405c --- /dev/null +++ b/lua/app/config/strings/th/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="เฟรมอวาตาร์ที่โค้งมนสามารถใช้ได้ตามค่าเริ่มต้น" + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/th/avatar_frame.lua.meta b/lua/app/config/strings/th/avatar_frame.lua.meta new file mode 100644 index 00000000..326e0f83 --- /dev/null +++ b/lua/app/config/strings/th/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b6035fe28448bba4d99008ec9615b2d8 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/th/chapter.lua b/lua/app/config/strings/th/chapter.lua index 9b628142..248d88f8 100644 --- a/lua/app/config/strings/th/chapter.lua +++ b/lua/app/config/strings/th/chapter.lua @@ -88,9 +88,24 @@ local chapter = { }, [30]={ + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + } } local config = { -data=chapter,count=30 +data=chapter,count=35 } 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 55df060a..41f371b7 100644 --- a/lua/app/config/strings/th/item.lua +++ b/lua/app/config/strings/th/item.lua @@ -55,6 +55,9 @@ local item = { }, [19]={ + }, + [20]={ + }, [12001]={ @@ -133,6 +136,6 @@ local item = { } } local config = { -data=item,count=44 +data=item,count=45 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/avatar.lua b/lua/app/config/strings/vi/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/vi/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/avatar.lua.meta b/lua/app/config/strings/vi/avatar.lua.meta new file mode 100644 index 00000000..408b76c4 --- /dev/null +++ b/lua/app/config/strings/vi/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2e1f0c926cef57f4986fb3a41d1496d9 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/vi/avatar_frame.lua b/lua/app/config/strings/vi/avatar_frame.lua new file mode 100644 index 00000000..08e5fab4 --- /dev/null +++ b/lua/app/config/strings/vi/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="Khung Avatar tròn trĩnh, mặc định có." + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/avatar_frame.lua.meta b/lua/app/config/strings/vi/avatar_frame.lua.meta new file mode 100644 index 00000000..f22fcc60 --- /dev/null +++ b/lua/app/config/strings/vi/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 386cfeaa1310f294887e8b821f909933 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/vi/chapter.lua b/lua/app/config/strings/vi/chapter.lua index 9b628142..248d88f8 100644 --- a/lua/app/config/strings/vi/chapter.lua +++ b/lua/app/config/strings/vi/chapter.lua @@ -88,9 +88,24 @@ local chapter = { }, [30]={ + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + } } local config = { -data=chapter,count=30 +data=chapter,count=35 } 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 d0e95cd3..7794e093 100644 --- a/lua/app/config/strings/vi/item.lua +++ b/lua/app/config/strings/vi/item.lua @@ -58,6 +58,9 @@ local item = { }, [19]={ + }, + [20]={ + }, [12001]={ @@ -136,6 +139,6 @@ local item = { } } local config = { -data=item,count=44 +data=item,count=45 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/avatar.lua b/lua/app/config/strings/zh/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/zh/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/avatar.lua.meta b/lua/app/config/strings/zh/avatar.lua.meta new file mode 100644 index 00000000..bb12dbed --- /dev/null +++ b/lua/app/config/strings/zh/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b7c423d2d55031d48bb7b8fecf330920 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/zh/avatar_frame.lua b/lua/app/config/strings/zh/avatar_frame.lua new file mode 100644 index 00000000..c11d1a53 --- /dev/null +++ b/lua/app/config/strings/zh/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="圓潤的頭像框，默認擁有。" + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/avatar_frame.lua.meta b/lua/app/config/strings/zh/avatar_frame.lua.meta new file mode 100644 index 00000000..c7e077eb --- /dev/null +++ b/lua/app/config/strings/zh/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6d3262a99efe6f84096157cbb75ae15e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/zh/chapter.lua b/lua/app/config/strings/zh/chapter.lua index c7c44c59..b2ef3d14 100644 --- a/lua/app/config/strings/zh/chapter.lua +++ b/lua/app/config/strings/zh/chapter.lua @@ -88,9 +88,24 @@ local chapter = { }, [30]={ ["name"]="30.魔都出口" + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + } } local config = { -data=chapter,count=30 +data=chapter,count=35 } 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 48cd5a2a..85dfe37c 100644 --- a/lua/app/config/strings/zh/item.lua +++ b/lua/app/config/strings/zh/item.lua @@ -74,6 +74,9 @@ local item = { [19]={ ["name"]="隨機碎片", ["desc"]="挂機可獲得隨機碎片，領取數量和品級將根據關卡提高。" + }, + [20]={ + }, [12001]={ ["name"]="舞孃碎片", @@ -172,6 +175,6 @@ local item = { } } local config = { -data=item,count=44 +data=item,count=45 } return config \ No newline at end of file diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index 02c84fcd..048b5d8e 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -181,6 +181,7 @@ GConst.ATLAS_PATH = { MAIN = "assets/arts/atlas/ui/main.asset", BATTLE = "assets/arts/atlas/ui/battle.asset", DAILY_CHALLENGE = "assets/arts/atlas/ui/daily_challenge.asset", + DUNGEON = "assets/arts/atlas/ui/dungeon.asset", ICON_ITEM = "assets/arts/atlas/icon/item.asset", UI_LOGIN = "assets/arts/atlas/ui/login.asset", ICON_SKILL = "assets/arts/atlas/icon/skill.asset", diff --git a/lua/app/ui/common/cell/reward_cell.lua b/lua/app/ui/common/cell/reward_cell.lua index 28862b3d..c423dfd5 100644 --- a/lua/app/ui/common/cell/reward_cell.lua +++ b/lua/app/ui/common/cell/reward_cell.lua @@ -96,18 +96,6 @@ function RewardCell:_refreshItem(info, count) end end -function RewardCell:setVisibleFragment(isShow) - self.fragment:setVisible(isShow) -end - -function RewardCell:setVisibleS(isShow) - self.sImg:setVisible(isShow) -end - -function RewardCell:setRewardIcon(atlas, name) - self.icon:setSprite(atlas, name) -end - function RewardCell:setNumTx(str) self.numTx:setText(str) end diff --git a/lua/app/ui/dungeon/dungeon_board_cell.lua b/lua/app/ui/dungeon/dungeon_board_cell.lua index 1b1e3616..75ee7add 100644 --- a/lua/app/ui/dungeon/dungeon_board_cell.lua +++ b/lua/app/ui/dungeon/dungeon_board_cell.lua @@ -3,11 +3,10 @@ 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.txTitle = self.uiMap["dungeon_board_cell.tx_title"] + self.countdown = self.uiMap["dungeon_board_cell.countdown"] + self.txCountdown = self.uiMap["dungeon_board_cell.countdown.tx_countdown"] + self.txOpen = self.uiMap["dungeon_board_cell.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"] @@ -15,6 +14,8 @@ function DungeonBoardCell:init() 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.itemReward = self.uiMap["dungeon_board_cell.item_reward"] + self.itemRewardIcon = self.uiMap["dungeon_board_cell.item_reward.icon"] self.btnStart:addClickListener(function() -- 打开副本关卡选择界面 @@ -37,8 +38,7 @@ end function DungeonBoardCell:refreshInfo() self.txTitle:setText(DataManager.DungeonData:getTitle(self.moduleKey)) self.txOpen:setText(DataManager.DungeonData:getOpenTimeDesc(self.moduleKey)) - self.icon:setSprite(DataManager.DungeonData:getIcon(self.moduleKey)) - -- self.baseObject:setTexture("assets/arts/textures/background/fund/fund_bg_1.png") + self.baseObject:setTexture(DataManager.DungeonData:getBanner(self.moduleKey)) if DataManager.DungeonData:isActive(self.moduleKey) then self.btnStart:setVisible(true) @@ -47,14 +47,15 @@ function DungeonBoardCell:refreshInfo() -- 红点 if DataManager.DungeonData:isCanChallenge(self.moduleKey) then - self.btnStart:addRedPoint(65, 35, 0.6) + self.btnStart:addRedPoint(110, 40, 0.6) else self.btnStart:removeRedPoint() end - self.txOpen:setAnchoredPositionY(-115) + self.txOpen:setAnchoredPositionY(-110) self.txStart:setText(I18N:getGlobalText(I18N.GlobalConst.START_DESC)) - self.txTimes:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, DataManager.DungeonData:getRemainTimes(self.moduleKey))) + local timeStr = ":" .. DataManager.DungeonData:getRemainTimes(self.moduleKey) .. "" + self.txTimes:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, timeStr)) self:refreshCountdown(self.txCountdown) else self.btnStart:setVisible(false) @@ -68,29 +69,25 @@ function DungeonBoardCell:refreshInfo() end function DungeonBoardCell:refreshRewards() - 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:clearCells() - - local rewards = DataManager.DungeonData:getBoardShowRewardId(self.moduleKey) - if rewards ~= nil then + local reward = DataManager.DungeonData:getBoardShowRewardId(self.moduleKey) + if reward ~= nil then -- 展示实际item - self.scrollRect:addRefreshCallback(function(index, cell) - cell:refreshItemById(rewards[index], 0) + local info = ConfigManager:getConfig("item")[reward] + if info == nil then + return + end + + self.itemRewardIcon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon) + self.itemReward:setTouchEnable(true) + self.itemReward:addClickListener(function() + ModuleManager.TipsManager:showRewardTips(reward, info.type, self.itemReward) end) else - rewards = DataManager.DungeonData:getBoardShowRewardIcon(self.moduleKey) + reward = DataManager.DungeonData:getBoardShowRewardIcon(self.moduleKey) -- 展示icon图片 - self.scrollRect:addRefreshCallback(function(index, cell) - cell:setRewardIcon(rewards[index][1], rewards[index][2]) - cell:setVisibleS(false) - cell:setVisibleFragment(false) - cell:setTouchEnable(false) - end) + self.itemRewardIcon:setSprite(reward[1], reward[2]) + self.itemReward:setTouchEnable(false) end - self.scrollRect:setTotalCount(#rewards) end function DungeonBoardCell:refreshCountdown(txCountdown) diff --git a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua index b9964299..0f31f396 100644 --- a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua +++ b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua @@ -25,6 +25,7 @@ end function DungeonDifficultyUI:onLoadRootComplete() self.uiMap = self.root:genAllChildren() + self.icon = self.uiMap["dungeon_difficulty_ui.bg.title.icon_title"] 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"] @@ -42,19 +43,33 @@ function DungeonDifficultyUI:onLoadRootComplete() self.buffObj = self.uiMap["dungeon_difficulty_ui.bg.boss_buff"] self.txbuff = self.uiMap["dungeon_difficulty_ui.bg.boss_buff.tx_buff"] self.iconBuff = self.uiMap["dungeon_difficulty_ui.bg.boss_buff.icon_buff"] - self.rewardFirst = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) - self.rewardPass = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_pass"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) + self.rewardTx = self.uiMap["dungeon_difficulty_ui.bg.reward_desc"] + self.rewardFirst = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first"] + self.rewardFirstIcon = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first.icon"] + self.rewardFirstNum = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first.num"] + self.rewardPass = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_pass"] + self.rewardPassIcon = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_pass.icon"] + self.rewardPassNum = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_pass.num"] self.txFrist = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first.tx_first"] + self.txLock = self.uiMap["dungeon_difficulty_ui.bg.tx_lock"] + self.btnGroup = self.uiMap["dungeon_difficulty_ui.bg.btns"] + local iconPath = DataManager.DungeonData:getIcon(self.module) + self.icon:setSprite(iconPath[1], iconPath[2], function() + self.icon:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize() + end) self.txTitle:setText(DataManager.DungeonData:getTitle(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))) + self.txStartCost:setText(GFunc.getRewardNum(cost)) + self.txSweepCost:setText(GFunc.getRewardNum(cost)) + local timeString = ":" .. DataManager.DungeonData:getRemainTimes(self.module).."" + self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, timeString)) self.txFrist:setText(I18N:getGlobalText(I18N.GlobalConst.FIRST_PASS)) + self.rewardTx:setText(I18N:getGlobalText(I18N.GlobalConst.REWARD_DESC)..":") + self.txLock:setText(I18N:getGlobalText(I18N.GlobalConst.PASS_REQUIRE)) self:refreshDifficulty() @@ -70,7 +85,7 @@ function DungeonDifficultyUI:onLoadRootComplete() ModuleManager.DungeonManager:reqSweep(self.module, self.curId) end) self.arrowLeft:addClickListener(function() - if self:isCanChallengeMinId() then + if self:isMinId() then return end @@ -78,7 +93,7 @@ function DungeonDifficultyUI:onLoadRootComplete() self:refreshDifficulty() end) self.arrowRight:addClickListener(function() - if self:isCanChallengeMaxId() then + if self:isMaxId() then return end @@ -88,8 +103,6 @@ function DungeonDifficultyUI:onLoadRootComplete() 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)) @@ -97,10 +110,14 @@ function DungeonDifficultyUI:refreshDifficulty() local buff = DataManager.DungeonData:getBossBuff(self.module, self.curId) local desc = DataManager.DungeonData:getRule(self.module) if buff then + local cfg = ConfigManager:getConfigWithOtherKey("buff", "name")[buff.type] self.txDesc:setActive(false) self.buffObj:setActive(true) - self.txbuff:setText("") - self.iconBuff:setSprite("","") + self.txbuff:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_DESC)) + self.iconBuff:setSprite(GConst.ATLAS_PATH.ICON_BUFF, cfg.icon) + self.iconBuff:addClickListener(function() + ModuleManager.TipsManager:showDescTips(GFunc.getBuffDesc(buff.type, buff.num), self.iconBuff) + end) elseif desc then self.txDesc:setActive(true) self.buffObj:setActive(false) @@ -110,16 +127,48 @@ function DungeonDifficultyUI:refreshDifficulty() self.buffObj:setActive(false) end + -- 箭头 + self.txLock:setActive(not self:isCanChallengeId()) + self.btnGroup:setActive(self:isCanChallengeId()) + self.arrowRight:setActive(not self:isMaxId()) + self.arrowLeft:setActive(not self:isMinId()) + -- 奖励 - local rewardFirst = DataManager.DungeonData:getFirstReward(self.module, self.curId) - local rewardPass = DataManager.DungeonData:getPassReward(self.module, self.curId) - if not self:isCanSweepId() and rewardFirst then - self.rewardFirst:setVisible(true) - self.rewardFirst:refreshByConfig(rewardFirst) + local reward = DataManager.DungeonData:getBoardShowRewardId(self.module) + if reward ~= nil then + -- 展示实际item + local info = ConfigManager:getConfig("item")[reward] + if info == nil then + return + end + + self.rewardFirstIcon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon) + self.rewardPassIcon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon) + self.rewardFirst:setTouchEnable(true) + self.rewardPass:setTouchEnable(true) + self.rewardFirst:addClickListener(function() + ModuleManager.TipsManager:showRewardTips(reward, info.type, self.rewardFirst) + end) + self.rewardPass:addClickListener(function() + ModuleManager.TipsManager:showRewardTips(reward, info.type, self.rewardPass) + end) else - self.rewardFirst:setVisible(false) + reward = DataManager.DungeonData:getBoardShowRewardIcon(self.module) + -- 展示icon图片 + self.rewardFirstIcon:setSprite(reward[1], reward[2]) + self.rewardPassIcon:setSprite(reward[1], reward[2]) + self.rewardFirst:setTouchEnable(false) + self.rewardPass:setTouchEnable(false) end - self.rewardPass:refreshByConfig(rewardPass) + local firstNum = DataManager.DungeonData:getFirstRewardNum(self.module, self.curId) + local passNum = DataManager.DungeonData:getPassRewardNum(self.module, self.curId) + if not self:isCanSweepId() and firstNum then + self.rewardFirst:setActive(true) + self.rewardFirstNum:setText(firstNum) + else + self.rewardFirst:setActive(false) + end + self.rewardPassNum:setText(passNum) end -- 是否是可扫荡关卡 @@ -127,13 +176,18 @@ function DungeonDifficultyUI:isCanSweepId() return self.curId < DataManager.DungeonData:getUnlockMaxId(self.module) end ---是否是能挑战的最大关卡 -function DungeonDifficultyUI:isCanChallengeMaxId() - return self.curId == DataManager.DungeonData:getUnlockMaxId(self.module) +--是否是可挑战关卡 +function DungeonDifficultyUI:isCanChallengeId() + return self.curId <= DataManager.DungeonData:getUnlockMaxId(self.module) end ---是否是能挑战的最小关卡 -function DungeonDifficultyUI:isCanChallengeMinId() +-- 是最大副本id +function DungeonDifficultyUI:isMaxId() + return self.curId == DataManager.DungeonData:getConfigMaxId(self.module) +end + +--是最小关卡 +function DungeonDifficultyUI:isMinId() return self.curId == 1 end diff --git a/lua/app/ui/main_city/component/chapter_comp.lua b/lua/app/ui/main_city/component/chapter_comp.lua index 6333701d..7f5d55f3 100644 --- a/lua/app/ui/main_city/component/chapter_comp.lua +++ b/lua/app/ui/main_city/component/chapter_comp.lua @@ -19,6 +19,10 @@ function ChapterComp:getEntranceIcon() return GConst.ATLAS_PATH.MAIN,"main_dec_5" end +function ChapterComp:getEntranceBg() + return GConst.ATLAS_PATH.MAIN,"main_btn_ringt" +end + function ChapterComp:getHpCost() return DataManager.ChapterData:getFightCost() end 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 3af7c0d7..038c0a81 100644 --- a/lua/app/ui/main_city/component/daily_challenge_comp.lua +++ b/lua/app/ui/main_city/component/daily_challenge_comp.lua @@ -13,6 +13,10 @@ function DailyChallengeComp:getEntranceIcon() return GConst.ATLAS_PATH.MAIN,"main_dec_1" end +function DailyChallengeComp:getEntranceBg() + return GConst.ATLAS_PATH.MAIN,"main_btn_ligth" +end + function DailyChallengeComp:getShowEntranceRedPoint() return DataManager.DailyChallengeData:isMeetChallenge() end diff --git a/lua/app/ui/main_city/component/dungeon_comp.lua b/lua/app/ui/main_city/component/dungeon_comp.lua index db5c9d59..5bdb83b6 100644 --- a/lua/app/ui/main_city/component/dungeon_comp.lua +++ b/lua/app/ui/main_city/component/dungeon_comp.lua @@ -13,6 +13,10 @@ function DungeonComp:getEntranceIcon() return GConst.ATLAS_PATH.MAIN,"main_dec_2" end +function DungeonComp:getEntranceBg() + return GConst.ATLAS_PATH.MAIN,"main_btn_ringt" +end + function DungeonComp:getShowEntranceRedPoint() return DataManager.DungeonData:isCanChallengeAnyone() end diff --git a/lua/app/ui/main_city/component/main_comp.lua b/lua/app/ui/main_city/component/main_comp.lua index 6ef4ae5b..0bad81ea 100644 --- a/lua/app/ui/main_city/component/main_comp.lua +++ b/lua/app/ui/main_city/component/main_comp.lua @@ -105,6 +105,8 @@ function MainComp:refreshLeftBtn() end self.leftBtn:setActive(true) + local bgAtlas, bgName = moduleCell:getEntranceBg() + self.uiMap["main_comp.left_btn.bg"]:setSprite(bgAtlas, bgName) 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, function() @@ -137,6 +139,8 @@ function MainComp:refreshRightBtn() end self.rightBtn:setActive(true) + local bgAtlas, bgName = moduleCell:getEntranceBg() + self.uiMap["main_comp.right_btn.bg"]:setSprite(bgAtlas, bgName) 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, function() 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 9c43bbbf..5ade76df 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 @@ -15,6 +15,10 @@ function MainCompBaseCell:getEntranceIcon() return "","" end +function MainCompBaseCell:getEntranceBg() + return "","" +end + function MainCompBaseCell:getShowEntranceRedPoint() return false end diff --git a/lua/app/userdata/dungeon/dungeon_data.lua b/lua/app/userdata/dungeon/dungeon_data.lua index c7fb921c..f1ceb8d9 100644 --- a/lua/app/userdata/dungeon/dungeon_data.lua +++ b/lua/app/userdata/dungeon/dungeon_data.lua @@ -267,27 +267,31 @@ function DungeonData:getBoardShowRewardId(moduleKey) return self.dataDungeons[moduleKey]:getBoardShowRewardId() end --- 获取展示副本首通奖励 -function DungeonData:getFirstReward(moduleKey, id) +-- 获取展示副本首通奖励个数 +function DungeonData:getFirstRewardNum(moduleKey, id) -- 通关后，不展示首通奖励 - return self.dataDungeons[moduleKey]:getFirstReward(id) + return self.dataDungeons[moduleKey]:getFirstRewardNum(id) end --- 获取展示副本通关奖励 -function DungeonData:getPassReward(moduleKey, id) - -- 波次奖励数量==通关+波次奖励数量 - return self.dataDungeons[moduleKey]:getPassReward(id) +-- 获取展示副本通关奖励个数 +function DungeonData:getPassRewardNum(moduleKey, id) + return self.dataDungeons[moduleKey]:getPassRewardNum(id) end --获取副本已解锁最大id function DungeonData:getUnlockMaxId(moduleKey) local id = self.dataDungeons[moduleKey]:getPassedMaxId() + 1 - if id > #self.dataDungeons[moduleKey]:getConfig() then + if id > self:getConfigMaxId(moduleKey) then id = id - 1 end return id end +-- 获取副本配置的最高关卡 +function DungeonData:getConfigMaxId(moduleKey) + return #self.dataDungeons[moduleKey]:getConfig() +end + --获取副本已通关的最高关卡id function DungeonData:getPassedMaxId(moduleKey) return self.dataDungeons[moduleKey]:getPassedMaxId() diff --git a/lua/app/userdata/dungeon/dungeon_data_base_comp.lua b/lua/app/userdata/dungeon/dungeon_data_base_comp.lua index a06cf744..b9e7449c 100644 --- a/lua/app/userdata/dungeon/dungeon_data_base_comp.lua +++ b/lua/app/userdata/dungeon/dungeon_data_base_comp.lua @@ -86,13 +86,13 @@ function DungeonDataBaseComp:getBoardShowRewardId() return nil end --- 获取首通奖励 -function DungeonDataBaseComp:getFirstReward() +-- 获取首通奖励个数 +function DungeonDataBaseComp:getFirstRewardNum() return nil end --- 获取通关奖励（通关+波次奖励 or 百分比奖励） -function DungeonDataBaseComp:getPassReward() +-- 获取通关奖励个数 +function DungeonDataBaseComp:getPassRewardNum() return nil end diff --git a/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua b/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua index b1230bfd..841afa25 100644 --- a/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua +++ b/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua @@ -46,11 +46,11 @@ function DungeonGoldDataComp:getOpenWeekString() end function DungeonGoldDataComp:getIcon() - return GConst.ATLAS_PATH.COMMON,"common_chest_1" + return {GConst.ATLAS_PATH.DUNGEON,"dungeon_dec_1"} end function DungeonGoldDataComp:getBanner() - return "" + return "assets/arts/textures/background/dungeon/dungeon_bg_1.png" end function DungeonGoldDataComp:getChallengeHpCost() @@ -62,15 +62,15 @@ function DungeonGoldDataComp:getTodayMaxCount() end function DungeonGoldDataComp:getBoardShowRewardId() - return {1} + return 1 end -function DungeonGoldDataComp:getFirstReward(id) - return ConfigManager:getConfig("chapter_dungeon_gold")[id].first_pass_reward +function DungeonGoldDataComp:getFirstRewardNum(id) + return GFunc.getRewardNum(ConfigManager:getConfig("chapter_dungeon_gold")[id].first_pass_reward) end -function DungeonGoldDataComp:getPassReward(id) - return ConfigManager:getConfig("chapter_dungeon_gold")[id].percent_reward +function DungeonGoldDataComp:getPassRewardNum(id) + return GFunc.getRewardNum(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_shards_data_comp.lua b/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua index 6831d648..3ba39a00 100644 --- a/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua +++ b/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua @@ -42,16 +42,15 @@ function DungeonShardsDataComp:getOpenWeekString() end function DungeonShardsDataComp:getBossBuff(id) - Logger.printTable(self:getConfig()[id]) - return self:getConfig()[id].effect + return self:getConfig()[id].effect[1] end function DungeonShardsDataComp:getIcon() - return GConst.ATLAS_PATH.COMMON,"common_dec_3" + return {GConst.ATLAS_PATH.DUNGEON,"dungeon_dec_2"} end function DungeonShardsDataComp:getBanner() - return "" + return "assets/arts/textures/background/dungeon/dungeon_bg_2.png" end function DungeonShardsDataComp:getChallengeHpCost() @@ -63,25 +62,28 @@ function DungeonShardsDataComp:getTodayMaxCount() end function DungeonShardsDataComp:getBoardShowRewardIcon() - return { - [1]={ - GConst.ATLAS_PATH.ICON_ITEM,"4" - }, - [2]={ - GConst.ATLAS_PATH.ICON_ITEM,"5" - } - } + return {GConst.ATLAS_PATH.ICON_ITEM,"20"} end -function DungeonShardsDataComp:getFirstReward(id) - return ConfigManager:getConfig("chapter_dungeon_shards")[id].first_pass_reward +function DungeonShardsDataComp:getFirstRewardNum(id) + local count = 0 + for index, reward in ipairs(ConfigManager:getConfig("chapter_dungeon_shards")[id].first_pass_reward) do + count = count + GFunc.getRewardNum(reward) + end + return count end -function DungeonShardsDataComp:getPassReward(id) +function DungeonShardsDataComp:getPassRewardNum(id) + local count = 0 local pass = ConfigManager:getConfig("chapter_dungeon_shards")[id].pass_reward local wave = ConfigManager:getConfig("chapter_dungeon_shards")[id].wave_reward - -- todo 处理奖励结构 - return pass + for index, reward in ipairs(pass) do + count = count + GFunc.getRewardNum(reward) + end + for index, reward in ipairs(wave) do + count = count + GFunc.getRewardNum(reward) + end + return count end return DungeonShardsDataComp \ No newline at end of file From 1d68846a85059cd85c83187b6b626ddaef06a131 Mon Sep 17 00:00:00 2001 From: Fang Date: Tue, 13 Jun 2023 17:34:09 +0800 Subject: [PATCH 16/20] =?UTF-8?q?ui=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/skill.lua | 59 +++++++------------ lua/app/config/strings/cn/global.lua | 4 +- lua/app/config/strings/en/global.lua | 2 +- lua/app/config/strings/zh/global.lua | 2 +- lua/app/module/chapter/chapter_manager.lua | 2 + lua/app/module/dungeon/dungeon_manager.lua | 6 ++ lua/app/ui/dungeon/dungeon_board_cell.lua | 31 ++++++---- .../ui/main_city/component/dungeon_comp.lua | 10 ++++ lua/app/userdata/dungeon/dungeon_data.lua | 56 +++++++++++------- .../dungeon/dungeon_data_base_comp.lua | 5 ++ .../dungeon/dungeon_gold_data_comp.lua | 6 +- .../dungeon/dungeon_shards_data_comp.lua | 6 +- 12 files changed, 116 insertions(+), 73 deletions(-) diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 7dce5959..103a0c56 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -237,9 +237,8 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=5, - ["sound_hit"]={ - 1200120 - }, + ["sound"]=12001200, + ["sound_delay"]=0, ["name_act"]="skill01", ["fx_self"]=300022, ["bullet_time"]={ @@ -1623,9 +1622,8 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=5, - ["sound_hit"]={ - 2200120 - }, + ["sound"]=22001200, + ["sound_delay"]=0, ["name_act"]="skill01", ["fx_self"]=300009, ["bullet_time"]={ @@ -1721,9 +1719,8 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=5, - ["sound_hit"]={ - 2200120 - }, + ["sound"]=22001200, + ["sound_delay"]=0, ["name_act"]="skill01", ["fx_self"]=300009, ["bullet_time"]={ @@ -2404,9 +2401,8 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 2400120 - }, + ["sound"]=24001200, + ["sound_delay"]=0, ["name_act"]="skill01", ["fx_self"]=300032, ["bullet_time"]={ @@ -2548,9 +2544,8 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 2400120 - }, + ["sound"]=24001200, + ["sound_delay"]=0, ["name_act"]="skill01", ["fx_self"]=300032, ["bullet_time"]={ @@ -2592,9 +2587,8 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 2400120 - }, + ["sound"]=24001200, + ["sound_delay"]=0, ["name_act"]="skill01", ["fx_self"]=300032, ["bullet_time"]={ @@ -2944,9 +2938,8 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 3200120 - }, + ["sound"]=32001200, + ["sound_delay"]=0, ["name_act"]="skill01", ["fx_self"]=300004, ["bullet_time"]={ @@ -3738,9 +3731,8 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=5, - ["sound_hit"]={ - 3400120 - }, + ["sound"]=34001200, + ["sound_delay"]=0, ["name_act"]="skill01", ["fx_self"]=300092, ["bullet_time"]={ @@ -4226,9 +4218,8 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 4200120 - }, + ["sound"]=42001200, + ["sound_delay"]=0, ["name_act"]="skill01", ["fx_target"]=300014, ["bullet_time"]={ @@ -6187,11 +6178,8 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 54001201, - 0, - 54001203 - }, + ["sound"]=54001200, + ["sound_delay"]=0, ["name_act"]="skill01", ["fx_self"]=300089, ["bullet_time"]={ @@ -6261,11 +6249,8 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 54001201, - 0, - 54001203 - }, + ["sound"]=54001200, + ["sound_delay"]=0, ["name_act"]="skill01", ["fx_self"]=300089, ["bullet_time"]={ diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index e44d4880..23dbb608 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -97,7 +97,7 @@ local localization_global = ["STR_UNLOCK"] = "解锁", ["TASK_DESC_1"] = "通行证专属任务", ["STR_COMPLETED"] = "已完成", - ["HERO_CARD_TIPS_DESC"] = "可能获得以下英雄卡牌：", + ["HERO_CARD_TIPS_DESC"] = "可能获得以下英雄碎片：", ["HERO_CARD_DESC_QLT_2"] = "优秀英雄", ["HERO_CARD_DESC_QLT_3"] = "稀有英雄", ["HERO_CARD_DESC_QLT_4"] = "史诗英雄", @@ -220,7 +220,7 @@ local localization_global = ["DUNGEON_GOLD_TITLE"] = "金币副本（需要包装）", ["DUNGEON_GOLD_HELP"] = "规定回合内击毁古代遗迹！", ["DUNGEON_GOLD_OPEN"] = "开启时间：周二、周四、周六、周日", - ["DUNGEON_OPEN"] = "开启时间：", + ["DUNGEON_OPEN"] = "开启时间:", ["FIRST_PASS"] = "首通", ["PASS_REQUIRE"] = "通关上一关卡解锁", ["DUNGEON_STAGE"] = "关卡", diff --git a/lua/app/config/strings/en/global.lua b/lua/app/config/strings/en/global.lua index 30ef1458..3a73bbd5 100644 --- a/lua/app/config/strings/en/global.lua +++ b/lua/app/config/strings/en/global.lua @@ -97,7 +97,7 @@ local localization_global = ["STR_UNLOCK"] = "Unlock", ["TASK_DESC_1"] = "Pass-exclusive Quest", ["STR_COMPLETED"] = "Completed", - ["HERO_CARD_TIPS_DESC"] = "Possible Hero Card Rewards:", + ["HERO_CARD_TIPS_DESC"] = "Possible Hero Shard Rewards:", ["HERO_CARD_DESC_QLT_2"] = "Uncommon Hero", ["HERO_CARD_DESC_QLT_3"] = "Rare Hero", ["HERO_CARD_DESC_QLT_4"] = "Epic Hero", diff --git a/lua/app/config/strings/zh/global.lua b/lua/app/config/strings/zh/global.lua index 7ac96024..c38b2e02 100644 --- a/lua/app/config/strings/zh/global.lua +++ b/lua/app/config/strings/zh/global.lua @@ -97,7 +97,7 @@ local localization_global = ["STR_UNLOCK"] = "解鎖", ["TASK_DESC_1"] = "通行證專屬任務", ["STR_COMPLETED"] = "已完成", - ["HERO_CARD_TIPS_DESC"] = "可能會獲得以下英雄卡牌：", + ["HERO_CARD_TIPS_DESC"] = "可能會獲得以下英雄碎片：", ["HERO_CARD_DESC_QLT_2"] = "優秀英雄", ["HERO_CARD_DESC_QLT_3"] = "稀有英雄", ["HERO_CARD_DESC_QLT_4"] = "史詩英雄", diff --git a/lua/app/module/chapter/chapter_manager.lua b/lua/app/module/chapter/chapter_manager.lua index fc602b5e..0010b04d 100644 --- a/lua/app/module/chapter/chapter_manager.lua +++ b/lua/app/module/chapter/chapter_manager.lua @@ -116,6 +116,8 @@ function ChapterManager:endFightFinish(result) DataManager:tryOpenModules() -- 更新每日挑战数据 ModuleManager.DailyChallengeManager:onResetState() + -- 更新副本活动 + DataManager.DungeonData:setDirty() -- 章节通关 标记可弹出章节礼包 DataManager.ShopData:markPopUpGiftForActChapterStore(maxChapter) ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_PASS_CHAPTER) diff --git a/lua/app/module/dungeon/dungeon_manager.lua b/lua/app/module/dungeon/dungeon_manager.lua index 76bb376a..9a4afa25 100644 --- a/lua/app/module/dungeon/dungeon_manager.lua +++ b/lua/app/module/dungeon/dungeon_manager.lua @@ -32,6 +32,12 @@ end -- 内部接口-------------------------------------------------------------------------- function DungeonManager:checkDayChange() + if not DataManager.DungeonData:getIfCanReset() then + return + end + + -- 跨天重置数据 + DataManager.DungeonData:onDayChange() end -- 请求挑战金币副本 diff --git a/lua/app/ui/dungeon/dungeon_board_cell.lua b/lua/app/ui/dungeon/dungeon_board_cell.lua index 75ee7add..25fd07d8 100644 --- a/lua/app/ui/dungeon/dungeon_board_cell.lua +++ b/lua/app/ui/dungeon/dungeon_board_cell.lua @@ -8,7 +8,9 @@ function DungeonBoardCell:init() self.txCountdown = self.uiMap["dungeon_board_cell.countdown.tx_countdown"] self.txOpen = self.uiMap["dungeon_board_cell.tx_open"] self.lock = self.uiMap["dungeon_board_cell.lock"] + self.lockIcon = self.uiMap["dungeon_board_cell.lock.desc.icon"] self.lockTxLock = self.uiMap["dungeon_board_cell.lock.desc.tx_lock"] + self.lockIconCountdown = self.uiMap["dungeon_board_cell.lock.countdown.icon"] 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"] @@ -29,7 +31,6 @@ end function DungeonBoardCell:refresh(moduleKey) self.moduleKey = moduleKey - self.baseObject:setName(self.moduleKey) self:refreshInfo() self:refreshRewards() @@ -37,8 +38,8 @@ end function DungeonBoardCell:refreshInfo() self.txTitle:setText(DataManager.DungeonData:getTitle(self.moduleKey)) - self.txOpen:setText(DataManager.DungeonData:getOpenTimeDesc(self.moduleKey)) - self.baseObject:setTexture(DataManager.DungeonData:getBanner(self.moduleKey)) + self.txOpen:setText("" .. DataManager.DungeonData:getOpenTimeDesc(self.moduleKey) .. "") + self.baseObject:setTexture(DataManager.DungeonData:getBanner(self.moduleKey)) if DataManager.DungeonData:isActive(self.moduleKey) then self.btnStart:setVisible(true) @@ -66,6 +67,9 @@ function DungeonBoardCell:refreshInfo() self.lockTxLock:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_OPEN)) self:refreshCountdown(self.lockTxCountdown) end + + GFunc.centerImgAndTx(self.lockIcon, self.lockTxLock, 10) + GFunc.centerImgAndTx(self.lockIconCountdown, self.lockTxCountdown, 10) end function DungeonBoardCell:refreshRewards() @@ -91,17 +95,24 @@ function DungeonBoardCell:refreshRewards() end function DungeonBoardCell:refreshCountdown(txCountdown) - if not self.countdownSid then - self.countdownSid = txCountdown:scheduleGlobal(function() - self:updateTime(txCountdown) - end, 1) - end + if self.countdownSid then + SchedulerManager:unscheduleGlobal(self.countdownSid) + self.countdownSid = nil + end + self.countdownSid = txCountdown:scheduleGlobal(function() + self:updateTime(txCountdown) + end, 1) self:updateTime(txCountdown) end function DungeonBoardCell:updateTime(txCountdown) - local remainTime = Time:getTodaySurplusTime() - txCountdown:setText(GFunc.getTimeStrWithHMS(remainTime)) + if self.remainTime == nil then + self.remainTime = DataManager.DungeonData:geNextTime(self.moduleKey) + else + self.remainTime = self.remainTime - 1 + end + + txCountdown:setText(GFunc.getTimeStrWithHMS(self.remainTime)) end return DungeonBoardCell \ No newline at end of file diff --git a/lua/app/ui/main_city/component/dungeon_comp.lua b/lua/app/ui/main_city/component/dungeon_comp.lua index 5bdb83b6..c5e72239 100644 --- a/lua/app/ui/main_city/component/dungeon_comp.lua +++ b/lua/app/ui/main_city/component/dungeon_comp.lua @@ -48,6 +48,16 @@ function DungeonComp:refreshShow() else self.scrollRectComp:updateAllCell() end + + -- 跨天定时器 + if self.countdownSid then + SchedulerManager:unscheduleGlobal(self.countdownSid) + self.countdownSid = nil + end + self.countdownSid = self:getBaseObject():scheduleGlobal(function() + ModuleManager.DungeonManager:checkDayChange() + end, Time:getTodaySurplusTime()) + end return DungeonComp \ No newline at end of file diff --git a/lua/app/userdata/dungeon/dungeon_data.lua b/lua/app/userdata/dungeon/dungeon_data.lua index f1ceb8d9..3d2fd1c5 100644 --- a/lua/app/userdata/dungeon/dungeon_data.lua +++ b/lua/app/userdata/dungeon/dungeon_data.lua @@ -17,13 +17,9 @@ 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 + if data == nil then + return + end self:initAllDataClass() self.dataDungeons[ModuleManager.MODULE_KEY.DUNGEON_GOLD]:init(data) @@ -33,12 +29,8 @@ end -- 初始化碎片副本数据 function DungeonData:initDungeonShards(data) - if EDITOR_MODE then - data = { - today_challenge_count = 2, - max_chapter_shards_id = 2, - -- latest_chapter_shards_id = 1, - } + if data == nil then + return end self:initAllDataClass() @@ -54,6 +46,21 @@ function DungeonData:initAllDataClass() 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 + + self.initDay = Time:getBeginningOfServerToday() +end + +function DungeonData:getIfCanReset() + return self.initDay < Time:getBeginningOfServerToday() +end + +-- 跨天处理 +function DungeonData:onDayChange() + self.data.gold.today_challenge_count = 0 + self.data.shards.today_challenge_count = 0 + + self:initDungeonGold(self.data.gold) + self:initDungeonGold(self.data.shards) end -- 客户端处理副本次数+1的情况 @@ -212,6 +219,15 @@ function DungeonData:getChallengeHpCost(moduleKey) return self.dataDungeons[moduleKey]:getChallengeHpCost() end +-- 获取副本下个状态改变时间 +function DungeonData:geNextTime(moduleKey) + if self:isActive(moduleKey) then + return self:getCloseTime(moduleKey) + else + return self:getOpenTime(moduleKey) + end +end + -- 获取副本开启倒计时 function DungeonData:getOpenTime(moduleKey) if not self.dataDungeons[moduleKey] then @@ -221,7 +237,7 @@ function DungeonData:getOpenTime(moduleKey) local isClose = true local count = 0 while isClose do - local checkWeek = Time:getWeekByTimeStamp(self:getServerTime() + ((count + 1) * 86400)) + local checkWeek = Time:getWeekByTimeStamp(Time:getServerTime() + ((count + 1) * 86400)) if self:isActiveCycle(moduleKey, checkWeek) then isClose = false else @@ -241,7 +257,7 @@ function DungeonData:getCloseTime(moduleKey) local isActive = true local count = 0 while isActive do - local checkWeek = Time:getWeekByTimeStamp(self:getServerTime() + ((count + 1) * 86400)) + local checkWeek = Time:getWeekByTimeStamp(Time:getServerTime() + ((count + 1) * 86400)) if not self:isActiveCycle(moduleKey, checkWeek) then isActive = false else @@ -252,11 +268,6 @@ function DungeonData:getCloseTime(moduleKey) return Time:getTodaySurplusTime() + (count * 86400) end --- 获取看板展示的副本奖励 -function DungeonData:getBoardShowRewards(moduleKey) - return nil -end - -- 获取看板展示的副本奖励(返回icon) function DungeonData:getBoardShowRewardIcon(moduleKey) return self.dataDungeons[moduleKey]:getBoardShowRewardIcon() @@ -327,6 +338,11 @@ function DungeonData:getBanner(moduleKey) return self.dataDungeons[moduleKey]:getBanner() end +-- 获取开启时间文本颜色 +function DungeonData:getOpenTextColor(moduleKey) + return self.dataDungeons[moduleKey]:getOpenTextColor() +end + function DungeonData:setCurFightChapterId(chapterId) self.curFightchapterId = chapterId or 1 end diff --git a/lua/app/userdata/dungeon/dungeon_data_base_comp.lua b/lua/app/userdata/dungeon/dungeon_data_base_comp.lua index b9e7449c..f56199e7 100644 --- a/lua/app/userdata/dungeon/dungeon_data_base_comp.lua +++ b/lua/app/userdata/dungeon/dungeon_data_base_comp.lua @@ -51,6 +51,11 @@ function DungeonDataBaseComp:getBanner() return nil end +-- 获取开启时间文本颜色 +function DungeonDataBaseComp:getOpenTextColor() + return nil +end + -- 获取总挑战次数 function DungeonDataBaseComp:getTotalChallengeCount() return nil diff --git a/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua b/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua index 841afa25..5900371e 100644 --- a/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua +++ b/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua @@ -26,7 +26,7 @@ function DungeonGoldDataComp:getModuleKey() end function DungeonGoldDataComp:getOpenWeekCycle() - return {1,2,3,4,5,6,7} + return {2,4,6,7} end function DungeonGoldDataComp:getConfigName() @@ -53,6 +53,10 @@ function DungeonGoldDataComp:getBanner() return "assets/arts/textures/background/dungeon/dungeon_bg_1.png" end +function DungeonGoldDataComp:getOpenTextColor() + return "#FFEDC5" +end + function DungeonGoldDataComp:getChallengeHpCost() return GFunc.getConstReward("dungeon_gold_cost") end diff --git a/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua b/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua index 3ba39a00..69f89208 100644 --- a/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua +++ b/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua @@ -26,7 +26,7 @@ function DungeonShardsDataComp:getModuleKey() end function DungeonShardsDataComp:getOpenWeekCycle() - return {1,2,3,4,5,6,7} + return {1,3,5,7} end function DungeonShardsDataComp:getConfigName() @@ -53,6 +53,10 @@ function DungeonShardsDataComp:getBanner() return "assets/arts/textures/background/dungeon/dungeon_bg_2.png" end +function DungeonShardsDataComp:getOpenTextColor() + return "#E4F5FE" +end + function DungeonShardsDataComp:getChallengeHpCost() return GFunc.getConstReward("dungeon_shards_cost") end From 097812e730679437f97c5bb27c8ed13d47aef2cb Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 14 Jun 2023 10:22:34 +0800 Subject: [PATCH 17/20] fix --- lua/app/common/event_manager.lua | 2 ++ lua/app/module/dungeon/dungeon_manager.lua | 17 ++++++++++++----- lua/app/ui/dungeon/dungeon_difficulty_ui.lua | 7 +++++++ .../ui/main_city/component/dungeon_comp.lua | 5 ++++- lua/app/ui/main_city/main_city_ui.lua | 2 +- lua/app/userdata/dungeon/dungeon_data.lua | 18 ++++++++++++++++-- .../dungeon/dungeon_shards_data_comp.lua | 4 ++++ 7 files changed, 46 insertions(+), 9 deletions(-) diff --git a/lua/app/common/event_manager.lua b/lua/app/common/event_manager.lua index c4b8ff53..1e12eb58 100644 --- a/lua/app/common/event_manager.lua +++ b/lua/app/common/event_manager.lua @@ -33,6 +33,8 @@ EventManager.CUSTOM_EVENT = { CLOSE_BOX_HERO_UI = "CLOSE_BOX_HERO_UI", CLOSE_BOX_OPEN_UI = "CLOSE_BOX_OPEN_UI", BIND_ACCOUNT_SUCCESS = "BIND_ACCOUNT_SUCCESS", + DUNGEON_CHALLENGE = "DUNGEON_CHALLENGE",-- 副本开始挑战 + DUNGEON_SWEEP = "DUNGEON_SWEEP",-- 副本开始扫荡 -- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN", -- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER" } diff --git a/lua/app/module/dungeon/dungeon_manager.lua b/lua/app/module/dungeon/dungeon_manager.lua index 9a4afa25..dc44f858 100644 --- a/lua/app/module/dungeon/dungeon_manager.lua +++ b/lua/app/module/dungeon/dungeon_manager.lua @@ -32,6 +32,9 @@ end -- 内部接口-------------------------------------------------------------------------- function DungeonManager:checkDayChange() + if EDITOR_MODE then + Logger.logHighlight("检查跨天：".. tostring(DataManager.DungeonData:getIfCanReset())) + end if not DataManager.DungeonData:getIfCanReset() then return end @@ -44,7 +47,7 @@ end function DungeonManager:reqChallengeGold(id) local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD -- 判断次数 - if not (DataManager.DungeonData:getRemainTimes(moduleKey) > 0) then + if DataManager.DungeonData:getRemainTimes(moduleKey) <= 0 then GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) return end @@ -70,6 +73,7 @@ function DungeonManager:respChallengeGold(result) DataManager.DungeonData:onFightCountReduce(ModuleManager.MODULE_KEY.DUNGEON_GOLD) DataManager.DungeonData:setCurFightChapterId(result.reqData.chapter_gold_id) ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD) + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.DUNGEON_CHALLENGE) end end @@ -98,7 +102,7 @@ end function DungeonManager:reqSweepGold(id) local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD -- 判断次数 - if not (DataManager.DungeonData:getRemainTimes(moduleKey) > 0) then + if DataManager.DungeonData:getRemainTimes(moduleKey) <= 0 then GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) return end @@ -124,14 +128,15 @@ end function DungeonManager:respSweepGold(result) if result.err_code == GConst.ERROR_STR.SUCCESS then DataManager.DungeonData:onFightCountReduce(ModuleManager.MODULE_KEY.DUNGEON_GOLD) + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.DUNGEON_SWEEP) end end -- 请求挑战碎片副本 function DungeonManager:reqChallengeShards(id) - local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD + local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_SHARDS -- 判断次数 - if not (DataManager.DungeonData:getRemainTimes(moduleKey) > 0) then + if DataManager.DungeonData:getRemainTimes(moduleKey) <= 0 then GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) return end @@ -157,6 +162,7 @@ function DungeonManager:respChallengeShards(result) DataManager.DungeonData:onFightCountReduce(ModuleManager.MODULE_KEY.DUNGEON_SHARDS) DataManager.DungeonData:setCurFightChapterId(result.reqData.chapter_shards_id) ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS) + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.DUNGEON_CHALLENGE) end end @@ -184,7 +190,7 @@ end function DungeonManager:reqSweepShards(id) local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_SHARDS -- 判断次数 - if not (DataManager.DungeonData:getRemainTimes(moduleKey) > 0) then + if DataManager.DungeonData:getRemainTimes(moduleKey) <= 0 then GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) return end @@ -210,6 +216,7 @@ end function DungeonManager:respSweepShards(result) if result.err_code == GConst.ERROR_STR.SUCCESS then DataManager.DungeonData:onFightCountReduce(ModuleManager.MODULE_KEY.DUNGEON_SHARDS) + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.DUNGEON_SWEEP) end end diff --git a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua index 0f31f396..f7bb1a0c 100644 --- a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua +++ b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua @@ -100,6 +100,13 @@ function DungeonDifficultyUI:onLoadRootComplete() self.curId = self.curId + 1 self:refreshDifficulty() end) + + self:addEventListener(EventManager.CUSTOM_EVENT.DUNGEON_CHALLENGE, function() + self:closeUI() + end) + self:addEventListener(EventManager.CUSTOM_EVENT.DUNGEON_SWEEP, function() + self:closeUI() + end) end function DungeonDifficultyUI:refreshDifficulty() diff --git a/lua/app/ui/main_city/component/dungeon_comp.lua b/lua/app/ui/main_city/component/dungeon_comp.lua index c5e72239..192883ae 100644 --- a/lua/app/ui/main_city/component/dungeon_comp.lua +++ b/lua/app/ui/main_city/component/dungeon_comp.lua @@ -41,6 +41,9 @@ function DungeonComp:init() end function DungeonComp:refreshShow() + if EDITOR_MODE then + Logger.logHighlight("更新副本显示."..tostring(Time:getTodaySurplusTime())) + end self.openDungeons = DataManager.DungeonData:getOpenDungeons() if self.scrollRectComp:getTotalCount() ~= #self.openDungeons then self.scrollRectComp:clearCells() @@ -56,7 +59,7 @@ function DungeonComp:refreshShow() end self.countdownSid = self:getBaseObject():scheduleGlobal(function() ModuleManager.DungeonManager:checkDayChange() - end, Time:getTodaySurplusTime()) + end, Time:getTodaySurplusTime() + 1) end diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 83a183b6..a8fadff1 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -237,7 +237,7 @@ function MainCityUI:_bind() end end) - self:bind(DataManager.DailyChallengeData, "isDirty", function() + self:bind(DataManager.DungeonData, "isDirty", function() if self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.MAIN then if self.subComps[self.selectedIndex] then self.subComps[self.selectedIndex]:refreshDungeon() diff --git a/lua/app/userdata/dungeon/dungeon_data.lua b/lua/app/userdata/dungeon/dungeon_data.lua index 3d2fd1c5..d04dc6fb 100644 --- a/lua/app/userdata/dungeon/dungeon_data.lua +++ b/lua/app/userdata/dungeon/dungeon_data.lua @@ -21,6 +21,11 @@ function DungeonData:initDungeonGold(data) return end + if EDITOR_MODE then + Logger.logHighlight("更新金币副本数据") + Logger.printTable(data) + end + self:initAllDataClass() self.dataDungeons[ModuleManager.MODULE_KEY.DUNGEON_GOLD]:init(data) self.data.gold = data @@ -33,6 +38,11 @@ function DungeonData:initDungeonShards(data) return end + if EDITOR_MODE then + Logger.logHighlight("更新碎片副本数据") + Logger.printTable(data) + end + self:initAllDataClass() self.dataDungeons[ModuleManager.MODULE_KEY.DUNGEON_SHARDS]:init(data) self.data.shards = data @@ -45,6 +55,10 @@ function DungeonData:initAllDataClass() 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() + + if EDITOR_MODE then + Logger.logHighlight("星期".. tostring(Time:getWeekByTimeStamp())) + end end self.initDay = Time:getBeginningOfServerToday() @@ -60,7 +74,7 @@ function DungeonData:onDayChange() self.data.shards.today_challenge_count = 0 self:initDungeonGold(self.data.gold) - self:initDungeonGold(self.data.shards) + self:initDungeonShards(self.data.shards) end -- 客户端处理副本次数+1的情况 @@ -70,7 +84,7 @@ function DungeonData:onFightCountReduce(moduleKey) 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) + self:initDungeonShards(self.data.shards) end end diff --git a/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua b/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua index 69f89208..6bf0eb71 100644 --- a/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua +++ b/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua @@ -37,6 +37,10 @@ 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 From ecb24214aa2d52795ad2e1e0fbf28bb44c61e1de Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 14 Jun 2023 11:38:50 +0800 Subject: [PATCH 18/20] fix --- lua/app/config/chapter_dungeon_shards.lua | 60 +-- lua/app/config/skill.lua | 457 +++++++++--------- lua/app/config/skill_rogue.lua | 250 +++++----- lua/app/config/strings/cn/hero.lua | 4 +- lua/app/config/strings/cn/item.lua | 8 +- .../battle_controller_dungeon_shards.lua | 4 +- lua/app/module/dungeon/dungeon_manager.lua | 4 +- lua/app/ui/dungeon/dungeon_board_cell.lua | 10 +- lua/app/ui/dungeon/dungeon_difficulty_ui.lua | 11 +- lua/app/userdata/dungeon/dungeon_data.lua | 4 + 10 files changed, 414 insertions(+), 398 deletions(-) diff --git a/lua/app/config/chapter_dungeon_shards.lua b/lua/app/config/chapter_dungeon_shards.lua index 0a59a4c6..4975bad9 100644 --- a/lua/app/config/chapter_dungeon_shards.lua +++ b/lua/app/config/chapter_dungeon_shards.lua @@ -10,7 +10,7 @@ local chapter_dungeon_shards = { 4, 5 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 104, 204, 304, @@ -99,7 +99,7 @@ local chapter_dungeon_shards = { 9, 10 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 604, 704, 804, @@ -188,7 +188,7 @@ local chapter_dungeon_shards = { 14, 15 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 1104, 1204, 1304, @@ -277,7 +277,7 @@ local chapter_dungeon_shards = { 19, 20 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 1604, 1704, 1804, @@ -366,7 +366,7 @@ local chapter_dungeon_shards = { 24, 25 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 2104, 2204, 2304, @@ -455,7 +455,7 @@ local chapter_dungeon_shards = { 29, 30 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 2604, 2704, 2804, @@ -544,7 +544,7 @@ local chapter_dungeon_shards = { 34, 35 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 3104, 3204, 3304, @@ -633,7 +633,7 @@ local chapter_dungeon_shards = { 39, 40 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 3604, 3704, 3804, @@ -722,7 +722,7 @@ local chapter_dungeon_shards = { 44, 45 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 4104, 4204, 4304, @@ -811,7 +811,7 @@ local chapter_dungeon_shards = { 49, 50 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 4604, 4704, 4804, @@ -900,7 +900,7 @@ local chapter_dungeon_shards = { 54, 55 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 5104, 5204, 5304, @@ -989,7 +989,7 @@ local chapter_dungeon_shards = { 59, 60 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 5604, 5704, 5804, @@ -1078,7 +1078,7 @@ local chapter_dungeon_shards = { 64, 65 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 6104, 6204, 6304, @@ -1167,7 +1167,7 @@ local chapter_dungeon_shards = { 69, 70 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 6604, 6704, 6804, @@ -1256,7 +1256,7 @@ local chapter_dungeon_shards = { 74, 75 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 7104, 7204, 7304, @@ -1345,7 +1345,7 @@ local chapter_dungeon_shards = { 79, 80 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 7604, 7704, 7804, @@ -1434,7 +1434,7 @@ local chapter_dungeon_shards = { 84, 85 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 8104, 8204, 8304, @@ -1523,7 +1523,7 @@ local chapter_dungeon_shards = { 89, 90 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 8604, 8704, 8804, @@ -1612,7 +1612,7 @@ local chapter_dungeon_shards = { 94, 95 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 9104, 9204, 9304, @@ -1701,7 +1701,7 @@ local chapter_dungeon_shards = { 99, 100 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 9604, 9704, 9804, @@ -1790,7 +1790,7 @@ local chapter_dungeon_shards = { 104, 105 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 10104, 10204, 10304, @@ -1879,7 +1879,7 @@ local chapter_dungeon_shards = { 109, 110 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 10604, 10704, 10804, @@ -1968,7 +1968,7 @@ local chapter_dungeon_shards = { 114, 115 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 11104, 11204, 11304, @@ -2057,7 +2057,7 @@ local chapter_dungeon_shards = { 119, 120 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 11604, 11704, 11804, @@ -2146,7 +2146,7 @@ local chapter_dungeon_shards = { 124, 125 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 12104, 12204, 12304, @@ -2235,7 +2235,7 @@ local chapter_dungeon_shards = { 129, 130 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 12604, 12704, 12804, @@ -2324,7 +2324,7 @@ local chapter_dungeon_shards = { 134, 135 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 13104, 13204, 13304, @@ -2413,7 +2413,7 @@ local chapter_dungeon_shards = { 139, 140 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 13604, 13704, 13804, @@ -2502,7 +2502,7 @@ local chapter_dungeon_shards = { 144, 145 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 14104, 14204, 14304, @@ -2591,7 +2591,7 @@ local chapter_dungeon_shards = { 149, 150 }, - ["monster_dungeon_shards"]={ + ["monster"]={ 14604, 14704, 14804, diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 103a0c56..92bf55d1 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -1120,9 +1120,8 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 1400120 - }, + ["sound"]=14001200, + ["sound_delay"]=0, ["name_act"]="skill01", ["fx_self"]=300049, ["bullet_time"]={ @@ -1337,9 +1336,8 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 54001201 - }, + ["sound"]=14002200, + ["sound_delay"]=0, ["name_act"]="skill01", ["fx_self"]=300089, ["bullet_time"]={ @@ -1435,9 +1433,8 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 54001201 - }, + ["sound"]=14002200, + ["sound_delay"]=0, ["name_act"]="skill01", ["fx_self"]=300089, ["bullet_time"]={ @@ -2738,9 +2735,8 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=6, - ["sound_hit"]={ - 2400120 - }, + ["sound"]=24002200, + ["sound_delay"]=0, ["name_act"]="skill01", ["fx_self"]=300032, ["bullet_time"]={ @@ -3869,12 +3865,12 @@ local skill = { } }, [3400210]={ - ["position"]=3, + ["position"]=4, ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { - ["type"]="hurt_green", + ["type"]="hurt_blue", ["num"]=10000, ["ratio"]=10000, ["round"]=0 @@ -3882,8 +3878,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3891,15 +3887,15 @@ local skill = { 1000001 }, ["name_act"]="attack01", - ["fx_self"]=300091 + ["fx_self"]=300033 }, [3400211]={ - ["position"]=3, + ["position"]=4, ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { - ["type"]="hurt_green", + ["type"]="hurt_blue", ["num"]=10000, ["ratio"]=10000, ["round"]=0 @@ -3907,8 +3903,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3916,15 +3912,15 @@ local skill = { 1000002 }, ["name_act"]="attack02", - ["fx_self"]=300091 + ["fx_self"]=300033 }, [3400212]={ - ["position"]=3, + ["position"]=4, ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { - ["type"]="hurt_green", + ["type"]="hurt_blue", ["num"]=10000, ["ratio"]=10000, ["round"]=0 @@ -3932,8 +3928,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3941,15 +3937,15 @@ local skill = { 1000003 }, ["name_act"]="attack03", - ["fx_self"]=300091 + ["fx_self"]=300093 }, [3400213]={ - ["position"]=3, + ["position"]=4, ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { - ["type"]="hurt_green", + ["type"]="hurt_blue", ["num"]=10000, ["ratio"]=10000, ["round"]=0 @@ -3957,8 +3953,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3966,127 +3962,145 @@ local skill = { 1000004 }, ["name_act"]="attack04", - ["fx_self"]=300091 + ["fx_self"]=300094 }, [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, + ["position"]=4, ["method"]=2, ["skill_type"]=4, ["boardrange"]={ - { - ["type"]=1, - ["range"]=2 - }, - { - ["type"]=2, - ["range"]=2 - } + }, - ["battle_icon"]="18", + ["battle_icon"]="19", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { - ["type"]="hurt_green", + ["type"]="hurt_blue", ["num"]=40000, ["ratio"]=10000, ["round"]=0 }, { - ["type"]="curse", - ["num"]=2500, - ["ratio"]=10000, - ["round"]=1 + ["type"]="lethargy", + ["num"]=0, + ["ratio"]=5000, + ["round"]=2 } }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=200, - ["shake_type"]=6, + ["shake_type"]=5, ["sound_hit"]={ - 3400120 + 4300120 }, ["name_act"]="skill01", - ["fx_self"]=300092, + ["fx_target"]=300034, ["bullet_time"]={ - 1600, + 633, 3000, - 200 + 400 } }, + [3400221]={ + ["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 + }, [3400222]={ - ["position"]=3, + ["position"]=4, + ["buff_condition"]={ + { + { + ["type"]="state", + ["attr"]="lethargy", + ["op"]=">", + ["v"]=0, + ["side"]=2 + } + } + }, ["effect_type"]=2, ["trigger"]=5, ["effect"]={ { - ["type"]="corrupt", - ["num"]=5000, - ["ratio"]=1000, + ["type"]="imprison", + ["num"]=0, + ["ratio"]=10000, ["round"]=2 } }, ["obj"]=2 }, [3400223]={ - ["position"]=3, - ["effect_type"]=2, - ["trigger"]=5, + ["energy"]=8, + ["link"]=1, + ["position"]=4, + ["method"]=2, + ["skill_type"]=4, + ["boardrange"]={ + + }, + ["battle_icon"]="19", + ["effect_type"]=1, + ["trigger"]=1, ["effect"]={ { - ["type"]="corrupt", - ["num"]=5000, - ["ratio"]=1000, + ["type"]="hurt_blue", + ["num"]=40000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="lethargy", + ["num"]=0, + ["ratio"]=5000, ["round"]=2 } }, - ["obj"]=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 + } }, [4200110]={ ["position"]=4, @@ -4976,9 +4990,8 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=5, - ["sound_hit"]={ - 4300120 - }, + ["sound"]=44001200, + ["sound_delay"]=0, ["name_act"]="skill01", ["fx_target"]=300034, ["bullet_time"]={ @@ -5047,12 +5060,12 @@ local skill = { ["obj"]=2 }, [4400210]={ - ["position"]=4, + ["position"]=3, ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { - ["type"]="hurt_blue", + ["type"]="hurt_green", ["num"]=10000, ["ratio"]=10000, ["round"]=0 @@ -5060,8 +5073,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 2, - 0 + 1, + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5069,15 +5082,15 @@ local skill = { 1000001 }, ["name_act"]="attack01", - ["fx_self"]=300033 + ["fx_self"]=300091 }, [4400211]={ - ["position"]=4, + ["position"]=3, ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { - ["type"]="hurt_blue", + ["type"]="hurt_green", ["num"]=10000, ["ratio"]=10000, ["round"]=0 @@ -5085,8 +5098,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 2, - 0 + 1, + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5094,15 +5107,15 @@ local skill = { 1000002 }, ["name_act"]="attack02", - ["fx_self"]=300033 + ["fx_self"]=300091 }, [4400212]={ - ["position"]=4, + ["position"]=3, ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { - ["type"]="hurt_blue", + ["type"]="hurt_green", ["num"]=10000, ["ratio"]=10000, ["round"]=0 @@ -5110,8 +5123,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 2, - 0 + 1, + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5119,15 +5132,15 @@ local skill = { 1000003 }, ["name_act"]="attack03", - ["fx_self"]=300093 + ["fx_self"]=300091 }, [4400213]={ - ["position"]=4, + ["position"]=3, ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { - ["type"]="hurt_blue", + ["type"]="hurt_green", ["num"]=10000, ["ratio"]=10000, ["round"]=0 @@ -5135,8 +5148,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 2, - 0 + 1, + 140 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5144,145 +5157,127 @@ local skill = { 1000004 }, ["name_act"]="attack04", - ["fx_self"]=300094 + ["fx_self"]=300091 }, [4400220]={ ["energy"]=10, ["link"]=1, - ["position"]=4, - ["method"]=2, - ["skill_type"]=4, - ["boardrange"]={ - - }, - ["battle_icon"]="19", + ["position"]=3, + ["method"]=1, + ["skill_type"]=0, + ["battle_icon"]="18", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { - ["type"]="hurt_blue", + ["type"]="hurt_green", ["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, + ["type"]="curse", + ["num"]=2500, ["ratio"]=10000, ["round"]=1 } }, - ["obj"]=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 + } }, - [4400222]={ - ["position"]=4, - ["buff_condition"]={ + [4400221]={ + ["energy"]=10, + ["link"]=1, + ["position"]=3, + ["method"]=2, + ["skill_type"]=4, + ["boardrange"]={ { - { - ["type"]="state", - ["attr"]="lethargy", - ["op"]=">", - ["v"]=0, - ["side"]=2 - } + ["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 + } + }, + [4400222]={ + ["position"]=3, ["effect_type"]=2, ["trigger"]=5, ["effect"]={ { - ["type"]="imprison", - ["num"]=0, - ["ratio"]=10000, + ["type"]="corrupt", + ["num"]=5000, + ["ratio"]=1000, ["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, + ["position"]=3, + ["effect_type"]=2, + ["trigger"]=5, ["effect"]={ { - ["type"]="hurt_blue", - ["num"]=40000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="lethargy", - ["num"]=0, - ["ratio"]=5000, + ["type"]="corrupt", + ["num"]=5000, + ["ratio"]=1000, ["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 - } + ["obj"]=2 }, [5200110]={ ["position"]=5, diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index e4e1e462..9be155d4 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -2482,67 +2482,96 @@ local skill_rogue = { ["weight"]=100000, ["qlt"]=4, ["type"]=6, - ["skill_position"]=3, - ["icon"]="188" + ["skill_position"]=4, + ["icon"]="189" }, [3400201]={ ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, - ["type"]=1, - ["parameter"]={ - 3400221 + ["type"]=2, + ["skill_position"]=4, + ["boardrange"]={ + { + ["type"]=5, + ["range"]=1 + }, + { + ["type"]=6, + ["range"]=1 + }, + { + ["type"]=7, + ["range"]=1 + }, + { + ["type"]=8, + ["range"]=1 + } }, - ["skill_position"]=3, - ["icon"]="150" + ["icon"]="157" }, [3400202]={ ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, - ["type"]=3, - ["skill_position"]=3, + ["type"]=12, + ["skill_position"]=4, ["effect"]={ { - ["type"]="atkp", - ["num"]=5000, + ["type"]="add_skill", + ["num"]=3400221, ["ratio"]=10000, ["round"]=1 } }, - ["obj"]=1, - ["icon"]="151" + ["obj"]=6, + ["icon"]="158" }, [3400203]={ + ["unlock"]=4400201, ["limit_times"]=1, ["weight"]=3000, - ["qlt"]=4, - ["type"]=8, - ["parameter"]={ - 2, - 1 + ["qlt"]=3, + ["type"]=2, + ["skill_position"]=4, + ["boardrange"]={ + { + ["type"]=5, + ["range"]=1 + }, + { + ["type"]=6, + ["range"]=1 + }, + { + ["type"]=7, + ["range"]=1 + }, + { + ["type"]=8, + ["range"]=1 + } }, - ["skill_position"]=3, - ["icon"]="152" + ["icon"]="159" }, [3400204]={ ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, - ["type"]=7, + ["type"]=16, ["parameter"]={ 2, - 2500 + 5000 }, - ["skill_position"]=3, - ["icon"]="153" + ["skill_position"]=4, + ["icon"]="160" }, [3400205]={ ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, ["type"]=9, - ["skill_position"]=3, ["effect"]={ { ["type"]="add_skill", @@ -2551,46 +2580,36 @@ local skill_rogue = { ["round"]=999 } }, - ["obj"]=5, - ["icon"]="154" + ["obj"]=6, + ["icon"]="161" }, [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, + ["skill_position"]=4, ["effect"]={ { - ["type"]="add_skill", - ["num"]=3400223, + ["type"]="atkp_blue_add", + ["num"]=1500, ["ratio"]=10000, ["round"]=999 } }, - ["obj"]=5, - ["icon"]="156" + ["obj"]=6, + ["icon"]="162" + }, + [3400207]={ + ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, + ["type"]=1, + ["parameter"]={ + 3400223 + }, + ["skill_position"]=4, + ["icon"]="163" }, [4200100]={ ["limit_times"]=1, @@ -3076,96 +3095,67 @@ local skill_rogue = { ["weight"]=100000, ["qlt"]=4, ["type"]=6, - ["skill_position"]=4, - ["icon"]="189" + ["skill_position"]=3, + ["icon"]="188" }, [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 - } + ["type"]=1, + ["parameter"]={ + 4400221 }, - ["icon"]="157" + ["skill_position"]=3, + ["icon"]="150" }, [4400202]={ ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, - ["type"]=12, - ["skill_position"]=4, + ["type"]=3, + ["skill_position"]=3, ["effect"]={ { - ["type"]="add_skill", - ["num"]=4400221, + ["type"]="atkp", + ["num"]=5000, ["ratio"]=10000, ["round"]=1 } }, - ["obj"]=6, - ["icon"]="158" + ["obj"]=1, + ["icon"]="151" }, [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 - } + ["qlt"]=4, + ["type"]=8, + ["parameter"]={ + 2, + 1 }, - ["icon"]="159" + ["skill_position"]=3, + ["icon"]="152" }, [4400204]={ ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, - ["type"]=16, + ["type"]=7, ["parameter"]={ 2, - 5000 + 2500 }, - ["skill_position"]=4, - ["icon"]="160" + ["skill_position"]=3, + ["icon"]="153" }, [4400205]={ ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, ["type"]=9, + ["skill_position"]=3, ["effect"]={ { ["type"]="add_skill", @@ -3174,36 +3164,46 @@ local skill_rogue = { ["round"]=999 } }, - ["obj"]=6, - ["icon"]="161" + ["obj"]=5, + ["icon"]="154" }, [4400206]={ + ["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" + }, + [4400207]={ + ["unlock"]=3400205, + ["cover_unlock"]=3400205, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, ["type"]=9, - ["skill_position"]=4, + ["skill_position"]=3, ["effect"]={ { - ["type"]="atkp_blue_add", - ["num"]=1500, + ["type"]="add_skill", + ["num"]=4400223, ["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" + ["obj"]=5, + ["icon"]="156" }, [5200100]={ ["limit_times"]=1, diff --git a/lua/app/config/strings/cn/hero.lua b/lua/app/config/strings/cn/hero.lua index cebd7b0a..33b707b4 100644 --- a/lua/app/config/strings/cn/hero.lua +++ b/lua/app/config/strings/cn/hero.lua @@ -54,7 +54,7 @@ local hero = { ["desc"]="这一箭下去你可能会死。" }, [34002]={ - ["name"]="艳后" + ["name"]="梦魔" }, [42001]={ ["name"]="冰心", @@ -73,7 +73,7 @@ local hero = { ["desc"]="有人持剑起舞，寒冰妖姬用剑让敌人起舞。" }, [44002]={ - ["name"]="梦魔" + ["name"]="艳后" }, [52001]={ ["name"]="忍者伦", diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index b32f73a1..844b75dd 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -136,8 +136,8 @@ local item = { ["desc"]="木兰碎片，凑齐可激活或升级。" }, [34002]={ - ["name"]="艳后碎片", - ["desc"]="艳后碎片，凑齐可激活或升级。" + ["name"]="梦魔碎片", + ["desc"]="梦魔碎片，凑齐可激活或升级。" }, [42001]={ ["name"]="冰心碎片", @@ -156,8 +156,8 @@ local item = { ["desc"]="寒冰妖姬碎片，凑齐可激活或升级。" }, [44002]={ - ["name"]="梦魔碎片", - ["desc"]="梦魔碎片，凑齐可激活或升级。" + ["name"]="艳后碎片", + ["desc"]="艳后碎片，凑齐可激活或升级。" }, [52001]={ ["name"]="忍者伦碎片", diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua b/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua index 17bf58dc..058ef731 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_shards.lua @@ -22,18 +22,20 @@ function BattleControllerDungeonShards:controllBattleEnd() local atkReport = {} local teamEntity = DataManager.BattleData:getAtkTeam() local members = teamEntity:getAllMembers() + local totalDamage = 0 for k, v in pairs(members) do local report = { heroId = v:getId(), dmg = v:getDamageCount(), } + totalDamage = totalDamage + v:getDamageCount() table.insert(atkReport, report) end self.combatReport.atkReport = atkReport if not self.victory then self.combatReport.wave = self.combatReport.wave - 1 end - ModuleManager.ChapterManager:reqEndChallengeShards(self.chapterId, self.combatReport, self.gotMysteryBoxIndexs, self.taskProgress) + ModuleManager.DungeonManager:reqEndChallengeShards(self.chapterId, self.combatReport, self.taskProgress, totalDamage) end function BattleControllerDungeonShards:postWaveOver(atkDead, isQuit) diff --git a/lua/app/module/dungeon/dungeon_manager.lua b/lua/app/module/dungeon/dungeon_manager.lua index dc44f858..66a1e8d0 100644 --- a/lua/app/module/dungeon/dungeon_manager.lua +++ b/lua/app/module/dungeon/dungeon_manager.lua @@ -128,6 +128,7 @@ end function DungeonManager:respSweepGold(result) if result.err_code == GConst.ERROR_STR.SUCCESS then DataManager.DungeonData:onFightCountReduce(ModuleManager.MODULE_KEY.DUNGEON_GOLD) + GFunc.showRewardBox(result.rewards) EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.DUNGEON_SWEEP) end end @@ -167,7 +168,7 @@ function DungeonManager:respChallengeShards(result) end -- 请求结算碎片副本 -function DungeonManager:reqEndChallengeShards(id, combatReport, taskProgress, totalDamage, remainingHp) +function DungeonManager:reqEndChallengeShards(id, combatReport, taskProgress, totalDamage) local parmas = { win = true, total_damage = totalDamage, @@ -216,6 +217,7 @@ end function DungeonManager:respSweepShards(result) if result.err_code == GConst.ERROR_STR.SUCCESS then DataManager.DungeonData:onFightCountReduce(ModuleManager.MODULE_KEY.DUNGEON_SHARDS) + GFunc.showRewardBox(result.rewards) EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.DUNGEON_SWEEP) end end diff --git a/lua/app/ui/dungeon/dungeon_board_cell.lua b/lua/app/ui/dungeon/dungeon_board_cell.lua index 25fd07d8..b060a4be 100644 --- a/lua/app/ui/dungeon/dungeon_board_cell.lua +++ b/lua/app/ui/dungeon/dungeon_board_cell.lua @@ -55,7 +55,13 @@ function DungeonBoardCell:refreshInfo() self.txOpen:setAnchoredPositionY(-110) self.txStart:setText(I18N:getGlobalText(I18N.GlobalConst.START_DESC)) - local timeStr = ":" .. DataManager.DungeonData:getRemainTimes(self.moduleKey) .. "" + local time = DataManager.DungeonData:getRemainTimes(self.moduleKey) + local timeStr = nil + if time <= 0 then + timeStr = ":" .. time .. "" + else + timeStr = ":" .. time + end self.txTimes:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, timeStr)) self:refreshCountdown(self.txCountdown) else @@ -106,7 +112,7 @@ function DungeonBoardCell:refreshCountdown(txCountdown) end function DungeonBoardCell:updateTime(txCountdown) - if self.remainTime == nil then + if self.remainTime == nil or self.remainTime < 0 then self.remainTime = DataManager.DungeonData:geNextTime(self.moduleKey) else self.remainTime = self.remainTime - 1 diff --git a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua index f7bb1a0c..684fd7c1 100644 --- a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua +++ b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua @@ -65,8 +65,15 @@ function DungeonDifficultyUI:onLoadRootComplete() local cost = DataManager.DungeonData:getChallengeHpCost(self.module) self.txStartCost:setText(GFunc.getRewardNum(cost)) self.txSweepCost:setText(GFunc.getRewardNum(cost)) - local timeString = ":" .. DataManager.DungeonData:getRemainTimes(self.module).."" - self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, timeString)) + + local time = DataManager.DungeonData:getRemainTimes(self.module) + local timeStr = nil + if time <= 0 then + timeStr = ":" .. time .. "" + else + timeStr = ":" .. time + end + self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, timeStr)) self.txFrist:setText(I18N:getGlobalText(I18N.GlobalConst.FIRST_PASS)) self.rewardTx:setText(I18N:getGlobalText(I18N.GlobalConst.REWARD_DESC)..":") self.txLock:setText(I18N:getGlobalText(I18N.GlobalConst.PASS_REQUIRE)) diff --git a/lua/app/userdata/dungeon/dungeon_data.lua b/lua/app/userdata/dungeon/dungeon_data.lua index d04dc6fb..9560eb9e 100644 --- a/lua/app/userdata/dungeon/dungeon_data.lua +++ b/lua/app/userdata/dungeon/dungeon_data.lua @@ -73,6 +73,10 @@ function DungeonData:onDayChange() self.data.gold.today_challenge_count = 0 self.data.shards.today_challenge_count = 0 + if EDITOR_MODE then + Logger.logHighlight("星期".. tostring(Time:getWeekByTimeStamp())) + end + self:initDungeonGold(self.data.gold) self:initDungeonShards(self.data.shards) end From 49d9a4ebd9bbba2e9562dbd616971d823406910c Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 14 Jun 2023 14:35:31 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=A7=E6=89=BF?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/userdata/dungeon/dungeon_data_base_comp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/userdata/dungeon/dungeon_data_base_comp.lua b/lua/app/userdata/dungeon/dungeon_data_base_comp.lua index f56199e7..cf264def 100644 --- a/lua/app/userdata/dungeon/dungeon_data_base_comp.lua +++ b/lua/app/userdata/dungeon/dungeon_data_base_comp.lua @@ -1,4 +1,4 @@ -local DungeonDataBaseComp = class("DungeonDataBaseComp", LuaComponent) +local DungeonDataBaseComp = class("DungeonDataBaseComp", BaseData) -- 需要继承重写的部分 *********************************************************** From 4d05a6e4332629182e994ed2496c6fed3819ab1f Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 14 Jun 2023 14:51:02 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E5=91=BD=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._base_comp.lua => dungeon_base_entity.lua} | 48 +++++------ ....lua.meta => dungeon_base_entity.lua.meta} | 2 +- lua/app/userdata/dungeon/dungeon_data.lua | 4 +- .../dungeon/dungeon_gold_data_comp.lua | 80 ----------------- .../userdata/dungeon/dungeon_gold_entity.lua | 86 +++++++++++++++++++ ....lua.meta => dungeon_gold_entity.lua.meta} | 2 +- ...ata_comp.lua => dungeon_shards_entity.lua} | 59 +++++++------ ...ua.meta => dungeon_shards_entity.lua.meta} | 2 +- 8 files changed, 149 insertions(+), 134 deletions(-) rename lua/app/userdata/dungeon/{dungeon_data_base_comp.lua => dungeon_base_entity.lua} (55%) rename lua/app/userdata/dungeon/{dungeon_shards_data_comp.lua.meta => dungeon_base_entity.lua.meta} (86%) delete mode 100644 lua/app/userdata/dungeon/dungeon_gold_data_comp.lua create mode 100644 lua/app/userdata/dungeon/dungeon_gold_entity.lua rename lua/app/userdata/dungeon/{dungeon_data_base_comp.lua.meta => dungeon_gold_entity.lua.meta} (86%) rename lua/app/userdata/dungeon/{dungeon_shards_data_comp.lua => dungeon_shards_entity.lua} (51%) rename lua/app/userdata/dungeon/{dungeon_gold_data_comp.lua.meta => dungeon_shards_entity.lua.meta} (86%) diff --git a/lua/app/userdata/dungeon/dungeon_data_base_comp.lua b/lua/app/userdata/dungeon/dungeon_base_entity.lua similarity index 55% rename from lua/app/userdata/dungeon/dungeon_data_base_comp.lua rename to lua/app/userdata/dungeon/dungeon_base_entity.lua index cf264def..57a38c20 100644 --- a/lua/app/userdata/dungeon/dungeon_data_base_comp.lua +++ b/lua/app/userdata/dungeon/dungeon_base_entity.lua @@ -1,103 +1,103 @@ -local DungeonDataBaseComp = class("DungeonDataBaseComp", BaseData) +local DungeonBaseEntity = class("DungeonBaseEntity", BaseData) -- 需要继承重写的部分 *********************************************************** -- 初始化服务器数据 -function DungeonDataBaseComp:init(data) +function DungeonBaseEntity:init(data) end -- 获取副本模块名，对应ModuleManager.MODULE_KEY -function DungeonDataBaseComp:getModuleKey() +function DungeonBaseEntity:getModuleKey() return nil end -- 获取副本开启周期（星期几） -function DungeonDataBaseComp:getOpenWeekCycle() +function DungeonBaseEntity:getOpenWeekCycle() return nil end -- 获取副本配置名称 -function DungeonDataBaseComp:getConfigName() +function DungeonBaseEntity:getConfigName() return nil end -- 获取副本标题文案 -function DungeonDataBaseComp:getTitleString() +function DungeonBaseEntity:getTitleString() return nil end -- 获取副本规则描述(金币副本) -function DungeonDataBaseComp:getRuleString() +function DungeonBaseEntity:getRuleString() return nil end -- 获取副本boss抗性(碎片副本) -function DungeonDataBaseComp:getBossBuff(id) +function DungeonBaseEntity:getBossBuff(id) return nil end -- 获取开始时间描述 -function DungeonDataBaseComp:getOpenWeekString() +function DungeonBaseEntity:getOpenWeekString() return nil end -- 获取副本角标图 -function DungeonDataBaseComp:getIcon() +function DungeonBaseEntity:getIcon() return nil end -- 获取副本banner图 -function DungeonDataBaseComp:getBanner() +function DungeonBaseEntity:getBanner() return nil end -- 获取开启时间文本颜色 -function DungeonDataBaseComp:getOpenTextColor() +function DungeonBaseEntity:getOpenTextColor() return nil end -- 获取总挑战次数 -function DungeonDataBaseComp:getTotalChallengeCount() +function DungeonBaseEntity:getTotalChallengeCount() return nil end -- 获取今日已挑战次数 -function DungeonDataBaseComp:getTodayChallengeCount() +function DungeonBaseEntity:getTodayChallengeCount() return nil end -- 获取已通关的最大副本id -function DungeonDataBaseComp:getPassedMaxId() +function DungeonBaseEntity:getPassedMaxId() return nil end -- 获取挑战体力消耗 -function DungeonDataBaseComp:getChallengeHpCost() +function DungeonBaseEntity:getChallengeHpCost() return nil end -- 获取每日最大挑战次数 -function DungeonDataBaseComp:getTodayMaxCount() +function DungeonBaseEntity:getTodayMaxCount() return nil end -- 获取看板展示的副本奖励(返回icon) -function DungeonDataBaseComp:getBoardShowRewardIcon() +function DungeonBaseEntity:getBoardShowRewardIcon() return nil end -- 获取看板展示的副本奖励（返回id list） -function DungeonDataBaseComp:getBoardShowRewardId() +function DungeonBaseEntity:getBoardShowRewardId() return nil end -- 获取首通奖励个数 -function DungeonDataBaseComp:getFirstRewardNum() +function DungeonBaseEntity:getFirstRewardNum() return nil end -- 获取通关奖励个数 -function DungeonDataBaseComp:getPassRewardNum() +function DungeonBaseEntity:getPassRewardNum() return nil end @@ -105,13 +105,13 @@ end -- 常规逻辑 ********************************************************************* -- 获取今日剩余挑战次数 -function DungeonDataBaseComp:getTodayRemainLimitCount() +function DungeonBaseEntity:getTodayRemainLimitCount() return self:getTodayMaxCount() - self:getTodayChallengeCount() end -- 获取副本配置 -function DungeonDataBaseComp:getConfig() +function DungeonBaseEntity:getConfig() return ConfigManager:getConfig(self:getConfigName()) end -return DungeonDataBaseComp \ No newline at end of file +return DungeonBaseEntity \ 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_base_entity.lua.meta similarity index 86% rename from lua/app/userdata/dungeon/dungeon_shards_data_comp.lua.meta rename to lua/app/userdata/dungeon/dungeon_base_entity.lua.meta index da7d0728..4f849ef1 100644 --- a/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua.meta +++ b/lua/app/userdata/dungeon/dungeon_base_entity.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a6126d3822550ed449313e7bdb7b6fe1 +guid: e4b0cc0f74106f04ab07ab30b1b724d8 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/userdata/dungeon/dungeon_data.lua b/lua/app/userdata/dungeon/dungeon_data.lua index 9560eb9e..24a15496 100644 --- a/lua/app/userdata/dungeon/dungeon_data.lua +++ b/lua/app/userdata/dungeon/dungeon_data.lua @@ -53,8 +53,8 @@ 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() + self.dataDungeons[ModuleManager.MODULE_KEY.DUNGEON_GOLD] = require "app/userdata/dungeon/dungeon_gold_entity":create() + self.dataDungeons[ModuleManager.MODULE_KEY.DUNGEON_SHARDS] = require "app/userdata/dungeon/dungeon_shards_entity":create() if EDITOR_MODE then Logger.logHighlight("星期".. tostring(Time:getWeekByTimeStamp())) diff --git a/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua b/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua deleted file mode 100644 index 5900371e..00000000 --- a/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua +++ /dev/null @@ -1,80 +0,0 @@ -local DungeonDataBaseComp = require "app/userdata/dungeon/dungeon_data_base_comp" -local DungeonGoldDataComp = class("DungeonGoldDataComp", DungeonDataBaseComp) - --- 金币副本数据 - -function DungeonGoldDataComp:init(data) - self.totalChallengeCount = data.total_challenge_count - self.todayChallengeCount = data.today_challenge_count - self.maxPassedId = data.max_chapter_gold_id -end - -function DungeonGoldDataComp:getTotalChallengeCount() - return self.totalChallengeCount -end - -function DungeonGoldDataComp:getTodayChallengeCount() - return self.todayChallengeCount -end - -function DungeonGoldDataComp: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:getConfigName() - return "chapter_dungeon_gold" -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 {GConst.ATLAS_PATH.DUNGEON,"dungeon_dec_1"} -end - -function DungeonGoldDataComp:getBanner() - return "assets/arts/textures/background/dungeon/dungeon_bg_1.png" -end - -function DungeonGoldDataComp:getOpenTextColor() - return "#FFEDC5" -end - -function DungeonGoldDataComp:getChallengeHpCost() - return GFunc.getConstReward("dungeon_gold_cost") -end - -function DungeonGoldDataComp:getTodayMaxCount() - return GFunc.getConstIntValue("dungeon_gold_limit") -end - -function DungeonGoldDataComp:getBoardShowRewardId() - return 1 -end - -function DungeonGoldDataComp:getFirstRewardNum(id) - return GFunc.getRewardNum(ConfigManager:getConfig("chapter_dungeon_gold")[id].first_pass_reward) -end - -function DungeonGoldDataComp:getPassRewardNum(id) - return GFunc.getRewardNum(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_entity.lua b/lua/app/userdata/dungeon/dungeon_gold_entity.lua new file mode 100644 index 00000000..f059d6c4 --- /dev/null +++ b/lua/app/userdata/dungeon/dungeon_gold_entity.lua @@ -0,0 +1,86 @@ +local DungeonBaseEntity = require "app/userdata/dungeon/dungeon_base_entity" +local DungeonGoldEntity = class("DungeonGoldEntity", DungeonBaseEntity) + +-- 金币副本数据 + +function DungeonGoldEntity:init(data) + self.totalChallengeCount = data.total_challenge_count + self.todayChallengeCount = data.today_challenge_count + self.maxPassedId = data.max_chapter_gold_id +end + +function DungeonGoldEntity:getTotalChallengeCount() + return self.totalChallengeCount +end + +function DungeonGoldEntity:getTodayChallengeCount() + return self.todayChallengeCount +end + +function DungeonGoldEntity:getPassedMaxId() + return self.maxPassedId +end + +function DungeonGoldEntity:getModuleKey() + return ModuleManager.MODULE_KEY.DUNGEON_GOLD +end + +function DungeonGoldEntity:getOpenWeekCycle() + if self.openWeek == nil then + self.openWeek = {2,4,6,7} + end + return self.openWeek +end + +function DungeonGoldEntity:getConfigName() + return "chapter_dungeon_gold" +end + +function DungeonGoldEntity:getTitleString() + return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_GOLD_TITLE) +end + +function DungeonGoldEntity:getRuleString() + return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_GOLD_HELP) +end + +function DungeonGoldEntity:getOpenWeekString() + return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_GOLD_OPEN) +end + +function DungeonGoldEntity:getIcon() + if self.dungeonIcon == nil then + self.dungeonIcon = {GConst.ATLAS_PATH.DUNGEON,"dungeon_dec_1"} + end + return self.dungeonIcon +end + +function DungeonGoldEntity:getBanner() + return "assets/arts/textures/background/dungeon/dungeon_bg_1.png" +end + +function DungeonGoldEntity:getOpenTextColor() + return "#FFEDC5" +end + +function DungeonGoldEntity:getChallengeHpCost() + return GFunc.getConstReward("dungeon_gold_cost") +end + +function DungeonGoldEntity:getTodayMaxCount() + return GFunc.getConstIntValue("dungeon_gold_limit") +end + +function DungeonGoldEntity:getBoardShowRewardId() + return 1 +end + +function DungeonGoldEntity:getFirstRewardNum(id) + return GFunc.getRewardNum(ConfigManager:getConfig("chapter_dungeon_gold")[id].first_pass_reward) +end + +function DungeonGoldEntity:getPassRewardNum(id) + return GFunc.getRewardNum(ConfigManager:getConfig("chapter_dungeon_gold")[id].percent_reward) +end + +return DungeonGoldEntity \ 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_gold_entity.lua.meta similarity index 86% rename from lua/app/userdata/dungeon/dungeon_data_base_comp.lua.meta rename to lua/app/userdata/dungeon/dungeon_gold_entity.lua.meta index 76653357..e259d755 100644 --- a/lua/app/userdata/dungeon/dungeon_data_base_comp.lua.meta +++ b/lua/app/userdata/dungeon/dungeon_gold_entity.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4e42e026c21002845b2e72498b2e2e92 +guid: 792ac3a45b52c5d4c895737413faf6db ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua b/lua/app/userdata/dungeon/dungeon_shards_entity.lua similarity index 51% rename from lua/app/userdata/dungeon/dungeon_shards_data_comp.lua rename to lua/app/userdata/dungeon/dungeon_shards_entity.lua index 6bf0eb71..73e8d6de 100644 --- a/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua +++ b/lua/app/userdata/dungeon/dungeon_shards_entity.lua @@ -1,79 +1,88 @@ -local DungeonDataBaseComp = require "app/userdata/dungeon/dungeon_data_base_comp" -local DungeonShardsDataComp = class("DungeonShardsDataComp", DungeonDataBaseComp) +local DungeonBaseEntity = require "app/userdata/dungeon/dungeon_base_entity" +local DungeonShardsEntity = class("DungeonShardsEntity", DungeonBaseEntity) -- 碎片副本数据 -function DungeonShardsDataComp:init(data) +function DungeonShardsEntity:init(data) self.totalChallengeCount = data.total_challenge_count self.todayChallengeCount = data.today_challenge_count self.maxPassedId = data.max_chapter_shards_id end -function DungeonShardsDataComp:getTotalChallengeCount() +function DungeonShardsEntity:getTotalChallengeCount() return self.totalChallengeCount end -function DungeonShardsDataComp:getTodayChallengeCount() +function DungeonShardsEntity:getTodayChallengeCount() return self.todayChallengeCount end -function DungeonShardsDataComp:getPassedMaxId() +function DungeonShardsEntity:getPassedMaxId() return self.maxPassedId end -function DungeonShardsDataComp:getModuleKey() +function DungeonShardsEntity:getModuleKey() return ModuleManager.MODULE_KEY.DUNGEON_SHARDS end -function DungeonShardsDataComp:getOpenWeekCycle() - return {1,3,5,7} +function DungeonShardsEntity:getOpenWeekCycle() + if self.openWeek == nil then + self.openWeek = {1,3,5,7} + end + return self.openWeek end -function DungeonShardsDataComp:getConfigName() +function DungeonShardsEntity:getConfigName() return "chapter_dungeon_shards" end -function DungeonShardsDataComp:getTitleString() +function DungeonShardsEntity:getTitleString() return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_SHARDS_TITLE) end -function DungeonShardsDataComp:getRuleString() +function DungeonShardsEntity:getRuleString() return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_SHARDS_HELP) end -function DungeonShardsDataComp:getOpenWeekString() +function DungeonShardsEntity:getOpenWeekString() return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_SHARDS_OPEN) end -function DungeonShardsDataComp:getBossBuff(id) +function DungeonShardsEntity:getBossBuff(id) return self:getConfig()[id].effect[1] end -function DungeonShardsDataComp:getIcon() - return {GConst.ATLAS_PATH.DUNGEON,"dungeon_dec_2"} +function DungeonShardsEntity:getIcon() + if self.dungeonIcon == nil then + self.dungeonIcon = {GConst.ATLAS_PATH.DUNGEON,"dungeon_dec_2"} + end + return self.dungeonIcon end -function DungeonShardsDataComp:getBanner() +function DungeonShardsEntity:getBanner() return "assets/arts/textures/background/dungeon/dungeon_bg_2.png" end -function DungeonShardsDataComp:getOpenTextColor() +function DungeonShardsEntity:getOpenTextColor() return "#E4F5FE" end -function DungeonShardsDataComp:getChallengeHpCost() +function DungeonShardsEntity:getChallengeHpCost() return GFunc.getConstReward("dungeon_shards_cost") end -function DungeonShardsDataComp:getTodayMaxCount() +function DungeonShardsEntity:getTodayMaxCount() return GFunc.getConstIntValue("dungeon_shards_limit") end -function DungeonShardsDataComp:getBoardShowRewardIcon() - return {GConst.ATLAS_PATH.ICON_ITEM,"20"} +function DungeonShardsEntity:getBoardShowRewardIcon() + if self.rewardIcon == nil then + self.rewardIcon = {GConst.ATLAS_PATH.ICON_ITEM,"20"} + end + return self.rewardIcon end -function DungeonShardsDataComp:getFirstRewardNum(id) +function DungeonShardsEntity:getFirstRewardNum(id) local count = 0 for index, reward in ipairs(ConfigManager:getConfig("chapter_dungeon_shards")[id].first_pass_reward) do count = count + GFunc.getRewardNum(reward) @@ -81,7 +90,7 @@ function DungeonShardsDataComp:getFirstRewardNum(id) return count end -function DungeonShardsDataComp:getPassRewardNum(id) +function DungeonShardsEntity:getPassRewardNum(id) local count = 0 local pass = ConfigManager:getConfig("chapter_dungeon_shards")[id].pass_reward local wave = ConfigManager:getConfig("chapter_dungeon_shards")[id].wave_reward @@ -94,4 +103,4 @@ function DungeonShardsDataComp:getPassRewardNum(id) return count end -return DungeonShardsDataComp \ No newline at end of file +return DungeonShardsEntity \ 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_shards_entity.lua.meta similarity index 86% rename from lua/app/userdata/dungeon/dungeon_gold_data_comp.lua.meta rename to lua/app/userdata/dungeon/dungeon_shards_entity.lua.meta index 59bba927..f6e34ec0 100644 --- a/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua.meta +++ b/lua/app/userdata/dungeon/dungeon_shards_entity.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 962fc33db86976b4cbcd1205a2fbdd82 +guid: 915b7ed44e1bfb24fa12a24eeb2813d3 ScriptedImporter: internalIDToNameTable: [] externalObjects: {}