From f1f1daafa29399dd36ae14a45ed4a8d6a568e5fd Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 6 Sep 2023 16:49:08 +0800 Subject: [PATCH 01/35] =?UTF-8?q?=E7=AC=A6=E6=96=87=E5=8A=9F=E8=83=BD?= 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 | 5 +- lua/app/common/module_manager.lua | 2 + lua/app/common/pay_manager.lua | 3 + lua/app/common/server_push_manager.lua | 1 + lua/app/config/activity_pvp_wingift.lua | 4 + lua/app/config/arena_rank.lua | 8 +- lua/app/config/buff.lua | 149 +++++++++- lua/app/config/const.lua | 15 +- lua/app/config/grid_type.lua | 6 +- .../localization_global_const.lua | 41 ++- lua/app/config/monster_dungeon_rune.lua | 255 +++++++++--------- lua/app/config/runes_sub.lua | 160 +++++------ lua/app/config/skill.lua | 180 ++++++++----- lua/app/config/skill_rogue.lua | 14 +- lua/app/config/strings/cn/global.lua | 28 +- lua/app/config/strings/cn/skill_rogue.lua | 14 +- lua/app/global/global_const.lua | 4 +- lua/app/global/global_func.lua | 31 ++- lua/app/module/battle/battle_const.lua | 1 + lua/app/module/hero/hero_const.lua | 24 +- lua/app/module/hero/hero_manager.lua | 8 +- lua/app/module/item/item_const.lua | 1 + lua/app/module/runes.meta | 8 + lua/app/module/runes/runes_const.lua | 29 ++ .../runes/runes_const.lua.meta} | 2 +- lua/app/module/runes/runes_manager.lua | 45 ++++ lua/app/module/runes/runes_manager.lua.meta | 10 + lua/app/module/tips/tips_manager.lua | 2 +- lua/app/ui/hero/cell/attr_cell.lua | 38 ++- lua/app/ui/hero/cell/attr_node_cell.lua | 16 +- lua/app/ui/hero/hero_attr_ui.lua | 15 +- lua/app/ui/hero/hero_comp.lua | 4 +- lua/app/ui/hero/hero_detail_ui.lua | 117 ++++---- lua/app/ui/hero/hero_info_comp.lua | 7 + .../{skin_info_comp.lua => hero_skin_ui.lua} | 86 +++--- lua/app/ui/hero/hero_skin_ui.lua.meta | 10 + lua/app/ui/hero/runes_info_comp.lua | 193 +++++++++++++ lua/app/ui/hero/runes_info_comp.lua.meta | 10 + lua/app/ui/runes.meta | 8 + lua/app/ui/runes/runes_level_ui.lua | 78 ++++++ lua/app/ui/runes/runes_level_ui.lua.meta | 10 + lua/app/ui/runes/runes_source_ui.lua | 140 ++++++++++ lua/app/ui/runes/runes_source_ui.lua.meta | 10 + lua/app/ui/runes/runes_suit_ui.lua | 69 +++++ lua/app/ui/runes/runes_suit_ui.lua.meta | 10 + lua/app/userdata/hero/hero_entity.lua | 67 +++++ lua/app/userdata/runes.meta | 8 + lua/app/userdata/runes/runes_data.lua | 218 +++++++++++++++ lua/app/userdata/runes/runes_data.lua.meta | 10 + lua/app/userdata/runes/runes_entity.lua | 206 ++++++++++++++ lua/app/userdata/runes/runes_entity.lua.meta | 10 + lua/app/userdata/shop/shop_data.lua | 16 ++ 53 files changed, 1971 insertions(+), 438 deletions(-) create mode 100644 lua/app/module/runes.meta create mode 100644 lua/app/module/runes/runes_const.lua rename lua/app/{ui/hero/skin_info_comp.lua.meta => module/runes/runes_const.lua.meta} (86%) create mode 100644 lua/app/module/runes/runes_manager.lua create mode 100644 lua/app/module/runes/runes_manager.lua.meta rename lua/app/ui/hero/{skin_info_comp.lua => hero_skin_ui.lua} (87%) create mode 100644 lua/app/ui/hero/hero_skin_ui.lua.meta create mode 100644 lua/app/ui/hero/runes_info_comp.lua create mode 100644 lua/app/ui/hero/runes_info_comp.lua.meta create mode 100644 lua/app/ui/runes.meta create mode 100644 lua/app/ui/runes/runes_level_ui.lua create mode 100644 lua/app/ui/runes/runes_level_ui.lua.meta create mode 100644 lua/app/ui/runes/runes_source_ui.lua create mode 100644 lua/app/ui/runes/runes_source_ui.lua.meta create mode 100644 lua/app/ui/runes/runes_suit_ui.lua create mode 100644 lua/app/ui/runes/runes_suit_ui.lua.meta create mode 100644 lua/app/userdata/runes.meta create mode 100644 lua/app/userdata/runes/runes_data.lua create mode 100644 lua/app/userdata/runes/runes_data.lua.meta create mode 100644 lua/app/userdata/runes/runes_entity.lua create mode 100644 lua/app/userdata/runes/runes_entity.lua.meta diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index f91aab77..039da2d7 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -154,6 +154,8 @@ BIReport.ITEM_GET_TYPE = { DUNGEON_RUNE_SETTLEMENT = "DungeonRuneSettlement", DUNGEON_RUNE_SWEEP = "DungeonRuneSweep", DUNGEON_RUNE_BUY_WING = "DungeonRunebuyWing", + RUNES_QUENCHING = "RuneQuenching", + RUNES_GIFT = "RuneGift", } BIReport.ADS_CLICK_TYPE = { @@ -227,6 +229,7 @@ BIReport.GIFT_TYPE = { ACT_SUMMER = "ActSummer", ACT_HERO_FUND = "ActHeroFund", FOURTEEN_DAY_GIFT = "FourteenDayGift", + RUNES_GIFT = "RunesGift", } BIReport.COIN_TYPE = { diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index d38f5f9a..e68db3fb 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -16,6 +16,7 @@ function DataManager:init() self:initManager("BagData", "app/userdata/bag/bag_data") self:initManager("EquipData", "app/userdata/equip/equip_data") self:initManager("SkinData", "app/userdata/skin/skin_data") + self:initManager("RunesData", "app/userdata/runes/runes_data") self:initManager("BattleData", "app/userdata/battle/battle_data") self:initManager("BattlePVPData", "app/userdata/battle/battle_pvp_data") self:initManager("FormationData", "app/userdata/formation/formation_data") @@ -106,6 +107,7 @@ function DataManager:clear() self.BagData:clear() self.EquipData:clear() self.SkinData:clear() + self.RunesData:clear() self.FormationData:clear() self.ActivityData:clear() self.MailData:clear() @@ -151,7 +153,8 @@ function DataManager:initWithServerData(data) self.EquipData:init(data.heroes_equips) self.EquipData:initGifts(data.act_weapon_armor_gift) self.SkinData:init(data.bag.skins) - -- HeroData要在EquipData和SkinData之后初始化，依赖它们的属性数据 + self.RunesData:init(data.rune) + -- HeroData要在EquipData、SkinData、RunesData之后初始化，依赖它们的属性数据 self.HeroData:init(data.bag.heroes) self.BagData:init(data.bag) self.FormationData:init(data.fight_info) diff --git a/lua/app/common/module_manager.lua b/lua/app/common/module_manager.lua index 684868be..e7561401 100644 --- a/lua/app/common/module_manager.lua +++ b/lua/app/common/module_manager.lua @@ -69,6 +69,8 @@ local MODULE_PATHS = { EquipManager = "app/module/equip/equip_manager", -- 皮肤 SkinManager = "app/module/skin/skin_manager", + -- 皮肤 + RunesManager = "app/module/runes/runes_manager", -- 英雄基金 HeroFundManager = "app/module/activity/hero_fund/hero_fund_manager", -- 世界首领活动 diff --git a/lua/app/common/pay_manager.lua b/lua/app/common/pay_manager.lua index e6c6b0b1..1e860e1c 100644 --- a/lua/app/common/pay_manager.lua +++ b/lua/app/common/pay_manager.lua @@ -27,6 +27,7 @@ PayManager.PURCHARSE_ACT_TYPE = { WEAPON_UPGRADE_GIFT = 15, ARMOR_UPGRADE_GIFT = 16, FOURTEEN_DAY_GIFT = 17, + RUNES_GIFT = 21, } PayManager.PURCHARSE_TYPE_CONFIG = { @@ -56,6 +57,7 @@ PayManager.BI_ITEM_GET_TYPE = { [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.WEAPON_GIFT, [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.ARMOR_GIFT, [PayManager.PURCHARSE_ACT_TYPE.FOURTEEN_DAY_GIFT] = BIReport.ITEM_GET_TYPE.FOURTEEN_DAY_GIFT, + [PayManager.PURCHARSE_ACT_TYPE.RUNES_GIFT] = BIReport.ITEM_GET_TYPE.RUNES_GIFT, }, [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.ITEM_GET_TYPE.GOLD_PIG, [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.ITEM_GET_TYPE.MALL_TREASURE, @@ -82,6 +84,7 @@ PayManager.BI_GIFT_TYPE = { [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.GIFT_TYPE.WEAPON_GIFT, [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.GIFT_TYPE.ARMOR_GIFT, [PayManager.PURCHARSE_ACT_TYPE.FOURTEEN_DAY_GIFT] = BIReport.GIFT_TYPE.FOURTEEN_DAY_GIFT, + [PayManager.PURCHARSE_ACT_TYPE.RUNES_GIFT] = BIReport.GIFT_TYPE.RUNES_GIFT, }, [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.GIFT_TYPE.GOLD_PIG, [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.GIFT_TYPE.MALL_TREASURE, diff --git a/lua/app/common/server_push_manager.lua b/lua/app/common/server_push_manager.lua index f7c33fae..495667e0 100644 --- a/lua/app/common/server_push_manager.lua +++ b/lua/app/common/server_push_manager.lua @@ -23,6 +23,7 @@ function ServerPushManager:initWhenLogin() self:addServerPushListener(ProtoMsgType.FromMsgEnum.AIHelpUnreadNtf, ModuleManager.GameSettingManager, ModuleManager.GameSettingManager.rspAiHelperNtf) self:addServerPushListener(ProtoMsgType.FromMsgEnum.RecoveryNtf, ModuleManager.ItemManager, ModuleManager.ItemManager.rspRecoveryNtf) self:addServerPushListener(ProtoMsgType.FromMsgEnum.BossRushBoughtNtf, ModuleManager.ActBossRushManager, ModuleManager.ActBossRushManager.rspBossRushBoughtNtf) + self:addServerPushListener(ProtoMsgType.FromMsgEnum.RuneUpdateNtf, ModuleManager.RunesManager, ModuleManager.RunesManager.rspUpdate) end ---- 移除全局推送监听 diff --git a/lua/app/config/activity_pvp_wingift.lua b/lua/app/config/activity_pvp_wingift.lua index 0eddda0a..1bcccc12 100644 --- a/lua/app/config/activity_pvp_wingift.lua +++ b/lua/app/config/activity_pvp_wingift.lua @@ -1,5 +1,6 @@ local activity_pvp_wingift = { [1]={ + ["win"]=1, ["reward"]={ { ["type"]=1, @@ -20,6 +21,7 @@ local activity_pvp_wingift = { } }, [2]={ + ["win"]=4, ["reward"]={ { ["type"]=1, @@ -40,6 +42,7 @@ local activity_pvp_wingift = { } }, [3]={ + ["win"]=7, ["reward"]={ { ["type"]=1, @@ -60,6 +63,7 @@ local activity_pvp_wingift = { } }, [4]={ + ["win"]=10, ["reward"]={ { ["type"]=1, diff --git a/lua/app/config/arena_rank.lua b/lua/app/config/arena_rank.lua index aaaf7bdf..7ed06955 100644 --- a/lua/app/config/arena_rank.lua +++ b/lua/app/config/arena_rank.lua @@ -3303,8 +3303,8 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=46000, - ["num_for_nothing"]="Ug5cA2U=" + ["num"]=25000, + ["num_for_nothing"]="VA1cA2U=" }, { ["type"]=1, @@ -5383,8 +5383,8 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=54000, - ["num_for_nothing"]="UwxcA2U=" + ["num"]=25000, + ["num_for_nothing"]="VA1cA2U=" }, { ["type"]=1, diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index 1d56329c..7e0ced84 100644 --- a/lua/app/config/buff.lua +++ b/lua/app/config/buff.lua @@ -53,7 +53,9 @@ local buff = { ["stack"]=2, ["position"]=1, ["decr"]=1, - ["icon"]="dec_dmg_red_add" + ["icon"]="dec_dmg_red_add", + ["show_name"]=true, + ["ispercent"]=1 }, [8]={ ["id"]=8, @@ -62,7 +64,9 @@ local buff = { ["stack"]=2, ["position"]=2, ["decr"]=1, - ["icon"]="dec_dmg_yellow_add" + ["icon"]="dec_dmg_yellow_add", + ["show_name"]=true, + ["ispercent"]=1 }, [9]={ ["id"]=9, @@ -71,7 +75,9 @@ local buff = { ["stack"]=2, ["position"]=3, ["decr"]=1, - ["icon"]="dec_dmg_green_add" + ["icon"]="dec_dmg_green_add", + ["show_name"]=true, + ["ispercent"]=1 }, [10]={ ["id"]=10, @@ -80,7 +86,9 @@ local buff = { ["stack"]=2, ["position"]=4, ["decr"]=1, - ["icon"]="dec_dmg_blue_add" + ["icon"]="dec_dmg_blue_add", + ["show_name"]=true, + ["ispercent"]=1 }, [11]={ ["id"]=11, @@ -89,7 +97,9 @@ local buff = { ["stack"]=2, ["position"]=5, ["decr"]=1, - ["icon"]="dec_dmg_purple_add" + ["icon"]="dec_dmg_purple_add", + ["show_name"]=true, + ["ispercent"]=1 }, [12]={ ["id"]=12, @@ -97,7 +107,9 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["decr"]=1, - ["icon"]="dec_dmg_all_add" + ["icon"]="dec_dmg_all_add", + ["show_name"]=true, + ["ispercent"]=1 }, [13]={ ["id"]=13, @@ -192,7 +204,8 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["decr"]=1, - ["icon"]="weakness_all_add" + ["icon"]="weakness_all_add", + ["ispercent"]=1 }, [25]={ ["id"]=25, @@ -406,6 +419,7 @@ local buff = { ["formula"]=4, ["icon"]="burn", ["show_name"]=true, + ["ispercent"]=1, ["fx_take"]={ 36 } @@ -416,6 +430,8 @@ local buff = { ["buff_type"]=1, ["decr"]=2, ["icon"]="vulnerable", + ["show_name"]=true, + ["ispercent"]=1, ["fx_get"]={ 34 } @@ -444,6 +460,7 @@ local buff = { ["formula"]=4, ["icon"]="poison", ["show_name"]=true, + ["ispercent"]=1, ["fx_take"]={ 35 } @@ -467,6 +484,7 @@ local buff = { ["decr"]=2, ["icon"]="corrupt", ["show_name"]=true, + ["ispercent"]=1, ["fx_get"]={ 19 } @@ -479,6 +497,7 @@ local buff = { ["formula"]=4, ["icon"]="bleed", ["show_name"]=true, + ["ispercent"]=1, ["fx_take"]={ 31 } @@ -490,6 +509,7 @@ local buff = { ["decr"]=2, ["icon"]="weaken", ["show_name"]=true, + ["ispercent"]=1, ["fx_continued"]={ 33 } @@ -530,7 +550,7 @@ local buff = { ["id"]=59, ["name"]="first_hand", ["buff_type"]=1, - ["decr"]=3, + ["decr"]=1, ["icon"]="first_hand" }, [60]={ @@ -559,7 +579,8 @@ local buff = { ["stack"]=1, ["decr"]=1, ["icon"]="counterattack", - ["show_name"]=true + ["show_name"]=true, + ["ispercent"]=1 }, [63]={ ["id"]=63, @@ -568,6 +589,7 @@ local buff = { ["decr"]=1, ["icon"]="thorns", ["show_name"]=true, + ["ispercent"]=1, ["fx_continued"]={ 18 } @@ -765,7 +787,7 @@ local buff = { ["decr"]=1, ["formula"]=3, ["icon"]="rebirth", - ["fx_take"]={ + ["fx_disappear"]={ 44 } }, @@ -790,6 +812,7 @@ local buff = { ["decr"]=1, ["formula"]=3, ["icon"]="self_heal", + ["show_name"]=true, ["fx_take"]={ 300027 } @@ -799,14 +822,103 @@ local buff = { ["name"]="charm", ["buff_type"]=7, ["decr"]=2, - ["icon"]="charm" + ["icon"]="charm", + ["show_name"]=true }, [88]={ ["id"]=88, ["name"]="immune", ["buff_type"]=7, ["decr"]=1, - ["icon"]="immune" + ["icon"]="immune", + ["show_name"]=true + }, + [89]={ + ["id"]=89, + ["name"]="forever_first_hand", + ["buff_type"]=1, + ["decr"]=3, + ["icon"]="first_hand" + }, + [90]={ + ["id"]=90, + ["name"]="forever_counterattack", + ["buff_type"]=1, + ["stack"]=1, + ["decr"]=3, + ["icon"]="counterattack", + ["ispercent"]=1 + }, + [91]={ + ["id"]=91, + ["name"]="forever_dec_dmg_red_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=1, + ["decr"]=3, + ["icon"]="dec_dmg_red_add", + ["ispercent"]=1 + }, + [92]={ + ["id"]=92, + ["name"]="forever_dec_dmg_yellow_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=2, + ["decr"]=3, + ["icon"]="dec_dmg_yellow_add", + ["ispercent"]=1 + }, + [93]={ + ["id"]=93, + ["name"]="forever_dec_dmg_green_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=3, + ["decr"]=3, + ["icon"]="dec_dmg_green_add", + ["ispercent"]=1 + }, + [94]={ + ["id"]=94, + ["name"]="forever_dec_dmg_blue_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=4, + ["decr"]=3, + ["icon"]="dec_dmg_blue_add", + ["ispercent"]=1 + }, + [95]={ + ["id"]=95, + ["name"]="forever_dec_dmg_purple_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=5, + ["decr"]=3, + ["icon"]="dec_dmg_purple_add", + ["ispercent"]=1 + }, + [96]={ + ["id"]=96, + ["name"]="forever_dec_dmg_all_add", + ["buff_type"]=1, + ["stack"]=2, + ["decr"]=3, + ["icon"]="dec_dmg_all_add", + ["ispercent"]=1 + }, + [97]={ + ["id"]=97, + ["name"]="forever_thorns", + ["buff_type"]=1, + ["decr"]=3, + ["icon"]="thorns", + ["show_name"]=true, + ["ispercent"]=1, + ["fx_continued"]={ + 18 + } } } local keys = { @@ -898,12 +1010,21 @@ local keys = { ["ocean_shield"]=buff[85], ["self_heal"]=buff[86], ["charm"]=buff[87], - ["immune"]=buff[88] + ["immune"]=buff[88], + ["forever_first_hand"]=buff[89], + ["forever_counterattack"]=buff[90], + ["forever_dec_dmg_red_add"]=buff[91], + ["forever_dec_dmg_yellow_add"]=buff[92], + ["forever_dec_dmg_green_add"]=buff[93], + ["forever_dec_dmg_blue_add"]=buff[94], + ["forever_dec_dmg_purple_add"]=buff[95], + ["forever_dec_dmg_all_add"]=buff[96], + ["forever_thorns"]=buff[97] } } local config = { data=buff, keys=keys, -count=88 +count=97 } return config \ No newline at end of file diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index 61d527c4..af101080 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -492,6 +492,19 @@ local const = { ["activity_pvp_bounty_point"]={ ["value"]=10 }, + ["activity_pvp_refresh_ad_times"]={ + ["value"]=1 + }, + ["activity_pvp_refresh_cost"]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, ["activity_skin_fight_id_1"]={ ["value"]=4104 }, @@ -510,6 +523,6 @@ local const = { } } local config = { -data=const,count=102 +data=const,count=104 } 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 5a6895df..f01dad05 100644 --- a/lua/app/config/grid_type.lua +++ b/lua/app/config/grid_type.lua @@ -440,7 +440,7 @@ local grid_type = { ["break_sfx"]="sfx_piece_zhongrushi_b01" }, [31]={ - ["icon"]="battle_obstacle_lron_1", + ["icon"]="battle_obstacle_iron_1", ["next_type"]=0, ["break_condition"]={ 1, @@ -453,7 +453,7 @@ local grid_type = { ["break_sfx"]="sfx_piece_tiexie_b01" }, [32]={ - ["icon"]="battle_obstacle_lron_2", + ["icon"]="battle_obstacle_iron_2", ["next_type"]=31, ["break_condition"]={ 1, @@ -466,7 +466,7 @@ local grid_type = { ["break_sfx"]="sfx_piece_tiexie_b01" }, [33]={ - ["icon"]="battle_obstacle_lron_3", + ["icon"]="battle_obstacle_iron_3", ["next_type"]=32, ["break_condition"]={ 1, diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index f1be157a..c221884f 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -527,13 +527,42 @@ local LocalizationGlobalConst = DUNGEON_RUNE_TIP_4 = "DUNGEON_RUNE_TIP_4", DUNGEON_RUNE_TIP_5 = "DUNGEON_RUNE_TIP_5", UNFINISHED = "UNFINISHED", - - ["DUNGEON_RUNE_DESC_1"]= "DUNGEON_RUNE_DESC_1", - ["DUNGEON_RUNE_DESC_2"] = "DUNGEON_RUNE_DESC_2", - ["DUNGEON_RUNE_DESC_3"] = "DUNGEON_RUNE_DESC_3", - ["DUNGEON_RUNE_DESC_4"] = "DUNGEON_RUNE_DESC_4", - ["DUNGEON_RUNE_DESC_5"] = "DUNGEON_RUNE_DESC_5", + RUNES_DESC_1 = "RUNES_DESC_1", + RUNES_DESC_2 = "RUNES_DESC_2", + RUNES_DESC_3 = "RUNES_DESC_3", + RUNES_DESC_4 = "RUNES_DESC_4", + RUNES_DESC_5 = "RUNES_DESC_5", + RUNES_DESC_6 = "RUNES_DESC_6", + RUNES_DESC_7 = "RUNES_DESC_7", + RUNES_DESC_8 = "RUNES_DESC_8", + RUNES_DESC_9 = "RUNES_DESC_9", + RUNES_DESC_10 = "RUNES_DESC_10", + RUNES_DESC_11 = "RUNES_DESC_11", + RUNES_DESC_12 = "RUNES_DESC_12", + RUNES_DESC_13 = "RUNES_DESC_13", + RUNES_DESC_14 = "RUNES_DESC_14", + RUNES_DESC_15 = "RUNES_DESC_15", + RUNES_DESC_16 = "RUNES_DESC_16", + RUNES_DESC_17 = "RUNES_DESC_17", + RUNES_DESC_18 = "RUNES_DESC_18", + RUNES_DESC_19 = "RUNES_DESC_19", + RUNES_DESC_20 = "RUNES_DESC_20", + RUNES_DESC_21 = "RUNES_DESC_21", + RUNES_DESC_22 = "RUNES_DESC_22", + RUNES_DESC_23 = "RUNES_DESC_23", + RUNES_DESC_24 = "RUNES_DESC_24", + RUNES_DESC_25 = "RUNES_DESC_25", + DUNGEON_RUNE_DESC_1 = "DUNGEON_RUNE_DESC_1", + DUNGEON_RUNE_DESC_2 = "DUNGEON_RUNE_DESC_2", + DUNGEON_RUNE_DESC_3 = "DUNGEON_RUNE_DESC_3", + DUNGEON_RUNE_DESC_4 = "DUNGEON_RUNE_DESC_4", + DUNGEON_RUNE_DESC_5 = "DUNGEON_RUNE_DESC_5", DUNGEON_RUNE_DESC_6 = "DUNGEON_RUNE_DESC_6", + DUNGEON_RUNE_DESC_7 = "DUNGEON_RUNE_DESC_7", + DUNGEON_RUNE_DESC_8 = "DUNGEON_RUNE_DESC_8", + DUNGEON_RUNE_DESC_9 = "DUNGEON_RUNE_DESC_9", + DUNGEON_RUNE_DESC_10 = "DUNGEON_RUNE_DESC_10", + DUNGEON_RUNE_DESC_11 = "DUNGEON_RUNE_DESC_11", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/monster_dungeon_rune.lua b/lua/app/config/monster_dungeon_rune.lua index a7aeb674..151cd5c8 100644 --- a/lua/app/config/monster_dungeon_rune.lua +++ b/lua/app/config/monster_dungeon_rune.lua @@ -2,8 +2,8 @@ local monster_dungeon_rune = { [108]={ ["none"]="大史莱姆（红）", ["monster_base"]=10027, - ["hp"]=681920000, - ["atk"]=6080000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20076, @@ -15,8 +15,8 @@ local monster_dungeon_rune = { [208]={ ["none"]="大史莱姆（黄）", ["monster_base"]=10025, - ["hp"]=278310000, - ["atk"]=4040000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20070, @@ -28,8 +28,8 @@ local monster_dungeon_rune = { [308]={ ["none"]="大史莱姆（蓝）", ["monster_base"]=10026, - ["hp"]=278310000, - ["atk"]=4040000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20073, @@ -41,8 +41,8 @@ local monster_dungeon_rune = { [408]={ ["none"]="大史莱姆（绿）", ["monster_base"]=10024, - ["hp"]=205490000, - ["atk"]=3950000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20067, @@ -54,8 +54,8 @@ local monster_dungeon_rune = { [508]={ ["none"]="盾刀骷髅兵", ["monster_base"]=10009, - ["hp"]=482700000, - ["atk"]=5690000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20025, @@ -67,8 +67,8 @@ local monster_dungeon_rune = { [608]={ ["none"]="盾刀骷髅兵（有头盔）", ["monster_base"]=10039, - ["hp"]=593840000, - ["atk"]=5780000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20112, @@ -80,8 +80,8 @@ local monster_dungeon_rune = { [708]={ ["none"]="哥布林匕首(蓝)", ["monster_base"]=10001, - ["hp"]=474020000, - ["atk"]=5340000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20001, @@ -93,8 +93,8 @@ local monster_dungeon_rune = { [808]={ ["none"]="哥布林匕首(紫)", ["monster_base"]=10003, - ["hp"]=554250000, - ["atk"]=5310000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20007, @@ -106,8 +106,8 @@ local monster_dungeon_rune = { [908]={ ["none"]="哥布林法师（红）", ["monster_base"]=10008, - ["hp"]=298160000, - ["atk"]=4390000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20022, @@ -119,8 +119,8 @@ local monster_dungeon_rune = { [1008]={ ["none"]="哥布林法师(蓝)", ["monster_base"]=10005, - ["hp"]=525000000, - ["atk"]=5020000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20013, @@ -132,8 +132,8 @@ local monster_dungeon_rune = { [1108]={ ["none"]="哥布林法师（绿）", ["monster_base"]=10006, - ["hp"]=372560000, - ["atk"]=4530000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20016, @@ -145,8 +145,8 @@ local monster_dungeon_rune = { [1208]={ ["none"]="哥布林法师（紫）", ["monster_base"]=10007, - ["hp"]=450590000, - ["atk"]=5230000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20019, @@ -158,8 +158,8 @@ local monster_dungeon_rune = { [1308]={ ["none"]="哥布林斧头(红)", ["monster_base"]=10002, - ["hp"]=426740000, - ["atk"]=4940000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20004, @@ -171,8 +171,8 @@ local monster_dungeon_rune = { [1408]={ ["none"]="哥布林棍棒(绿)", ["monster_base"]=10004, - ["hp"]=391500000, - ["atk"]=5410000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20010, @@ -184,8 +184,8 @@ local monster_dungeon_rune = { [1508]={ ["none"]="黑色食人花", ["monster_base"]=10050, - ["hp"]=474020000, - ["atk"]=5340000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20145, @@ -197,8 +197,8 @@ local monster_dungeon_rune = { [1608]={ ["none"]="红色蝙蝠恶魔", ["monster_base"]=10052, - ["hp"]=507910000, - ["atk"]=5800000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20151, @@ -210,8 +210,8 @@ local monster_dungeon_rune = { [1708]={ ["none"]="红色恶魔野猪", ["monster_base"]=10051, - ["hp"]=347620000, - ["atk"]=4170000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20148, @@ -223,8 +223,8 @@ local monster_dungeon_rune = { [1808]={ ["none"]="红色蜥蜴剑士", ["monster_base"]=10047, - ["hp"]=324830000, - ["atk"]=4460000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20136, @@ -236,8 +236,8 @@ local monster_dungeon_rune = { [1908]={ ["none"]="红色幽灵恶魔", ["monster_base"]=10055, - ["hp"]=309200000, - ["atk"]=3730000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20160, @@ -249,8 +249,8 @@ local monster_dungeon_rune = { [2008]={ ["none"]="红色蜘蛛", ["monster_base"]=10046, - ["hp"]=507910000, - ["atk"]=5800000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20133, @@ -262,8 +262,8 @@ local monster_dungeon_rune = { [2108]={ ["none"]="黄发剑士", ["monster_base"]=10030, - ["hp"]=554250000, - ["atk"]=5310000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20085, @@ -275,8 +275,8 @@ local monster_dungeon_rune = { [2208]={ ["none"]="火山甲壳虫", ["monster_base"]=10061, - ["hp"]=482700000, - ["atk"]=5690000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20178, @@ -288,8 +288,8 @@ local monster_dungeon_rune = { [2308]={ ["none"]="火山岩石怪", ["monster_base"]=10060, - ["hp"]=298160000, - ["atk"]=4390000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20175, @@ -301,8 +301,8 @@ local monster_dungeon_rune = { [2408]={ ["none"]="剑盾士兵（黄发）", ["monster_base"]=10034, - ["hp"]=298160000, - ["atk"]=4390000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20097, @@ -314,8 +314,8 @@ local monster_dungeon_rune = { [2508]={ ["none"]="剑盾士兵（蓝发）", ["monster_base"]=10035, - ["hp"]=372560000, - ["atk"]=4530000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20100, @@ -327,8 +327,8 @@ local monster_dungeon_rune = { [2608]={ ["none"]="骷髅弓箭手", ["monster_base"]=10038, - ["hp"]=391500000, - ["atk"]=5410000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20109, @@ -340,8 +340,8 @@ local monster_dungeon_rune = { [2708]={ ["none"]="骷髅枪兵", ["monster_base"]=10010, - ["hp"]=347620000, - ["atk"]=4170000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20028, @@ -353,8 +353,8 @@ local monster_dungeon_rune = { [2808]={ ["none"]="骷髅小法师", ["monster_base"]=10040, - ["hp"]=482700000, - ["atk"]=5690000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20115, @@ -366,8 +366,8 @@ local monster_dungeon_rune = { [2908]={ ["none"]="蓝发剑士", ["monster_base"]=10031, - ["hp"]=345780000, - ["atk"]=4720000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20088, @@ -379,8 +379,8 @@ local monster_dungeon_rune = { [3008]={ ["none"]="蓝色蝙蝠恶魔", ["monster_base"]=10041, - ["hp"]=391500000, - ["atk"]=5410000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20118, @@ -392,8 +392,8 @@ local monster_dungeon_rune = { [3108]={ ["none"]="蓝色独眼蝙蝠", ["monster_base"]=10044, - ["hp"]=191410000, - ["atk"]=3630000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20127, @@ -405,8 +405,8 @@ local monster_dungeon_rune = { [3208]={ ["none"]="蓝色恶魔野猪", ["monster_base"]=10042, - ["hp"]=365170000, - ["atk"]=4980000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20121, @@ -418,8 +418,8 @@ local monster_dungeon_rune = { [3308]={ ["none"]="绿色食人花", ["monster_base"]=10049, - ["hp"]=409220000, - ["atk"]=4500000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20142, @@ -431,8 +431,8 @@ local monster_dungeon_rune = { [3408]={ ["none"]="绿色蜥蜴剑士", ["monster_base"]=10048, - ["hp"]=482700000, - ["atk"]=5690000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20139, @@ -444,8 +444,8 @@ local monster_dungeon_rune = { [3508]={ ["none"]="魔都小枪兵（红）", ["monster_base"]=10057, - ["hp"]=191410000, - ["atk"]=3630000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20166, @@ -457,8 +457,8 @@ local monster_dungeon_rune = { [3608]={ ["none"]="魔都小枪兵（紫）", ["monster_base"]=10058, - ["hp"]=164360000, - ["atk"]=3050000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20169, @@ -470,8 +470,8 @@ local monster_dungeon_rune = { [3708]={ ["none"]="女巫师（蓝）", ["monster_base"]=10032, - ["hp"]=525000000, - ["atk"]=5020000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20091, @@ -483,8 +483,8 @@ local monster_dungeon_rune = { [3808]={ ["none"]="女巫师（紫）", ["monster_base"]=10033, - ["hp"]=278310000, - ["atk"]=4040000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20094, @@ -496,8 +496,8 @@ local monster_dungeon_rune = { [3908]={ ["none"]="青绿鬼火", ["monster_base"]=10054, - ["hp"]=191410000, - ["atk"]=3630000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20157, @@ -509,8 +509,8 @@ local monster_dungeon_rune = { [4008]={ ["none"]="人类弓箭手（红）", ["monster_base"]=10036, - ["hp"]=554250000, - ["atk"]=5310000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20103, @@ -522,8 +522,8 @@ local monster_dungeon_rune = { [4108]={ ["none"]="人类弓箭手（绿）", ["monster_base"]=10037, - ["hp"]=205490000, - ["atk"]=3950000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20106, @@ -535,8 +535,8 @@ local monster_dungeon_rune = { [4208]={ ["none"]="人鱼双匕首（红）", ["monster_base"]=10065, - ["hp"]=243300000, - ["atk"]=2900000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20187, @@ -548,8 +548,8 @@ local monster_dungeon_rune = { [4308]={ ["none"]="人鱼双匕首（蓝）", ["monster_base"]=10063, - ["hp"]=191500000, - ["atk"]=2660000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20184, @@ -561,8 +561,8 @@ local monster_dungeon_rune = { [4408]={ ["none"]="兽人大刀兵（红）", ["monster_base"]=10014, - ["hp"]=450590000, - ["atk"]=5230000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20037, @@ -574,8 +574,8 @@ local monster_dungeon_rune = { [4508]={ ["none"]="兽人大刀兵（黄）", ["monster_base"]=10015, - ["hp"]=507910000, - ["atk"]=5800000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20040, @@ -587,8 +587,8 @@ local monster_dungeon_rune = { [4608]={ ["none"]="兽人大刀兵（蓝）", ["monster_base"]=10013, - ["hp"]=205490000, - ["atk"]=3950000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20034, @@ -600,8 +600,8 @@ local monster_dungeon_rune = { [4708]={ ["none"]="兽人大刀兵（绿）", ["monster_base"]=10012, - ["hp"]=482700000, - ["atk"]=5690000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20031, @@ -613,8 +613,8 @@ local monster_dungeon_rune = { [4808]={ ["none"]="兽人盾骨兵（红）", ["monster_base"]=10017, - ["hp"]=593840000, - ["atk"]=5780000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20046, @@ -626,8 +626,8 @@ local monster_dungeon_rune = { [4908]={ ["none"]="兽人盾骨兵（黄）", ["monster_base"]=10018, - ["hp"]=593840000, - ["atk"]=5780000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20049, @@ -639,8 +639,8 @@ local monster_dungeon_rune = { [5008]={ ["none"]="兽人盾骨兵（蓝）", ["monster_base"]=10019, - ["hp"]=372560000, - ["atk"]=4530000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20052, @@ -652,8 +652,8 @@ local monster_dungeon_rune = { [5108]={ ["none"]="兽人盾骨兵（绿）", ["monster_base"]=10016, - ["hp"]=593840000, - ["atk"]=5780000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20043, @@ -665,8 +665,8 @@ local monster_dungeon_rune = { [5208]={ ["none"]="双斧莫西干（红）", ["monster_base"]=10029, - ["hp"]=391500000, - ["atk"]=5410000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20082, @@ -678,8 +678,8 @@ local monster_dungeon_rune = { [5308]={ ["none"]="双斧莫西干（紫）", ["monster_base"]=10028, - ["hp"]=298160000, - ["atk"]=4390000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20079, @@ -691,8 +691,8 @@ local monster_dungeon_rune = { [5408]={ ["none"]="水蜥蜴", ["monster_base"]=10064, - ["hp"]=224450000, - ["atk"]=3190000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -704,8 +704,8 @@ local monster_dungeon_rune = { [5508]={ ["none"]="小史莱姆（红）", ["monster_base"]=10023, - ["hp"]=507910000, - ["atk"]=5800000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20064, @@ -717,8 +717,8 @@ local monster_dungeon_rune = { [5608]={ ["none"]="小史莱姆（黄）", ["monster_base"]=10021, - ["hp"]=593840000, - ["atk"]=5780000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20058, @@ -730,8 +730,8 @@ local monster_dungeon_rune = { [5708]={ ["none"]="小史莱姆（蓝）", ["monster_base"]=10022, - ["hp"]=205490000, - ["atk"]=3950000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20061, @@ -743,8 +743,8 @@ local monster_dungeon_rune = { [5808]={ ["none"]="小史莱姆（绿）", ["monster_base"]=10020, - ["hp"]=602910000, - ["atk"]=5280000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20055, @@ -756,8 +756,8 @@ local monster_dungeon_rune = { [5908]={ ["none"]="紫色独眼蝙蝠", ["monster_base"]=10043, - ["hp"]=474020000, - ["atk"]=5340000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20124, @@ -769,8 +769,8 @@ local monster_dungeon_rune = { [6008]={ ["none"]="紫色鬼火", ["monster_base"]=10053, - ["hp"]=549890000, - ["atk"]=4690000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20154, @@ -782,8 +782,8 @@ local monster_dungeon_rune = { [6108]={ ["none"]="紫色幽灵恶魔", ["monster_base"]=10056, - ["hp"]=191410000, - ["atk"]=3630000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20163, @@ -795,8 +795,8 @@ local monster_dungeon_rune = { [6208]={ ["none"]="紫色蜘蛛", ["monster_base"]=10045, - ["hp"]=205490000, - ["atk"]=3950000, + ["hp"]=999999999, + ["atk"]=999999999, ["atk_times"]=3, ["hurt_skill"]={ 20130, @@ -939,6 +939,9 @@ local monster_dungeon_rune = { 30206, 30207 }, + ["passive_skill"]={ + 10013 + }, ["monster_exp"]=0 }, [7008]={ @@ -979,7 +982,6 @@ local monster_dungeon_rune = { 30220 }, ["passive_skill"]={ - 10013, 10014, 30218 }, @@ -1001,7 +1003,8 @@ local monster_dungeon_rune = { 30226, 30227, 30228, - 30229 + 30229, + 30230 }, ["passive_skill"]={ 10013, diff --git a/lua/app/config/runes_sub.lua b/lua/app/config/runes_sub.lua index a530cb16..0df40356 100644 --- a/lua/app/config/runes_sub.lua +++ b/lua/app/config/runes_sub.lua @@ -90,45 +90,45 @@ local runes_sub = { }, ["attr_5"]={ { - ["type"]="attr_normal_hurtp_red", + ["type"]="attr_normal_hurt_red", ["num"]=10000 }, { - ["type"]="attr_normal_hurtp_yellow", + ["type"]="attr_normal_hurt_yellow", ["num"]=10000 }, { - ["type"]="attr_normal_hurtp_green", + ["type"]="attr_normal_hurt_green", ["num"]=10000 }, { - ["type"]="attr_normal_hurtp_blue", + ["type"]="attr_normal_hurt_blue", ["num"]=10000 }, { - ["type"]="attr_normal_hurtp_purple", + ["type"]="attr_normal_hurt_purple", ["num"]=10000 } }, ["attr_6"]={ { - ["type"]="attr_skill_hurtp_red", + ["type"]="attr_skill_hurt_red", ["num"]=10000 }, { - ["type"]="attr_skill_hurtp_yellow", + ["type"]="attr_skill_hurt_yellow", ["num"]=10000 }, { - ["type"]="attr_skill_hurtp_green", + ["type"]="attr_skill_hurt_green", ["num"]=10000 }, { - ["type"]="attr_skill_hurtp_blue", + ["type"]="attr_skill_hurt_blue", ["num"]=10000 }, { - ["type"]="attr_skill_hurtp_purple", + ["type"]="attr_skill_hurt_purple", ["num"]=10000 } }, @@ -334,45 +334,45 @@ local runes_sub = { }, ["attr_5"]={ { - ["type"]="attr_normal_hurtp_red", + ["type"]="attr_normal_hurt_red", ["num"]=20000 }, { - ["type"]="attr_normal_hurtp_yellow", + ["type"]="attr_normal_hurt_yellow", ["num"]=20000 }, { - ["type"]="attr_normal_hurtp_green", + ["type"]="attr_normal_hurt_green", ["num"]=20000 }, { - ["type"]="attr_normal_hurtp_blue", + ["type"]="attr_normal_hurt_blue", ["num"]=20000 }, { - ["type"]="attr_normal_hurtp_purple", + ["type"]="attr_normal_hurt_purple", ["num"]=20000 } }, ["attr_6"]={ { - ["type"]="attr_skill_hurtp_red", + ["type"]="attr_skill_hurt_red", ["num"]=20000 }, { - ["type"]="attr_skill_hurtp_yellow", + ["type"]="attr_skill_hurt_yellow", ["num"]=20000 }, { - ["type"]="attr_skill_hurtp_green", + ["type"]="attr_skill_hurt_green", ["num"]=20000 }, { - ["type"]="attr_skill_hurtp_blue", + ["type"]="attr_skill_hurt_blue", ["num"]=20000 }, { - ["type"]="attr_skill_hurtp_purple", + ["type"]="attr_skill_hurt_purple", ["num"]=20000 } }, @@ -578,45 +578,45 @@ local runes_sub = { }, ["attr_5"]={ { - ["type"]="attr_normal_hurtp_red", + ["type"]="attr_normal_hurt_red", ["num"]=30000 }, { - ["type"]="attr_normal_hurtp_yellow", + ["type"]="attr_normal_hurt_yellow", ["num"]=30000 }, { - ["type"]="attr_normal_hurtp_green", + ["type"]="attr_normal_hurt_green", ["num"]=30000 }, { - ["type"]="attr_normal_hurtp_blue", + ["type"]="attr_normal_hurt_blue", ["num"]=30000 }, { - ["type"]="attr_normal_hurtp_purple", + ["type"]="attr_normal_hurt_purple", ["num"]=30000 } }, ["attr_6"]={ { - ["type"]="attr_skill_hurtp_red", + ["type"]="attr_skill_hurt_red", ["num"]=30000 }, { - ["type"]="attr_skill_hurtp_yellow", + ["type"]="attr_skill_hurt_yellow", ["num"]=30000 }, { - ["type"]="attr_skill_hurtp_green", + ["type"]="attr_skill_hurt_green", ["num"]=30000 }, { - ["type"]="attr_skill_hurtp_blue", + ["type"]="attr_skill_hurt_blue", ["num"]=30000 }, { - ["type"]="attr_skill_hurtp_purple", + ["type"]="attr_skill_hurt_purple", ["num"]=30000 } }, @@ -822,45 +822,45 @@ local runes_sub = { }, ["attr_5"]={ { - ["type"]="attr_normal_hurtp_red", + ["type"]="attr_normal_hurt_red", ["num"]=40000 }, { - ["type"]="attr_normal_hurtp_yellow", + ["type"]="attr_normal_hurt_yellow", ["num"]=40000 }, { - ["type"]="attr_normal_hurtp_green", + ["type"]="attr_normal_hurt_green", ["num"]=40000 }, { - ["type"]="attr_normal_hurtp_blue", + ["type"]="attr_normal_hurt_blue", ["num"]=40000 }, { - ["type"]="attr_normal_hurtp_purple", + ["type"]="attr_normal_hurt_purple", ["num"]=40000 } }, ["attr_6"]={ { - ["type"]="attr_skill_hurtp_red", + ["type"]="attr_skill_hurt_red", ["num"]=40000 }, { - ["type"]="attr_skill_hurtp_yellow", + ["type"]="attr_skill_hurt_yellow", ["num"]=40000 }, { - ["type"]="attr_skill_hurtp_green", + ["type"]="attr_skill_hurt_green", ["num"]=40000 }, { - ["type"]="attr_skill_hurtp_blue", + ["type"]="attr_skill_hurt_blue", ["num"]=40000 }, { - ["type"]="attr_skill_hurtp_purple", + ["type"]="attr_skill_hurt_purple", ["num"]=40000 } }, @@ -1066,45 +1066,45 @@ local runes_sub = { }, ["attr_5"]={ { - ["type"]="attr_normal_hurtp_red", + ["type"]="attr_normal_hurt_red", ["num"]=50000 }, { - ["type"]="attr_normal_hurtp_yellow", + ["type"]="attr_normal_hurt_yellow", ["num"]=50000 }, { - ["type"]="attr_normal_hurtp_green", + ["type"]="attr_normal_hurt_green", ["num"]=50000 }, { - ["type"]="attr_normal_hurtp_blue", + ["type"]="attr_normal_hurt_blue", ["num"]=50000 }, { - ["type"]="attr_normal_hurtp_purple", + ["type"]="attr_normal_hurt_purple", ["num"]=50000 } }, ["attr_6"]={ { - ["type"]="attr_skill_hurtp_red", + ["type"]="attr_skill_hurt_red", ["num"]=50000 }, { - ["type"]="attr_skill_hurtp_yellow", + ["type"]="attr_skill_hurt_yellow", ["num"]=50000 }, { - ["type"]="attr_skill_hurtp_green", + ["type"]="attr_skill_hurt_green", ["num"]=50000 }, { - ["type"]="attr_skill_hurtp_blue", + ["type"]="attr_skill_hurt_blue", ["num"]=50000 }, { - ["type"]="attr_skill_hurtp_purple", + ["type"]="attr_skill_hurt_purple", ["num"]=50000 } }, @@ -1310,45 +1310,45 @@ local runes_sub = { }, ["attr_5"]={ { - ["type"]="attr_normal_hurtp_red", + ["type"]="attr_normal_hurt_red", ["num"]=90000 }, { - ["type"]="attr_normal_hurtp_yellow", + ["type"]="attr_normal_hurt_yellow", ["num"]=90000 }, { - ["type"]="attr_normal_hurtp_green", + ["type"]="attr_normal_hurt_green", ["num"]=90000 }, { - ["type"]="attr_normal_hurtp_blue", + ["type"]="attr_normal_hurt_blue", ["num"]=90000 }, { - ["type"]="attr_normal_hurtp_purple", + ["type"]="attr_normal_hurt_purple", ["num"]=90000 } }, ["attr_6"]={ { - ["type"]="attr_skill_hurtp_red", + ["type"]="attr_skill_hurt_red", ["num"]=90000 }, { - ["type"]="attr_skill_hurtp_yellow", + ["type"]="attr_skill_hurt_yellow", ["num"]=90000 }, { - ["type"]="attr_skill_hurtp_green", + ["type"]="attr_skill_hurt_green", ["num"]=90000 }, { - ["type"]="attr_skill_hurtp_blue", + ["type"]="attr_skill_hurt_blue", ["num"]=90000 }, { - ["type"]="attr_skill_hurtp_purple", + ["type"]="attr_skill_hurt_purple", ["num"]=90000 } }, @@ -1554,45 +1554,45 @@ local runes_sub = { }, ["attr_5"]={ { - ["type"]="attr_normal_hurtp_red", + ["type"]="attr_normal_hurt_red", ["num"]=100000 }, { - ["type"]="attr_normal_hurtp_yellow", + ["type"]="attr_normal_hurt_yellow", ["num"]=100000 }, { - ["type"]="attr_normal_hurtp_green", + ["type"]="attr_normal_hurt_green", ["num"]=100000 }, { - ["type"]="attr_normal_hurtp_blue", + ["type"]="attr_normal_hurt_blue", ["num"]=100000 }, { - ["type"]="attr_normal_hurtp_purple", + ["type"]="attr_normal_hurt_purple", ["num"]=100000 } }, ["attr_6"]={ { - ["type"]="attr_skill_hurtp_red", + ["type"]="attr_skill_hurt_red", ["num"]=100000 }, { - ["type"]="attr_skill_hurtp_yellow", + ["type"]="attr_skill_hurt_yellow", ["num"]=100000 }, { - ["type"]="attr_skill_hurtp_green", + ["type"]="attr_skill_hurt_green", ["num"]=100000 }, { - ["type"]="attr_skill_hurtp_blue", + ["type"]="attr_skill_hurt_blue", ["num"]=100000 }, { - ["type"]="attr_skill_hurtp_purple", + ["type"]="attr_skill_hurt_purple", ["num"]=100000 } }, @@ -1798,45 +1798,45 @@ local runes_sub = { }, ["attr_5"]={ { - ["type"]="attr_normal_hurtp_red", + ["type"]="attr_normal_hurt_red", ["num"]=200000 }, { - ["type"]="attr_normal_hurtp_yellow", + ["type"]="attr_normal_hurt_yellow", ["num"]=200000 }, { - ["type"]="attr_normal_hurtp_green", + ["type"]="attr_normal_hurt_green", ["num"]=200000 }, { - ["type"]="attr_normal_hurtp_blue", + ["type"]="attr_normal_hurt_blue", ["num"]=200000 }, { - ["type"]="attr_normal_hurtp_purple", + ["type"]="attr_normal_hurt_purple", ["num"]=200000 } }, ["attr_6"]={ { - ["type"]="attr_skill_hurtp_red", + ["type"]="attr_skill_hurt_red", ["num"]=200000 }, { - ["type"]="attr_skill_hurtp_yellow", + ["type"]="attr_skill_hurt_yellow", ["num"]=200000 }, { - ["type"]="attr_skill_hurtp_green", + ["type"]="attr_skill_hurt_green", ["num"]=200000 }, { - ["type"]="attr_skill_hurtp_blue", + ["type"]="attr_skill_hurt_blue", ["num"]=200000 }, { - ["type"]="attr_skill_hurtp_purple", + ["type"]="attr_skill_hurt_purple", ["num"]=200000 } }, diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 9580b2f4..62ecc59c 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -9326,7 +9326,7 @@ local skill = { ["round"]=1 } }, - ["obj"]=2 + ["obj"]=1 }, [5400423]={ ["position"]=5, @@ -9567,10 +9567,10 @@ local skill = { ["trigger"]=2, ["effect"]={ { - ["type"]="dec_dmg_red_add", + ["type"]="forever_dec_dmg_red_add", ["num"]=5000, ["ratio"]=10000, - ["round"]=0 + ["round"]=9999 } }, ["obj"]=1, @@ -9584,10 +9584,10 @@ local skill = { ["trigger"]=2, ["effect"]={ { - ["type"]="dec_dmg_yellow_add", + ["type"]="forever_dec_dmg_yellow_add", ["num"]=5000, ["ratio"]=10000, - ["round"]=0 + ["round"]=9999 } }, ["obj"]=1, @@ -9601,10 +9601,10 @@ local skill = { ["trigger"]=2, ["effect"]={ { - ["type"]="dec_dmg_green_add", + ["type"]="forever_dec_dmg_green_add", ["num"]=5000, ["ratio"]=10000, - ["round"]=0 + ["round"]=9999 } }, ["obj"]=1, @@ -9618,10 +9618,10 @@ local skill = { ["trigger"]=2, ["effect"]={ { - ["type"]="dec_dmg_blue_add", + ["type"]="forever_dec_dmg_blue_add", ["num"]=5000, ["ratio"]=10000, - ["round"]=0 + ["round"]=9999 } }, ["obj"]=1, @@ -9635,10 +9635,10 @@ local skill = { ["trigger"]=2, ["effect"]={ { - ["type"]="dec_dmg_purple_add", + ["type"]="forever_dec_dmg_purple_add", ["num"]=5000, ["ratio"]=10000, - ["round"]=0 + ["round"]=9999 } }, ["obj"]=1, @@ -9652,10 +9652,10 @@ local skill = { ["trigger"]=2, ["effect"]={ { - ["type"]="first_hand", + ["type"]="forever_first_hand", ["num"]=10000, ["ratio"]=10000, - ["round"]=0 + ["round"]=9999 } }, ["obj"]=1, @@ -9669,10 +9669,10 @@ local skill = { ["trigger"]=2, ["effect"]={ { - ["type"]="counterattack", + ["type"]="forever_counterattack", ["num"]=2500, ["ratio"]=10000, - ["round"]=0 + ["round"]=9999 } }, ["obj"]=1 @@ -24046,7 +24046,7 @@ local skill = { { ["type"]="state", ["attr"]="dmg_addition_all_add", - ["op"]="=", + ["op"]="<", ["v"]=0, ["side"]=1 } @@ -24062,7 +24062,7 @@ local skill = { { ["type"]="state", ["attr"]="vulnerable", - ["op"]="=", + ["op"]="<", ["v"]=0, ["side"]=1 } @@ -24252,7 +24252,7 @@ local skill = { 2, 0 }, - ["cd"]=3, + ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, @@ -24275,7 +24275,7 @@ local skill = { { ["type"]="weaken", ["num"]=2500, - ["ratio"]=1000, + ["ratio"]=10000, ["round"]=2 } }, @@ -24305,7 +24305,7 @@ local skill = { { ["type"]="weaken", ["num"]=2500, - ["ratio"]=1000, + ["ratio"]=10000, ["round"]=2 } }, @@ -24335,7 +24335,7 @@ local skill = { { ["type"]="weaken", ["num"]=2500, - ["ratio"]=1000, + ["ratio"]=10000, ["round"]=2 } }, @@ -24370,7 +24370,7 @@ local skill = { } }, ["obj"]=2, - ["cd"]=7, + ["cd"]=4, ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, @@ -24398,8 +24398,8 @@ local skill = { } }, ["obj"]=2, - ["cd"]=7, - ["cd_start"]=3, + ["cd"]=4, + ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -24492,7 +24492,7 @@ local skill = { } }, ["obj"]=2, - ["cd"]=5, + ["cd"]=4, ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, @@ -24514,7 +24514,7 @@ local skill = { } }, ["obj"]=2, - ["cd"]=5, + ["cd"]=4, ["cd_start"]=1, ["shake_time"]=200, ["shake_type"]=6, @@ -24536,7 +24536,7 @@ local skill = { } }, ["obj"]=2, - ["cd"]=5, + ["cd"]=4, ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, @@ -24555,7 +24555,7 @@ local skill = { ["effect_type"]=1, ["trigger"]=1, ["obj"]=2, - ["cd"]=5, + ["cd"]=4, ["cd_start"]=3, ["shake_time"]=200, ["shake_type"]=6, @@ -24643,7 +24643,7 @@ local skill = { ["effect"]={ { ["type"]="heal", - ["num"]=10000, + ["num"]=100000, ["ratio"]=10000, ["round"]=1 } @@ -24656,7 +24656,7 @@ local skill = { ["effect"]={ { ["type"]="shield", - ["num"]=1000, + ["num"]=2000, ["ratio"]=10000, ["round"]=3 }, @@ -24769,10 +24769,22 @@ local skill = { ["num"]=20000, ["ratio"]=10000, ["round"]=0 + }, + { + ["type"]="imprison", + ["num"]=0, + ["ratio"]=10000, + ["round"]=2 + }, + { + ["type"]="corrupt", + ["num"]=7500, + ["ratio"]=10000, + ["round"]=2 } }, ["obj"]=2, - ["cd"]=4, + ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, @@ -24796,11 +24808,11 @@ local skill = { ["type"]="normal_attack_add", ["num"]=2, ["ratio"]=10000, - ["round"]=2 + ["round"]=3 } }, - ["obj"]=2, - ["cd"]=4, + ["obj"]=1, + ["cd"]=3, ["cd_start"]=0 }, [30197]={ @@ -24884,7 +24896,7 @@ local skill = { } }, ["obj"]=1, - ["cd"]=11, + ["cd"]=10, ["cd_start"]=0 }, [30201]={ @@ -24899,7 +24911,7 @@ local skill = { } }, ["obj"]=1, - ["cd"]=11, + ["cd"]=10, ["cd_start"]=2 }, [30202]={ @@ -24914,7 +24926,7 @@ local skill = { } }, ["obj"]=1, - ["cd"]=11, + ["cd"]=10, ["cd_start"]=4 }, [30203]={ @@ -24929,7 +24941,7 @@ local skill = { } }, ["obj"]=1, - ["cd"]=11, + ["cd"]=10, ["cd_start"]=6 }, [30204]={ @@ -24944,7 +24956,7 @@ local skill = { } }, ["obj"]=1, - ["cd"]=11, + ["cd"]=10, ["cd_start"]=8 }, [30205]={ @@ -24953,7 +24965,7 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=40000, ["ratio"]=10000, ["round"]=0 }, @@ -24965,7 +24977,7 @@ local skill = { } }, ["obj"]=2, - ["cd"]=9, + ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, @@ -24981,7 +24993,7 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=40000, ["ratio"]=10000, ["round"]=0 }, @@ -24993,8 +25005,8 @@ local skill = { } }, ["obj"]=2, - ["cd"]=9, - ["cd_start"]=3, + ["cd"]=3, + ["cd_start"]=1, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -25009,7 +25021,7 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=40000, ["ratio"]=10000, ["round"]=0 }, @@ -25021,8 +25033,8 @@ local skill = { } }, ["obj"]=2, - ["cd"]=9, - ["cd_start"]=6, + ["cd"]=3, + ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ @@ -25119,7 +25131,7 @@ local skill = { ["effect"]={ { ["type"]="shield", - ["num"]=1000, + ["num"]=2000, ["ratio"]=10000, ["round"]=2 } @@ -25129,7 +25141,7 @@ local skill = { 2, 0 }, - ["cd"]=4, + ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, @@ -25155,7 +25167,7 @@ local skill = { 2, 0 }, - ["cd"]=4, + ["cd"]=3, ["cd_start"]=1, ["shake_time"]=200, ["shake_type"]=6, @@ -25181,7 +25193,7 @@ local skill = { 2, 0 }, - ["cd"]=4, + ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, @@ -25265,25 +25277,21 @@ local skill = { ["trigger"]=2, ["effect"]={ { - ["type"]="dec_dmg_all_add", + ["type"]="forever_dec_dmg_all_add", ["num"]=5000, ["ratio"]=10000, - ["round"]=0 + ["round"]=999 } }, ["obj"]=1 }, [30219]={ - ["skill_type"]=9, - ["skill_type_parameter"]={ - 12500 - }, ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=80000, ["ratio"]=10000, ["round"]=0 }, @@ -25299,7 +25307,7 @@ local skill = { 2, 0 }, - ["cd"]=5, + ["cd"]=4, ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, @@ -25310,6 +25318,10 @@ local skill = { ["fx_self"]=200099 }, [30220]={ + ["skill_type"]=9, + ["skill_type_parameter"]={ + 12500 + }, ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -25325,7 +25337,7 @@ local skill = { 2, 0 }, - ["cd"]=5, + ["cd"]=4, ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, @@ -25409,10 +25421,10 @@ local skill = { ["trigger"]=2, ["effect"]={ { - ["type"]="thorns", + ["type"]="forever_thorns", ["num"]=1000, ["ratio"]=10000, - ["round"]=0 + ["round"]=999 } }, ["obj"]=1 @@ -25422,8 +25434,8 @@ local skill = { ["trigger"]=1, ["effect"]={ { - ["type"]="undead", - ["num"]=0, + ["type"]="rebirth", + ["num"]=62500, ["ratio"]=10000, ["round"]=2 }, @@ -25439,7 +25451,7 @@ local skill = { 2, 0 }, - ["cd"]=4, + ["cd"]=6, ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, @@ -25462,7 +25474,7 @@ local skill = { 2, 0 }, - ["cd"]=7, + ["cd"]=6, ["cd_start"]=0, ["name_act"]="skill01" }, @@ -25479,7 +25491,7 @@ local skill = { 2, 0 }, - ["cd"]=8, + ["cd"]=6, ["cd_start"]=1, ["name_act"]="skill01" }, @@ -25517,6 +25529,38 @@ local skill = { ["cd_start"]=4, ["name_act"]="skill01" }, + [30230]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="rebirth", + ["num"]=62500, + ["ratio"]=10000, + ["round"]=2 + }, + { + ["type"]="heal", + ["num"]=125000, + ["ratio"]=10000, + ["round"]=1 + } + }, + ["obj"]=1, + ["skill_position"]={ + 2, + 0 + }, + ["cd"]=6, + ["cd_start"]=5, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound_hit"]={ + 10018 + }, + ["name_act"]="skill01", + ["fx_self"]=200099 + }, [40001]={ ["effect_type"]=1, ["trigger"]=1, @@ -30443,6 +30487,6 @@ local skill = { } } local config = { -data=skill,count=1102 +data=skill,count=1103 } 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 aed3868e..e4a09b39 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -1636,7 +1636,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=1, ["parameter"]={ - 1400325 + 1400425 }, ["skill_position"]=1, ["icon"]="270" @@ -5319,7 +5319,7 @@ local skill_rogue = { ["effect"]={ { ["type"]="add_skill", - ["num"]=5400321, + ["num"]=5400421, ["ratio"]=10000, ["round"]=999 } @@ -5336,7 +5336,7 @@ local skill_rogue = { ["effect"]={ { ["type"]="add_skill", - ["num"]=5400322, + ["num"]=5400422, ["ratio"]=10000, ["round"]=1 } @@ -5353,7 +5353,7 @@ local skill_rogue = { ["effect"]={ { ["type"]="add_skill", - ["num"]=5400323, + ["num"]=5400423, ["ratio"]=10000, ["round"]=1 } @@ -5372,7 +5372,7 @@ local skill_rogue = { ["effect"]={ { ["type"]="add_skill", - ["num"]=5400324, + ["num"]=5400424, ["ratio"]=10000, ["round"]=1 } @@ -5391,7 +5391,7 @@ local skill_rogue = { ["effect"]={ { ["type"]="add_skill", - ["num"]=5400325, + ["num"]=5400425, ["ratio"]=10000, ["round"]=999 } @@ -5408,7 +5408,7 @@ local skill_rogue = { ["effect"]={ { ["type"]="add_skill", - ["num"]=5400326, + ["num"]=5400426, ["ratio"]=10000, ["round"]=1 } diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index ef1a83a2..135e6513 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -527,8 +527,32 @@ local localization_global = ["DUNGEON_RUNE_TIP_4"] = "血量回复至50%", ["DUNGEON_RUNE_TIP_5"] = "回合数+5！", ["UNFINISHED"] = "未完成", - - ["DUNGEON_RUNE_DESC_1"]= "目标", + ["RUNES_DESC_1"] = "符文铸台:{0}级", + ["RUNES_DESC_2"] = "符文套装", + ["RUNES_DESC_3"] = "符文铸台{0}级解锁", + ["RUNES_DESC_4"] = "一键淬炼", + ["RUNES_DESC_5"] = "淬炼", + ["RUNES_DESC_6"] = "符文", + ["RUNES_DESC_7"] = "符文铸台等级", + ["RUNES_DESC_8"] = "1.消耗符文精粹提升符文铸台等级。\n2.符文铸台等级提升将解锁付文栏，有概率淬炼出高品质符文。\n3.所有英雄符文铸台等级互通。\n4.同一种属性，最多只会出现2条。", + ["RUNES_DESC_9"] = "符文套装效果", + ["RUNES_DESC_10"] = "生命套装", + ["RUNES_DESC_11"] = "攻击套装", + ["RUNES_DESC_12"] = "增伤套装", + ["RUNES_DESC_13"] = "暴击套装", + ["RUNES_DESC_14"] = "爆伤套装", + ["RUNES_DESC_15"] = "Lv1-2件套:{0}", + ["RUNES_DESC_16"] = "Lv2-4件套:{0}", + ["RUNES_DESC_17"] = "符文每日礼包", + ["RUNES_DESC_18"] = "强化材料不足", + ["RUNES_DESC_19"] = "符文精华不足，洋葱头也没办法", + ["RUNES_DESC_20"] = "符文之塔获得", + ["RUNES_DESC_21"] = "一键淬炼，只有在出现S和SS符文或符文精粹不足时停止，是否开始？", + ["RUNES_DESC_22"] = "符文属性", + ["RUNES_DESC_23"] = "无套装效果", + ["RUNES_DESC_24"] = "请先激活英雄", + ["RUNES_DESC_25"] = "符文淬炼至少保留1个未锁符文", + ["DUNGEON_RUNE_DESC_1"] = "目标", ["DUNGEON_RUNE_DESC_2"] = "再次挑战", ["DUNGEON_RUNE_DESC_3"] = "通关获得", ["DUNGEON_RUNE_DESC_4"] = "扫荡获得", diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index b2abe9f9..3d2c2f78 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -876,28 +876,28 @@ local skill_rogue = { ["desc"]="九尾祥瑞激活所需能量-2。" }, [2400400]={ - ["desc"]="解锁双截龙棍：使用后本次伤害提升，并额外造成多次大量技能伤害。" + ["desc"]="解锁啊，打！：使用后本次伤害提升，并额外造成多次大量技能伤害。" }, [2400401]={ - ["desc"]="双截龙棍技能伤害提升。" + ["desc"]="啊，打！技能伤害提升。" }, [2400402]={ - ["desc"]="双截龙棍沿＋方向可额外消除4格。" + ["desc"]="啊，打！沿＋方向可额外消除4格。" }, [2400403]={ ["desc"]="龙哥普攻有5%概率附加眩晕效果，1回合。" }, [2400404]={ - ["desc"]="双截龙棍沿X方向可额外消除4格。" + ["desc"]="啊，打！沿X方向可额外消除4格。" }, [2400405]={ - ["desc"]="双截龙棍可附加流血效果，2回合。" + ["desc"]="啊，打！可附加流血效果，2回合。" }, [2400406]={ ["desc"]="Combo:龙哥普攻对冰霜和流血敌人额外增伤。" }, [2400407]={ - ["desc"]="双截龙棍附加的眩晕效果概率提高至10%，回合数+1。" + ["desc"]="啊，打！附加的眩晕效果概率提高至10%，回合数+1。" }, [3400400]={ ["desc"]="解锁刺杀艺术：使用后本次伤害提升，并额外造成多次大量技能伤害。" @@ -936,7 +936,7 @@ local skill_rogue = { ["desc"]="飞棺降物附加的冰霜效果，回合数+1。" }, [4400404]={ - ["desc"]="Combo:已逝行者普攻对腐败敌人将恢复生命。" + ["desc"]="Combo:已逝行者普攻腐败敌人将恢复生命。" }, [4400405]={ ["desc"]="飞棺降物释放后为团队附加重生效果，1回合。" diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index a61ad7e6..cb5e20be 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -13,6 +13,7 @@ local CONST_PATHS = { HeroConst = "app/module/hero/hero_const", FormationConst = "app/module/formation/formation_const", EquipConst = "app/module/equip/equip_const", + RunesConst = "app/module/runes/runes_const", DungeonConst = "app/module/dungeon/dungeon_const", ShopConst = "app/module/shop/shop_const", SummonConst = "app/module/summon/summon_const", @@ -310,7 +311,8 @@ GConst.MESSAGE_BOX_TYPE = { GConst.MESSAGE_BOX_SHOW_TODAY = { BOUNTY_BUY_LEVEL = 1, HOT_SELL_BUY = 2, - ACTIVITY_BUY_LEVEL = 2, + ACTIVITY_BUY_LEVEL = 3, + RUNES_AUTO = 4, } GConst.QUALITY_TYPE = diff --git a/lua/app/global/global_func.lua b/lua/app/global/global_func.lua index 06d2c83a..09b53f0b 100644 --- a/lua/app/global/global_func.lua +++ b/lua/app/global/global_func.lua @@ -434,10 +434,27 @@ function GFunc.getBuffDesc(buffName, effectNum, ispercent) end function GFunc.getAttrDesc(attrName, attrNum) - attrNum = attrNum // 100 + attrNum = GFunc.getAttrShowValue(attrName, attrNum, true) return I18N:getTextWithOtherKey("attr", "name", attrName, "desc", attrNum) end +-- 获取属性用于显示的数值 +function GFunc.getAttrShowValue(attrType, attrNum, notPercentSign) + if table.containValue(GConst.MATCH_ATTACK_ADD_NAME, attrType) or + table.containValue(GConst.MATCH_HP_ADD_NAME, attrType) or + table.containValue(GConst.MATCH_NORMAL_HURTP_NAME, attrType) or + table.containValue(GConst.MATCH_SKILL_HURTP_NAME, attrType) or + table.containValue(GConst.MATCH_CRIT_NAME, attrType) or + table.containValue(GConst.MATCH_CRIT_TIME_NAME, attrType) or + table.containValue(GConst.MATCH_CURED_NAME, attrType) + then + local str = notPercentSign and "" or "%" + return attrNum // GConst.BattleConst.PERCENT_FACTOR .. str + else + return attrNum // GConst.BattleConst.DEFAULT_FACTOR + end +end + function GFunc.getAttrName(key) return I18N:getText("attr", key, "name") end @@ -1821,7 +1838,7 @@ function GFunc.formatPlayerName(name) return name end --- info = {array_heroes, heroes_equips, skins} -- 服务器返回的数据 +-- info = {array_heroes, heroes_equips, skins, heroes_runes} -- 服务器返回的数据 function GFunc.formatPlayerFormationInfo(info) local formation = {} if not info.array_heroes then @@ -1840,6 +1857,9 @@ function GFunc.formatPlayerFormationInfo(info) if not info.skins then info.skins = {} end + if not info.heroes_runes then + info.heroes_runes = {} + end for matchType, heroEntity in pairs(formation) do local heroId = heroEntity:getCfgId() @@ -1868,6 +1888,13 @@ function GFunc.formatPlayerFormationInfo(info) if #skinIds > 0 then heroEntity:setSkins(skinIds) end + + -- 处理符文 + if info.heroes_runes[heroId] == nil then + info.heroes_runes[heroId] = {grids = {}} + end + local runesEntity = DataManager.RunesData:createEntity(heroId, info.heroes_runes[heroId].grids) + heroEntity:setRunes(runesEntity) end return formation diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 16aab34b..4726a9d5 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -20,6 +20,7 @@ BattleConst.SKILL_TYPE_ASSISTING = 3 BattleConst.SKILL_TYPE_PASSIVE = 4 BattleConst.SKILL_SELECT_COUNT = 3 BattleConst.DEFAULT_FACTOR = 10000 +BattleConst.PERCENT_FACTOR = 100 BattleConst.TIME_FACTOR = 1000 BattleConst.INIT_POS_X = 140 -- 战斗单位初始化的坐标 BattleConst.UNIT_FRONT_POS_X = 0 -- 战斗单位身前的坐标 diff --git a/lua/app/module/hero/hero_const.lua b/lua/app/module/hero/hero_const.lua index b8bc0f4d..6d406356 100644 --- a/lua/app/module/hero/hero_const.lua +++ b/lua/app/module/hero/hero_const.lua @@ -1,5 +1,14 @@ local HeroConst = {} +-- 英雄颜色类型 +HeroConst.MATCH_TYPE = { + RED = 1, + YELLOW = 2, + GREEN = 3, + BLUE = 4, + PURPLE = 5 +} + HeroConst.MATCH_ICON_NAME = { [1] = "match_1", [2] = "match_2", @@ -21,7 +30,7 @@ HeroConst.PANEL_TYPE = { HERO = 1, WEAPON = 2, ARMOR = 3, - SKIN = 4, + RUNES = 4, } -- 总计 @@ -70,6 +79,18 @@ HeroConst.ATTR_SHOW_SKIN = { GConst.MATCH_SKILL_HURTP_NAME, -- 技能增伤百分比 GConst.MATCH_CURED_NAME, -- 治疗效果提升百分比 } +-- 符文 +HeroConst.ATTR_SHOW_RUNES = { + GConst.MATCH_HP_FIX_NAME, -- 生命 + GConst.MATCH_ATTACK_NAME, -- 攻击 + GConst.MATCH_NORMAL_HURT_NAME, -- 普攻增伤 + GConst.MATCH_SKILL_HURT_NAME, -- 技能增伤 + GConst.MATCH_CRIT_NAME, -- 暴击率百分比 + GConst.MATCH_CRIT_TIME_NAME, -- 暴击伤害百分比 + GConst.MATCH_NORMAL_HURTP_NAME, -- 普攻增伤百分比 + GConst.MATCH_SKILL_HURTP_NAME, -- 技能增伤百分比 + GConst.MATCH_CURED_NAME, -- 治疗效果提升百分比 +} -- 需要显示属性的模块 HeroConst.SHOW_NODE = { @@ -77,6 +98,7 @@ HeroConst.SHOW_NODE = { HeroConst.ATTR_SHOW_BASE, HeroConst.ATTR_SHOW_WEAPON, HeroConst.ATTR_SHOW_ARMOR, + HeroConst.ATTR_SHOW_RUNES, HeroConst.ATTR_SHOW_SKIN, } diff --git a/lua/app/module/hero/hero_manager.lua b/lua/app/module/hero/hero_manager.lua index 80618ba2..8f8566fb 100644 --- a/lua/app/module/hero/hero_manager.lua +++ b/lua/app/module/hero/hero_manager.lua @@ -1,7 +1,11 @@ local HeroManager = class("HeroManager", BaseModule) -function HeroManager:showHeroDetailUI(heroId, onlyLook, heroEntity, skinId, formationType) - UIManager:showUI("app/ui/hero/hero_detail_ui", {heroId = heroId, onlyLook = onlyLook, heroEntity = heroEntity, skinId = skinId, formationType = formationType}) +function HeroManager:showHeroDetailUI(heroId, onlyLook, heroEntity, formationType) + UIManager:showUI("app/ui/hero/hero_detail_ui", {heroId = heroId, onlyLook = onlyLook, heroEntity = heroEntity, formationType = formationType}) +end + +function HeroManager:showHeroSkinUI(heroId, onlyLookSkinId) + UIManager:showUI("app/ui/hero/hero_skin_ui", {heroId = heroId, onlyLookSkinId = onlyLookSkinId}) end function HeroManager:showHeroUnlockUI(heroIdList) diff --git a/lua/app/module/item/item_const.lua b/lua/app/module/item/item_const.lua index 7a87a188..c66a9cba 100644 --- a/lua/app/module/item/item_const.lua +++ b/lua/app/module/item/item_const.lua @@ -19,6 +19,7 @@ ItemConst.ITEM_ID_ARENA_TICKET = 22 ItemConst.ITEM_ID_FOURTEEN_DAY_EXCHANGE = 51 ItemConst.ITEM_ID_GLOD_WING = 49 ItemConst.ITEM_ID_SLIVER_WING = 50 +ItemConst.ITEM_ID_RUNES = 55 ItemConst.ITEM_TYPE = { RES = 1, diff --git a/lua/app/module/runes.meta b/lua/app/module/runes.meta new file mode 100644 index 00000000..53a3d38f --- /dev/null +++ b/lua/app/module/runes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 18d45baac20fe4d4b8f98e500a15c222 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/module/runes/runes_const.lua b/lua/app/module/runes/runes_const.lua new file mode 100644 index 00000000..ec960a1f --- /dev/null +++ b/lua/app/module/runes/runes_const.lua @@ -0,0 +1,29 @@ +local RunesConst = {} + +RunesConst.GIFT_IDS = { + 210102, + 210202, + 210302, +} + +RunesConst.QUALITY_ICON = { + [1] = "hero_rune_f", + [2] = "hero_rune_e", + [3] = "hero_rune_d", + [4] = "hero_rune_c", + [5] = "hero_rune_b", + [6] = "hero_rune_a", + [7] = "hero_rune_s", + [8] = "hero_rune_ss", +} + +-- 最大属性栏位数 +RunesConst.MAX_ATTR_GRID_COUNT = 6 +-- 品质个数 +RunesConst.MAX_QUALITY_COUNT = 8 +-- 最大套装个数 +RunesConst.MAX_SUITS_COUNT = 5 +-- 最大符文种类个数 +RunesConst.MAX_ATTR_COUNT = 11 + +return RunesConst \ No newline at end of file diff --git a/lua/app/ui/hero/skin_info_comp.lua.meta b/lua/app/module/runes/runes_const.lua.meta similarity index 86% rename from lua/app/ui/hero/skin_info_comp.lua.meta rename to lua/app/module/runes/runes_const.lua.meta index 2dae3444..64b9aa20 100644 --- a/lua/app/ui/hero/skin_info_comp.lua.meta +++ b/lua/app/module/runes/runes_const.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7209380a6f275fe4fa7fd87e464fde53 +guid: 4bda2a68bd04f8e4993df04a2b3878c7 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/module/runes/runes_manager.lua b/lua/app/module/runes/runes_manager.lua new file mode 100644 index 00000000..38c3c295 --- /dev/null +++ b/lua/app/module/runes/runes_manager.lua @@ -0,0 +1,45 @@ +local RunesManager = class("RunesManager", BaseModule) + +-- 锁定和解锁属性栏 +function RunesManager:reqChangeLockGrid(heroId, index, isLock) + self:sendMessage(ProtoMsgType.FromMsgEnum.RuneLockReq, {hero_id = heroId, grid_num = index, lock = isLock}, {}, self.rspChangeLockGrid) +end + +function RunesManager:rspChangeLockGrid(result) + if result.hero_girds then + DataManager.RunesData:onGridLockSuccess(result.reqData.hero_id, result.hero_girds.grids) + end +end + +-- 淬炼 +function RunesManager:reqQuenching(heroId, autoCount) + if DataManager.RunesData:getRunes(heroId):getAttrLockCount() >= DataManager.RunesData:getUnlockCount() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_25)) + return + end + if self.isReqQuenching then + return + end + + local cost = DataManager.RunesData:getRunes(heroId):getMaterialCost() + if not GFunc.checkCost(GFunc.getRewardId(cost), GFunc.getRewardNum(cost), true) then + UIManager:showUI("app/ui/runes/runes_source_ui") + return + end + + self.isReqQuenching = true + self:sendMessage(ProtoMsgType.FromMsgEnum.RuneQuenchingReq, {hero_id = heroId, auto_count = autoCount}, {}, self.rspQuenching, BIReport.ITEM_GET_TYPE.RUNES_QUENCHING) +end + +function RunesManager:rspQuenching(result) + self.isReqQuenching = false + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.RunesData:onQuenchingSuccess(result.level, result.exp, result.reqData.hero_id, result.hero_girds.grids) + end +end + +function RunesManager:rspUpdate(result) + DataManager.RunesData:init(result.rune) +end + +return RunesManager \ No newline at end of file diff --git a/lua/app/module/runes/runes_manager.lua.meta b/lua/app/module/runes/runes_manager.lua.meta new file mode 100644 index 00000000..ca51460f --- /dev/null +++ b/lua/app/module/runes/runes_manager.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 88f86325d3b00894d8fb5beb962a5ac0 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/tips/tips_manager.lua b/lua/app/module/tips/tips_manager.lua index 059bfd01..dde5d2d7 100644 --- a/lua/app/module/tips/tips_manager.lua +++ b/lua/app/module/tips/tips_manager.lua @@ -48,7 +48,7 @@ function TipsManager:showRewardTips(rewardId, rewardType, tarPrefabObj, alignTyp return elseif info.type == GConst.ItemConst.ITEM_TYPE.SKIN then -- 英雄皮肤 - ModuleManager.HeroManager:showHeroDetailUI(DataManager.SkinData:getHeroIdBySkinId(info.parameter), true, nil, info.parameter) + ModuleManager.HeroManager:showHeroSkinUI(DataManager.SkinData:getHeroIdBySkinId(info.parameter), info.parameter) return elseif info.type == GConst.ItemConst.ITEM_TYPE.RANDOM_BOX_ITEM or info.type == GConst.ItemConst.ITEM_TYPE.FIXED_BOX_ITEM then self:showBoxItemTips(rewardId) diff --git a/lua/app/ui/hero/cell/attr_cell.lua b/lua/app/ui/hero/cell/attr_cell.lua index 617f5bbd..6f2a4497 100644 --- a/lua/app/ui/hero/cell/attr_cell.lua +++ b/lua/app/ui/hero/cell/attr_cell.lua @@ -1,6 +1,4 @@ local AttrCell = class("AttrCell", BaseCell) -local DEFAULT_FACTOR = GConst.BattleConst.DEFAULT_FACTOR -local PERCENT_FACTOR = 100 function AttrCell:init() local uiMap = self:getUIMap() @@ -63,9 +61,11 @@ function AttrCell:showHp() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD):getHp() elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then value = value + DataManager.SkinData:getHp(self.heroEntity) + elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_RUNES then + value = value + self.heroEntity:getRunes():getAttrValue(self.attrName) end - self.txValue:setText(value // DEFAULT_FACTOR) + self.txValue:setText(GFunc.getAttrShowValue(self.attrName, value)) end -- 显示攻击力 @@ -95,9 +95,11 @@ function AttrCell:showAtk() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD):getAttack() elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then value = value + DataManager.SkinData:getAttack(self.heroEntity) + elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_RUNES then + value = value + self.heroEntity:getRunes():getAttrValue(self.attrName) end - self.txValue:setText(value // DEFAULT_FACTOR) + self.txValue:setText(GFunc.getAttrShowValue(self.attrName, value)) end -- 显示普攻增伤 @@ -117,9 +119,11 @@ function AttrCell:showNormalHurt() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD):getNormalHurt() elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then value = value + DataManager.SkinData:getNormalHurt(self.heroEntity) + elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_RUNES then + value = value + self.heroEntity:getRunes():getAttrValue(self.attrName) end - self.txValue:setText(value // DEFAULT_FACTOR) + self.txValue:setText(GFunc.getAttrShowValue(self.attrName, value)) end -- 显示技能增伤 @@ -139,9 +143,11 @@ function AttrCell:showSkillHurt() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD):getSkillHurt() elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then value = value + DataManager.SkinData:getSkillHurt(self.heroEntity) + elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_RUNES then + value = value + self.heroEntity:getRunes():getAttrValue(self.attrName) end - self.txValue:setText(value // DEFAULT_FACTOR) + self.txValue:setText(GFunc.getAttrShowValue(self.attrName, value)) end -- 显示暴击率 @@ -158,9 +164,11 @@ function AttrCell:showCrit() elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then value = value + DataManager.SkinData:getCritPercent(self.heroEntity) + elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_RUNES then + value = value + self.heroEntity:getRunes():getAttrValue(self.attrName) end - self.txValue:setText(value // PERCENT_FACTOR .. "%") + self.txValue:setText(GFunc.getAttrShowValue(self.attrName, value)) end -- 显示暴击伤害百分比 @@ -177,9 +185,11 @@ function AttrCell:showCritAtk() elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then value = value + DataManager.SkinData:getCritHurtPercent(self.heroEntity) + elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_RUNES then + value = value + self.heroEntity:getRunes():getAttrValue(self.attrName) end - self.txValue:setText(value // PERCENT_FACTOR .. "%") + self.txValue:setText(GFunc.getAttrShowValue(self.attrName, value)) end -- 显示普攻增伤百分比 @@ -200,9 +210,11 @@ function AttrCell:showNormalHurtp() -- value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD):getNormalHurtPercent() elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then value = value + DataManager.SkinData:getNormalHurtPercent(self.heroEntity) + elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_RUNES then + value = value + self.heroEntity:getRunes():getAttrValue(self.attrName) end - self.txValue:setText(value // PERCENT_FACTOR .. "%") + self.txValue:setText(GFunc.getAttrShowValue(self.attrName, value)) end -- 显示技能增伤百分比 @@ -223,9 +235,11 @@ function AttrCell:showSkillHurtp() -- value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD):getSkillHurtPercent() elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then value = value + DataManager.SkinData:getSkillHurtPercent(self.heroEntity) + elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_RUNES then + value = value + self.heroEntity:getRunes():getAttrValue(self.attrName) end - self.txValue:setText(value // PERCENT_FACTOR .. "%") + self.txValue:setText(GFunc.getAttrShowValue(self.attrName, value)) end -- 显示治疗效果提升百分比 @@ -242,9 +256,11 @@ function AttrCell:showCured() elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then value = value + DataManager.SkinData:getHealPercent(self.heroEntity) + elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_RUNES then + value = value + self.heroEntity:getRunes():getAttrValue(self.attrName) end - self.txValue:setText(value // PERCENT_FACTOR .. "%") + self.txValue:setText(GFunc.getAttrShowValue(self.attrName, value)) end return AttrCell \ No newline at end of file diff --git a/lua/app/ui/hero/cell/attr_node_cell.lua b/lua/app/ui/hero/cell/attr_node_cell.lua index 8f506223..8053e6ea 100644 --- a/lua/app/ui/hero/cell/attr_node_cell.lua +++ b/lua/app/ui/hero/cell/attr_node_cell.lua @@ -20,11 +20,13 @@ function AttrNodeCell:refresh(heroEntity, node) self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_16)) elseif node == GConst.HeroConst.ATTR_SHOW_SKIN then self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_17)) + elseif node == GConst.HeroConst.ATTR_SHOW_RUNES then + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_22)) end self.attrCount = 0 for index, attr in ipairs(node) do - if node ~= GConst.HeroConst.ATTR_SHOW_SKIN or DataManager.SkinData:hasAttr(heroEntity, attr[heroEntity:getMatchType()]) then + if self:isShowAttr(heroEntity, node, attr) then self.attrCount = self.attrCount + 1 CellManager:loadCellAsync(ATTR_CELL_PATH, ATTR_CELL, self.itemsRoot, function(cell) cell:refresh(heroEntity, node, attr) @@ -33,6 +35,18 @@ function AttrNodeCell:refresh(heroEntity, node) end end +-- 是否显示属性项 +function AttrNodeCell:isShowAttr(heroEntity, node, attr) + if node == GConst.HeroConst.ATTR_SHOW_SKIN then + return DataManager.SkinData:hasAttr(heroEntity, attr[heroEntity:getMatchType()]) + end + if node == GConst.HeroConst.ATTR_SHOW_RUNES then + return heroEntity:getRunes():hasAttr(attr[heroEntity:getMatchType()]) + end + + return true +end + --获取节点显示属性个数 function AttrNodeCell:getShowAttrCount() return self.attrCount diff --git a/lua/app/ui/hero/hero_attr_ui.lua b/lua/app/ui/hero/hero_attr_ui.lua index 1b419be6..eb9d93bb 100644 --- a/lua/app/ui/hero/hero_attr_ui.lua +++ b/lua/app/ui/hero/hero_attr_ui.lua @@ -44,7 +44,7 @@ function HeroAttrUI:onRefresh() local totalHeight = 0 for index, node in ipairs(GConst.HeroConst.SHOW_NODE) do -- 有皮肤属性时才显示皮肤 - if node ~= GConst.HeroConst.ATTR_SHOW_SKIN or #DataManager.SkinData:getOwnAllAttr(self.heroEntity) > 0 then + if self:isShowAttr(node) then CellManager:loadCellAsync(ATTR_NODE_CELL_PATH, ATTR_NODE_CELL, self.rootNodes, function(cell) cell:refresh(self.heroEntity, node) @@ -60,4 +60,17 @@ function HeroAttrUI:onRefresh() self.rootNodes:setAnchoredPositionY(0) end +-- 是否显示属性块 +function HeroAttrUI:isShowAttr(node) + if node == GConst.HeroConst.ATTR_SHOW_SKIN then + return #DataManager.SkinData:getOwnAllAttr(self.heroEntity) > 0 + end + if node == GConst.HeroConst.ATTR_SHOW_RUNES then + local all = self.heroEntity:getRunes():getAllAttr() + return all and #all > 0 + end + + return true +end + return HeroAttrUI \ No newline at end of file diff --git a/lua/app/ui/hero/hero_comp.lua b/lua/app/ui/hero/hero_comp.lua index f8c1d7b7..8e8abbaf 100644 --- a/lua/app/ui/hero/hero_comp.lua +++ b/lua/app/ui/hero/hero_comp.lua @@ -58,7 +58,7 @@ function HeroComp:init() if heroId then local hero = DataManager.HeroData:getHeroById(heroId) if hero then - ModuleManager.HeroManager:showHeroDetailUI(heroId, nil, nil, nil, self.battleType) + ModuleManager.HeroManager:showHeroDetailUI(heroId, nil, nil, self.battleType) end end end) @@ -265,7 +265,7 @@ function HeroComp:onClickHero(cell, heroId) self.largeHeroCell:refresh(entity, not entity:isActived(), self.onClickUseFunc) self.largeHeroCell:showCheck(self.curFormation[entity:getMatchType()] == heroId) else - ModuleManager.HeroManager:showHeroDetailUI(heroId, nil, nil, nil, self.battleType) + ModuleManager.HeroManager:showHeroDetailUI(heroId, nil, nil, self.battleType) self.largeHeroCell:getBaseObject():setAnchoredPositionX(OUT_SCREEN_X) end else diff --git a/lua/app/ui/hero/hero_detail_ui.lua b/lua/app/ui/hero/hero_detail_ui.lua index e969a868..dd27a174 100644 --- a/lua/app/ui/hero/hero_detail_ui.lua +++ b/lua/app/ui/hero/hero_detail_ui.lua @@ -2,10 +2,9 @@ local HeroDetailUI = class("HeroDetailUI", BaseUI) local COMP_HERO = "app/ui/hero/hero_info_comp" local COMP_WEAPON = "app/ui/hero/weapon_info_comp" local COMP_ARMOR = "app/ui/hero/armor_info_comp" -local COMP_SKIN = "app/ui/hero/skin_info_comp" +local COMP_RUNES = "app/ui/hero/runes_info_comp" local SIZE_DELTA_Y_HERO = 942 local SIZE_DELTA_Y_LOOK_HERO = 802 -local SIZE_DELTA_Y_LOOK_SKIN = 720 function HeroDetailUI:isFullScreen() return false @@ -20,12 +19,7 @@ function HeroDetailUI:onPressBackspace() end function HeroDetailUI:ctor(parmas) - if parmas.skinId then - self.onlyLookSkinId = parmas.skinId - self.panelType = GConst.HeroConst.PANEL_TYPE.SKIN - else - self.panelType = parmas.panelType or GConst.HeroConst.PANEL_TYPE.HERO - end + self.panelType = parmas.panelType or GConst.HeroConst.PANEL_TYPE.HERO self.formationType = parmas.formationType self.onlyLook = parmas.onlyLook if parmas.heroEntity then @@ -43,9 +37,10 @@ function HeroDetailUI:onLoadRootComplete() self.heroInfo = uiMap["hero_detail_ui.hero_info"] self.weaponInfo = uiMap["hero_detail_ui.weapon_info"] self.armorInfo = uiMap["hero_detail_ui.armor_info"] - self.skinInfo = uiMap["hero_detail_ui.skin_info"] + self.runesInfo = uiMap["hero_detail_ui.runes_info"] self.txTitle = uiMap["hero_detail_ui.common.img_title.tx_title"] self.btnClose = uiMap["hero_detail_ui.common.btn_close"] + self.bg = uiMap["hero_detail_ui.common.bg.bg"] self.btnHero = uiMap["hero_detail_ui.common.btns.btn_hero"] self.txHero1 = uiMap["hero_detail_ui.common.btns.btn_hero.tx_btn"] self.selectHero = uiMap["hero_detail_ui.common.btns.btn_hero.select"] @@ -60,11 +55,11 @@ function HeroDetailUI:onLoadRootComplete() self.txArmor1 = uiMap["hero_detail_ui.common.btns.btn_armor.tx_btn"] self.selectArmor = uiMap["hero_detail_ui.common.btns.btn_armor.select"] self.txArmor2 = uiMap["hero_detail_ui.common.btns.btn_armor.select.tx_select"] - self.btnSkin = uiMap["hero_detail_ui.common.btns.btn_skin"] - self.lockSkin = uiMap["hero_detail_ui.common.btns.btn_skin.content.img_lock"] - self.txSkin1 = uiMap["hero_detail_ui.common.btns.btn_skin.content.tx_btn"] - self.selectSkin = uiMap["hero_detail_ui.common.btns.btn_skin.select"] - self.txSkin2 = uiMap["hero_detail_ui.common.btns.btn_skin.select.tx_select"] + self.btnRunes = uiMap["hero_detail_ui.common.btns.btn_runes"] + self.lockRunes = uiMap["hero_detail_ui.common.btns.btn_runes.content.img_lock"] + self.txRunes1 = uiMap["hero_detail_ui.common.btns.btn_runes.content.tx_btn"] + self.selectRunes = uiMap["hero_detail_ui.common.btns.btn_runes.select"] + self.txRunes2 = uiMap["hero_detail_ui.common.btns.btn_runes.select.tx_select"] self.btnLeft = uiMap["hero_detail_ui.common.btn_left"] self.btnRight = uiMap["hero_detail_ui.common.btn_right"] @@ -74,8 +69,8 @@ function HeroDetailUI:onLoadRootComplete() self.txWeapon2:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_1)) self.txArmor1:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_2)) self.txArmor2:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_2)) - self.txSkin1:setText(I18N:getGlobalText(I18N.GlobalConst.SKIN)) - self.txSkin2:setText(I18N:getGlobalText(I18N.GlobalConst.SKIN)) + self.txRunes1:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_6)) + self.txRunes2:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_6)) if not DataManager.EquipData:isWeaponOpen() then self.lockWeapon:setVisible(true) GFunc.centerImgAndTx(self.lockWeapon, self.txWeapon1, 5) @@ -88,11 +83,11 @@ function HeroDetailUI:onLoadRootComplete() else self.lockArmor:setVisible(false) end - if not DataManager.SkinData:isOpen() then - self.lockSkin:setVisible(true) - GFunc.centerImgAndTx(self.lockSkin, self.txSkin1, 5) + if not DataManager.RunesData:isOpen() then + self.lockRunes:setVisible(true) + GFunc.centerImgAndTx(self.lockRunes, self.txRunes1, 5) else - self.lockSkin:setVisible(false) + self.lockRunes:setVisible(false) end self.heroList = DataManager.HeroData:getAllHeroesSort(self.formationType) @@ -117,18 +112,22 @@ function HeroDetailUI:onLoadRootComplete() self.panelType = GConst.HeroConst.PANEL_TYPE.ARMOR self:refreshShow() end) - self.btnSkin:addClickListener(function() - if not DataManager.SkinData:isOpen(true) then + self.btnRunes:addClickListener(function() + if not DataManager.RunesData:isOpen(true) then return end - self.panelType = GConst.HeroConst.PANEL_TYPE.SKIN + if not self.heroEntity:isActived() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_24)) + return + end + self.panelType = GConst.HeroConst.PANEL_TYPE.RUNES self:refreshShow() end) self.btnClose:addClickListener(function() self:closeUI() end) self.btnLeft:addClickListener(function() - if not self:isExistLeftHero() then + if not self:isShowLeftArrow() then return end self.heroEntity = DataManager.HeroData:getHeroById(self.heroList[self.idxLast].cfgId) @@ -136,7 +135,7 @@ function HeroDetailUI:onLoadRootComplete() self:refreshShow() end) self.btnRight:addClickListener(function() - if not self:isExistRightHero() then + if not self:isShowRightArrow() then return end self.heroEntity = DataManager.HeroData:getHeroById(self.heroList[self.idxNext].cfgId) @@ -168,9 +167,6 @@ function HeroDetailUI:onLoadRootComplete() self:addEventListener(EventManager.CUSTOM_EVENT.GO_DUNGEON_UI, function() self:closeUI() end) - self:addEventListener(EventManager.CUSTOM_EVENT.SKIN_SELECT, function(skinId) - self.compSkin:refreshSelectSkin(skinId) - end) end function HeroDetailUI:updateSide() @@ -190,28 +186,26 @@ function HeroDetailUI:refreshShow() self:showWeaponInfo() elseif self.panelType == GConst.HeroConst.PANEL_TYPE.ARMOR then self:showArmorInfo() - elseif self.panelType == GConst.HeroConst.PANEL_TYPE.SKIN then - self:showSkinInfo() + elseif self.panelType == GConst.HeroConst.PANEL_TYPE.RUNES then + self:showRunesInfo() end if self.onlyLook then -- 仅查看的不显示升级和激活按钮 self.btnHero:setActive(false) self.btnWeapon:setActive(false) self.btnArmor:setActive(false) - self.btnSkin:setActive(false) + self.btnRunes:setActive(false) self.btnLeft:setActive(false) self.btnRight:setActive(false) if self.panelType == GConst.HeroConst.PANEL_TYPE.HERO then self.commonInfo:setSizeDeltaY(SIZE_DELTA_Y_LOOK_HERO) - elseif self.panelType == GConst.HeroConst.PANEL_TYPE.SKIN then - self.commonInfo:setSizeDeltaY(SIZE_DELTA_Y_LOOK_SKIN) end else self.btnHero:setActive(true) self.btnWeapon:setActive(true) self.btnArmor:setActive(true) - self.btnSkin:setActive(true) - self.btnLeft:setActive(self:isExistLeftHero()) - self.btnRight:setActive(self:isExistRightHero()) + self.btnRunes:setActive(true) + self.btnLeft:setActive(self:isShowLeftArrow()) + self.btnRight:setActive(self:isShowRightArrow()) self.commonInfo:setSizeDeltaY(SIZE_DELTA_Y_HERO) self:refreshRedPoint() end @@ -243,8 +237,9 @@ function HeroDetailUI:showHeroInfo() self.selectWeapon:setActive(false) self.armorInfo:setActive(false) self.selectArmor:setActive(false) - self.skinInfo:setActive(false) - self.selectSkin:setActive(false) + self.runesInfo:setActive(false) + self.selectRunes:setActive(false) + self.bg:setActive(true) if not self.compHero then self.heroInfo:initPrefabHelper() @@ -263,8 +258,9 @@ function HeroDetailUI:showWeaponInfo() self.selectWeapon:setActive(true) self.armorInfo:setActive(false) self.selectArmor:setActive(false) - self.skinInfo:setActive(false) - self.selectSkin:setActive(false) + self.runesInfo:setActive(false) + self.selectRunes:setActive(false) + self.bg:setActive(true) if not self.compWeapon then self.weaponInfo:initPrefabHelper() @@ -284,8 +280,9 @@ function HeroDetailUI:showArmorInfo() self.selectWeapon:setActive(false) self.armorInfo:setActive(true) self.selectArmor:setActive(true) - self.skinInfo:setActive(false) - self.selectSkin:setActive(false) + self.runesInfo:setActive(false) + self.selectRunes:setActive(false) + self.bg:setActive(true) if not self.compArmor then self.armorInfo:initPrefabHelper() @@ -298,34 +295,42 @@ function HeroDetailUI:showArmorInfo() self.compArmor:refresh() end -function HeroDetailUI:showSkinInfo() +function HeroDetailUI:showRunesInfo() self.heroInfo:setActive(false) self.selectHero:setActive(false) self.weaponInfo:setActive(false) self.selectWeapon:setActive(false) self.armorInfo:setActive(false) self.selectArmor:setActive(false) - self.skinInfo:setActive(true) - self.selectSkin:setActive(true) + self.runesInfo:setActive(true) + self.selectRunes:setActive(true) + self.bg:setActive(false) - if not self.compSkin then - self.skinInfo:initPrefabHelper() - self.skinInfo:genAllChildren() - self.compSkin = self.skinInfo:addLuaComponent(COMP_SKIN) - self.compSkin:setUI(self) + if not self.compRunes then + self.runesInfo:initPrefabHelper() + self.runesInfo:genAllChildren() + self.compRunes = self.runesInfo:addLuaComponent(COMP_RUNES) end - self.compSkin:setHeroData(self.heroEntity, self.onlyLookSkinId) - self.compSkin:refresh() + self.compRunes:setHeroData(self.heroEntity) + self.compRunes:refresh() end --- 是否存在左侧英雄 -function HeroDetailUI:isExistLeftHero() +-- 是否显示左箭头 +function HeroDetailUI:isShowLeftArrow() + if self.panelType == GConst.HeroConst.PANEL_TYPE.RUNES then + return false + end + return self.idxLast and self.idxLast > 0 end --- 是否存在右侧英雄 -function HeroDetailUI:isExistRightHero() +-- 是否显示右箭头 +function HeroDetailUI:isShowRightArrow() + if self.panelType == GConst.HeroConst.PANEL_TYPE.RUNES then + return false + end + return self.idxNext and self.idxNext <= #self.heroList end diff --git a/lua/app/ui/hero/hero_info_comp.lua b/lua/app/ui/hero/hero_info_comp.lua index 94e4df5a..e71dab05 100644 --- a/lua/app/ui/hero/hero_info_comp.lua +++ b/lua/app/ui/hero/hero_info_comp.lua @@ -34,6 +34,8 @@ function HeroInfoComp:init() self.bgElement = uiMap["hero_detail_ui.bg.element_bg"] self.btnAttr = uiMap["hero_info.bg_6.btn_attr"] self.fragmentNode = uiMap["hero_detail_ui.bg.fragment_bg"] + self.btnSkin = uiMap["hero_info.up.btn_skin"] + self.txSkin = uiMap["hero_info.up.btn_skin.tx_skin"] self.skill = {} self.skillIcon = {} @@ -47,7 +49,12 @@ function HeroInfoComp:init() self.spineObjSkill:setVisible(false) self.spineObjLv:setVisible(false) self.spineObj:setVisible(false) + self.txSkin:setText(I18N:getGlobalText(I18N.GlobalConst.SKIN)) + self.btnSkin:setActive(DataManager.SkinData:isOpen()) + self.btnSkin:addClickListener(function() + ModuleManager.HeroManager:showHeroSkinUI(self.heroEntity:getCfgId()) + end) self.btnUp:addClickListener(function() ModuleManager.HeroManager:upgradeHero(self.heroEntity:getCfgId(), self.heroEntity) end) diff --git a/lua/app/ui/hero/skin_info_comp.lua b/lua/app/ui/hero/hero_skin_ui.lua similarity index 87% rename from lua/app/ui/hero/skin_info_comp.lua rename to lua/app/ui/hero/hero_skin_ui.lua index 56ffcb02..d53e574c 100644 --- a/lua/app/ui/hero/skin_info_comp.lua +++ b/lua/app/ui/hero/hero_skin_ui.lua @@ -1,13 +1,37 @@ -local SkinInfoComp = class("SkinInfoComp", LuaComponent) -local DEFAULT_FACTOR = GConst.BattleConst.DEFAULT_FACTOR -local PERCENT_FACTOR = 100 - +local HeroSkinUI = class("HeroSkinUI", BaseUI) local SIZE_DELTA_Y_SKIN = 942 local SIZE_DELTA_Y_LOOK = 720 -function SkinInfoComp:init() - local uiMap = self:getUIMap() +function HeroSkinUI:isFullScreen() + return false +end +function HeroSkinUI:getPrefabPath() + return "assets/prefabs/ui/hero/hero_skin_ui.prefab" +end + +function HeroSkinUI:onPressBackspace() + self:closeUI() +end + +function HeroSkinUI:ctor(parmas) + self.heroEntity = DataManager.HeroData:getHeroById(parmas.heroId) + + if parmas.onlyLookSkinId then + self.onlyLook = true + self.selectSkinId = parmas.onlyLookSkinId + else + self.onlyLook = false + self.selectSkinId = self.heroEntity:getSkinId() + end +end + +function HeroSkinUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + self.bg = uiMap["hero_skin_ui.bg"] + self.content = uiMap["hero_skin_ui.content"] + self.txTitle = uiMap["hero_skin_ui.common.img_title.tx_title"] + self.btnClose = uiMap["hero_skin_ui.common.btn_close"] self.txName = uiMap["skin_info.name.tx_name"] self.bgQlt = uiMap["skin_info.bg_qlt"] self.iconQlt = uiMap["skin_info.bg_qlt.icon_qlt"] @@ -26,36 +50,28 @@ function SkinInfoComp:init() self.attr[i] = uiMap["skin_info.attr_" .. i] end + self.txTitle:setText(self.heroEntity:getName()) self.txDesc1:setText(I18N:getGlobalText(I18N.GlobalConst.SKIN_ATTR)) self.txDesc2:setText(I18N:getGlobalText(I18N.GlobalConst.SKIN_LIST)) + self.btnClose:addClickListener(function() + self:closeUI() + end) self.btnUse:addClickListener(function() ModuleManager.SkinManager:reqChangeSkin(self.heroEntity:getCfgId(), self.selectSkinId) end) self.btnAttr:addClickListener(function() UIManager:showUI("app/ui/hero/hero_attr_ui", {heroEntity = self.heroEntity}) end) -end - -function SkinInfoComp:setUI(ui) - self.uiRoot = ui -end - -function SkinInfoComp:setHeroData(heroEntity, onlyLookSkinId) - self.heroEntity = heroEntity - if onlyLookSkinId then - self.onlyLook = true - self.selectSkinId = onlyLookSkinId - else - self.onlyLook = false - self.selectSkinId = self.heroEntity:getSkinId() - end self:bind(self.heroEntity, "isDirty", function() - self:refresh() + self:onRefresh() + end) + self:addEventListener(EventManager.CUSTOM_EVENT.SKIN_SELECT, function(skinId) + self:refreshSelectSkin(skinId) end) end -function SkinInfoComp:refresh() +function HeroSkinUI:onRefresh() local ids = DataManager.SkinData:getHeroAllSkinIdsSort(self.heroEntity:getCfgId()) self.scrollrectComp:addInitCallback(function() return "app/ui/hero/cell/skin_cell" @@ -70,7 +86,7 @@ function SkinInfoComp:refresh() end -- 刷新选择皮肤相关内容 -function SkinInfoComp:refreshSelectSkin(selectId) +function HeroSkinUI:refreshSelectSkin(selectId) if selectId then self.selectSkinId = selectId self.scrollrectComp:updateAllCell() @@ -95,77 +111,65 @@ function SkinInfoComp:refreshSelectSkin(selectId) local txTitle = map["tx_title"] local txNum = map["tx_num"] - local showValue if curAttr[index].type == GConst.MATCH_ATTACK_NAME[self.heroEntity:getMatchType()] then -- 攻击 table.insert(showAttrType, GConst.MATCH_ATTACK_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_5") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_ATK).."") - showValue = curAttr[index].num // DEFAULT_FACTOR elseif curAttr[index].type == GConst.MATCH_ATTACK_ADD_NAME[self.heroEntity:getMatchType()] then -- 攻击加成百分比 table.insert(showAttrType, GConst.MATCH_ATTACK_ADD_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_5") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_ATK).."") - showValue = curAttr[index].num // PERCENT_FACTOR .. "%" elseif curAttr[index].type == GConst.MATCH_HP_FIX_NAME[self.heroEntity:getMatchType()] then -- 生命 table.insert(showAttrType, GConst.MATCH_HP_FIX_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_4") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_HP).."") - showValue = curAttr[index].num // DEFAULT_FACTOR elseif curAttr[index].type == GConst.MATCH_HP_ADD_NAME[self.heroEntity:getMatchType()] then -- 生命加成百分比 table.insert(showAttrType, GConst.MATCH_HP_ADD_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_4") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_HP).."") - showValue = (curAttr[index].num // PERCENT_FACTOR) .. "%" elseif curAttr[index].type == GConst.MATCH_NORMAL_HURT_NAME[self.heroEntity:getMatchType()] then -- 普攻增伤 table.insert(showAttrType, GConst.MATCH_NORMAL_HURT_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_20") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_NORMAL_HURT).."") - showValue = curAttr[index].num // DEFAULT_FACTOR elseif curAttr[index].type == GConst.MATCH_SKILL_HURT_NAME[self.heroEntity:getMatchType()] then -- 技能增伤 table.insert(showAttrType, GConst.MATCH_SKILL_HURT_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_21") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_SKILL_HURT).."") - showValue = curAttr[index].num // DEFAULT_FACTOR elseif curAttr[index].type == GConst.MATCH_NORMAL_HURTP_NAME[self.heroEntity:getMatchType()] then -- 普攻增伤百分比 table.insert(showAttrType, GConst.MATCH_NORMAL_HURTP_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_20") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_NORMAL_HURTP).."") - showValue = curAttr[index].num // PERCENT_FACTOR .. "%" elseif curAttr[index].type == GConst.MATCH_SKILL_HURTP_NAME[self.heroEntity:getMatchType()] then -- 技能增伤百分比 table.insert(showAttrType, GConst.MATCH_SKILL_HURTP_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_21") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_SKILL_HURTP).."") - showValue = curAttr[index].num // PERCENT_FACTOR .. "%" elseif curAttr[index].type == GConst.MATCH_CRIT_NAME[self.heroEntity:getMatchType()] then -- 暴击率百分比 table.insert(showAttrType, GConst.MATCH_CRIT_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_22") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_CRIT).."") - showValue = curAttr[index].num // PERCENT_FACTOR .. "%" elseif curAttr[index].type == GConst.MATCH_CRIT_TIME_NAME[self.heroEntity:getMatchType()] then -- 暴击伤害百分比 table.insert(showAttrType, GConst.MATCH_CRIT_TIME_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_23") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_CRIT_TIME).."") - showValue = curAttr[index].num // PERCENT_FACTOR .. "%" elseif curAttr[index].type == GConst.MATCH_CURED_NAME[self.heroEntity:getMatchType()] then -- 治疗提升百分比 table.insert(showAttrType, GConst.MATCH_CURED_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_24") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_CURED).."") - showValue = curAttr[index].num // PERCENT_FACTOR .. "%" else obj:setVisible(false) end - txNum:setText(showValue) + txNum:setText(GFunc.getAttrShowValue(curAttr[index].type, curAttr[index].num)) else obj:setVisible(false) end @@ -221,12 +225,14 @@ function SkinInfoComp:refreshSelectSkin(selectId) if self.onlyLook then -- 仅查看 self.txDesc2:setVisible(false) self.scrollrectComp.baseObject:setVisible(false) - self.baseObject:setSizeDeltaY(SIZE_DELTA_Y_LOOK) + self.bg:setSizeDeltaY(SIZE_DELTA_Y_LOOK) + self.content:setSizeDeltaY(SIZE_DELTA_Y_LOOK) else self.txDesc2:setVisible(true) self.scrollrectComp.baseObject:setVisible(true) - self.baseObject:setSizeDeltaY(SIZE_DELTA_Y_SKIN) + self.bg:setSizeDeltaY(SIZE_DELTA_Y_SKIN) + self.content:setSizeDeltaY(SIZE_DELTA_Y_SKIN) end end -return SkinInfoComp \ No newline at end of file +return HeroSkinUI \ No newline at end of file diff --git a/lua/app/ui/hero/hero_skin_ui.lua.meta b/lua/app/ui/hero/hero_skin_ui.lua.meta new file mode 100644 index 00000000..3ae659a2 --- /dev/null +++ b/lua/app/ui/hero/hero_skin_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 013e50285bf00304b9911ee482aa7b3d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/hero/runes_info_comp.lua b/lua/app/ui/hero/runes_info_comp.lua new file mode 100644 index 00000000..c83e2f6b --- /dev/null +++ b/lua/app/ui/hero/runes_info_comp.lua @@ -0,0 +1,193 @@ +local RunesInfoComp = class("RunesInfoComp", LuaComponent) + +local LOCK_ICON = "common_lock" +local UNLOCK_ICON = "common_lock_1" + +function RunesInfoComp:init() + local uiMap = self:getUIMap() + self.btnHelp = uiMap["runes_info.btn_help"] + self.imgProg = uiMap["runes_info.prog.img_prog"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) + self.txLevel = uiMap["runes_info.level.tx_level"] + self.btnSuit = uiMap["runes_info.btn_suit"] + self.txSuit = uiMap["runes_info.btn_suit.tx_suit"] + self.itemMaterial = uiMap["runes_info.item_material"] + self.txNum = uiMap["runes_info.item_material.tx_num"] + self.btnUse = uiMap["runes_info.bottom.btn_use"] + self.txUse = uiMap["runes_info.bottom.btn_use.tx_use"] + self.imgCost = uiMap["runes_info.bottom.btn_use.cost.img_cost"] + self.txCost = uiMap["runes_info.bottom.btn_use.cost.tx_cost"] + self.btnAuto = uiMap["runes_info.bottom.btn_auto"] + self.spineAuto = uiMap["runes_info.bottom.btn_auto.spine_auto"] + self.txAuto = uiMap["runes_info.bottom.btn_auto.tx_auto"] + self.txEmpty = uiMap["runes_info.suits.tx_empty"] + self.mask = uiMap["runes_info.bottom.mask"] + self.suits = {} + for i = 1, 3 do + self.suits[i] = uiMap["runes_info.suits.item_suit_" .. i] + end + self.grids = {} + for i = 1, 6 do + self.grids[i] = uiMap["runes_info.list_attr.grid_" .. i] + end + + self.mask:setActive(false) + self.spineAuto:playAnim("idle", true, true) + self.txSuit:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_2)) + self.txUse:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_5)) + self.txAuto:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_4)) + self.txEmpty:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_23)) + + self.itemMaterial:addClickListener(function() + UIManager:showUI("app/ui/runes/runes_source_ui") + end) + self.btnHelp:addClickListener(function() + UIManager:showUI("app/ui/runes/runes_level_ui") + end) + self.btnSuit:addClickListener(function() + UIManager:showUI("app/ui/runes/runes_suit_ui", self.heroEntity) + end) + self.btnAuto:addClickListener(function() + if self.autoSid == nil then + local params ={ + content = I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_21), + boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, + showToday = GConst.MESSAGE_BOX_SHOW_TODAY.RUNES_AUTO, + okFunc = function() + self:startAutoQuenching() + end, + } + GFunc.showMessageBox(params) + else + self:endAutoQuenching() + end + end) + self.btnUse:addClickListener(function() + ModuleManager.RunesManager:reqQuenching(self.heroEntity:getCfgId(), 0) + end) + self:bind(DataManager.BagData.ItemData, "dirty", function() + self:refresh() + end) + self:bind(DataManager.RunesData, "isDirty", function() + self:refresh() + end) +end + +function RunesInfoComp:setHeroData(heroEntity) + self.heroEntity = heroEntity + self.runesEntity = DataManager.RunesData:getRunes(self.heroEntity:getCfgId()) +end + +function RunesInfoComp:refresh() + + local curExp = DataManager.RunesData:getLevelExp() + local maxExp = DataManager.RunesData:getNextLevelTotalExp() + + self.txNum:setText(DataManager.RunesData:getMaterialCount()) + self.txCost:setText(GFunc.getRewardNum(self.runesEntity:getMaterialCost())) + self.txLevel:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_1, DataManager.RunesData:getLevel())) + self.imgProg.value = curExp / maxExp + GFunc.centerImgAndTx(self.imgCost, self.txCost) + + self:refreshSuit() + self:refreshRunes() +end + +-- 刷新符文 +function RunesInfoComp:refreshRunes() + for index, obj in ipairs(self.grids) do + local map = obj:genAllChildren() + local imgQlt = map["img_qlt"] + local imgSuit = map["img_suit"] + local txAttr = map["tx_attr"] + local imgLock = map["img_lock"] + local lock = map["lock"] + local txLock = map["tx_lock"] + obj:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR).enabled = false + + if DataManager.RunesData:isUnlock(index) then + lock:setActive(false) + imgQlt:setSprite(GConst.ATLAS_PATH.HERO, GConst.RunesConst.QUALITY_ICON[index]) + imgSuit:setSprite(GConst.ATLAS_PATH.HERO, "hero_rune_"..self.runesEntity:getGridSuit(index)) + imgLock:setSprite(GConst.ATLAS_PATH.COMMON, self.runesEntity:isAttrLock(index) and LOCK_ICON or UNLOCK_ICON) + local attr = self.runesEntity:getGridAttr(index) + if attr then + txAttr:setText(GFunc.getAttrDesc(attr.type, attr.num)) + end + imgLock:addClickListener(function() + ModuleManager.RunesManager:reqChangeLockGrid(self.heroEntity:getCfgId(), index, not self.runesEntity:isAttrLock(index)) + end) + else + lock:setActive(true) + txLock:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_3, DataManager.RunesData:getUnlockLevel(index))) + end + end +end + +-- 刷新套装 +function RunesInfoComp:refreshSuit() + local ids = self.runesEntity:getSuitIds() + + local isEmpty = true + for index, obj in ipairs(self.suits) do + local map = obj:genAllChildren() + local img = map["img"] + local tx = map["tx"] + + if ids[index] then + local level = self.runesEntity:getSuitLevel(ids[index].id) + if level > 0 then + isEmpty = false + obj:setActive(true) + img:setSprite(GConst.ATLAS_PATH.HERO, "hero_rune_"..ids[index].id) + tx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, level)) + else + obj:setActive(false) + end + else + obj:setActive(false) + end + end + + self.txEmpty:setActive(isEmpty) +end + +-- 开始自动淬炼 +function RunesInfoComp:startAutoQuenching() + self.mask:setActive(true) + self:autoQuenching() + self.autoSid = self.baseObject:scheduleGlobal(function() + local cost = self.runesEntity:getMaterialCost() + if not GFunc.checkCost(GFunc.getRewardId(cost), GFunc.getRewardNum(cost), true) then + self:endAutoQuenching() + return + end + self:autoQuenching() + end, 1 / 3) + self.spineAuto:playAnim("attack", true, true) +end + +-- 结束自动淬炼 +function RunesInfoComp:endAutoQuenching() + self.mask:setActive(false) + if self.autoSid then + self.baseObject:unscheduleGlobal(self.autoSid) + self.autoSid = nil + end + + for index, obj in ipairs(self.grids) do + if DataManager.RunesData:isUnlock(index) then + local animator = obj:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR) + animator.enabled = true + -- CS.UnityEngine.Animator.StringToHash("runes_shake") 结果是1132417824 + animator:Play(1132417824, -1, 0) + end + end + self.spineAuto:playAnim("idle", true, true) +end + +-- 请求一次自动淬炼 +function RunesInfoComp:autoQuenching() + ModuleManager.RunesManager:reqQuenching(self.heroEntity:getCfgId(), 0) +end + +return RunesInfoComp \ No newline at end of file diff --git a/lua/app/ui/hero/runes_info_comp.lua.meta b/lua/app/ui/hero/runes_info_comp.lua.meta new file mode 100644 index 00000000..86d85a4c --- /dev/null +++ b/lua/app/ui/hero/runes_info_comp.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4d6ae74e1ac107c4ca73bacaafebec15 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/runes.meta b/lua/app/ui/runes.meta new file mode 100644 index 00000000..6921d9f4 --- /dev/null +++ b/lua/app/ui/runes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 03aa5a5d9fc516842b410568fc7345d7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/ui/runes/runes_level_ui.lua b/lua/app/ui/runes/runes_level_ui.lua new file mode 100644 index 00000000..a35d5953 --- /dev/null +++ b/lua/app/ui/runes/runes_level_ui.lua @@ -0,0 +1,78 @@ +local RunesLevelUI = class("RunesLevelUI", BaseUI) + +local ARROW_LIGHT = "common_arrow_2" +local ARROW_GRAY = "common_arrow_3" + +function RunesLevelUI:isFullScreen() + return false +end + +function RunesLevelUI:getPrefabPath() + return "assets/prefabs/ui/runes/runes_level_ui.prefab" +end + +function RunesLevelUI:onPressBackspace() + self:closeUI() +end + +function RunesLevelUI:ctor() + self.curLevel = DataManager.RunesData:getLevel() +end + +function RunesLevelUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + self.txTitle = uiMap["runes_level_ui.bg.title.tx_title"] + self.btnClose = uiMap["runes_level_ui.bg.close_btn"] + self.btnRight = uiMap["runes_level_ui.bg.select.btn_right"] + self.btnLeft = uiMap["runes_level_ui.bg.select.btn_left"] + self.txSelect = uiMap["runes_level_ui.bg.select.tx_select"] + self.txDesc = uiMap["runes_level_ui.bg.bottom.tx_desc"] + + self.quality = {} + for i = 1, 8 do + self.quality[i] = uiMap["runes_level_ui.bg.list.qlt_cell_" .. i] + end + + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_7)) + self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_8)) + + self.btnRight:addClickListener(function() + self.curLevel = self.curLevel + 1 + self:onRefresh() + end) + self.btnLeft:addClickListener(function() + self.curLevel = self.curLevel - 1 + self:onRefresh() + end) + self.btnClose:addClickListener(function() + self:closeUI() + end) +end + +function RunesLevelUI:onRefresh() + self.txSelect:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, self.curLevel)) + if self.curLevel >= DataManager.RunesData:getMaxLevel() then + self.btnRight:setTouchEnable(false) + self.btnRight:setSprite(GConst.ATLAS_PATH.COMMON, ARROW_GRAY) + else + self.btnRight:setTouchEnable(true) + self.btnRight:setSprite(GConst.ATLAS_PATH.COMMON, ARROW_LIGHT) + end + if self.curLevel <= 1 then + self.btnLeft:setTouchEnable(false) + self.btnLeft:setSprite(GConst.ATLAS_PATH.COMMON, ARROW_GRAY) + else + self.btnLeft:setTouchEnable(true) + self.btnLeft:setSprite(GConst.ATLAS_PATH.COMMON, ARROW_LIGHT) + end + + for index, obj in ipairs(self.quality) do + local map = obj:genAllChildren() + local icon = map["img_qlt"] + local rate = map["tx_rate"] + icon:setSprite(GConst.ATLAS_PATH.HERO, GConst.RunesConst.QUALITY_ICON[index]) + rate:setText(DataManager.RunesData:getQualityRate(self.curLevel, index) .. "%") + end +end + +return RunesLevelUI \ No newline at end of file diff --git a/lua/app/ui/runes/runes_level_ui.lua.meta b/lua/app/ui/runes/runes_level_ui.lua.meta new file mode 100644 index 00000000..f7436e22 --- /dev/null +++ b/lua/app/ui/runes/runes_level_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4e658a421ae93f9429873a072c30732f +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/runes/runes_source_ui.lua b/lua/app/ui/runes/runes_source_ui.lua new file mode 100644 index 00000000..280024c7 --- /dev/null +++ b/lua/app/ui/runes/runes_source_ui.lua @@ -0,0 +1,140 @@ +local RunesSourceUI = class("RunesSourceUI", BaseUI) + +function RunesSourceUI:isFullScreen() + return false +end + +function RunesSourceUI:getPrefabPath() + return "assets/prefabs/ui/runes/runes_source_ui.prefab" +end + +function RunesSourceUI:onPressBackspace() + self:closeUI() +end + +function RunesSourceUI:ctor() + self.curGiftIndex = 1 +end + +function RunesSourceUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + self.btnClose = uiMap["runes_source_ui.btn_close"] + -- 来源界面 + self.panelMain = uiMap["runes_source_ui.panel_main"] + self.txTitleMain = uiMap["runes_source_ui.panel_main.title.tx_title"] + self.txTips = uiMap["runes_source_ui.panel_main.img_banner.tx_tips"] + self.txGet = uiMap["runes_source_ui.panel_main.tx_get"] + self.txDesc = uiMap["runes_source_ui.panel_main.target.tx_desc"] + self.btnGo = uiMap["runes_source_ui.panel_main.target.btn_go"] + self.txGo = uiMap["runes_source_ui.panel_main.target.btn_go.tx_go"] + -- 礼包界面 + self.panelGift = uiMap["runes_source_ui.panel_gift"] + self.btn1 = uiMap["runes_source_ui.panel_gift.btns.btn_1"] + self.txBtn1 = uiMap["runes_source_ui.panel_gift.btns.btn_1.tx_btn"] + self.select1 = uiMap["runes_source_ui.panel_gift.btns.btn_1.select"] + self.txSelect1 = uiMap["runes_source_ui.panel_gift.btns.btn_1.select.tx_select"] + self.btn2 = uiMap["runes_source_ui.panel_gift.btns.btn_2"] + self.txBtn2 = uiMap["runes_source_ui.panel_gift.btns.btn_2.tx_btn"] + self.select2 = uiMap["runes_source_ui.panel_gift.btns.btn_2.select"] + self.txSelect2 = uiMap["runes_source_ui.panel_gift.btns.btn_2.select.tx_select"] + self.btn3 = uiMap["runes_source_ui.panel_gift.btns.btn_3"] + self.txBtn3 = uiMap["runes_source_ui.panel_gift.btns.btn_3.tx_btn"] + self.select3 = uiMap["runes_source_ui.panel_gift.btns.btn_3.select"] + self.txSelect3 = uiMap["runes_source_ui.panel_gift.btns.btn_3.select.tx_select"] + self.txTitleGift = uiMap["runes_source_ui.panel_gift.tx_title"] + self.txTime = uiMap["runes_source_ui.panel_gift.time.tx_time"] + self.btnBuy = uiMap["runes_source_ui.panel_gift.btn_buy"] + self.txBuy = uiMap["runes_source_ui.panel_gift.btn_buy.tx_buy"] + self.giftRewardCells = {} + for i = 1, 4 do + self.giftRewardCells[i] = uiMap["runes_source_ui.panel_gift.item_node.pop_reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.POP_REWARD_CELL) + end + + self.txTitleGift:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_17)) + self.txTitleMain:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_18)) + self.txTips:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_19)) + self.txGet:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_23)) + self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_20)) + self.txGo:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_21)) + + local gift1 = DataManager.ShopData:getActGiftConfig()[GConst.RunesConst.GIFT_IDS[1]] + self.txBtn1:setText(GFunc.getFormatPrice(gift1.recharge_id)) + self.txSelect1:setText(GFunc.getFormatPrice(gift1.recharge_id)) + local gift2 = DataManager.ShopData:getActGiftConfig()[GConst.RunesConst.GIFT_IDS[2]] + self.txBtn2:setText(GFunc.getFormatPrice(gift2.recharge_id)) + self.txSelect2:setText(GFunc.getFormatPrice(gift2.recharge_id)) + local gift3 = DataManager.ShopData:getActGiftConfig()[GConst.RunesConst.GIFT_IDS[3]] + self.txBtn3:setText(GFunc.getFormatPrice(gift3.recharge_id)) + self.txSelect3:setText(GFunc.getFormatPrice(gift3.recharge_id)) + + self.btn1:addClickListener(function() + if self.curGiftIndex == 1 then + return + end + self.curGiftIndex = 1 + self:onRefresh() + end) + self.btn2:addClickListener(function() + if self.curGiftIndex == 2 then + return + end + self.curGiftIndex = 2 + self:onRefresh() + end) + self.btn3:addClickListener(function() + if self.curGiftIndex == 3 then + return + end + self.curGiftIndex = 3 + self:onRefresh() + end) + self.btnGo:addClickListener(function() + ModuleManager.DungeonRuneManager:showMainUI() + end) + self.btnBuy:addClickListener(function() + PayManager:purchasePackage(GConst.RunesConst.GIFT_IDS[self.curGiftIndex], PayManager.PURCHARSE_TYPE.ACT_GIFT) + end) + self.btnClose:addClickListener(function() + self:closeUI() + end) + self:bind(DataManager.ShopData, "isDirty", function() + self:onRefresh() + end) +end + +function RunesSourceUI:onRefresh() + self.select1:setActive(self.curGiftIndex == 1) + self.select2:setActive(self.curGiftIndex == 2) + self.select3:setActive(self.curGiftIndex == 3) + + local giftId = GConst.RunesConst.GIFT_IDS[self.curGiftIndex] + local gift = DataManager.ShopData:getActGiftConfig()[giftId] + + if gift == nil then + self.panelGift:setActive(false) + return + end + local remain = DataManager.ShopData:getGiftRemainBuyNum(giftId) + self.panelGift:setActive(true) + self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, remain)) + if remain > 0 then + self.btnBuy:setTouchEnable(true) + self.btnBuy:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_green_1") + self.txBuy:setText(GFunc.getFormatPrice(gift.recharge_id)) + else + self.btnBuy:setTouchEnable(false) + self.btnBuy:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_1") + self.txBuy:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20)) + end + + for index, cell in ipairs(self.giftRewardCells) do + if gift.reward[index] then + cell:setVisible(true, 0.8) + cell:refresh(gift.reward[index].id, gift.reward[index].num, true) + else + cell:setVisible(false) + end + end +end + +return RunesSourceUI \ No newline at end of file diff --git a/lua/app/ui/runes/runes_source_ui.lua.meta b/lua/app/ui/runes/runes_source_ui.lua.meta new file mode 100644 index 00000000..01bfa35e --- /dev/null +++ b/lua/app/ui/runes/runes_source_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e0f16c6f0334eb04db5746a1576d0387 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/runes/runes_suit_ui.lua b/lua/app/ui/runes/runes_suit_ui.lua new file mode 100644 index 00000000..0880155d --- /dev/null +++ b/lua/app/ui/runes/runes_suit_ui.lua @@ -0,0 +1,69 @@ +local RunesSuitUI = class("RunesSuitUI", BaseUI) + +function RunesSuitUI:isFullScreen() + return false +end + +function RunesSuitUI:getPrefabPath() + return "assets/prefabs/ui/runes/runes_suit_ui.prefab" +end + +function RunesSuitUI:onPressBackspace() + self:closeUI() +end + +function RunesSuitUI:ctor(params) + self.heroEntity = params + self.runesEntity = DataManager.RunesData:getRunes(self.heroEntity:getCfgId()) + self.curLevel = DataManager.RunesData:getLevel() +end + +function RunesSuitUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + self.txTitle = uiMap["runes_suit_ui.bg.title.tx_title"] + self.btnClose = uiMap["runes_suit_ui.bg.close_btn"] + self.suits = {} + for i = 1, 5 do + self.suits[i] = uiMap["runes_suit_ui.bg.list.suit_cell_" .. i] + end + + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_9)) + + self.btnClose:addClickListener(function() + self:closeUI() + end) +end + +function RunesSuitUI:onRefresh() + for index, obj in ipairs(self.suits) do + local map = obj:genAllChildren() + local imgIcon = map["img_type"] + local txName = map["tx_suit_name"] + local txAttr1 = map["tx_suit_attr1"] + local txAttr2 = map["tx_suit_attr2"] + local txLevel = map["tx_level"] + imgIcon:setSprite(GConst.ATLAS_PATH.HERO, "hero_rune_"..index) + txName:setText(DataManager.RunesData:getSuitName(index)) + local attr1 = DataManager.RunesData:getSuitAttr(index, self.heroEntity:getMatchType(), 1) + local attr2 = DataManager.RunesData:getSuitAttr(index, self.heroEntity:getMatchType(), 2) + local level = self.runesEntity:getSuitLevel(index) + txLevel:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, level)) + + local str1 = I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_15, GFunc.getAttrDesc(attr1.type, attr1.num)) + local str2 = I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_16, GFunc.getAttrDesc(attr2.type, attr2.num)) + if level == 0 then + str1 = "" .. str1 .. "" + str2 = "" .. str2 .. "" + elseif level == 1 then + str1 = "" .. str1 .. "" + str2 = "" .. str2 .. "" + elseif level == 2 then + str1 = "" .. str1 .. "" + str2 = "" .. str2 .. "" + end + txAttr1:setText(str1) + txAttr2:setText(str2) + end +end + +return RunesSuitUI \ No newline at end of file diff --git a/lua/app/ui/runes/runes_suit_ui.lua.meta b/lua/app/ui/runes/runes_suit_ui.lua.meta new file mode 100644 index 00000000..a1987144 --- /dev/null +++ b/lua/app/ui/runes/runes_suit_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7eaccbe09a9a77b4c8def1595e994b66 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index 6db52cbe..caba2d9f 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -12,6 +12,7 @@ function HeroEntity:ctor(cfgId, lv, skin) self.baseAttrOriginal = {} self.equipAttr = {} self.skinAttr = {} + self.runesAttr = {} self.allAttr = {} end @@ -54,6 +55,12 @@ function HeroEntity:onSkinAttrChange() self:setDirty() end +function HeroEntity:onRunesAttrChange() + self:updateRunesAttr() + self:updateTotalAttr() + self:setDirty() +end + function HeroEntity:setDirty() self.data.isDirty = not self.data.isDirty end @@ -67,6 +74,7 @@ function HeroEntity:updateAllAttr() self:updateBaseAttr() self:updateEquipAttr() self:updateSkinAttr() + self:updateRunesAttr() self:updateTotalAttr() end @@ -193,6 +201,46 @@ function HeroEntity:updateSkinAttr() end end +-- 更新符文属性 +function HeroEntity:updateRunesAttr() + self.runesAttr = {} + + local hp = self:getRunes():getAttrValue(GConst.MATCH_HP_FIX_NAME[self:getMatchType()]) + local atk = self:getRunes():getAttrValue(GConst.MATCH_ATTACK_NAME[self:getMatchType()]) + local normalHurt = self:getRunes():getAttrValue(GConst.MATCH_NORMAL_HURT_NAME[self:getMatchType()]) + local skillHurt = self:getRunes():getAttrValue(GConst.MATCH_SKILL_HURT_NAME[self:getMatchType()]) + local critPer = self:getRunes():getAttrValue(GConst.MATCH_CRIT_NAME[self:getMatchType()]) + local critHurtPer = self:getRunes():getAttrValue(GConst.MATCH_CRIT_TIME_NAME[self:getMatchType()]) + local normalHurtPer = self:getRunes():getAttrValue(GConst.MATCH_NORMAL_HURTP_NAME[self:getMatchType()]) + local skillHurtPer = self:getRunes():getAttrValue(GConst.MATCH_SKILL_HURTP_NAME[self:getMatchType()]) + local healPer = self:getRunes():getAttrValue(GConst.MATCH_CURED_NAME[self:getMatchType()]) + + self.runesAttr[GConst.MATCH_HP_NAME[self:getMatchType()]] = hp + self.runesAttr[GConst.MATCH_ATTACK_NAME[self:getMatchType()]] = atk + self.runesAttr[GConst.MATCH_NORMAL_HURT_NAME[self:getMatchType()]] = normalHurt + self.runesAttr[GConst.MATCH_SKILL_HURT_NAME[self:getMatchType()]] = skillHurt + self.runesAttr[GConst.MATCH_CRIT_NAME[self:getMatchType()]] = critPer + self.runesAttr[GConst.MATCH_CRIT_TIME_NAME[self:getMatchType()]] = critHurtPer + self.runesAttr[GConst.MATCH_NORMAL_HURTP_NAME[self:getMatchType()]] = normalHurtPer + self.runesAttr[GConst.MATCH_SKILL_HURTP_NAME[self:getMatchType()]] = skillHurtPer + self.runesAttr[GConst.MATCH_CURED_NAME[self:getMatchType()]] = healPer + + if EDITOR_MODE then + local printStr = "" + printStr = printStr .. "更新符文数值："..self:getCfgId() .. "\n" + printStr = printStr .. "生命：".. hp .. "\n" + printStr = printStr .. "攻击力：".. atk .. "\n" + printStr = printStr .. "普攻增伤：".. normalHurt .. "\n" + printStr = printStr .. "技能增伤：".. skillHurt .. "\n" + printStr = printStr .. "暴击率：".. critPer .. "\n" + printStr = printStr .. "暴击伤害百分比：".. critHurtPer .. "\n" + printStr = printStr .. "普攻增伤百分比：".. normalHurtPer .. "\n" + printStr = printStr .. "技能增伤百分比：".. skillHurtPer .. "\n" + printStr = printStr .. "治疗加成百分比：".. healPer .. "\n" + Logger.logHighlight(printStr) + end +end + -- 更新总属性 function HeroEntity:updateTotalAttr() self.allAttr = {} @@ -205,6 +253,9 @@ function HeroEntity:updateTotalAttr() for k, v in pairs(self.skinAttr) do self:addTotalAttrValue(k, v) end + for k, v in pairs(self.runesAttr) do + self:addTotalAttrValue(k, v) + end end function HeroEntity:setTotalAttrValue(name, value) @@ -500,6 +551,7 @@ function HeroEntity:getTotalBaseHp() end end result = result + DataManager.SkinData:getBaseHp(self) + result = result + self:getRunes():getAttrValue(GConst.MATCH_HP_FIX_NAME, true) return result end @@ -517,6 +569,7 @@ function HeroEntity:getTotalBaseAtk() end -- Logger.logHighlight(logStr) result = result + DataManager.SkinData:getBaseAttack(self) + result = result + self:getRunes():getAttrValue(GConst.MATCH_ATTACK_NAME, true) return result end @@ -545,4 +598,18 @@ function HeroEntity:getSkins() return self.unlockSkins end +function HeroEntity:setRunes(runesEntity) + self.runesEntity = runesEntity + self:getTotalAttrValue() -- 防止报错 + self:onRunesAttrChange() +end + +function HeroEntity:getRunes() + if self.runesEntity then + return self.runesEntity + end + + return DataManager.RunesData:getRunes(self:getCfgId()) +end + return HeroEntity \ No newline at end of file diff --git a/lua/app/userdata/runes.meta b/lua/app/userdata/runes.meta new file mode 100644 index 00000000..296421aa --- /dev/null +++ b/lua/app/userdata/runes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 623c3622200ddb346836080a5e43badb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/userdata/runes/runes_data.lua b/lua/app/userdata/runes/runes_data.lua new file mode 100644 index 00000000..b0d0bd0c --- /dev/null +++ b/lua/app/userdata/runes/runes_data.lua @@ -0,0 +1,218 @@ +local RunesData = class("RunesData", BaseData) +local RunesEntity = require "app/userdata/runes/runes_entity" + +function RunesData:ctor() + self.data.isDirty = false +end + +function RunesData:clear() + DataManager:unregisterTryOpenFunc("RunesData") +end + +function RunesData:init(data) + data = data or GConst.EMPTY_TABLE + if EDITOR_MODE then + Logger.logHighlight("符文初始化数据") + Logger.printTable(data) + end + + self.level = data.level or 1 + self.exp = data.exp or 0 + if data.heroes_grids then + for heroId, grids in pairs(data.heroes_grids) do + self:addEquip(heroId, grids.grids) + end + end + + -- 活动开启 + DataManager:registerTryOpenFunc("RunesData", function() + if self:isOpen() then + DataManager:unregisterTryOpenFunc("RunesData") + self:setDirty() + end + end) + self:setDirty() +end + +function RunesData:setDirty() + self.data.isDirty = not self.data.isDirty +end + +function RunesData:isOpen(showToast) + if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.RUNES_OPEN, not showToast) then + return false + end + return true +end + +function RunesData:addEquip(heroId, grids) + if self.runes == nil then + self.runes = {} + end + + if self.runes[heroId] == nil then + self.runes[heroId] = self:createEntity(heroId, grids) + else + self.runes[heroId]:updateGrids(grids) + end +end + +function RunesData:createEntity(heroId, grids) + return RunesEntity:create(heroId, grids) +end + +function RunesData:getRunes(heroId) + if self.runes == nil then + self.runes = {} + end + if self.runes[heroId] == nil then + self.runes[heroId] = self:createEntity(heroId) + end + + return self.runes[heroId] +end + +-- 获取当前等级配置 +function RunesData:getLevelConfig() + return ConfigManager:getConfig("runes_level") +end + +-- 获取铸台最大等级 +function RunesData:getMaxLevel() + return #self:getLevelConfig() +end + +-- 获取符文铸台等级 +function RunesData:getLevel() + return self.level +end + +-- 获取等级当前经验 +function RunesData:getLevelExp() + return self.exp +end + +-- 获取到下一档的总经验 +function RunesData:getNextLevelTotalExp() + local cfg = self:getLevelConfig()[self:getLevel() + 1] + if cfg then + return cfg.cost or 0 + end + + return 0 +end + +-- 获取相应铸台等级的品质概率 +function RunesData:getQualityRate(level, quality) + local cfg = self:getLevelConfig()[level] + + local total = 0 + for i = 1, GConst.RunesConst.MAX_QUALITY_COUNT do + total = total + (cfg["weight_"..i] or 0) + end + + local value = cfg["weight_"..quality] + if value then + return string.format("%.2f",(value / total) * 100) + else + return 0 + end +end + +-- 获取相应套装的相应属性 +function RunesData:getSuitAttr(id, heroType, suitLevel) + local data = ConfigManager:getConfig("runes_suit")[id] + local attrs + if heroType == GConst.HeroConst.MATCH_TYPE.RED then + attrs = data.red_suit_attr + elseif heroType == GConst.HeroConst.MATCH_TYPE.YELLOW then + attrs = data.yellow_suit_attr + elseif heroType == GConst.HeroConst.MATCH_TYPE.GREEN then + attrs = data.green_suit_attr + elseif heroType == GConst.HeroConst.MATCH_TYPE.BLUE then + attrs = data.blue_suit_attr + elseif heroType == GConst.HeroConst.MATCH_TYPE.PURPLE then + attrs = data.purple_suit_attr + end + + if attrs ~= nil and attrs[suitLevel] then + return attrs[suitLevel] + end + + return nil +end + +-- 获取锻造材料个数 +function RunesData:getMaterialCount() + return DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_RUNES) +end + +-- 是否可以一键铸造 +function RunesData:canAutoMake() + local cfg = self:getLevelConfig()[self:getLevel()] + return cfg.auto and cfg.auto == 1 +end + +-- 符文栏是否解锁 +function RunesData:isUnlock(index) + local level = self:getLevel() + return index <= self:getLevelConfig()[level].grid +end + +-- 获取符文栏解锁个数 +function RunesData:getUnlockCount() + local unlock = 0 + for i = 1, GConst.RunesConst.MAX_ATTR_GRID_COUNT do + if self:isUnlock(i) then + unlock = unlock + 1 + end + end + + return unlock +end + +-- 获取符文栏解锁等级要求 +function RunesData:getUnlockLevel(index) + for level, data in ipairs(self:getLevelConfig()) do + if data.grid >= index then + return level + end + end + + return 0 +end + +-- 获取套装名 +function RunesData:getSuitName(index) + if index == 1 then + return I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_10) + elseif index == 2 then + return I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_11) + elseif index == 3 then + return I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_12) + elseif index == 4 then + return I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_13) + elseif index == 5 then + return I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_14) + end + + return nil +end + +-- 改变属性栏锁定状态成功 +function RunesData:onGridLockSuccess(heroId, grids) + self.runes[heroId]:updateGrids(grids) + + self:setDirty() +end + +-- 淬炼成功 +function RunesData:onQuenchingSuccess(level, exp, heroId, grids) + self.level = level + self.exp = exp + self.runes[heroId]:updateGrids(grids) + + self:setDirty() +end + +return RunesData \ No newline at end of file diff --git a/lua/app/userdata/runes/runes_data.lua.meta b/lua/app/userdata/runes/runes_data.lua.meta new file mode 100644 index 00000000..9b1dc6c1 --- /dev/null +++ b/lua/app/userdata/runes/runes_data.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a9a5f762edecf854ab9eecd7ace92c0e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/userdata/runes/runes_entity.lua b/lua/app/userdata/runes/runes_entity.lua new file mode 100644 index 00000000..9f32f1eb --- /dev/null +++ b/lua/app/userdata/runes/runes_entity.lua @@ -0,0 +1,206 @@ +local RunesEntity = class("RunesEntity", BaseData) +local DEFAULT_FACTOR = GConst.BattleConst.DEFAULT_FACTOR + +function RunesEntity:ctor(heroId, grids) + self.heroId = heroId + self.grids = grids or GConst.EMPTY_TABLE +end + +function RunesEntity:setDirty() + self.data.isDirty = not self.data.isDirty +end + +function RunesEntity:updateGrids(grids) + self.grids = grids or GConst.EMPTY_TABLE + self:getHeroEntity():onRunesAttrChange() + self:setDirty() +end + +function RunesEntity:getHeroEntity() + if self.heroEntity == nil then + self.heroEntity = DataManager.HeroData:getHeroById(self.heroId) + end + + return self.heroEntity +end + +-- 符文栏是否锁定属性 +function RunesEntity:isAttrLock(index) + if self.grids[index] then + return self.grids[index].lock + end + + return false +end + +-- 获取已锁定的符文栏个数 +function RunesEntity:getAttrLockCount() + local lock = 0 + for i = 1, GConst.RunesConst.MAX_ATTR_GRID_COUNT do + if self:isAttrLock(i) then + lock = lock + 1 + end + end + + return lock +end + +-- 获取锻造的材料消耗 +function RunesEntity:getMaterialCost() + local base = GFunc.getConstReward("runes_cost_base") + local add = GFunc.getConstReward("runes_cost_add") + local total = {id = base.id, num = base.num, type = base.type} + + total.num = total.num + (add.num * self:getAttrLockCount()) + + return total +end + +-- -- 获取随机符文属性 +-- function RunesEntity:getRandomAttr() +-- local randomQlt = math.random(GConst.RunesConst.MAX_QUALITY_COUNT - 2) +-- local randomAttr = math.random(GConst.RunesConst.MAX_ATTR_COUNT) + +-- local cfg = ConfigManager:getConfig("runes_sub")[randomQlt] +-- return cfg["attr_"..randomAttr][self:getHeroEntity():getMatchType()] +-- end + +-- -- 获取随机套装 +-- function RunesEntity:getRandomSuit() +-- return math.random(GConst.RunesConst.MAX_SUITS_COUNT) +-- end + +-- 获取格子的符文属性 +function RunesEntity:getGridAttr(index) + if self.grids[index] then + local cfg = ConfigManager:getConfig("runes_sub")[self.grids[index].quality] + local attr = cfg["attr_"..self.grids[index].attr] + if attr then + return attr[self:getHeroEntity():getMatchType()] + end + end + + return nil +end + +-- 获取格子的套装 +function RunesEntity:getGridSuit(index) + if self.grids[index] then + return self.grids[index].suit + end + + Logger.logError("英雄".. self.heroId .. "未获取到格子的符文数据："..tostring(index)) + return 0 +end + +-- 获取套装等级,2件套是lv1,4件套是lv2，没有就是lv0 +function RunesEntity:getSuitLevel(index) + local count = self:getSuitCount(index) + + if count and count >= 4 then + return 2 + end + if count and count >= 2 then + return 1 + end + + return 0 +end + +-- 获取套装个数 +function RunesEntity:getSuitCount(id) + local data = table.find(self:getSuitIds(), function(value) return value.id == id end) + return data and data.count or 0 +end + +-- 获取已有的套装id map +function RunesEntity:getSuitIds() + local typeCount = {} + for i = 1, GConst.RunesConst.MAX_SUITS_COUNT do + local t = self:getGridSuit(i) + if t then + local temp = table.find(typeCount, function(value) return value.id == t end) + if temp then + temp.count = temp.count + 1 + else + table.insert(typeCount, {id = t, count = 1}) + end + end + end + table.sort(typeCount, function(a, b) + return a.count > b.count + end) + + return typeCount +end + +-- 属性相关接口start------------------------------------------------------------------------------------ + +-- 获取所有属性加成，未经过计算加成 +function RunesEntity:getAllAttr() + if not DataManager.RunesData:isOpen() then + return nil + end + + local all = {} + local func = function(attr) + if attr == nil then + return nil + end + + local temp = table.find(all, function(value) + return value.type == attr.type + end) + + if temp then + temp.num = temp.num + attr.num + else + table.insert(all, {type = attr.type, num = attr.num}) + end + end + + -- 格子属性 + for i = 1, GConst.RunesConst.MAX_ATTR_GRID_COUNT do + func(self:getGridAttr(i)) + end + -- 套装属性 + local pos = self:getHeroEntity():getMatchType() + for idx, data in pairs(self:getSuitIds()) do + func(DataManager.RunesData:getSuitAttr(data.id, pos, self:getSuitLevel(data.id))) + end + + return all +end + +-- 是否拥有某属性 +function RunesEntity:hasAttr(attrType) + return self:getAttrValue(attrType) > 0 +end + +-- 获取属性 , isBase是否是基础配置的属性 +function RunesEntity:getAttrValue(attrType, isBase) + local result + if not isBase and attrType == GConst.MATCH_HP_FIX_NAME[self:getHeroEntity():getMatchType()] then + result = self:getAttrValue(GConst.MATCH_HP_FIX_NAME[self:getHeroEntity():getMatchType()], true) + result = result + self:getHeroEntity():getTotalBaseHp() * self:getAttrValue(GConst.MATCH_HP_ADD_NAME[self:getHeroEntity():getMatchType()]) // DEFAULT_FACTOR + return result + elseif not isBase and attrType == GConst.MATCH_ATTACK_NAME[self:getHeroEntity():getMatchType()] then + result = self:getAttrValue(GConst.MATCH_ATTACK_NAME[self:getHeroEntity():getMatchType()], true) + result = result + self:getHeroEntity():getTotalBaseAtk() * self:getAttrValue(GConst.MATCH_ATTACK_ADD_NAME) // DEFAULT_FACTOR + return result + else + local all = self:getAllAttr() + if all == nil then + return 0 + end + result = table.find(all, function(value) + return attrType == value.type + end) + end + + return result and result.num or 0 +end + +-- 属性相关接口end------------------------------------------------------------------------------------ + +return RunesEntity \ No newline at end of file diff --git a/lua/app/userdata/runes/runes_entity.lua.meta b/lua/app/userdata/runes/runes_entity.lua.meta new file mode 100644 index 00000000..7d62dbd3 --- /dev/null +++ b/lua/app/userdata/runes/runes_entity.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 22f546c66a8d67842b8befee0e17a707 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/userdata/shop/shop_data.lua b/lua/app/userdata/shop/shop_data.lua index 5640b1a2..56f27705 100644 --- a/lua/app/userdata/shop/shop_data.lua +++ b/lua/app/userdata/shop/shop_data.lua @@ -19,6 +19,7 @@ end function ShopData:initCrossDay() DataManager:registerCrossDayFunc("ShopData", function() + self:resetRunesGift() self:resetMallDaily() self:resetCommonDailyGemAdCount() self:resetCommonDailyCoinAdCount() @@ -95,6 +96,14 @@ function ShopData:getGiftBoughtNum(actType, actId) return 0 end +-- 重置一个礼包购买次数 +function ShopData:resetGiftBoughtNum(actType, actId) + local data = self:getActGiftDetailData(actType, actId) + if data then + data.buy_count = 0 + end +end + -- 获取通用礼包剩余可购买次数 function ShopData:getGiftRemainBuyNum(actId) local bought = self:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, actId) @@ -1030,4 +1039,11 @@ function ShopData:markPopLastChapterActGift() end end +-- 重置符文每日礼包次数 +function ShopData:resetRunesGift() + for index, id in ipairs(GConst.RunesConst.GIFT_IDS) do + self:resetGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, id) + end +end + return ShopData \ No newline at end of file From 1a4b4e9764ac778eabe2a3227c92921f8e85e4ea Mon Sep 17 00:00:00 2001 From: Fang Date: Tue, 12 Sep 2023 15:02:58 +0800 Subject: [PATCH 02/35] =?UTF-8?q?=E5=AE=B9=E9=94=99=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/hero/runes_info_comp.lua | 5 ++++- lua/app/ui/runes/runes_source_ui.lua | 2 ++ lua/app/userdata/runes/runes_entity.lua | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lua/app/ui/hero/runes_info_comp.lua b/lua/app/ui/hero/runes_info_comp.lua index c83e2f6b..50c0295d 100644 --- a/lua/app/ui/hero/runes_info_comp.lua +++ b/lua/app/ui/hero/runes_info_comp.lua @@ -107,7 +107,10 @@ function RunesInfoComp:refreshRunes() if DataManager.RunesData:isUnlock(index) then lock:setActive(false) imgQlt:setSprite(GConst.ATLAS_PATH.HERO, GConst.RunesConst.QUALITY_ICON[index]) - imgSuit:setSprite(GConst.ATLAS_PATH.HERO, "hero_rune_"..self.runesEntity:getGridSuit(index)) + local suit = self.runesEntity:getGridSuit(index) + if suit then + imgSuit:setSprite(GConst.ATLAS_PATH.HERO, "hero_rune_"..suit) + end imgLock:setSprite(GConst.ATLAS_PATH.COMMON, self.runesEntity:isAttrLock(index) and LOCK_ICON or UNLOCK_ICON) local attr = self.runesEntity:getGridAttr(index) if attr then diff --git a/lua/app/ui/runes/runes_source_ui.lua b/lua/app/ui/runes/runes_source_ui.lua index 280024c7..8f390497 100644 --- a/lua/app/ui/runes/runes_source_ui.lua +++ b/lua/app/ui/runes/runes_source_ui.lua @@ -90,6 +90,8 @@ function RunesSourceUI:onLoadRootComplete() end) self.btnGo:addClickListener(function() ModuleManager.DungeonRuneManager:showMainUI() + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_DUNGEON_UI) + self:closeUI() end) self.btnBuy:addClickListener(function() PayManager:purchasePackage(GConst.RunesConst.GIFT_IDS[self.curGiftIndex], PayManager.PURCHARSE_TYPE.ACT_GIFT) diff --git a/lua/app/userdata/runes/runes_entity.lua b/lua/app/userdata/runes/runes_entity.lua index 9f32f1eb..b424341d 100644 --- a/lua/app/userdata/runes/runes_entity.lua +++ b/lua/app/userdata/runes/runes_entity.lua @@ -89,8 +89,8 @@ function RunesEntity:getGridSuit(index) return self.grids[index].suit end - Logger.logError("英雄".. self.heroId .. "未获取到格子的符文数据："..tostring(index)) - return 0 + -- Logger.logError("英雄".. self.heroId .. "未获取到格子的符文数据："..tostring(index)) + return nil end -- 获取套装等级,2件套是lv1,4件套是lv2，没有就是lv0 From 1f931231715ea9d9fc696a86a50f67fe97a22a92 Mon Sep 17 00:00:00 2001 From: Fang Date: Tue, 12 Sep 2023 15:27:27 +0800 Subject: [PATCH 03/35] =?UTF-8?q?=E6=98=BE=E7=A4=BAfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/global/global_func.lua | 3 ++- lua/app/userdata/runes/runes_entity.lua | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lua/app/global/global_func.lua b/lua/app/global/global_func.lua index 09b53f0b..2fcbcb00 100644 --- a/lua/app/global/global_func.lua +++ b/lua/app/global/global_func.lua @@ -446,7 +446,8 @@ function GFunc.getAttrShowValue(attrType, attrNum, notPercentSign) table.containValue(GConst.MATCH_SKILL_HURTP_NAME, attrType) or table.containValue(GConst.MATCH_CRIT_NAME, attrType) or table.containValue(GConst.MATCH_CRIT_TIME_NAME, attrType) or - table.containValue(GConst.MATCH_CURED_NAME, attrType) + table.containValue(GConst.MATCH_CURED_NAME, attrType) or + table.containValue(GConst.MATCH_ALL_HURTP_NAME, attrType) then local str = notPercentSign and "" or "%" return attrNum // GConst.BattleConst.PERCENT_FACTOR .. str diff --git a/lua/app/userdata/runes/runes_entity.lua b/lua/app/userdata/runes/runes_entity.lua index b424341d..fba86feb 100644 --- a/lua/app/userdata/runes/runes_entity.lua +++ b/lua/app/userdata/runes/runes_entity.lua @@ -188,6 +188,10 @@ function RunesEntity:getAttrValue(attrType, isBase) result = self:getAttrValue(GConst.MATCH_ATTACK_NAME[self:getHeroEntity():getMatchType()], true) result = result + self:getHeroEntity():getTotalBaseAtk() * self:getAttrValue(GConst.MATCH_ATTACK_ADD_NAME) // DEFAULT_FACTOR return result + elseif not isBase and (attrType == GConst.MATCH_NORMAL_HURTP_NAME[self:getHeroEntity():getMatchType()] or attrType == GConst.MATCH_SKILL_HURTP_NAME[self:getHeroEntity():getMatchType()]) then + result = self:getAttrValue(GConst.MATCH_ALL_HURTP_NAME[self:getHeroEntity():getMatchType()]) + result = result + self:getAttrValue(GConst.MATCH_ATTACK_ADD_NAME) + return result else local all = self:getAllAttr() if all == nil then From 5c490ce2b698c2afd8ffc1513a32d2cb39ede7a6 Mon Sep 17 00:00:00 2001 From: Fang Date: Tue, 12 Sep 2023 16:03:22 +0800 Subject: [PATCH 04/35] =?UTF-8?q?=E6=98=BE=E7=A4=BAfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/userdata/runes/runes_data.lua | 2 +- lua/app/userdata/runes/runes_entity.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/app/userdata/runes/runes_data.lua b/lua/app/userdata/runes/runes_data.lua index b0d0bd0c..92bc7bdd 100644 --- a/lua/app/userdata/runes/runes_data.lua +++ b/lua/app/userdata/runes/runes_data.lua @@ -89,7 +89,7 @@ end -- 获取等级当前经验 function RunesData:getLevelExp() - return self.exp + return self.exp - self:getLevelConfig()[self:getLevel()].cost end -- 获取到下一档的总经验 diff --git a/lua/app/userdata/runes/runes_entity.lua b/lua/app/userdata/runes/runes_entity.lua index fba86feb..3cc979b6 100644 --- a/lua/app/userdata/runes/runes_entity.lua +++ b/lua/app/userdata/runes/runes_entity.lua @@ -189,8 +189,8 @@ function RunesEntity:getAttrValue(attrType, isBase) result = result + self:getHeroEntity():getTotalBaseAtk() * self:getAttrValue(GConst.MATCH_ATTACK_ADD_NAME) // DEFAULT_FACTOR return result elseif not isBase and (attrType == GConst.MATCH_NORMAL_HURTP_NAME[self:getHeroEntity():getMatchType()] or attrType == GConst.MATCH_SKILL_HURTP_NAME[self:getHeroEntity():getMatchType()]) then - result = self:getAttrValue(GConst.MATCH_ALL_HURTP_NAME[self:getHeroEntity():getMatchType()]) - result = result + self:getAttrValue(GConst.MATCH_ATTACK_ADD_NAME) + result = self:getAttrValue(attrType, true) + result = result + self:getAttrValue(GConst.MATCH_ALL_HURTP_NAME, true) return result else local all = self:getAllAttr() From fd27091c5eb88bc3f572b6930214686248fb44cb Mon Sep 17 00:00:00 2001 From: Fang Date: Tue, 12 Sep 2023 16:16:48 +0800 Subject: [PATCH 05/35] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/runes/runes_manager.lua | 18 ++++----- lua/app/ui/hero/runes_info_comp.lua | 52 ++++++++++++++++---------- 2 files changed, 39 insertions(+), 31 deletions(-) diff --git a/lua/app/module/runes/runes_manager.lua b/lua/app/module/runes/runes_manager.lua index 38c3c295..68958747 100644 --- a/lua/app/module/runes/runes_manager.lua +++ b/lua/app/module/runes/runes_manager.lua @@ -2,10 +2,16 @@ local RunesManager = class("RunesManager", BaseModule) -- 锁定和解锁属性栏 function RunesManager:reqChangeLockGrid(heroId, index, isLock) + if self.isReqLockChange then + return + end + self.isReqLockChange = true + self:sendMessage(ProtoMsgType.FromMsgEnum.RuneLockReq, {hero_id = heroId, grid_num = index, lock = isLock}, {}, self.rspChangeLockGrid) end function RunesManager:rspChangeLockGrid(result) + self.isReqLockChange = false if result.hero_girds then DataManager.RunesData:onGridLockSuccess(result.reqData.hero_id, result.hero_girds.grids) end @@ -13,21 +19,11 @@ end -- 淬炼 function RunesManager:reqQuenching(heroId, autoCount) - if DataManager.RunesData:getRunes(heroId):getAttrLockCount() >= DataManager.RunesData:getUnlockCount() then - GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_25)) - return - end if self.isReqQuenching then return end - - local cost = DataManager.RunesData:getRunes(heroId):getMaterialCost() - if not GFunc.checkCost(GFunc.getRewardId(cost), GFunc.getRewardNum(cost), true) then - UIManager:showUI("app/ui/runes/runes_source_ui") - return - end - self.isReqQuenching = true + self:sendMessage(ProtoMsgType.FromMsgEnum.RuneQuenchingReq, {hero_id = heroId, auto_count = autoCount}, {}, self.rspQuenching, BIReport.ITEM_GET_TYPE.RUNES_QUENCHING) end diff --git a/lua/app/ui/hero/runes_info_comp.lua b/lua/app/ui/hero/runes_info_comp.lua index 50c0295d..9f3278a9 100644 --- a/lua/app/ui/hero/runes_info_comp.lua +++ b/lua/app/ui/hero/runes_info_comp.lua @@ -53,7 +53,7 @@ function RunesInfoComp:init() boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, showToday = GConst.MESSAGE_BOX_SHOW_TODAY.RUNES_AUTO, okFunc = function() - self:startAutoQuenching() + self:reqQuenching(true) end, } GFunc.showMessageBox(params) @@ -62,7 +62,7 @@ function RunesInfoComp:init() end end) self.btnUse:addClickListener(function() - ModuleManager.RunesManager:reqQuenching(self.heroEntity:getCfgId(), 0) + self:reqQuenching(false) end) self:bind(DataManager.BagData.ItemData, "dirty", function() self:refresh() @@ -154,19 +154,36 @@ function RunesInfoComp:refreshSuit() self.txEmpty:setActive(isEmpty) end --- 开始自动淬炼 -function RunesInfoComp:startAutoQuenching() - self.mask:setActive(true) - self:autoQuenching() - self.autoSid = self.baseObject:scheduleGlobal(function() - local cost = self.runesEntity:getMaterialCost() - if not GFunc.checkCost(GFunc.getRewardId(cost), GFunc.getRewardNum(cost), true) then - self:endAutoQuenching() - return - end - self:autoQuenching() - end, 1 / 3) - self.spineAuto:playAnim("attack", true, true) +-- 请求淬炼 +function RunesInfoComp:reqQuenching(isAuto) + -- 是否全部锁定 + if DataManager.RunesData:getRunes(self.heroEntity:getCfgId()):getAttrLockCount() >= DataManager.RunesData:getUnlockCount() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_25)) + return + end + -- 材料是否足够 + local cost = self.runesEntity:getMaterialCost() + if not GFunc.checkCost(GFunc.getRewardId(cost), GFunc.getRewardNum(cost), true) then + UIManager:showUI("app/ui/runes/runes_source_ui") + return + end + + if isAuto then + -- 自动淬炼 + self.mask:setActive(true) + self.autoSid = self.baseObject:scheduleGlobal(function() + local cost = self.runesEntity:getMaterialCost() + if not GFunc.checkCost(GFunc.getRewardId(cost), GFunc.getRewardNum(cost), true) then + self:endAutoQuenching() + return + end + ModuleManager.RunesManager:reqQuenching(self.heroEntity:getCfgId(), 0) + end, 1 / 3) + self.spineAuto:playAnim("attack", true, true) + else + -- 单次淬炼 + ModuleManager.RunesManager:reqQuenching(self.heroEntity:getCfgId(), 0) + end end -- 结束自动淬炼 @@ -188,9 +205,4 @@ function RunesInfoComp:endAutoQuenching() self.spineAuto:playAnim("idle", true, true) end --- 请求一次自动淬炼 -function RunesInfoComp:autoQuenching() - ModuleManager.RunesManager:reqQuenching(self.heroEntity:getCfgId(), 0) -end - return RunesInfoComp \ No newline at end of file From 178de4c5069b077ede11c006e0523920bc4f9ca0 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 12 Sep 2023 16:22:10 +0800 Subject: [PATCH 06/35] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/battle/controller/battle_controller_dungeon_rune.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua index 5304806e..7435f84c 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua @@ -411,7 +411,7 @@ function BattleControllerDungeonRune:getRuneTaskAllOver() local taskProgress = ModuleManager.DungeonRuneManager:getTaskStatus(self, chapterCondition) local taskOver = true for index, info in pairs(taskProgress) do - if not info.over then + if not info.over and index ~= 1 then taskOver = false break end From 97cef0d41d225d3c93cca8a4fe7a45948408a26c Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 12 Sep 2023 16:31:27 +0800 Subject: [PATCH 07/35] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/battle/controller/battle_controller_dungeon_rune.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua index 7435f84c..7de6b4b7 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua @@ -401,7 +401,7 @@ function BattleControllerDungeonRune:getRuneTaskNumByType(taskInfo) elseif taskType == GConst.DungeonRuneConst.TASK_TYPE.BREAK_GRID_TYPE then return self.totalBreakedGridType[taskParams1] or 0 elseif taskType == GConst.DungeonRuneConst.TASK_TYPE.KILL_MONSTER then - return self.getTaskProgress[GConst.BattleConst.BATTLE_TASK_FIELD.KILL_NORMAL_MONSTER] + return self.taskProgress[GConst.BattleConst.BATTLE_TASK_FIELD.KILL_NORMAL_MONSTER] end end From 6f010c00b4bf90796be94a51d79b601ab11bff32 Mon Sep 17 00:00:00 2001 From: Fang Date: Tue, 12 Sep 2023 17:59:10 +0800 Subject: [PATCH 08/35] =?UTF-8?q?=E5=AE=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/userdata/runes/runes_data.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/userdata/runes/runes_data.lua b/lua/app/userdata/runes/runes_data.lua index 92bc7bdd..d3bfaa8d 100644 --- a/lua/app/userdata/runes/runes_data.lua +++ b/lua/app/userdata/runes/runes_data.lua @@ -89,7 +89,7 @@ end -- 获取等级当前经验 function RunesData:getLevelExp() - return self.exp - self:getLevelConfig()[self:getLevel()].cost + return self.exp - (self:getLevelConfig()[self:getLevel()].cost or 0) end -- 获取到下一档的总经验 From 1e21958ae6674bdc825dad14b72791d5aeb614d9 Mon Sep 17 00:00:00 2001 From: Fang Date: Tue, 12 Sep 2023 18:11:24 +0800 Subject: [PATCH 09/35] =?UTF-8?q?=E6=9B=B4=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/activity_pvp_board.lua | 21306 ++++++++++++ lua/app/config/activity_pvp_board.lua.meta | 10 + lua/app/config/chapter_board_rune.lua | 32411 +++++++++++-------- lua/app/config/chapter_dungeon_rune.lua | 2140 +- lua/app/config/grid_edge_type.lua | 16 +- lua/app/config/runes_level.lua | 148 +- lua/app/config/runes_sub.lua | 830 +- lua/app/config/runes_suit.lua | 100 +- lua/app/config/skill.lua | 94 +- lua/app/config/skill_rogue.lua | 11 +- lua/app/config/strings/cn/global.lua | 6 +- lua/app/config/strings/cn/skill_rogue.lua | 4 +- lua/app/config/task_type.lua | 132 + lua/app/config/task_type.lua.meta | 10 + 14 files changed, 43259 insertions(+), 13959 deletions(-) create mode 100644 lua/app/config/activity_pvp_board.lua create mode 100644 lua/app/config/activity_pvp_board.lua.meta create mode 100644 lua/app/config/task_type.lua create mode 100644 lua/app/config/task_type.lua.meta diff --git a/lua/app/config/activity_pvp_board.lua b/lua/app/config/activity_pvp_board.lua new file mode 100644 index 00000000..522962f8 --- /dev/null +++ b/lua/app/config/activity_pvp_board.lua @@ -0,0 +1,21306 @@ +local activity_pvp_board = { + [1]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 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 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [2]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + } + } + }, + [3]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + } + } + }, + [4]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 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 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [5]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [6]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + } + } + }, + [7]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + } + } + }, + [8]={ + ["board"]={ + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + } + } + }, + [9]={ + ["board"]={ + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [10]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + } + } + }, + [11]={ + ["board"]={ + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 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 + }, + { + 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, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + } + } + }, + [12]={ + ["board"]={ + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + } + } + }, + [13]={ + ["board"]={ + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + } + } + }, + [14]={ + ["board"]={ + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + } + } + }, + [15]={ + ["board"]={ + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [16]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [17]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + } + } + }, + [18]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + } + } + }, + [19]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 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 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [20]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + } + } + }, + [21]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + } + } + }, + [22]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + } + } + }, + [23]={ + ["board"]={ + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + } + } + }, + [24]={ + ["board"]={ + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [25]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + } + } + }, + [26]={ + ["board"]={ + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 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, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + } + } + }, + [27]={ + ["board"]={ + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + } + } + }, + [28]={ + ["board"]={ + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + } + } + }, + [29]={ + ["board"]={ + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + } + } + }, + [30]={ + ["board"]={ + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [31]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [32]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + } + } + }, + [33]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + } + } + }, + [34]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 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 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [35]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + } + } + }, + [36]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + } + } + }, + [37]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + } + } + }, + [38]={ + ["board"]={ + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + } + } + }, + [39]={ + ["board"]={ + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [40]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + } + } + }, + [41]={ + ["board"]={ + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 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, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + } + } + }, + [42]={ + ["board"]={ + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + } + } + }, + [43]={ + ["board"]={ + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + } + } + }, + [44]={ + ["board"]={ + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + } + } + }, + [45]={ + ["board"]={ + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [46]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [47]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + } + } + }, + [48]={ + ["board"]={ + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + } + } + }, + [49]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 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 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [50]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + } + } + }, + [51]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + } + } + }, + [52]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + } + } + }, + [53]={ + ["board"]={ + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + } + } + }, + [54]={ + ["board"]={ + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [55]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + } + } + }, + [56]={ + ["board"]={ + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 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, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + } + } + }, + [57]={ + ["board"]={ + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + } + } + }, + [58]={ + ["board"]={ + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + } + } + }, + [59]={ + ["board"]={ + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + } + } + }, + [60]={ + ["board"]={ + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [61]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [62]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [63]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [64]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [65]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + } + } + }, + [66]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + } + } + }, + [67]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + } + } + }, + [68]={ + ["board"]={ + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + } + } + }, + [69]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + } + } + }, + [70]={ + ["board"]={ + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + } + } + }, + [71]={ + ["board"]={ + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + } + } + }, + [72]={ + ["board"]={ + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 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 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [73]={ + ["board"]={ + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [74]={ + ["board"]={ + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [75]={ + ["board"]={ + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 36, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + } +} +local config = { +data=activity_pvp_board,count=75 +} +return config \ No newline at end of file diff --git a/lua/app/config/activity_pvp_board.lua.meta b/lua/app/config/activity_pvp_board.lua.meta new file mode 100644 index 00000000..596d1d52 --- /dev/null +++ b/lua/app/config/activity_pvp_board.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 0ea07987f5138fd4783f9cb9509cf506 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/chapter_board_rune.lua b/lua/app/config/chapter_board_rune.lua index b9675822..bc7c3281 100644 --- a/lua/app/config/chapter_board_rune.lua +++ b/lua/app/config/chapter_board_rune.lua @@ -6,12 +6,12 @@ local chapter_board_rune = { 0 }, { - 1, - 0 + 0, + 5 }, { 0, - 2 + 5 }, { 0, @@ -19,23 +19,43 @@ local chapter_board_rune = { }, { 0, - 4 + 5 + }, + { + 0, + 3 }, { 1, 0 }, { - 1, - 0 + 0, + 5 }, { - 1, - 0 + 0, + 5 }, { - 1, - 0 + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 5 }, { 0, @@ -50,20 +70,24 @@ local chapter_board_rune = { 2 }, { - 1, - 0 + 0, + 4 }, { - 1, - 0 + 0, + 5 }, { - 1, - 0 + 0, + 2 }, { - 1, - 0 + 0, + 4 + }, + { + 0, + 5 }, { 0, @@ -71,27 +95,23 @@ local chapter_board_rune = { }, { 0, - 4 + 5 }, { 0, - 4 + 3 }, { - 1, - 0 + 0, + 3 }, { - 1, - 0 + 0, + 2 }, { - 1, - 0 - }, - { - 1, - 0 + 0, + 5 }, { 0, @@ -101,6 +121,58 @@ local chapter_board_rune = { 0, 3 }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, { 0, 3 @@ -110,92 +182,142 @@ local chapter_board_rune = { 0 }, { - 1, - 0 + 0, + 5 }, { 1, 0 }, { - 1, - 0 + 0, + 4 }, { - 1, - 0 + 0, + 4 + } + }, + ["grid_edge"]={ + { + ["pos"]=12, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=22, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=32, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=42, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=52, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=62, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=72, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=16, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=26, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=36, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=46, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=56, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=66, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=76, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=14, + ["type"]=5, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=14, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=14, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=24, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=24, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=34, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=34, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=44, + ["type"]=6, + ["direction"]=2 } } }, @@ -206,23 +328,23 @@ local chapter_board_rune = { 0 }, { - 2, + 1, 0 }, { 0, - 1 + 3 }, { 0, - 2 + 3 }, { 0, - 1 + 4 }, { - 2, + 1, 0 }, { @@ -237,10 +359,42 @@ local chapter_board_rune = { 1, 0 }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 0, 3 }, + { + 0, + 5 + }, + { + 0, + 1 + }, { 0, 1 @@ -254,40 +408,32 @@ local chapter_board_rune = { 0 }, { - 1, - 0 + 0, + 3 }, { - 1, - 0 + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 }, { 0, 1 }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, { 0, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 + 3 }, { 1, @@ -305,30 +451,10 @@ local chapter_board_rune = { 2, 0 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 2, 0 }, - { - 1, - 0 - }, { 2, 0 @@ -378,11 +504,7 @@ local chapter_board_rune = { 0 }, { - 1, - 0 - }, - { - 1, + 31, 0 }, { @@ -401,66 +523,10 @@ local chapter_board_rune = { }, [3]={ ["board"]={ - { - 1, - 0 - }, - { - 1, - 0 - }, { 2, 0 }, - { - 0, - 2 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 2, 0 @@ -477,53 +543,137 @@ local chapter_board_rune = { 0, 3 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, { 2, 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 24, 0 }, { 2, 0 }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 0 + }, { 0, 4 }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, - 1 + 2 }, { 2, @@ -531,84 +681,222 @@ local chapter_board_rune = { }, { 0, - 1 + 3 }, { - 1, + 0, + 3 + }, + { + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 2 + }, + { + 2, 0 }, { - 1, + 0, + 3 + }, + { + 0, 0 }, { - 1, + 0, 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=13, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=23, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=33, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=42, + ["type"]=5, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=42, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=51, + ["type"]=5, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=51, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=62, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=62, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=73, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=15, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=25, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=35, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=57, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=57, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=75, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=54, + ["type"]=6, + ["direction"]=1 + }, + { + ["pos"]=54, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=54, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=54, + ["type"]=6, + ["direction"]=4 } } }, [4]={ ["board"]={ + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, { 1, 0 }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, { 2, 0 }, + { + 0, + 2 + }, + { + 0, + 3 + }, { 0, 3 @@ -619,78 +907,58 @@ local chapter_board_rune = { }, { 0, - 4 + 2 + }, + { + 0, + 2 }, { 2, 0 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, { 0, 1 }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, { 0, 2 }, { 0, - 4 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 + 2 }, { 2, 0 }, - { - 3, - 0 - }, { 0, - 5 + 1 }, { - 3, - 0 + 0, + 1 }, { 2, 0 }, { - 1, - 0 - }, - { - 2, - 0 - }, - { - 3, + 0, 0 }, { @@ -699,54 +967,30 @@ local chapter_board_rune = { }, { 0, - 5 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 + 3 }, { 1, 0 }, - { - 2, - 0 - }, - { - 3, - 0 - }, { 0, - 5 - }, - { - 3, - 0 + 2 }, { 2, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { @@ -755,48 +999,110 @@ local chapter_board_rune = { }, { 0, - 5 + 2 }, { 2, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 28, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 14, + 2, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 28, 0 } + }, + ["grid_edge"]={ + { + ["pos"]=51, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=51, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=62, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=62, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=73, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=73, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=75, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=75, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=57, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=57, + ["type"]=5, + ["direction"]=1 + } } }, [5]={ @@ -805,24 +1111,56 @@ local chapter_board_rune = { 1, 0 }, + { + 2, + 0 + }, { 1, 0 }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 31, + 0 + }, + { + 2, + 0 + }, { 0, 3 }, { 0, - 2 + 1 }, { 0, 3 }, { - 1, + 2, + 0 + }, + { + 31, 0 }, { @@ -830,35 +1168,87 @@ local chapter_board_rune = { 0 }, { - 1, + 2, 0 }, - { - 0, - 2 - }, - { - 0, - 2 - }, { 0, 3 }, { 0, - 2 + 1 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 35, + 4 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 35, + 4 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 }, { 0, 2 }, + { + 0, + 1 + }, + { + 2, + 0 + }, { 1, 0 }, { - 3, + 31, 0 }, { @@ -866,15 +1256,7 @@ local chapter_board_rune = { 0 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 2, 0 }, { @@ -882,7 +1264,7 @@ local chapter_board_rune = { 0 }, { - 3, + 2, 0 }, { @@ -890,23 +1272,11 @@ local chapter_board_rune = { 0 }, { - 3, + 31, 0 }, { - 3, - 0 - }, - { - 14, - 0 - }, - { - 3, - 0 - }, - { - 3, + 1, 0 }, { @@ -914,100 +1284,86 @@ local chapter_board_rune = { 0 }, { - 3, + 1, 0 }, { 2, 0 }, - { - 3, - 0 - }, { 1, 0 }, - { - 3, - 0 - }, { 2, 0 }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, { 1, 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=43, + ["type"]=5, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=43, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=43, + ["type"]=5, + ["direction"]=3 }, { - 3, - 0 + ["pos"]=44, + ["type"]=5, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=44, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=45, + ["type"]=5, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=45, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 + ["pos"]=45, + ["type"]=5, + ["direction"]=4 } } }, [6]={ ["board"]={ { - 1, - 0 + 0, + 4 }, { - 1, - 0 + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 }, { 0, @@ -1015,26 +1371,42 @@ local chapter_board_rune = { }, { 0, - 2 + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 }, { 0, 5 }, { - 1, - 0 + 0, + 1 }, { - 1, - 0 + 0, + 4 }, { - 1, - 0 + 0, + 4 }, { - 1, + 2, 0 }, { @@ -1043,35 +1415,15 @@ local chapter_board_rune = { }, { 0, - 3 + 4 }, { 0, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 + 1 }, { 0, - 5 - }, - { - 2, - 3 + 4 }, { 0, @@ -1090,63 +1442,27 @@ local chapter_board_rune = { 0 }, { - 3, - 0 + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 }, { 2, 0 }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 14, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, { 1, 0 }, { - 3, + 2, 0 }, { @@ -1154,7 +1470,11 @@ local chapter_board_rune = { 0 }, { - 3, + 2, + 0 + }, + { + 1, 0 }, { @@ -1162,23 +1482,7 @@ local chapter_board_rune = { 0 }, { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, + 2, 0 }, { @@ -1186,16 +1490,117 @@ local chapter_board_rune = { 0 }, { - 3, + 2, + 0 + }, + { + 2, 0 }, { 1, 0 }, + { + 0, + 0 + }, { 1, 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 2, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=12, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=12, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=23, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=23, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=34, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=34, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=34, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=25, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=25, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=16, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=16, + ["type"]=5, + ["direction"]=2 } } }, @@ -1206,7 +1611,27 @@ local chapter_board_rune = { 0 }, { - 3, + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 1, 0 }, { @@ -1215,31 +1640,23 @@ local chapter_board_rune = { }, { 0, - 2 + 1 }, { 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 + 1 }, { 0, - 2 + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 }, { 0, @@ -1247,10 +1664,46 @@ local chapter_board_rune = { }, { 0, - 2 + 1 }, { - 3, + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 35, 0 }, { @@ -1258,91 +1711,23 @@ local chapter_board_rune = { 0 }, { - 1, + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, 0 }, { - 3, + 0, 0 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 14, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 0, 0 }, { @@ -1361,22 +1746,18 @@ local chapter_board_rune = { 0, 0 }, - { - 3, - 0 - }, { 1, 0 }, - { - 1, - 0 - }, - { - 3, - 0 - }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 0, 0 @@ -1396,165 +1777,106 @@ local chapter_board_rune = { { 1, 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 35, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=41, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=42, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=43, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=43, + ["type"]=6, + ["direction"]=1 + }, + { + ["pos"]=43, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=44, + ["type"]=6, + ["direction"]=1 + }, + { + ["pos"]=45, + ["type"]=6, + ["direction"]=1 + }, + { + ["pos"]=45, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=47, + ["type"]=5, + ["direction"]=2 } } }, [8]={ ["board"]={ - { - 1, - 0 - }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 + 5 }, { 0, 2 }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 14, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, { 2, 0 }, { - 2, + 24, 0 }, { @@ -1563,51 +1885,274 @@ local chapter_board_rune = { }, { 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 2, 0 }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, { 1, 0 }, { - 1, - 0 + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 1 }, { 1, 0 }, { - 1, + 24, 0 }, { - 1, + 2, 0 }, { - 1, + 0, + 4 + }, + { + 24, 0 }, { - 1, + 0, + 4 + }, + { + 2, 0 }, { - 1, + 24, 0 } + }, + ["grid_edge"]={ + { + ["pos"]=13, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=23, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=23, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=34, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=34, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=34, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=25, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=25, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=15, + ["type"]=5, + ["direction"]=4 + } } }, [9]={ ["board"]={ { - 1, + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, 0 }, { - 1, - 0 + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 }, { 0, @@ -1622,39 +2167,7 @@ local chapter_board_rune = { 4 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, + 3, 0 }, { @@ -1663,86 +2176,18 @@ local chapter_board_rune = { }, { 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 7, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 0, - 2 + 1 }, { 0, 3 }, { - 2, - 0 + 0, + 1 }, { - 2, - 0 - }, - { - 14, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 7, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, + 3, 0 }, { @@ -1750,7 +2195,7 @@ local chapter_board_rune = { 0 }, { - 2, + 0, 0 }, { @@ -1758,27 +2203,15 @@ local chapter_board_rune = { 0 }, { - 7, + 3, 0 }, { - 1, - 0 + 0, + 1 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, + 3, 0 }, { @@ -1786,23 +2219,243 @@ local chapter_board_rune = { 0 }, { - 7, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 32, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 32, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 32, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=12, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=22, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=22, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=33, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=33, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=35, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=35, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=26, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=26, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=16, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=41, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=41, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=51, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=57, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=47, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=47, + ["type"]=5, + ["direction"]=3 } } }, [10]={ ["board"]={ { - 1, + 5, + 2 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 5, + 2 + }, + { + 0, + 0 + }, + { + 3, 0 }, { @@ -1811,7 +2464,23 @@ local chapter_board_rune = { }, { 0, - 4 + 1 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 }, { 0, @@ -1819,74 +2488,82 @@ local chapter_board_rune = { }, { 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 5 + }, + { + 0, + 0 + }, + { + 5, 2 }, + { + 0, + 0 + }, + { + 0, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 0, 1 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, + 0, 0 }, { 0, - 4 + 0 }, { 0, - 2 + 0 }, { 0, 1 }, { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, + 0, 0 }, { 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 1 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, 0 }, { @@ -1894,27 +2571,31 @@ local chapter_board_rune = { 0 }, { - 2, - 0 + 0, + 3 }, { - 7, - 0 + 0, + 1 }, { - 2, - 0 + 0, + 3 }, { 3, 0 }, { - 1, + 0, 0 }, { - 1, + 5, + 2 + }, + { + 0, 0 }, { @@ -1922,177 +2603,354 @@ local chapter_board_rune = { 0 }, { - 2, - 0 - }, - { - 14, - 0 - }, - { - 2, + 0, 0 }, { 0, 0 }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, 0 }, { - 2, - 0 + 5, + 2 + } + }, + ["grid_edge"]={ + { + ["pos"]=11, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=11, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=12, + ["type"]=5, + ["direction"]=2 }, { - 0, - 0 + ["pos"]=13, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=15, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=16, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=17, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=17, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=22, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=23, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=24, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=25, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=26, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=31, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=34, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=35, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=41, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=42, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=53, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=44, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=51, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=53, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=54, + ["type"]=6, + ["direction"]=1 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=61, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=61, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=62, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=63, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=64, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=65, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=67, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=71, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=77, + ["type"]=5, + ["direction"]=3 } } }, [11]={ ["board"]={ { - 1, + 3, + 0 + }, + { + 3, 0 }, { 0, - 1 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 1 - }, - { - 4, - 1 - }, - { - 4, 3 }, { - 4, - 2 - }, - { - 4, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 4 - }, - { - 4, - 4 - }, - { - 4, + 0, 3 }, { - 4, - 4 + 0, + 3 }, { - 4, - 4 - }, - { - 1, + 3, 0 }, { - 1, + 3, 0 }, { 0, 0 }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, { 0, 0 @@ -2101,6 +2959,18 @@ local chapter_board_rune = { 0, 0 }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, { 0, 0 @@ -2110,13 +2980,37 @@ local chapter_board_rune = { 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 12, + 1 + }, { 3, 0 @@ -2126,8 +3020,8 @@ local chapter_board_rune = { 0 }, { - 3, - 0 + 0, + 1 }, { 3, @@ -2138,76 +3032,128 @@ local chapter_board_rune = { 0 }, { - 1, - 0 + 12, + 1 + } + }, + ["grid_edge"]={ + { + ["pos"]=12, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=12, + ["type"]=6, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=22, + ["type"]=5, + ["direction"]=3 }, { - 2, - 0 + ["pos"]=32, + ["type"]=5, + ["direction"]=3 }, { - 14, - 0 + ["pos"]=42, + ["type"]=6, + ["direction"]=3 }, { - 2, - 0 + ["pos"]=42, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=53, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=53, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=64, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=64, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=55, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=55, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=46, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=46, + ["type"]=6, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=36, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=26, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=26, + ["type"]=6, + ["direction"]=1 + }, + { + ["pos"]=16, + ["type"]=5, + ["direction"]=4 } } }, [12]={ ["board"]={ { - 1, - 0 + 0, + 3 }, { 0, - 2 + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 }, { 0, @@ -2215,7 +3161,7 @@ local chapter_board_rune = { }, { 0, - 2 + 5 }, { 0, @@ -2223,35 +3169,103 @@ local chapter_board_rune = { }, { 0, - 4 + 1 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 4, + 0, 3 }, { - 4, - 4 + 0, + 1 }, { - 4, - 4 + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 }, { 1, @@ -2289,30 +3303,6 @@ local chapter_board_rune = { 1, 0 }, - { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, { 1, 0 @@ -2322,15 +3312,7 @@ local chapter_board_rune = { 0 }, { - 2, - 0 - }, - { - 14, - 0 - }, - { - 2, + 25, 0 }, { @@ -2341,58 +3323,6 @@ local chapter_board_rune = { 1, 0 }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 1, 0 @@ -2401,148 +3331,124 @@ local chapter_board_rune = { }, [13]={ ["board"]={ - { - 1, - 0 - }, - { - 2, - 0 - }, { 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 1 - }, - { - 2, - 2 - }, - { - 2, - 3 - }, - { - 2, - 4 - }, - { - 2, 5 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 1 - }, - { - 4, - 2 - }, - { - 4, - 3 - }, - { - 4, + 0, 4 }, { - 4, + 0, + 3 + }, + { + 0, 5 }, { - 1, - 0 + 0, + 2 }, { - 1, - 0 + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 4 + }, + { + 5, + 5 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 }, { 0, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, + 2, 0 }, { @@ -2553,12 +3459,28 @@ local chapter_board_rune = { 2, 0 }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, { 3, 0 }, { - 2, + 0, + 0 + }, + { + 3, 0 }, { @@ -2566,15 +3488,11 @@ local chapter_board_rune = { 0 }, { - 1, + 3, 0 }, { - 1, - 0 - }, - { - 2, + 0, 0 }, { @@ -2582,20 +3500,104 @@ local chapter_board_rune = { 0 }, { - 14, + 21, + 2 + }, + { + 0, 0 }, { - 3, + 0, 0 }, { - 2, + 21, + 2 + }, + { + 0, 0 }, { - 1, + 0, 0 + }, + { + 21, + 2 + } + }, + ["grid_edge"]={ + { + ["pos"]=41, + ["type"]=4, + ["direction"]=1 + }, + { + ["pos"]=42, + ["type"]=4, + ["direction"]=1 + }, + { + ["pos"]=43, + ["type"]=4, + ["direction"]=1 + }, + { + ["pos"]=44, + ["type"]=4, + ["direction"]=1 + }, + { + ["pos"]=45, + ["type"]=4, + ["direction"]=1 + }, + { + ["pos"]=46, + ["type"]=4, + ["direction"]=1 + }, + { + ["pos"]=47, + ["type"]=4, + ["direction"]=1 + }, + { + ["pos"]=71, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=72, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=73, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=74, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=75, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=76, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=77, + ["type"]=5, + ["direction"]=1 } } }, @@ -2606,8 +3608,8 @@ local chapter_board_rune = { 0 }, { - 2, - 0 + 0, + 1 }, { 0, @@ -2615,70 +3617,42 @@ local chapter_board_rune = { }, { 0, - 2 - }, - { - 0, - 1 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 1 - }, - { - 4, - 2 - }, - { - 4, - 1 - }, - { - 4, - 2 - }, - { - 4, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 2 - }, - { - 4, - 4 - }, - { - 4, - 5 - }, - { - 4, 3 }, { - 4, + 0, + 1 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, 2 }, { @@ -2691,22 +3665,26 @@ local chapter_board_rune = { }, { 0, - 0 + 3 }, { 0, - 0 - }, - { - 14, - 0 + 4 }, { 0, - 0 + 4 }, { 0, + 4 + }, + { + 0, + 3 + }, + { + 1, 0 }, { @@ -2714,120 +3692,171 @@ local chapter_board_rune = { 0 }, { - 2, + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 1, 0 }, { - 2, + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 7, 0 }, { - 2, + 5, + 3 + }, + { + 7, 0 }, { - 2, + 5, + 3 + }, + { + 7, 0 }, { - 2, - 0 + 5, + 3 + } + }, + ["grid_edge"]={ + { + ["pos"]=42, + ["type"]=5, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=43, + ["type"]=5, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=44, + ["type"]=5, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=45, + ["type"]=5, + ["direction"]=1 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 + ["pos"]=46, + ["type"]=5, + ["direction"]=1 } } }, [15]={ ["board"]={ { - 1, - 0 + 0, + 1 }, { 0, - 3 + 1 }, { 0, - 4 + 2 }, { 0, - 4 + 2 }, { 0, - 3 + 1 }, { 0, - 4 + 1 }, { - 1, - 0 + 0, + 5 }, { 1, @@ -2839,19 +3868,55 @@ local chapter_board_rune = { }, { 0, - 3 + 5 }, { 0, - 4 + 1 }, { 0, - 4 + 1 }, { 0, - 3 + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 }, { 1, @@ -2859,10 +3924,30 @@ local chapter_board_rune = { }, { 5, - 3 + 4 }, { - 2, + 5, + 4 + }, + { + 5, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, 0 }, { @@ -2870,80 +3955,68 @@ local chapter_board_rune = { 4 }, { - 2, + 5, + 5 + }, + { + 5, + 5 + }, + { + 1, 0 }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 1 + }, { 5, 3 }, - { - 2, - 0 - }, - { - 0, - 3 - }, - { - 2, - 0 - }, { 5, - 4 - }, - { - 2, - 0 - }, - { - 5, - 4 - }, - { - 2, - 0 - }, - { - 5, - 4 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 + 5 }, { 0, @@ -2952,66 +4025,14 @@ local chapter_board_rune = { { 0, 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 14, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 } } }, [16]={ ["board"]={ - { - 1, - 0 - }, { 0, - 3 - }, - { - 0, - 3 + 1 }, { 0, @@ -3023,14 +4044,74 @@ local chapter_board_rune = { }, { 0, - 3 + 1 }, { - 1, + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, 0 }, { @@ -3046,47 +4127,71 @@ local chapter_board_rune = { 4 }, { - 0, - 2 + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 4 }, { 0, 3 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 3 - }, - { - 4, + 0, 4 }, { - 4, - 4 - }, - { - 4, - 4 - }, - { - 4, - 3 - }, - { - 1, + 0, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -3110,109 +4215,139 @@ local chapter_board_rune = { 0 }, { - 1, + 0, 0 }, { - 2, + 0, 0 }, { - 5, - 2 + 12, + 5 + } + }, + ["grid_edge"]={ + { + ["pos"]=16, + ["type"]=6, + ["direction"]=2 }, { - 5, - 4 + ["pos"]=16, + ["type"]=5, + ["direction"]=4 }, { - 5, - 2 + ["pos"]=26, + ["type"]=5, + ["direction"]=2 }, { - 5, - 4 + ["pos"]=26, + ["type"]=6, + ["direction"]=4 }, { - 5, - 2 + ["pos"]=27, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=25, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=34, + ["type"]=5, + ["direction"]=2 }, { - 5, - 4 + ["pos"]=34, + ["type"]=5, + ["direction"]=4 }, { - 5, - 2 + ["pos"]=43, + ["type"]=5, + ["direction"]=4 }, { - 14, - 0 + ["pos"]=43, + ["type"]=6, + ["direction"]=2 }, { - 5, - 2 + ["pos"]=44, + ["type"]=5, + ["direction"]=2 }, { - 5, - 4 + ["pos"]=45, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=52, + ["type"]=6, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=52, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=61, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 + ["pos"]=61, + ["type"]=5, + ["direction"]=4 } } }, [17]={ ["board"]={ { - 0, - 3 + 5, + 1 }, { 0, 3 }, + { + 0, + 4 + }, + { + 0, + 4 + }, { 0, 3 }, + { + 0, + 1 + }, + { + 5, + 4 + }, + { + 5, + 3 + }, + { + 0, + 2 + }, { 0, 3 @@ -3223,10 +4358,50 @@ local chapter_board_rune = { }, { 0, + 4 + }, + { + 0, + 1 + }, + { + 5, + 2 + }, + { + 5, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 5, 1 }, { 0, + 0 + }, + { + 5, 1 }, { @@ -3235,42 +4410,58 @@ local chapter_board_rune = { }, { 0, - 2 + 4 }, { 0, 2 }, + { + 5, + 2 + }, { 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 2 + }, + { + 5, 1 }, { 5, - 3 + 2 }, { - 5, - 3 + 0, + 0 }, { - 5, - 3 + 0, + 0 }, { - 5, - 5 + 0, + 0 }, { - 5, - 5 + 0, + 0 }, { - 5, - 5 - }, - { - 2, + 0, 0 }, { @@ -3278,7 +4469,23 @@ local chapter_board_rune = { 3 }, { - 3, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -3286,129 +4493,174 @@ local chapter_board_rune = { 3 }, { - 5, - 5 - }, - { - 3, + 26, 0 }, { 5, - 5 + 1 }, { - 2, + 0, 0 }, { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 1, + 0, 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=31, + ["type"]=5, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=31, + ["type"]=6, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=42, + ["type"]=5, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=42, + ["type"]=6, + ["direction"]=4 }, { - 5, - 4 + ["pos"]=53, + ["type"]=5, + ["direction"]=1 }, { - 14, - 0 + ["pos"]=54, + ["type"]=5, + ["direction"]=1 }, { - 5, - 4 + ["pos"]=55, + ["type"]=5, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=46, + ["type"]=5, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=46, + ["type"]=6, + ["direction"]=3 }, { - 2, - 0 + ["pos"]=37, + ["type"]=5, + ["direction"]=1 }, { - 2, - 0 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 1, - 0 + ["pos"]=37, + ["type"]=6, + ["direction"]=3 } } }, [18]={ ["board"]={ { - 1, + 3, 0 }, { - 2, + 3, 0 }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, { 0, 4 @@ -3421,229 +4673,316 @@ local chapter_board_rune = { 0, 4 }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, { 0, 3 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 4, 2 }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, - 0 - }, - { - 0, - 0 - }, - { - 5, - 1 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 5, - 1 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 14, - 0 - }, - { - 5, 3 }, { - 5, + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, 3 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 5, - 1 - }, - { - 5, + 0, 3 }, { - 5, + 0, + 4 + }, + { + 0, + 5 + }, + { + 32, + 0 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, 3 }, { - 1, + 0, + 4 + }, + { + 0, + 5 + }, + { + 32, 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 5 + }, + { + 0, + 4 + } + }, + ["grid_edge"]={ + { + ["pos"]=23, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=23, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=24, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=25, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=25, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=31, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=31, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=33, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=34, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=34, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=35, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=37, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=52, + ["type"]=6, + ["direction"]=1 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=54, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=56, + ["type"]=6, + ["direction"]=1 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=62, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=63, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=63, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=65, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=65, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=73, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=75, + ["type"]=5, + ["direction"]=4 } } }, [19]={ ["board"]={ { - 1, + 3, 0 }, + { + 3, + 0 + }, + { + 0, + 2 + }, { 0, 3 }, { 0, - 1 + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 }, { 0, - 1 + 0 }, { 0, - 1 + 0 + }, + { + 0, + 0 }, { 0, 4 }, { - 1, - 0 + 0, + 1 }, { - 1, + 0, + 1 + }, + { + 0, 0 }, { 0, - 3 + 0 }, { 0, - 2 + 0 }, { 0, - 2 + 4 }, { 0, @@ -3653,42 +4992,6 @@ local chapter_board_rune = { 0, 4 }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 4, - 1 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, { 0, 0 @@ -3703,155 +5006,432 @@ local chapter_board_rune = { }, { 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 4, - 1 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 5, - 1 - }, - { - 5, 3 }, { - 5, + 0, 3 }, { - 1, + 0, + 1 + }, + { + 0, 0 }, { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 3 - }, - { - 14, + 0, 0 }, { - 5, - 1 + 0, + 0 }, { - 5, + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, 3 }, { - 5, - 1 + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 21, + 4 + }, + { + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 21, + 4 + } + }, + ["grid_edge"]={ + { + ["pos"]=11, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=12, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=12, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=13, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=16, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=16, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=17, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=23, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=23, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=26, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=26, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=32, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=32, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=35, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=35, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=41, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=41, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=44, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=51, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=54, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=57, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=62, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=62, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=65, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=65, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=72, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=75, + ["type"]=5, + ["direction"]=4 } } }, [20]={ ["board"]={ + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, { 1, 0 }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, { 1, 0 }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, { 0, 5 }, { 0, - 4 + 3 }, { 0, 5 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 3, 0 }, - { - 0, - 4 - }, { 0, 5 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, { 0, + 5 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 21, 4 }, { - 3, - 0 + 21, + 4 + }, + { + 21, + 4 }, { 1, @@ -3862,83 +5442,7 @@ local chapter_board_rune = { 0 }, { - 2, - 0 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 14, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 2, - 0 - }, - { - 2, + 0, 0 }, { @@ -3946,55 +5450,23 @@ local chapter_board_rune = { 0 }, { - 2, - 0 + 21, + 4 }, { - 2, - 0 + 21, + 4 }, { - 3, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 + 21, + 4 }, { 1, 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 1, - 0 - }, - { - 1, + 0, 0 } } @@ -4002,36 +5474,12 @@ local chapter_board_rune = { [21]={ ["board"]={ { - 1, + 25, 0 }, { 0, - 3 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 0, - 5 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 + 2 }, { 0, @@ -4043,22 +5491,130 @@ local chapter_board_rune = { }, { 0, - 5 + 3 }, { 0, - 4 + 2 }, { - 0, - 4 - }, - { - 1, + 25, 0 }, { - 1, + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 25, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 25, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 25, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -4067,174 +5623,280 @@ local chapter_board_rune = { }, { 0, - 5 + 2 }, { 0, - 5 + 3 }, { 0, - 5 + 2 }, { 0, - 4 + 3 }, { - 1, + 0, 0 }, { - 2, + 25, 0 }, { - 2, - 0 + 0, + 3 }, { - 2, - 0 + 0, + 2 }, { - 3, - 0 + 0, + 1 }, { - 2, - 0 + 0, + 2 }, { - 2, - 0 + 0, + 3 }, { - 2, + 25, 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=21, + ["type"]=5, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=21, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=21, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=22, + ["type"]=5, + ["direction"]=2 }, { - 14, - 0 + ["pos"]=26, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=26, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=27, + ["type"]=5, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=27, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=31, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=31, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=32, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=32, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=33, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=34, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=35, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=35, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=36, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=36, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=37, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=41, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=41, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=42, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=42, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=43, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=43, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=47, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=51, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=51, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=57, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=57, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=61, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=61, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=67, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=67, + ["type"]=5, + ["direction"]=3 } } }, [22]={ ["board"]={ - { - 1, - 0 - }, - { - 5, - 2 - }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 5, 2 }, { @@ -4254,7 +5916,83 @@ local chapter_board_rune = { 3 }, { - 1, + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, 0 }, { @@ -4262,27 +6000,75 @@ local chapter_board_rune = { 0 }, { - 5, + 0, 2 }, { - 2, + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, 0 }, { - 5, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 12, 1 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, + 0, 0 }, { @@ -4290,179 +6076,199 @@ local chapter_board_rune = { 0 }, { - 5, - 2 - }, - { - 2, - 0 - }, - { - 5, + 12, 1 }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, { 3, 0 }, { - 5, - 2 - }, - { - 2, + 0, 0 }, { - 5, + 12, 1 + } + }, + ["grid_edge"]={ + { + ["pos"]=44, + ["type"]=6, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=44, + ["type"]=5, + ["direction"]=3 }, { - 2, - 0 + ["pos"]=44, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=53, + ["type"]=5, + ["direction"]=1 }, { - 3, - 0 + ["pos"]=53, + ["type"]=5, + ["direction"]=3 }, { - 5, - 2 + ["pos"]=55, + ["type"]=5, + ["direction"]=1 }, { - 14, - 0 + ["pos"]=55, + ["type"]=5, + ["direction"]=4 }, { - 5, - 1 + ["pos"]=62, + ["type"]=6, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=62, + ["type"]=5, + ["direction"]=3 }, { - 2, - 0 + ["pos"]=64, + ["type"]=6, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=64, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=64, + ["type"]=5, + ["direction"]=4 }, { - 5, - 2 + ["pos"]=66, + ["type"]=6, + ["direction"]=1 }, { - 3, - 0 + ["pos"]=66, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=73, + ["type"]=6, + ["direction"]=1 }, { - 3, - 0 + ["pos"]=73, + ["type"]=5, + ["direction"]=3 }, { - 3, - 0 + ["pos"]=75, + ["type"]=6, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=75, + ["type"]=5, + ["direction"]=4 } } }, [23]={ ["board"]={ - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, - 2 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 2 - }, - { - 0, - 2 - }, - { - 0, - 5 - }, - { - 4, 4 }, { - 1, + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, 0 }, { - 1, + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, 0 }, { - 3, + 0, 0 }, { - 4, + 0, + 0 + }, + { + 0, + 3 + }, + { + 0, 3 }, { @@ -4471,18 +6277,66 @@ local chapter_board_rune = { }, { 0, - 5 + 0 }, { - 4, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 4 }, + { + 0, + 2 + }, { 0, 0 }, { - 1, + 21, + 1 + }, + { + 0, + 0 + }, + { + 21, + 1 + }, + { + 0, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -4490,125 +6344,281 @@ local chapter_board_rune = { 0 }, { - 4, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 2 + }, + { + 0, 3 }, { - 4, + 0, + 2 + }, + { + 3, + 0 + }, + { + 21, 1 }, { - 4, - 1 + 3, + 0 }, { - 4, + 0, 5 }, { 0, - 0 + 5 + } + }, + ["grid_edge"]={ + { + ["pos"]=32, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=32, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=33, + ["type"]=5, + ["direction"]=1 }, { - 0, - 0 + ["pos"]=34, + ["type"]=5, + ["direction"]=1 }, { - 0, - 0 + ["pos"]=35, + ["type"]=5, + ["direction"]=1 }, { - 0, - 0 + ["pos"]=35, + ["type"]=5, + ["direction"]=4 }, { - 0, - 0 + ["pos"]=36, + ["type"]=5, + ["direction"]=2 }, { - 0, - 0 + ["pos"]=41, + ["type"]=6, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=43, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=45, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=46, + ["type"]=6, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=51, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=52, + ["type"]=6, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=53, + ["type"]=6, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=53, + ["type"]=6, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=54, + ["type"]=6, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=55, + ["type"]=6, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=55, + ["type"]=6, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=56, + ["type"]=5, + ["direction"]=4 }, { - 14, - 0 + ["pos"]=61, + ["type"]=6, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=62, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=63, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=64, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=64, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=66, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=72, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=73, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=74, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=75, + ["type"]=5, + ["direction"]=4 } } }, [24]={ ["board"]={ { - 1, + 32, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 32, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 7, 0 }, { 0, 4 }, + { + 0, + 2 + }, { 0, 3 @@ -4621,6 +6631,50 @@ local chapter_board_rune = { 0, 3 }, + { + 7, + 0 + }, + { + 3, + 0 + }, + { + 7, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 7, + 0 + }, + { + 1, + 0 + }, + { + 32, + 0 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, { 0, 4 @@ -4633,38 +6687,6 @@ local chapter_board_rune = { 1, 0 }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, { 3, 0 @@ -4678,79 +6700,19 @@ local chapter_board_rune = { 0 }, { - 2, + 1, 0 }, { - 2, + 1, 0 }, { - 2, + 1, 0 }, { - 4, - 1 - }, - { - 4, - 1 - }, - { - 2, - 0 - }, - { - 4, - 5 - }, - { - 4, - 5 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 2, + 32, 0 }, { @@ -4758,39 +6720,15 @@ local chapter_board_rune = { 0 }, { - 2, + 32, 0 }, { - 2, + 3, 0 }, { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 14, - 0 - }, - { - 0, - 0 - }, - { - 1, + 32, 0 }, { @@ -4801,10 +6739,6 @@ local chapter_board_rune = { }, [25]={ ["board"]={ - { - 0, - 3 - }, { 0, 4 @@ -4815,24 +6749,36 @@ local chapter_board_rune = { }, { 0, - 4 + 1 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 + 0, + 5 }, { 0, 4 }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, { 0, 3 @@ -4843,91 +6789,47 @@ local chapter_board_rune = { }, { 0, - 3 + 1 }, { - 2, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 5, + 0, 4 }, { - 1, - 0 + 0, + 5 }, { - 1, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 5, + 0, 3 }, { 0, - 0 + 3 }, { - 1, - 0 + 0, + 4 }, { - 2, - 0 + 0, + 1 }, { - 3, - 0 + 0, + 4 }, { - 2, - 0 + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 5 }, { 3, @@ -4935,96 +6837,232 @@ local chapter_board_rune = { }, { 5, - 4 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 14, - 0 - }, - { - 2, - 0 + 2 }, { 3, 0 }, { - 2, + 0, + 4 + }, + { + 0, + 5 + }, + { + 1, 0 }, { - 5, + 0, 3 }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, { 3, 0 }, { 5, - 4 + 2 + }, + { + 3, + 0 + }, + { + 0, + 3 }, { 1, 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 5, + 2 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=43, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=43, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=43, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=43, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=53, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=53, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=53, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=64, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=64, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=64, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=74, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=74, + ["type"]=5, + ["direction"]=4 } } }, [26]={ ["board"]={ + { + 0, + 3 + }, + { + 0, + 3 + }, { 1, 0 }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 2 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, { 1, 0 @@ -5039,171 +7077,229 @@ local chapter_board_rune = { }, { 0, - 2 - }, - { - 2, - 0 + 5 }, { 0, - 2 + 4 }, { 0, 5 }, + { + 0, + 3 + }, { 1, 0 }, - { - 2, - 0 - }, { 0, - 2 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 0, - 2 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 14, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 4, - 4 - }, - { - 3, - 0 - }, - { - 4, - 4 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 4, - 1 - }, - { - 0, - 0 - }, - { - 4, - 4 - }, - { - 2, - 0 - }, - { - 4, 4 }, { 0, + 4 + }, + { + 0, + 4 + }, + { + 1, 0 }, { - 4, - 1 + 0, + 4 }, { - 4, - 1 + 0, + 4 }, { - 4, - 3 + 0, + 4 }, { - 4, - 3 + 0, + 4 }, { - 2, + 0, + 4 + }, + { + 1, 0 }, { - 4, + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, 3 }, { - 4, + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 5 + }, + { + 20, + 0 + }, + { + 20, + 0 + }, + { + 20, + 0 + }, + { + 0, 3 }, { - 4, + 1, + 0 + }, + { + 0, 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 5, + 3 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 5, + 3 + }, + { + 20, + 0 + }, + { + 5, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + } + }, + ["grid_edge"]={ + { + ["pos"]=53, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=53, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=53, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=4 } } }, [27]={ ["board"]={ { - 2, - 0 + 0, + 2 + }, + { + 0, + 1 }, { 0, @@ -5211,226 +7307,357 @@ local chapter_board_rune = { }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 4, - 4 - }, - { - 4, - 4 - }, - { - 1, - 0 - }, - { - 4, 5 }, { - 4, + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 2 + }, + { + 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, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 22, 5 }, { - 1, + 0, 0 }, { - 3, - 0 + 22, + 5 }, { 0, 0 }, { - 0, - 0 - }, - { - 14, - 0 + 22, + 5 }, { 0, 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=21, + ["type"]=5, + ["direction"]=1 }, { - 0, - 0 + ["pos"]=21, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=32, + ["type"]=5, + ["direction"]=1 }, { - 3, - 0 + ["pos"]=32, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=43, + ["type"]=5, + ["direction"]=1 }, { - 3, - 0 + ["pos"]=43, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=44, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=44, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=35, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=35, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=26, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=26, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 + ["pos"]=17, + ["type"]=5, + ["direction"]=2 } } }, [28]={ ["board"]={ { - 1, + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 30, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { 0, 2 }, - { - 0, - 4 - }, { 0, 3 }, - { - 0, - 4 - }, { 0, 2 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { @@ -5441,6 +7668,34 @@ local chapter_board_rune = { 0, 3 }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, { 0, 4 @@ -5449,108 +7704,44 @@ local chapter_board_rune = { 0, 3 }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, - 3 - }, - { - 3, - 0 - }, - { - 0, - 1 - }, - { - 3, - 0 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 3, - 0 - }, - { - 0, - 1 - }, - { - 3, - 0 - }, - { - 0, - 1 - }, - { - 3, - 0 - }, - { - 0, - 3 - }, - { - 3, - 0 - }, - { - 4, - 1 - }, - { - 4, 5 }, { - 4, - 5 - }, - { - 4, - 5 - }, - { - 4, - 1 + 0, + 4 }, { 3, 0 }, { - 1, - 0 - }, - { - 1, - 0 + 0, + 5 }, { 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 3, 0 }, { @@ -5559,55 +7750,169 @@ local chapter_board_rune = { }, { 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 + 2 }, { 0, - 0 + 2 + } + }, + ["grid_edge"]={ + { + ["pos"]=23, + ["type"]=5, + ["direction"]=1 }, { - 14, - 0 + ["pos"]=23, + ["type"]=5, + ["direction"]=3 }, { - 0, - 0 + ["pos"]=24, + ["type"]=5, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=24, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=25, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=25, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=33, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=34, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=34, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=43, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=43, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=64, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=64, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=74, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=74, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=75, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=75, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=75, + ["type"]=5, + ["direction"]=4 } } }, [29]={ ["board"]={ { - 1, - 0 + 0, + 3 }, { 0, - 2 + 5 + }, + { + 0, + 5 }, { 0, @@ -5619,75 +7924,163 @@ local chapter_board_rune = { }, { 0, - 4 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 + 2 }, { 0, 2 }, { - 4, + 0, + 5 + }, + { + 0, 3 }, { 0, - 4 + 5 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, - 0 + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 5 }, { 0, 2 }, { - 4, + 0, 2 }, { 0, - 3 + 0 }, { - 4, + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, 4 }, { 0, 4 }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 26, + 0 + }, + { + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, { 1, 0 }, { - 2, - 0 + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 }, { 3, @@ -5698,121 +8091,349 @@ local chapter_board_rune = { 0 }, { - 4, - 3 - }, - { - 3, + 26, 0 }, { - 3, + 1, 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=14, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=14, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=15, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=24, + ["type"]=5, + ["direction"]=3 }, { - 3, - 0 + ["pos"]=24, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=25, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=34, + ["type"]=5, + ["direction"]=3 }, { - 2, - 0 + ["pos"]=34, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=34, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=35, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=35, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=41, + ["type"]=5, + ["direction"]=2 }, { - 14, - 0 + ["pos"]=42, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=44, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=46, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=47, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=52, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=53, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=54, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=54, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=55, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=55, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=57, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=57, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=61, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=62, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=63, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=64, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=65, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=2 } } }, [30]={ ["board"]={ { - 1, + 3, 0 }, { 0, - 1 + 2 + }, + { + 0, + 4 }, { 0, 2 }, + { + 4, + 5 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 4, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 10, + 0 + }, + { + 4, + 4 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 4, + 5 + }, + { + 11, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 4, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 4, + 5 + }, { 0, 3 @@ -5823,220 +8444,144 @@ local chapter_board_rune = { }, { 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 1 - }, - { - 4, 2 }, - { - 4, - 3 - }, - { - 4, - 4 - }, - { - 4, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 1 - }, - { - 4, - 2 - }, - { - 4, - 3 - }, - { - 4, - 4 - }, - { - 4, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 3, 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=11, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=21, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=31, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=41, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=51, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=61, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=71, + ["type"]=5, + ["direction"]=4 }, { - 0, - 0 + ["pos"]=17, + ["type"]=5, + ["direction"]=3 }, { - 3, - 0 + ["pos"]=27, + ["type"]=5, + ["direction"]=3 }, { - 14, - 0 + ["pos"]=37, + ["type"]=5, + ["direction"]=3 }, { - 3, - 0 + ["pos"]=47, + ["type"]=5, + ["direction"]=3 }, { - 0, - 0 + ["pos"]=57, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=67, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 + ["pos"]=77, + ["type"]=5, + ["direction"]=3 } } }, [31]={ ["board"]={ - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, 3 }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, { 0, 3 @@ -6047,38 +8592,110 @@ local chapter_board_rune = { }, { 0, - 3 + 4 }, { - 4, - 3 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 4, + 0, 2 }, { - 4, - 3 + 0, + 1 }, { - 4, + 0, + 1 + }, + { + 0, 2 }, { - 3, + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 32, 0 }, { @@ -6086,39 +8703,7 @@ local chapter_board_rune = { 0 }, { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 2, + 32, 0 }, { @@ -6126,7 +8711,7 @@ local chapter_board_rune = { 0 }, { - 2, + 32, 0 }, { @@ -6134,83 +8719,143 @@ local chapter_board_rune = { 0 }, { - 2, + 32, 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=11, + ["type"]=5, + ["direction"]=4 }, { - 0, - 0 + ["pos"]=12, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=13, + ["type"]=5, + ["direction"]=4 }, { - 0, - 0 + ["pos"]=14, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=15, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=16, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=41, + ["type"]=5, + ["direction"]=4 }, { - 0, - 0 + ["pos"]=42, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=43, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=44, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=45, + ["type"]=5, + ["direction"]=4 }, { - 0, - 0 + ["pos"]=46, + ["type"]=5, + ["direction"]=4 }, { - 14, - 0 + ["pos"]=61, + ["type"]=5, + ["direction"]=4 }, { - 0, - 0 + ["pos"]=62, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=63, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=64, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=65, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=4 } } }, [32]={ ["board"]={ { - 1, - 0 + 0, + 3 }, { - 1, - 0 + 0, + 4 }, { - 4, + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, 1 }, { @@ -6218,109 +8863,97 @@ local chapter_board_rune = { 3 }, { - 4, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 9, - 0 - }, - { - 4, + 0, 1 }, { 0, - 3 - }, - { - 4, - 2 - }, - { - 9, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 7, - 0 - }, - { - 4, 1 }, { 0, - 3 + 5 }, { - 4, - 2 - }, - { - 7, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 7, - 0 - }, - { - 4, + 0, 1 }, { - 4, - 3 + 5, + 1 }, { - 4, - 2 + 0, + 1 }, { - 7, + 0, + 1 + }, + { + 0, + 1 + }, + { + 5, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 5, + 1 + }, + { + 3, 0 }, { - 1, + 5, + 1 + }, + { + 3, 0 }, { - 1, + 5, + 1 + }, + { + 0, + 1 + }, + { + 0, 0 }, { - 7, + 0, + 1 + }, + { + 5, + 1 + }, + { + 3, 0 }, + { + 5, + 1 + }, + { + 0, + 1 + }, { 0, 0 @@ -6334,20 +8967,16 @@ local chapter_board_rune = { 0 }, { - 7, - 0 + 0, + 1 }, { - 1, - 0 + 5, + 1 }, { - 1, - 0 - }, - { - 7, - 0 + 0, + 1 }, { 0, @@ -6358,24 +8987,12 @@ local chapter_board_rune = { 0 }, { - 0, - 0 + 34, + 5 }, { - 7, - 0 - }, - { - 1, - 0 - }, - { - 14, - 0 - }, - { - 10, - 0 + 34, + 5 }, { 0, @@ -6383,132 +9000,318 @@ local chapter_board_rune = { }, { 0, - 0 + 1 }, { 0, 0 }, { - 11, - 0 + 34, + 5 }, { - 14, - 0 + 34, + 5 + } + }, + ["grid_edge"]={ + { + ["pos"]=21, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=21, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=22, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=23, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=23, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=24, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=24, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=25, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=26, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=26, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=27, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=31, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=37, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=41, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=41, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=47, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=47, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=63, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=63, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=65, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=65, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=74, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=74, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=74, + ["type"]=5, + ["direction"]=2 } } }, [33]={ ["board"]={ { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 1 + 4, + 3 }, { 1, 0 }, { - 2, - 0 + 4, + 2 }, { - 2, - 0 + 0, + 2 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 + 4, + 2 }, { 1, 0 }, { - 0, - 0 + 4, + 3 }, { 0, 0 }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 14, - 0 - }, - { - 9, - 0 - }, { 3, 0 }, { - 3, - 0 + 4, + 2 }, { 3, 0 }, { - 10, + 4, + 2 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { 1, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 4, + 3 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 4, + 3 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 4, + 3 + }, + { + 3, + 0 + }, { 1, 0 @@ -6518,8 +9321,8 @@ local chapter_board_rune = { 0 }, { - 14, - 0 + 4, + 3 }, { 0, @@ -6537,46 +9340,6 @@ local chapter_board_rune = { 0, 0 }, - { - 1, - 0 - }, - { - 11, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 14, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, 0 @@ -6592,157 +9355,185 @@ local chapter_board_rune = { { 0, 0 - }, - { - 1, - 0 } } }, [34]={ ["board"]={ { - 3, - 0 + 0, + 4 }, { 0, - 1 + 4 }, { 0, - 1 + 5 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 }, { 3, 0 }, { - 0, - 1 + 4, + 4 }, { - 0, - 1 + 2, + 0 + }, + { + 4, + 4 + }, + { + 2, + 0 + }, + { + 4, + 4 }, { 3, 0 }, { - 0, - 1 + 4, + 5 }, { - 2, + 3, 0 }, { - 2, + 4, + 5 + }, + { + 3, + 0 + }, + { + 4, + 5 + }, + { + 3, + 0 + }, + { + 4, + 5 + }, + { + 0, 0 }, { 0, - 1 - }, - { - 2, - 0 - }, - { - 2, 0 }, { 0, - 1 - }, - { - 0, - 1 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, 0 }, { 0, - 1 - }, - { - 0, - 1 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 14, - 0 - }, - { - 2, - 0 - }, - { - 2, 0 }, { 0, - 1 - }, - { - 1, 0 }, { 0, - 1 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, 0 }, { 0, - 1 - }, - { - 1, 0 }, { - 1, + 4, + 5 + }, + { + 3, + 0 + }, + { + 4, + 4 + }, + { + 3, + 0 + }, + { + 4, + 4 + }, + { + 3, + 0 + }, + { + 4, + 5 + }, + { + 3, + 0 + }, + { + 32, 0 }, { @@ -6750,27 +9541,7 @@ local chapter_board_rune = { 0 }, { - 0, - 1 - }, - { - 2, - 0 - }, - { - 0, - 1 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, + 32, 0 }, { @@ -6778,24 +9549,12 @@ local chapter_board_rune = { 0 }, { - 3, - 0 - }, - { - 0, - 1 - }, - { - 3, + 32, 0 }, { 3, 0 - }, - { - 1, - 0 } } }, @@ -6806,121 +9565,121 @@ local chapter_board_rune = { 0 }, { - 0, - 3 + 1, + 0 }, { 0, 1 }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 0, - 5 - }, { 0, 1 }, { 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 4, - 3 - }, - { - 3, - 0 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 4, - 3 - }, - { - 4, 2 }, { - 3, + 1, 0 }, { - 0, - 5 + 1, + 0 }, { - 0, - 1 - }, - { - 0, - 4 - }, - { - 3, + 24, 0 }, { 4, 1 }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 4, + 1 + }, + { + 24, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 24, + 0 + }, + { + 4, + 1 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 4, + 1 + }, + { + 24, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 4, 2 @@ -6930,7 +9689,19 @@ local chapter_board_rune = { 1 }, { - 3, + 4, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 24, 0 }, { @@ -6942,27 +9713,23 @@ local chapter_board_rune = { 0 }, { - 3, + 4, + 3 + }, + { + 2, 0 }, { - 0, + 2, 0 }, { - 14, + 24, 0 }, { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, + 1, 0 }, { @@ -6974,15 +9741,7 @@ local chapter_board_rune = { 0 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 2, 0 }, { @@ -6997,66 +9756,276 @@ local chapter_board_rune = { 1, 0 } + }, + ["grid_edge"]={ + { + ["pos"]=11, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=21, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=31, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=41, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=51, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=61, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=71, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=12, + ["type"]=4, + ["direction"]=4 + }, + { + ["pos"]=22, + ["type"]=4, + ["direction"]=4 + }, + { + ["pos"]=32, + ["type"]=4, + ["direction"]=4 + }, + { + ["pos"]=42, + ["type"]=4, + ["direction"]=4 + }, + { + ["pos"]=52, + ["type"]=4, + ["direction"]=4 + }, + { + ["pos"]=62, + ["type"]=4, + ["direction"]=4 + }, + { + ["pos"]=72, + ["type"]=4, + ["direction"]=4 + }, + { + ["pos"]=15, + ["type"]=4, + ["direction"]=4 + }, + { + ["pos"]=25, + ["type"]=4, + ["direction"]=4 + }, + { + ["pos"]=35, + ["type"]=4, + ["direction"]=4 + }, + { + ["pos"]=45, + ["type"]=4, + ["direction"]=4 + }, + { + ["pos"]=55, + ["type"]=4, + ["direction"]=4 + }, + { + ["pos"]=65, + ["type"]=4, + ["direction"]=4 + }, + { + ["pos"]=75, + ["type"]=4, + ["direction"]=4 + }, + { + ["pos"]=16, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=26, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=76, + ["type"]=5, + ["direction"]=4 + } } }, [36]={ ["board"]={ { - 1, - 0 + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 }, { 3, 0 }, { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 + 12, + 2 }, { 3, 0 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 0, - 4 - }, - { - 2, - 0 - }, - { - 0, - 4 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, { 3, 0 @@ -7066,24 +10035,8 @@ local chapter_board_rune = { 0 }, { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 3, - 0 - }, - { - 3, - 0 + 12, + 2 }, { 3, @@ -7094,85 +10047,29 @@ local chapter_board_rune = { 0 }, { - 3, - 0 + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 5 + }, + { + 4, + 1 + }, + { + 4, + 1 }, { 2, 0 }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 14, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, 0 @@ -7186,209 +10083,209 @@ local chapter_board_rune = { 0 }, { - 0, - 0 - }, - { - 0, - 0 + 12, + 2 }, { 1, 0 + }, + { + 0, + 0 + }, + { + 12, + 2 } } }, [37]={ ["board"]={ - { - 1, - 0 - }, - { - 2, - 0 - }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, 1 }, { 0, - 0 - }, - { - 2, - 0 + 1 }, { 0, - 0 + 5 }, { - 5, - 2 + 0, + 5 }, { - 1, - 0 + 0, + 5 }, { - 1, - 0 + 4, + 4 + }, + { + 4, + 4 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 }, { 3, 0 }, { - 2, - 0 + 4, + 4 }, { - 14, - 0 + 4, + 4 }, { - 2, - 0 + 4, + 3 }, { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, + 4, 3 }, { 0, - 0 + 4 }, { - 2, + 0, + 4 + }, + { + 3, 0 }, { 0, + 3 + }, + { + 0, + 3 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 3, 0 }, { - 5, + 0, 5 }, { - 1, - 0 + 0, + 5 }, { - 1, - 0 + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 }, { 3, 0 }, { - 2, + 0, + 5 + }, + { + 0, + 5 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, 0 }, { - 5, - 2 + 4, + 1 }, { - 2, + 4, + 1 + }, + { + 1, 0 }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, { 3, 0 @@ -7396,73 +10293,147 @@ local chapter_board_rune = { { 1, 0 + }, + { + 1, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=16, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=17, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=21, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=22, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=26, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=26, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=27, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=27, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=32, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=41, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=42, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=42, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=56, + ["type"]=6, + ["direction"]=1 + }, + { + ["pos"]=56, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=57, + ["type"]=6, + ["direction"]=1 + }, + { + ["pos"]=57, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=66, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=66, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=67, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=67, + ["type"]=6, + ["direction"]=2 } } }, [38]={ ["board"]={ - { - 3, - 0 - }, - { - 2, - 0 - }, { 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 5, 5 }, + { + 0, + 1 + }, { 0, 5 }, { 0, - 2 + 4 + }, + { + 0, + 5 }, { 0, 1 }, { - 5, + 0, 1 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 2, + 0, 0 }, { @@ -7471,50 +10442,110 @@ local chapter_board_rune = { }, { 0, - 2 + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 }, { 0, 1 }, { - 2, + 0, 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { - 5, + 0, 5 }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 2, 0 }, { 0, - 2 + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 }, { 2, 0 }, { - 5, - 1 - }, - { - 3, - 0 - }, - { - 3, + 2, 0 }, { @@ -7527,32 +10558,12 @@ local chapter_board_rune = { }, { 0, - 2 - }, - { - 2, 0 }, { 2, 0 }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 5, - 5 - }, - { - 2, - 0 - }, { 2, 0 @@ -7562,15 +10573,11 @@ local chapter_board_rune = { 0 }, { - 5, - 1 - }, - { - 3, + 2, 0 }, { - 3, + 19, 0 }, { @@ -7578,11 +10585,7 @@ local chapter_board_rune = { 0 }, { - 2, - 0 - }, - { - 14, + 19, 0 }, { @@ -7590,232 +10593,416 @@ local chapter_board_rune = { 0 }, { - 2, + 19, 0 }, { - 3, + 2, 0 } + }, + ["grid_edge"]={ + { + ["pos"]=21, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=21, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=43, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=43, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=35, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=35, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=26, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=26, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=17, + ["type"]=5, + ["direction"]=2 + } } }, [39]={ ["board"]={ - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, { 0, 3 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 3 - }, - { - 13, - 1 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 14, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 13, - 5 - }, - { - 13, - 1 - }, - { - 13, 2 }, { - 1, - 0 + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 21, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 4 }, { 1, 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 21, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 3 + } + }, + ["grid_edge"]={ + { + ["pos"]=22, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=22, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=24, + ["type"]=6, + ["direction"]=1 + }, + { + ["pos"]=24, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=24, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=24, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=26, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=26, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=33, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=33, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=34, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=35, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=35, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=62, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=63, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=63, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=64, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=65, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=71, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=76, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=77, + ["type"]=5, + ["direction"]=2 } } }, [40]={ ["board"]={ { - 0, - 5 + 3, + 0 + }, + { + 3, + 0 }, { 0, 2 }, { - 0, - 1 - }, - { - 0, - 4 + 2, + 0 }, { 0, @@ -7829,33 +11016,41 @@ local chapter_board_rune = { 3, 0 }, + { + 3, + 0 + }, { 0, 5 }, + { + 0, + 1 + }, + { + 2, + 0 + }, { 0, 2 }, { 0, - 1 - }, - { - 0, - 4 - }, - { - 0, - 3 + 5 }, { 3, 0 }, { - 3, - 0 + 0, + 2 + }, + { + 0, + 5 }, { 0, @@ -7867,28 +11062,16 @@ local chapter_board_rune = { }, { 0, - 1 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 3, - 0 - }, - { - 14, - 0 + 5 }, { 0, 5 }, + { + 0, + 3 + }, { 0, 2 @@ -7899,7 +11082,51 @@ local chapter_board_rune = { }, { 0, - 4 + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 4, + 3 + }, + { + 4, + 5 + }, + { + 4, + 3 + }, + { + 4, + 3 + }, + { + 4, + 2 + }, + { + 4, + 5 + }, + { + 4, + 1 }, { 0, @@ -7910,100 +11137,167 @@ local chapter_board_rune = { 0 }, { - 3, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 + 0, + 2 }, { 3, 0 }, { - 1, - 0 - }, - { - 13, - 2 - }, - { - 13, - 1 - }, - { - 13, - 4 - }, - { - 13, + 0, 3 }, { - 2, + 3, 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 13, - 2 - }, - { - 13, + 0, 1 }, { - 13, - 4 + 3, + 0 }, { - 13, + 0, 3 }, { - 2, + 3, 0 }, { - 1, + 0, + 3 + }, + { + 3, 0 + }, + { + 0, + 1 + }, + { + 3, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=14, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=14, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=24, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=24, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=24, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=61, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=62, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=63, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=64, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=65, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=66, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=67, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=67, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=71, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=72, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=73, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=74, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=75, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=76, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=77, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=77, + ["type"]=6, + ["direction"]=4 } } }, [41]={ ["board"]={ { - 1, - 0 + 0, + 1 }, { 0, @@ -8011,31 +11305,23 @@ local chapter_board_rune = { }, { 0, - 3 + 2 + }, + { + 0, + 4 }, { 0, 1 }, - { - 0, - 3 - }, { 0, 1 }, - { - 1, - 0 - }, - { - 2, - 0 - }, { 0, - 3 + 2 }, { 0, @@ -8043,7 +11329,7 @@ local chapter_board_rune = { }, { 0, - 3 + 1 }, { 0, @@ -8051,46 +11337,130 @@ local chapter_board_rune = { }, { 0, - 3 + 1 }, { - 2, + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, 0 }, { - 2, + 4, + 2 + }, + { + 0, 0 }, { - 2, + 4, + 4 + }, + { + 0, 0 }, { - 2, + 4, + 2 + }, + { + 0, 0 }, { - 2, + 0, 0 }, { - 2, + 4, + 4 + }, + { + 0, 0 }, { - 2, + 4, + 2 + }, + { + 0, 0 }, { - 2, + 4, + 4 + }, + { + 0, 0 }, { - 2, + 3, 0 }, { - 2, + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 }, { @@ -8098,7 +11468,7 @@ local chapter_board_rune = { 5 }, { - 2, + 0, 0 }, { @@ -8106,15 +11476,7 @@ local chapter_board_rune = { 5 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, + 0, 0 }, { @@ -8122,88 +11484,117 @@ local chapter_board_rune = { 5 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, + 0, 0 }, { 13, 5 + } + }, + ["grid_edge"]={ + { + ["pos"]=41, + ["type"]=6, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=41, + ["type"]=5, + ["direction"]=4 }, { - 13, - 2 + ["pos"]=42, + ["type"]=5, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=42, + ["type"]=5, + ["direction"]=4 }, { - 13, - 2 + ["pos"]=43, + ["type"]=6, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=43, + ["type"]=5, + ["direction"]=4 }, { - 13, - 2 + ["pos"]=44, + ["type"]=5, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=44, + ["type"]=5, + ["direction"]=4 }, { - 13, - 2 + ["pos"]=45, + ["type"]=6, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=45, + ["type"]=5, + ["direction"]=4 }, { - 14, - 0 + ["pos"]=46, + ["type"]=5, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=46, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=47, + ["type"]=6, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=51, + ["type"]=6, + ["direction"]=4 }, { - 14, - 0 + ["pos"]=52, + ["type"]=6, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=53, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=54, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=55, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=56, + ["type"]=6, + ["direction"]=4 } } }, [42]={ ["board"]={ { - 1, - 0 + 0, + 1 }, { 0, @@ -8211,92 +11602,48 @@ local chapter_board_rune = { }, { 0, - 3 + 2 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 13, 5 }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, { 0, 5 }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, { 0, 5 @@ -8306,7 +11653,59 @@ local chapter_board_rune = { 5 }, { - 13, + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 25, + 0 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 4, 5 }, { @@ -8314,183 +11713,183 @@ local chapter_board_rune = { 0 }, { - 1, - 0 - }, - { - 14, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 14, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 13, + 4, 2 }, + { + 1, + 0 + }, + { + 4, + 5 + }, + { + 1, + 0 + }, + { + 4, + 3 + }, { 0, - 2 + 0 }, { 0, - 2 + 0 }, { 0, - 2 - }, - { - 13, - 2 - }, - { - 1, 0 }, { - 1, + 0, 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { - 3, + 25, 0 }, { - 1, + 0, 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 25, + 0 + }, + { + 0, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=41, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=42, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=43, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=45, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=4 } } }, [43]={ ["board"]={ { - 0, - 2 + 3, + 0 }, { 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 + 1 }, { 0, 4 }, + { + 0, + 1 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 5 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, { 0, 4 }, - { - 0, - 3 - }, - { - 0, - 3 - }, { 0, 1 }, { - 0, - 1 + 4, + 2 + }, + { + 4, + 5 }, { 0, - 1 + 0 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 2, 0 }, { - 2, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, + 1, 0 }, { @@ -8499,34 +11898,94 @@ local chapter_board_rune = { }, { 0, - 2 + 4 }, { 0, - 1 + 2 }, { - 2, + 4, + 3 + }, + { + 4, + 3 + }, + { + 0, 0 }, { - 2, + 0, 0 }, { - 2, + 3, 0 }, { - 2, - 0 + 0, + 2 }, { 0, 4 }, { - 14, + 0, + 2 + }, + { + 4, + 3 + }, + { + 4, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 4, + 2 + }, + { + 4, + 4 + }, + { + 4, + 1 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, 0 }, { @@ -8534,79 +11993,259 @@ local chapter_board_rune = { 1 }, { - 2, + 31, 0 }, { - 2, - 0 + 4, + 4 }, { - 1, + 4, + 1 + }, + { + 4, + 3 + }, + { + 0, 0 }, { 0, - 5 - }, - { - 13, - 5 - }, - { - 13, - 5 - }, - { - 13, - 5 - }, - { - 0, - 5 - }, - { - 1, 0 }, { - 1, + 3, 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=11, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=12, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=14, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=15, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=22, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=25, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=26, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=33, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=34, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=37, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=76, + ["type"]=5, + ["direction"]=4 } } }, [44]={ ["board"]={ { - 2, + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 3, 0 }, { - 2, + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 26, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 3, 0 }, { @@ -8615,83 +12254,55 @@ local chapter_board_rune = { }, { 0, - 3 + 4 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, + 2 }, { 0, 1 }, { - 2, - 0 + 0, + 2 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 + 0, + 2 }, { 0, 4 }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, { 0, 4 }, - { - 0, - 3 - }, { 0, 1 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 + 0, + 5 }, { 0, @@ -8699,111 +12310,71 @@ local chapter_board_rune = { }, { 0, - 3 + 2 + } + }, + ["grid_edge"]={ + { + ["pos"]=23, + ["type"]=5, + ["direction"]=2 }, { - 0, - 4 + ["pos"]=23, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=25, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=25, + ["type"]=5, + ["direction"]=3 }, { - 2, - 0 + ["pos"]=43, + ["type"]=5, + ["direction"]=3 }, { - 2, - 0 + ["pos"]=45, + ["type"]=5, + ["direction"]=4 }, { - 13, - 1 + ["pos"]=63, + ["type"]=5, + ["direction"]=1 }, { - 13, - 3 + ["pos"]=63, + ["type"]=5, + ["direction"]=4 }, { - 13, - 3 + ["pos"]=65, + ["type"]=5, + ["direction"]=1 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 14, - 0 - }, - { - 2, - 0 - }, - { - 13, - 5 - }, - { - 13, - 5 - }, - { - 13, - 3 - }, - { - 2, - 0 - }, - { - 14, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 13, - 5 - }, - { - 13, - 3 - }, - { - 13, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 + ["pos"]=65, + ["type"]=5, + ["direction"]=3 } } }, [45]={ ["board"]={ { - 2, - 0 + 0, + 5 + }, + { + 0, + 2 }, { 0, @@ -8811,226 +12382,325 @@ local chapter_board_rune = { }, { 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 14, - 0 - }, - { - 13, 1 }, { - 13, + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, 4 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 13, - 4 - }, - { - 13, + 0, 1 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 14, - 0 - }, - { - 13, - 4 - }, - { - 13, + 0, 1 }, { - 2, + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 4, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 5, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 4, + 2 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 4 + }, + { + 4, + 1 + }, + { + 4, + 4 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 0, 0 }, { - 2, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 21, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=21, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=26, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=31, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=33, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=34, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=35, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=37, + ["type"]=6, + ["direction"]=3 } } }, [46]={ ["board"]={ - { - 3, - 0 - }, { 0, - 3 - }, - { - 2, - 0 + 1 }, { 0, 1 }, { - 2, - 0 + 0, + 1 + }, + { + 0, + 2 }, { 0, 5 }, { - 3, - 0 + 0, + 2 }, { - 3, + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 1, 0 }, { @@ -9038,15 +12708,7 @@ local chapter_board_rune = { 4 }, { - 2, - 0 - }, - { - 0, - 1 - }, - { - 2, + 3, 0 }, { @@ -9057,32 +12719,12 @@ local chapter_board_rune = { 3, 0 }, - { - 3, - 0 - }, { 0, 1 }, { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 3, + 1, 0 }, { @@ -9090,79 +12732,43 @@ local chapter_board_rune = { 0 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 + 4, + 2 }, { 3, 0 }, { - 3, - 0 - }, - { - 2, - 0 - }, - { - 13, - 3 - }, - { - 13, - 4 - }, - { - 13, + 4, 5 }, { - 2, + 3, 0 }, + { + 4, + 2 + }, { 3, 0 }, { - 3, - 0 - }, - { - 2, - 0 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, + 4, 5 }, { - 2, + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, 0 }, { @@ -9174,28 +12780,58 @@ local chapter_board_rune = { 0 }, { - 14, - 0 - }, - { - 0, - 3 - }, - { - 0, + 4, 4 }, { - 0, - 5 + 23, + 3 }, { - 14, + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { 3, 0 + }, + { + 23, + 3 + } + }, + ["grid_edge"]={ + { + ["pos"]=53, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=63, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=64, + ["type"]=5, + ["direction"]=4 } } }, @@ -9205,62 +12841,110 @@ local chapter_board_rune = { 0, 2 }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, { 0, 2 }, { 0, - 4 + 5 }, { 0, 2 }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, { 0, 3 }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 29, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 30, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 30, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, { 0, 3 @@ -9277,6 +12961,66 @@ local chapter_board_rune = { 0, 3 }, + { + 0, + 0 + }, + { + 29, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 29, + 0 + }, { 0, 3 @@ -9285,117 +13029,141 @@ local chapter_board_rune = { 0, 3 }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 21, - 2 - }, - { - 2, - 0 - }, - { - 21, - 4 - }, - { - 2, - 0 - }, - { - 21, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, - 0 + 3 + } + }, + ["grid_edge"]={ + { + ["pos"]=23, + ["type"]=5, + ["direction"]=1 }, { - 14, - 0 + ["pos"]=23, + ["type"]=5, + ["direction"]=2 }, { - 0, - 0 + ["pos"]=23, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=24, + ["type"]=5, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=24, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=25, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=25, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=25, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=64, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=64, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=64, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=64, + ["type"]=5, + ["direction"]=4 } } }, @@ -9403,7 +13171,7 @@ local chapter_board_rune = { ["board"]={ { 0, - 5 + 4 }, { 0, @@ -9411,7 +13179,7 @@ local chapter_board_rune = { }, { 0, - 5 + 1 }, { 0, @@ -9419,7 +13187,7 @@ local chapter_board_rune = { }, { 0, - 5 + 3 }, { 0, @@ -9427,10 +13195,14 @@ local chapter_board_rune = { }, { 0, - 5 + 3 }, { - 2, + 0, + 4 + }, + { + 3, 0 }, { @@ -9438,15 +13210,95 @@ local chapter_board_rune = { 3 }, { - 2, - 0 + 0, + 1 }, { 0, 1 }, { - 2, + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 3, 0 }, { @@ -9454,11 +13306,31 @@ local chapter_board_rune = { 4 }, { - 2, + 0, + 5 + }, + { + 0, + 3 + }, + { + 3, 0 }, { - 2, + 3, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { @@ -9466,144 +13338,104 @@ local chapter_board_rune = { 3 }, { - 2, + 3, 0 }, { - 0, - 1 - }, - { - 2, - 0 - }, - { - 0, - 4 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 0, + 35, 3 }, { - 2, - 0 - }, - { - 0, - 1 - }, - { - 2, - 0 - }, - { - 0, - 4 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 21, - 5 - }, - { - 2, - 0 - }, - { - 21, - 5 - }, - { - 2, - 0 - }, - { - 21, - 5 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 14, - 0 - }, - { - 2, - 0 - }, - { - 21, - 5 - }, - { - 2, - 0 - }, - { - 14, - 0 - }, - { - 2, - 0 + 35, + 3 }, { 1, 0 }, { - 1, - 0 + 35, + 3 }, { - 1, - 0 + 35, + 3 }, { - 1, + 3, 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=61, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=62, + ["type"]=5, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=62, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=63, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=63, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=65, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=65, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=67, + ["type"]=5, + ["direction"]=2 } } }, [49]={ ["board"]={ { - 1, - 0 + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 3 }, { 0, @@ -9613,60 +13445,52 @@ local chapter_board_rune = { 0, 4 }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, { 0, 5 }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, { 0, 4 }, { 0, - 5 + 2 }, { 0, - 3 + 2 }, { - 2, + 9, 0 }, { - 1, - 0 + 0, + 2 }, { - 1, - 0 - }, - { - 21, - 3 - }, - { - 2, + 9, 0 }, { @@ -9674,95 +13498,95 @@ local chapter_board_rune = { 5 }, { - 2, + 9, 0 }, { - 21, + 0, + 2 + }, + { + 4, 4 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 21, + 4, 4 }, { - 2, - 0 - }, - { - 21, + 4, 3 }, { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 14, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 14, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 21, + 4, 4 }, { - 21, - 5 - }, - { - 21, + 4, 3 }, { - 2, + 4, + 4 + }, + { + 4, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { @@ -9770,27 +13594,23 @@ local chapter_board_rune = { 0 }, { - 1, + 32, 0 }, { - 2, + 31, 0 }, { - 2, + 32, 0 }, { - 21, - 5 - }, - { - 2, + 31, 0 }, { - 2, + 32, 0 }, { @@ -9802,12 +13622,60 @@ local chapter_board_rune = { [50]={ ["board"]={ { - 0, - 4 + 37, + 0 + }, + { + 2, + 0 }, { 0, - 4 + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 37, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 2, + 0 }, { 0, @@ -9825,64 +13693,56 @@ local chapter_board_rune = { 0, 1 }, + { + 0, + 3 + }, + { + 0, + 3 + }, { 0, 1 }, { - 9, - 0 + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 }, { 2, 0 }, { - 9, - 0 + 0, + 1 }, { - 2, - 0 + 0, + 5 }, { - 9, - 0 + 0, + 1 }, { - 2, - 0 + 0, + 4 }, { - 9, - 0 + 0, + 4 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, + 0, 0 }, { @@ -9890,83 +13750,27 @@ local chapter_board_rune = { 0 }, { - 21, - 2 - }, - { - 3, + 0, 0 }, { - 21, - 2 + 0, + 5 }, { - 3, + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, 0 }, { - 21, - 2 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 14, - 0 - }, - { - 21, - 2 - }, - { - 3, - 0 - }, - { - 21, - 2 - }, - { - 3, - 0 - }, - { - 21, - 2 - }, - { - 14, + 0, 0 }, { @@ -9974,7 +13778,19 @@ local chapter_board_rune = { 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 0, 0 }, { @@ -9982,20 +13798,81 @@ local chapter_board_rune = { 0 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, + 0, 0 }, { 3, 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=43, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=61, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=61, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=67, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=67, + ["type"]=5, + ["direction"]=2 } } }, @@ -10003,38 +13880,18 @@ local chapter_board_rune = { ["board"]={ { 0, - 2 + 3 }, { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 + 9, + 0 }, { 3, 0 }, { - 9, + 25, 0 }, { @@ -10045,12 +13902,24 @@ local chapter_board_rune = { 9, 0 }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, { 3, 0 }, { - 9, + 25, 0 }, { @@ -10059,86 +13928,50 @@ local chapter_board_rune = { }, { 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, 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 - }, - { - 21, 1 }, { 0, - 0 - }, - { - 21, - 1 + 4 }, { 0, - 0 - }, - { - 21, - 1 + 2 }, { 0, - 0 + 2 }, { - 21, + 0, 1 }, { @@ -10146,56 +13979,132 @@ local chapter_board_rune = { 0 }, { - 3, - 0 + 0, + 1 }, { - 3, - 0 + 0, + 2 }, { - 3, - 0 + 0, + 1 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 14, - 0 - }, - { - 2, + 1, 0 }, { 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 1, 0 }, { - 2, + 1, 0 }, { - 14, + 1, 0 }, { - 2, + 0, + 1 + }, + { + 8, 0 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 25, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 25, + 0 + }, + { + 1, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=14, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=14, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=14, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=24, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=24, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=24, + ["type"]=5, + ["direction"]=4 } } }, @@ -10203,250 +14112,296 @@ local chapter_board_rune = { ["board"]={ { 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 2, - 0 - }, - { - 9, - 0 - }, - { - 21, - 3 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, 4 }, { - 21, + 0, 4 }, + { + 0, + 4 + }, + { + 33, + 0 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 33, + 0 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 33, + 0 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 3, + 0 + }, + { + 4, + 1 + }, + { + 4, + 3 + }, + { + 4, + 5 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 33, + 0 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 10, + 0 + }, { 11, 0 }, { - 21, + 0, 3 }, { - 21, + 0, + 4 + }, + { + 33, + 0 + }, + { + 0, 3 }, { - 9, - 0 - }, - { - 1, - 0 - }, - { - 21, - 3 - }, - { - 21, - 3 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 14, - 0 - }, - { - 21, - 2 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 21, - 3 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 21, - 2 - }, - { - 3, - 0 - }, - { - 14, - 0 - }, - { - 21, - 3 - }, - { - 1, - 0 - }, - { - 21, + 0, 1 }, { - 21, + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, 1 }, { - 21, - 2 + 0, + 4 }, { - 21, - 1 + 33, + 0 }, { - 21, - 1 + 0, + 4 + }, + { + 0, + 3 }, { 10, 0 } + }, + ["grid_edge"]={ + { + ["pos"]=14, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=14, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=24, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=24, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=34, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=34, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=64, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=64, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=74, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=74, + ["type"]=5, + ["direction"]=4 + } } }, [53]={ ["board"]={ { - 0, - 4 - }, - { - 0, - 4 - }, - { - 21, + 23, 3 }, { - 21, - 5 - }, - { - 3, + 1, 0 }, { - 3, - 0 - }, - { - 14, - 0 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 21, - 3 - }, - { - 21, - 5 - }, - { - 3, + 1, 0 }, { @@ -10454,7 +14409,27 @@ local chapter_board_rune = { 0 }, { - 21, + 1, + 0 + }, + { + 1, + 0 + }, + { + 23, + 3 + }, + { + 23, + 3 + }, + { + 1, + 0 + }, + { + 0, 3 }, { @@ -10463,28 +14438,52 @@ local chapter_board_rune = { }, { 0, - 3 - }, - { - 21, - 2 - }, - { - 21, 5 }, { - 9, + 1, 0 }, { - 21, - 2 + 23, + 3 }, { - 21, + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, 3 }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, { 0, 4 @@ -10494,35 +14493,43 @@ local chapter_board_rune = { 1 }, { - 21, - 2 - }, - { - 8, - 0 - }, - { - 21, - 1 - }, - { - 21, - 2 - }, - { - 21, + 0, 3 }, { 0, - 1 + 3 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 0, + 5 }, { 0, 1 }, { - 8, + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, 0 }, { @@ -10530,243 +14537,222 @@ local chapter_board_rune = { 0 }, { - 21, - 1 + 3, + 0 }, { - 21, - 2 + 1, + 0 }, { - 21, + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 8, + 0 + }, + { + 1, + 0 + }, + { + 23, + 3 + }, + { + 23, + 3 + }, + { + 23, 3 }, { 1, 0 }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 21, - 1 - }, - { - 21, - 2 - }, { 8, 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=11, + ["type"]=5, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=11, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=17, + ["type"]=5, + ["direction"]=1 }, { - 3, - 0 + ["pos"]=17, + ["type"]=5, + ["direction"]=3 }, { - 3, - 0 + ["pos"]=21, + ["type"]=5, + ["direction"]=2 }, { - 21, - 1 + ["pos"]=21, + ["type"]=5, + ["direction"]=4 }, { - 14, - 0 + ["pos"]=27, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=27, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=73, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=73, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=74, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=75, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=75, + ["type"]=5, + ["direction"]=4 } } }, [54]={ ["board"]={ { - 1, + 32, + 0 + }, + { + 3, + 0 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 3, + 0 + }, + { + 32, + 0 + }, + { + 3, 0 }, { 0, - 1 + 0 }, { 0, - 1 + 0 }, { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, + 4, 4 }, { - 1, - 0 - }, - { - 9, + 0, 0 }, { 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 4, + 4 + }, + { + 24, + 0 + }, + { + 4, 1 }, { 0, + 0 + }, + { + 0, + 0 + }, + { + 4, 2 }, { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 21, - 3 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 21, - 3 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 11, - 0 - }, - { - 21, + 4, 1 }, { - 21, - 3 - }, - { - 21, - 3 - }, - { - 21, - 2 - }, - { - 14, + 32, 0 }, { @@ -10774,27 +14760,99 @@ local chapter_board_rune = { 0 }, { - 1, + 32, 0 }, { - 21, + 4, + 4 + }, + { + 4, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 4, + 4 + }, + { + 24, + 0 + }, + { + 4, 1 }, { - 21, - 1 + 0, + 0 }, { - 21, - 2 + 0, + 0 }, { - 21, - 2 + 3, + 0 }, { - 1, + 0, + 0 + }, + { + 0, + 0 + }, + { + 4, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 24, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 4, + 5 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 24, 0 } } @@ -10802,13 +14860,105 @@ local chapter_board_rune = { [55]={ ["board"]={ { - 18, + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 3, 0 }, { 0, 1 }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, { 0, 1 @@ -10823,179 +14973,229 @@ local chapter_board_rune = { }, { 0, - 4 + 3 }, { - 1, + 26, 0 }, { - 18, + 0, 0 }, { - 18, + 0, 0 }, { - 18, + 26, + 0 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 26, + 0 + }, + { + 0, + 0 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 26, 0 }, { 0, 1 + } + }, + ["grid_edge"]={ + { + ["pos"]=33, + ["type"]=5, + ["direction"]=1 }, { - 0, - 3 + ["pos"]=33, + ["type"]=5, + ["direction"]=3 }, { - 0, - 3 + ["pos"]=34, + ["type"]=5, + ["direction"]=1 }, { - 0, - 4 + ["pos"]=34, + ["type"]=5, + ["direction"]=4 }, { - 18, - 0 + ["pos"]=43, + ["type"]=5, + ["direction"]=2 }, { - 19, - 0 + ["pos"]=43, + ["type"]=5, + ["direction"]=3 }, { - 18, - 0 + ["pos"]=44, + ["type"]=5, + ["direction"]=2 }, { - 19, - 0 + ["pos"]=44, + ["type"]=5, + ["direction"]=4 }, { - 18, - 0 + ["pos"]=52, + ["type"]=5, + ["direction"]=1 }, { - 19, - 0 + ["pos"]=52, + ["type"]=5, + ["direction"]=3 }, { - 10, - 0 + ["pos"]=53, + ["type"]=5, + ["direction"]=1 }, { - 18, - 0 + ["pos"]=53, + ["type"]=5, + ["direction"]=3 }, { - 18, - 0 + ["pos"]=54, + ["type"]=5, + ["direction"]=1 }, { - 18, - 0 + ["pos"]=54, + ["type"]=5, + ["direction"]=3 }, { - 18, - 0 + ["pos"]=54, + ["type"]=5, + ["direction"]=2 }, { - 18, - 0 + ["pos"]=55, + ["type"]=5, + ["direction"]=1 }, { - 18, - 0 + ["pos"]=55, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=61, + ["type"]=5, + ["direction"]=2 }, { - 0, - 1 + ["pos"]=61, + ["type"]=5, + ["direction"]=4 }, { - 0, - 1 + ["pos"]=62, + ["type"]=5, + ["direction"]=4 }, { - 0, - 2 + ["pos"]=64, + ["type"]=5, + ["direction"]=4 }, { - 0, - 3 + ["pos"]=65, + ["type"]=5, + ["direction"]=4 }, { - 0, - 3 + ["pos"]=72, + ["type"]=5, + ["direction"]=4 }, { - 0, - 4 + ["pos"]=72, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=75, + ["type"]=5, + ["direction"]=3 }, { - 0, - 2 + ["pos"]=75, + ["type"]=5, + ["direction"]=2 }, { - 22, - 2 + ["pos"]=76, + ["type"]=5, + ["direction"]=1 }, { - 0, - 2 - }, - { - 22, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 22, - 2 - }, - { - 14, - 0 - }, - { - 22, - 3 - }, - { - 14, - 0 - }, - { - 22, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 + ["pos"]=76, + ["type"]=5, + ["direction"]=4 } } }, @@ -11003,127 +15203,79 @@ local chapter_board_rune = { ["board"]={ { 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 4, - 3 - }, - { - 4, - 3 - }, - { - 4, - 1 - }, - { - 4, - 2 - }, - { - 4, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 4, 5 }, { - 4, + 0, + 4 + }, + { + 0, + 3 + }, + { + 5, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 5, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, 5 }, { - 4, + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, 5 }, { 1, 0 }, - { - 1, - 0 - }, { 0, - 1 - }, - { - 0, - 1 + 4 }, { 0, @@ -11135,58 +15287,14 @@ local chapter_board_rune = { }, { 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 22, - 3 - }, - { - 22, - 3 - }, - { - 22, - 2 - }, - { - 22, - 2 - }, - { - 22, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 22, 5 }, { - 22, - 4 + 0, + 5 }, { - 22, + 0, 4 }, { @@ -11194,252 +15302,593 @@ local chapter_board_rune = { 0 }, { - 1, + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 3, 0 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + } + }, + ["grid_edge"]={ + { + ["pos"]=12, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=12, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=16, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=16, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=22, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=26, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=33, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=34, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=35, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=61, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=62, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=63, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=65, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=67, + ["type"]=5, + ["direction"]=1 } } }, [57]={ ["board"]={ { - 19, + 1, 0 }, { - 19, + 4, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 4, + 2 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 4, + 2 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 4, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 28, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 28, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { 0, 4 }, - { - 0, - 2 - }, { 0, 1 }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, { 0, - 2 - }, - { - 0, - 5 - }, - { - 0, - 2 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 4, 4 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 28, + 0 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 28, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 28, + 0 + }, + { + 4, + 2 + }, + { + 0, + 2 + }, + { + 4, + 1 + }, + { + 28, + 0 + }, + { + 0, + 0 + }, + { + 28, + 0 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, + { + 0, + 1 + }, { 4, 2 }, { 4, - 5 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 22, - 3 - }, - { - 22, - 3 - }, - { - 22, - 3 - }, - { - 22, 2 }, { - 22, - 5 - }, - { - 1, + 28, 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=32, + ["type"]=5, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=32, + ["type"]=5, + ["direction"]=2 }, { - 22, - 2 + ["pos"]=32, + ["type"]=5, + ["direction"]=2 }, { - 22, - 1 + ["pos"]=32, + ["type"]=5, + ["direction"]=4 }, { - 22, - 5 + ["pos"]=36, + ["type"]=5, + ["direction"]=1 }, { - 22, - 2 + ["pos"]=36, + ["type"]=5, + ["direction"]=2 }, { - 22, - 1 + ["pos"]=36, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=36, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=42, + ["type"]=5, + ["direction"]=4 }, { - 14, - 0 + ["pos"]=46, + ["type"]=5, + ["direction"]=3 }, { - 22, - 1 + ["pos"]=52, + ["type"]=6, + ["direction"]=4 }, { - 22, - 5 + ["pos"]=56, + ["type"]=6, + ["direction"]=3 }, { - 22, - 2 + ["pos"]=62, + ["type"]=6, + ["direction"]=4 }, { - 14, - 0 + ["pos"]=66, + ["type"]=6, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=71, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=77, + ["type"]=6, + ["direction"]=3 } } }, [58]={ ["board"]={ - { - 1, - 0 - }, { 0, - 4 - }, - { - 0, - 1 - }, - { - 0, - 4 + 3 }, { 0, 5 }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, { 0, 5 }, { - 1, - 0 + 0, + 3 }, { - 1, - 0 + 0, + 3 }, { - 19, - 0 + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 }, { 4, - 4 + 5 + }, + { + 4, + 1 + }, + { + 1, + 0 }, { 4, @@ -11447,30 +15896,26 @@ local chapter_board_rune = { }, { 4, - 4 + 5 + }, + { + 0, + 3 + }, + { + 0, + 1 }, { 4, - 4 + 1 }, { - 19, - 0 + 4, + 5 }, { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, + 25, 0 }, { @@ -11478,91 +15923,47 @@ local chapter_board_rune = { 5 }, { - 19, - 0 - }, - { - 19, - 0 - }, - { - 22, + 4, 1 }, { 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 14, - 0 - }, - { - 22, - 1 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 22, - 1 - }, - { - 22, - 1 - }, - { - 22, 2 }, { - 22, - 2 + 0, + 1 }, { - 22, - 2 + 4, + 1 }, { - 19, + 4, + 5 + }, + { + 4, + 1 + }, + { + 4, + 5 + }, + { + 4, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 25, 0 }, { @@ -11570,225 +15971,268 @@ local chapter_board_rune = { 0 }, { - 14, - 0 - }, - { - 22, - 1 - }, - { - 22, - 1 - }, - { - 22, - 1 - }, - { - 22, - 1 - }, - { - 19, + 25, 0 }, { 1, 0 + }, + { + 25, + 0 + }, + { + 0, + 2 + } + }, + ["grid_edge"]={ + { + ["pos"]=42, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=42, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=43, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=62, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=72, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=76, + ["type"]=6, + ["direction"]=4 } } }, [59]={ ["board"]={ - { - 19, - 0 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 1, - 0 - }, - { - 4, - 3 - }, - { - 4, - 4 - }, - { - 4, - 3 - }, - { - 4, - 1 - }, - { - 4, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, 0 }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 4, - 1 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 14, - 0 - }, - { - 0, - 4 - }, { 0, 5 }, { - 1, - 0 + 0, + 2 }, { - 1, - 0 + 0, + 2 }, { - 1, - 0 + 0, + 2 }, { - 22, - 1 - }, - { - 22, - 3 - }, - { - 22, + 0, 5 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 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, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 26, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 26, + 0 + }, + { + 0, + 0 + }, { 1, 0 @@ -11796,485 +16240,700 @@ local chapter_board_rune = { { 1, 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 26, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=11, + ["type"]=6, + ["direction"]=1 + }, + { + ["pos"]=11, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=21, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=31, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=33, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=34, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=35, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=27, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=17, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=17, + ["type"]=6, + ["direction"]=1 } } }, [60]={ ["board"]={ - { - 1, - 0 - }, - { - 1, - 5 - }, { 0, - 2 - }, - { - 0, - 5 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 19, - 0 - }, - { - 1, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 0, - 2 - }, - { - 0, - 5 - }, - { - 0, - 4 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 4, - 3 - }, - { - 4, - 3 - }, - { - 4, - 3 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 4, - 2 - }, - { - 22, - 2 - }, - { - 22, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 14, - 0 - }, - { - 0, - 0 - }, - { - 4, 1 }, { - 22, - 2 - }, - { - 22, - 4 - }, - { - 22, - 4 + 0, + 5 }, { 1, 0 }, + { + 37, + 0 + }, { 1, 0 }, { 0, + 5 + }, + { + 0, + 1 + }, + { + 3, 0 }, { - 14, + 0, + 5 + }, + { + 2, 0 }, { - 22, - 2 - }, - { - 22, + 5, 4 }, { - 22, + 2, + 0 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 5, 4 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=24, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=24, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=31, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=31, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=37, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=37, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=41, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=42, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=42, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=46, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=46, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=47, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=51, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=52, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=53, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=54, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=55, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=56, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=61, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=63, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=64, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=66, + ["type"]=2, + ["direction"]=4 } } }, [61]={ ["board"]={ { - 18, - 0 + 0, + 5 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 22, - 1 - }, - { - 22, - 3 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 22, 2 }, - { - 22, - 4 - }, - { - 18, - 0 - }, - { - 4, - 5 - }, - { - 4, - 5 - }, - { - 4, - 5 - }, - { - 4, - 4 - }, - { - 14, - 0 - }, - { - 22, - 5 - }, - { - 18, - 0 - }, { 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 22, - 1 - }, - { - 22, 2 }, { - 22, + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, 3 }, { - 22, + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, 4 + }, + { + 4, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 4, + 2 + }, + { + 0, + 2 + }, + { + 4, + 5 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 4, + 3 + }, + { + 0, + 3 + }, + { + 4, + 3 + }, + { + 0, + 3 + }, + { + 4, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 2 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 29, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 29, + 0 + }, + { + 4, + 3 + }, + { + 4, + 5 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 4, + 5 + }, + { + 4, + 2 + } + }, + ["grid_edge"]={ + { + ["pos"]=43, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=43, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=44, + ["type"]=6, + ["direction"]=1 + }, + { + ["pos"]=44, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=45, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=4 } } }, [62]={ ["board"]={ { - 22, - 5 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 4, - 3 + 0, + 2 }, { 0, - 1 - }, - { - 0, - 3 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 4, - 3 - }, - { - 4, 3 }, { 0, 4 }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, { 0, 3 }, { - 14, - 0 + 0, + 3 }, { - 19, - 0 + 0, + 4 }, { - 19, - 0 + 0, + 2 }, { - 19, - 0 + 0, + 1 }, { - 4, + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, 5 }, { @@ -12286,80 +16945,20 @@ local chapter_board_rune = { 1 }, { - 19, + 3, 0 }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 4, - 5 - }, - { - 4, - 5 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 14, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 4, - 2 - }, { 0, 1 }, { 0, - 2 + 5 }, { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 4, - 2 - }, - { - 4, - 2 + 0, + 3 }, { 0, @@ -12370,100 +16969,193 @@ local chapter_board_rune = { 1 }, { - 22, - 1 - }, - { - 19, - 0 - }, - { - 22, + 0, 2 }, { - 19, + 3, 0 }, { - 22, + 0, + 1 + }, + { + 0, 5 }, { - 1, + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 3, 0 }, { - 1, + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 3, 0 + }, + { + 0, + 3 + }, + { + 34, + 3 + }, + { + 3, + 0 + }, + { + 34, + 3 + }, + { + 3, + 0 + }, + { + 34, + 3 + }, + { + 3, + 0 + }, + { + 0, + 3 + } + }, + ["grid_edge"]={ + { + ["pos"]=16, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=26, + ["type"]=6, + ["direction"]=1 + }, + { + ["pos"]=26, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=26, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=36, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=46, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=71, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=72, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=73, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=74, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=75, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=76, + ["type"]=5, + ["direction"]=1 } } }, [63]={ ["board"]={ - { - 12, - 2 - }, - { - 18, - 0 - }, { 0, - 2 - }, - { - 0, - 5 - }, - { - 0, - 2 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 1, - 0 - }, - { - 18, - 0 - }, - { - 0, - 5 - }, - { - 0, - 2 + 4 }, { 0, 4 }, { - 18, - 0 - }, - { - 12, - 2 - }, - { - 12, - 2 - }, - { - 19, - 0 + 0, + 1 }, { 0, @@ -12478,75 +17170,131 @@ local chapter_board_rune = { 4 }, { - 19, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 12, + 0, 2 }, { - 12, + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, 2 }, { - 19, + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, 0 }, { - 19, + 0, 0 }, { - 19, + 0, 0 }, { - 19, + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 20, 0 }, { - 19, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 19, + 0, 0 }, { @@ -12554,7 +17302,7 @@ local chapter_board_rune = { 0 }, { - 1, + 0, 0 }, { @@ -12562,40 +17310,123 @@ local chapter_board_rune = { 0 }, { - 19, - 0 - }, - { - 12, - 2 - }, - { - 12, - 2 + 0, + 5 }, { 20, 0 }, - { - 14, - 0 - }, - { - 1, - 0 - }, - { - 14, - 0 - }, { 20, 0 }, { - 1, + 0, 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 20, + 0 + }, + { + 20, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=42, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=42, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=42, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=62, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=62, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=43, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=4 } } }, @@ -12603,186 +17434,178 @@ local chapter_board_rune = { ["board"]={ { 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 0, - 5 - }, - { - 18, - 0 - }, - { - 0, - 5 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 19, - 0 - }, - { - 18, - 0 - }, - { - 19, - 0 - }, - { - 18, - 0 - }, - { - 19, - 0 - }, - { - 18, - 0 - }, - { - 19, - 0 - }, - { - 4, - 3 - }, - { - 4, - 3 - }, - { - 4, - 3 - }, - { - 18, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 12, 1 }, { - 12, + 0, 1 }, { - 12, + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, 1 }, { - 14, + 0, 0 }, { - 14, + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, 0 }, { - 12, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 5, 2 }, { - 12, + 0, + 3 + }, + { + 0, + 3 + }, + { + 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, + 0 + }, + { + 5, 2 }, { - 1, + 0, 0 }, { @@ -12790,116 +17613,185 @@ local chapter_board_rune = { 0 }, { - 1, + 0, 0 }, { 1, 0 + }, + { + 0, + 0 + }, + { + 5, + 2 + } + }, + ["grid_edge"]={ + { + ["pos"]=21, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=21, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=42, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=42, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=42, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=43, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=43, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=36, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=27, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=27, + ["type"]=5, + ["direction"]=1 } } }, [65]={ ["board"]={ { - 19, + 3, 0 }, { - 19, + 3, + 0 + }, + { + 3, 0 }, { 0, - 1 + 5 }, { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 18, + 3, 0 }, { - 19, + 3, 0 }, { - 18, + 3, 0 }, { - 19, + 3, + 0 + }, + { + 3, 0 }, { 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 19, - 0 - }, - { - 18, - 0 - }, - { - 19, - 0 - }, - { - 18, - 0 - }, - { - 4, 3 }, { - 4, - 3 + 0, + 0 }, { - 4, + 0, 1 }, { - 14, + 3, 0 }, { - 18, + 3, 0 }, { - 18, + 3, 0 }, { - 19, - 0 + 0, + 1 }, { 0, @@ -12907,107 +17799,293 @@ local chapter_board_rune = { }, { 0, - 0 + 1 }, { 0, 0 }, { - 19, + 0, + 5 + }, + { + 3, 0 }, { - 18, + 0, + 1 + }, + { + 0, 0 }, { - 19, + 0, + 5 + }, + { + 0, 0 }, { - 18, + 0, + 3 + }, + { + 0, 0 }, { - 12, + 0, 4 }, { - 12, - 5 - }, - { - 12, - 5 - }, - { - 18, + 0, 0 }, { - 19, + 0, + 3 + }, + { + 0, 0 }, { - 18, + 0, + 1 + }, + { + 0, 0 }, { - 19, + 0, + 1 + }, + { + 0, 0 }, { - 18, + 0, + 1 + }, + { + 0, 0 }, { - 12, - 5 + 0, + 1 }, { - 12, - 5 - }, - { - 19, + 0, 0 }, { - 18, + 0, + 1 + }, + { + 0, 0 }, { - 19, + 0, + 1 + }, + { + 0, 0 }, { - 14, + 0, + 1 + }, + { + 0, 0 }, { - 19, + 0, + 1 + }, + { + 0, 0 }, { - 1, - 0 + 0, + 1 }, { - 1, + 0, 0 } + }, + ["grid_edge"]={ + { + ["pos"]=14, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=23, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=25, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=32, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=34, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=36, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=41, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=43, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=45, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=47, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=52, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=54, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=56, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=61, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=63, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=65, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=67, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=72, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=74, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=76, + ["type"]=6, + ["direction"]=2 + } } }, [66]={ ["board"]={ { - 1, - 0 + 0, + 4 }, { 0, - 5 + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 }, { 0, @@ -13019,188 +18097,965 @@ local chapter_board_rune = { }, { 0, - 5 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 5 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 + 2 }, { 0, 2 }, { - 1, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 12, + 0, 2 }, { - 18, - 0 + 0, + 2 }, { - 18, - 0 + 0, + 4 }, { - 18, - 0 - }, - { - 19, - 0 - }, - { - 12, + 5, 1 }, { - 19, + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, 0 }, { - 19, - 0 + 0, + 4 }, { - 19, - 0 + 0, + 4 }, { - 19, - 0 + 5, + 2 }, { - 19, - 0 + 5, + 4 }, { - 1, - 0 + 5, + 5 }, { - 19, - 0 + 12, + 2 }, { - 19, + 0, 0 }, { 12, - 3 + 2 }, { - 19, + 5, + 1 + }, + { + 5, + 4 + }, + { + 5, + 5 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 0, 0 }, { - 19, + 5, + 5 + }, + { + 5, + 2 + }, + { + 5, + 5 + }, + { + 12, + 2 + }, + { + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 19, + 0, 0 }, { - 19, + 0, 0 }, { - 19, - 0 + 12, + 2 + } + }, + ["grid_edge"]={ + { + ["pos"]=21, + ["type"]=6, + ["direction"]=1 }, { - 19, - 0 + ["pos"]=21, + ["type"]=5, + ["direction"]=4 }, { - 14, - 0 + ["pos"]=32, + ["type"]=6, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=32, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=33, + ["type"]=6, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=34, + ["type"]=6, + ["direction"]=2 }, { - 14, - 0 + ["pos"]=35, + ["type"]=6, + ["direction"]=2 }, { - 19, - 0 + ["pos"]=35, + ["type"]=5, + ["direction"]=4 }, { - 19, - 0 + ["pos"]=36, + ["type"]=6, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=27, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=27, + ["type"]=6, + ["direction"]=1 + }, + { + ["pos"]=41, + ["type"]=6, + ["direction"]=1 + }, + { + ["pos"]=41, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=52, + ["type"]=6, + ["direction"]=1 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=53, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=53, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=43, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=63, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=45, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=65, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=46, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=46, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=47, + ["type"]=6, + ["direction"]=1 } } }, [67]={ ["board"]={ + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 3 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 25, + 0 + }, + { + 0, + 0 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 3 + }, + { + 0, + 0 + }, + { + 25, + 0 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 5 + }, + { + 4, + 4 + }, + { + 4, + 5 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 4, + 2 + }, + { + 25, + 0 + }, + { + 4, + 2 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=31, + ["type"]=4, + ["direction"]=1 + }, + { + ["pos"]=32, + ["type"]=4, + ["direction"]=1 + }, + { + ["pos"]=32, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=36, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=36, + ["type"]=4, + ["direction"]=1 + }, + { + ["pos"]=37, + ["type"]=4, + ["direction"]=1 + }, + { + ["pos"]=42, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=45, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=53, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=53, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=4 + } + } + }, + [68]={ + ["board"]={ + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 5, + 2 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 5, + 1 + }, + { + 31, + 0 + }, + { + 0, + 0 + }, + { + 31, + 0 + }, + { + 5, + 2 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 31, + 0 + }, + { + 0, + 0 + }, + { + 5, + 1 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 5, + 1 + }, + { + 31, + 0 + }, + { + 0, + 0 + }, + { + 31, + 0 + }, + { + 5, + 5 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 5, + 2 + }, + { + 5, + 4 + }, + { + 5, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 3, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=33, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=33, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=34, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=35, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=35, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=53, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=53, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=2 + } + } + }, + [69]={ + ["board"]={ + { + 0, + 1 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 4, + 2 + }, + { + 35, + 3 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 4, + 4 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 35, + 3 + }, + { + 4, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 4 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 4, + 2 + }, + { + 35, + 3 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, { 0, 2 @@ -13209,160 +19064,202 @@ local chapter_board_rune = { 0, 4 }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 0, + 3 + } + }, + ["grid_edge"]={ + { + ["pos"]=23, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=23, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=23, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=23, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=63, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=63, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=63, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=63, + ["type"]=5, + ["direction"]=4 + } + } + }, + [70]={ + ["board"]={ + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, { 11, 0 }, { - 18, + 3, 0 }, { - 14, + 3, 0 }, { - 18, + 3, 0 }, { - 9, + 3, 0 }, { - 0, - 2 - }, - { - 0, - 4 - }, - { - 18, + 3, 0 }, { - 18, + 3, 0 }, { - 18, + 3, 0 }, { - 18, + 3, 0 }, { - 18, + 3, 0 }, { - 0, - 4 - }, - { - 0, - 1 - }, - { - 18, + 3, 0 }, { - 18, + 3, 0 }, { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 14, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, + 3, 0 }, { @@ -13370,631 +19267,87 @@ local chapter_board_rune = { 0 }, { - 19, + 11, 0 }, { - 19, + 3, 0 }, { - 19, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 1, - 0 - } - } - }, - [68]={ - ["board"]={ - { - 18, - 0 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 5 - }, - { - 18, - 0 - }, - { - 19, - 0 - }, - { - 4, - 4 - }, - { - 4, - 4 - }, - { - 19, - 0 - }, - { - 4, - 1 - }, - { - 4, - 1 - }, - { - 19, - 0 - }, - { - 18, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 12, - 5 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 19, - 0 - }, - { - 18, - 0 - }, - { - 1, - 0 - }, - { - 18, - 0 - }, - { - 19, + 3, 0 }, { - 18, + 3, 0 }, { - 19, + 3, 0 }, { - 14, + 3, 0 }, { - 19, + 3, 0 }, { - 1, + 3, 0 }, { - 19, + 3, 0 }, { - 14, + 3, 0 }, { - 19, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - } - } - }, - [69]={ - ["board"]={ - { - 19, - 0 - }, - { - 0, - 5 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 20, - 0 - }, - { - 4, - 4 - }, - { - 0, - 0 - }, - { - 4, - 4 - }, - { - 0, - 0 - }, - { - 4, - 4 - }, - { - 20, - 0 - }, - { - 0, - 0 - }, - { - 4, - 4 - }, - { - 0, - 0 - }, - { - 4, - 4 - }, - { - 0, - 0 - }, - { - 4, - 4 - }, - { - 0, - 0 - }, - { - 20, - 0 - }, - { - 12, - 4 - }, - { - 20, - 0 - }, - { - 12, - 4 - }, - { - 20, - 0 - }, - { - 12, - 4 - }, - { - 20, - 0 - }, - { - 12, - 4 - }, - { - 14, - 0 - }, - { - 12, - 4 - }, - { - 12, - 4 - }, - { - 12, - 4 - }, - { - 14, - 0 - }, - { - 12, - 4 - } - } - }, - [70]={ - ["board"]={ - { - 1, - 0 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 19, - 0 - }, - { - 4, - 2 - }, - { - 4, - 1 - }, - { - 4, - 3 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 18, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 4, - 2 - }, - { - 4, - 3 - }, - { - 4, - 2 - }, - { - 12, - 2 - }, - { - 0, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 4, - 2 - }, - { - 18, - 0 - }, - { - 19, - 0 - }, - { - 12, - 2 - }, - { - 0, - 0 - }, - { - 18, - 0 - }, - { - 18, - 0 - }, - { - 0, - 0 - }, - { - 12, - 2 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 19, - 0 - }, - { - 18, - 0 - }, - { - 12, - 2 - }, - { - 1, + 8, 0 }, { - 18, + 3, 0 }, { - 14, + 8, 0 }, { - 18, + 3, 0 }, { - 14, + 8, 0 }, { - 1, + 3, 0 }, { - 1, + 8, 0 } } @@ -14002,355 +19355,418 @@ local chapter_board_rune = { [71]={ ["board"]={ { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 1, - 0 + 4, + 3 }, { 0, 1 }, - { - 11, - 0 - }, { 0, 4 }, - { - 0, - 2 - }, { 0, 4 }, - { - 0, - 2 - }, - { - 12, - 2 - }, { 0, 1 }, { - 2, + 0, + 3 + }, + { + 4, + 4 + }, + { + 0, + 1 + }, + { + 4, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 4, + 3 + }, + { + 0, + 3 + }, + { + 0, 0 }, { - 2, + 0, + 4 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 0, + 5 + }, + { + 0, 0 }, { - 2, + 0, 0 }, { - 2, + 0, 0 }, { - 2, + 4, + 3 + }, + { + 0, + 4 + }, + { + 4, + 3 + }, + { + 0, 0 }, { - 1, + 0, 0 }, { - 2, + 0, 0 }, { - 11, + 0, 0 }, { - 3, + 4, + 4 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 0, 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { - 3, + 4, + 4 + }, + { + 0, + 5 + }, + { + 0, 0 }, { - 14, + 0, + 4 + }, + { + 4, + 3 + }, + { + 0, 0 }, { - 3, + 4, + 5 + }, + { + 0, + 3 + }, + { + 0, 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { - 3, - 0 + 0, + 5 }, { - 3, - 0 + 4, + 5 + } + }, + ["grid_edge"]={ + { + ["pos"]=21, + ["type"]=5, + ["direction"]=3 }, { - 3, - 0 + ["pos"]=21, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=32, + ["type"]=5, + ["direction"]=3 }, { - 2, - 0 + ["pos"]=32, + ["type"]=5, + ["direction"]=2 }, { - 11, - 0 + ["pos"]=27, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=27, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=36, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=36, + ["type"]=5, + ["direction"]=2 }, { - 2, - 0 + ["pos"]=44, + ["type"]=5, + ["direction"]=3 }, { - 14, - 0 + ["pos"]=44, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=44, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=63, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=63, + ["type"]=5, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=65, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=65, + ["type"]=5, + ["direction"]=3 }, { - 3, - 0 + ["pos"]=72, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=72, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=72, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=76, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=76, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=76, + ["type"]=5, + ["direction"]=2 } } }, [72]={ ["board"]={ { - 1, - 0 - }, - { - 0, - 4 - }, - { - 0, - 5 - }, - { - 0, - 4 - }, - { - 0, - 5 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 12, - 3 - }, - { - 0, - 4 - }, - { - 10, - 0 - }, - { - 0, - 5 - }, - { - 11, - 0 - }, - { - 0, - 4 - }, - { - 12, - 3 + 4, + 1 }, { 4, - 3 + 2 }, { - 2, - 0 + 0, + 4 }, { - 2, - 0 + 0, + 1 }, { - 2, - 0 + 0, + 4 }, { - 2, - 0 + 4, + 4 }, { - 2, + 4, + 4 + }, + { + 29, 0 }, { 4, - 3 + 1 }, { - 12, - 3 + 0, + 1 }, { - 3, + 0, + 4 + }, + { + 0, + 1 + }, + { + 4, + 2 + }, + { + 29, 0 }, { - 10, - 0 + 4, + 1 + }, + { + 4, + 4 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 4, + 1 + }, + { + 4, + 4 }, { 0, 0 }, { - 11, + 2, 0 }, { 3, 0 }, - { - 12, - 3 - }, { 7, 0 }, { - 7, + 3, 0 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 14, - 0 - }, - { - 7, - 0 - }, - { - 10, + 2, 0 }, { @@ -14358,15 +19774,43 @@ local chapter_board_rune = { 0 }, { - 11, + 0, 0 }, { - 7, + 4, + 3 + }, + { + 4, + 3 + }, + { + 4, + 1 + }, + { + 4, + 3 + }, + { + 4, + 2 + }, + { + 0, 0 }, { - 14, + 0, + 0 + }, + { + 4, + 2 + }, + { + 29, 0 }, { @@ -14374,57 +19818,49 @@ local chapter_board_rune = { 0 }, { - 7, + 29, 0 }, { - 7, + 4, + 3 + }, + { + 0, 0 }, { - 7, + 0, 0 }, { - 7, - 0 + 4, + 3 }, { - 7, - 0 + 4, + 2 }, { - 1, + 4, + 2 + }, + { + 4, + 1 + }, + { + 4, + 3 + }, + { + 0, 0 } } }, [73]={ ["board"]={ - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 9, - 0 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, { 1, 0 @@ -14435,90 +19871,14 @@ local chapter_board_rune = { }, { 0, - 1 - }, - { - 0, - 1 - }, - { - 2, - 0 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 1 - }, - { - 4, - 1 - }, - { - 2, - 0 - }, - { - 4, - 1 - }, - { - 4, - 1 - }, - { - 1, - 0 - }, - { - 4, 3 }, { - 4, + 0, + 3 + }, + { + 0, 3 }, { @@ -14526,7 +19886,7 @@ local chapter_board_rune = { 0 }, { - 2, + 1, 0 }, { @@ -14534,15 +19894,23 @@ local chapter_board_rune = { 0 }, { - 4, + 3, + 0 + }, + { + 0, 3 }, { - 4, + 0, 3 }, { - 14, + 0, + 3 + }, + { + 3, 0 }, { @@ -14550,11 +19918,115 @@ local chapter_board_rune = { 0 }, { - 1, + 3, 0 }, { - 2, + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -14562,287 +20034,498 @@ local chapter_board_rune = { 0 }, { - 1, + 3, 0 }, { - 14, + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { 1, 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=12, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=15, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=22, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=25, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=32, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=35, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=41, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=41, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=47, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=47, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=53, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=2 + }, + { + ["pos"]=72, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=72, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=73, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=74, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=75, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=76, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=76, + ["type"]=5, + ["direction"]=4 } } }, [74]={ ["board"]={ { - 1, + 32, 0 }, { - 3, + 32, 0 }, { - 3, + 32, 0 }, { - 9, + 32, + 0 + }, + { + 32, 0 }, { 0, - 1 + 5 }, { 0, 2 }, { - 0, - 1 - }, - { - 1, + 32, 0 }, { - 3, + 32, 0 }, { - 3, + 32, 0 }, { - 2, + 32, + 0 + }, + { + 32, 0 }, { 0, - 1 + 5 + }, + { + 0, + 4 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 0, + 3 }, { 0, 2 }, { - 0, - 2 - }, - { - 1, + 32, 0 }, { - 3, + 32, 0 }, { - 3, + 32, 0 }, { - 2, + 32, 0 }, { 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 14, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 + 4 }, { 10, 0 }, { - 1, + 0, + 4 + }, + { + 32, + 0 + }, + { + 32, + 0 + }, + { + 32, 0 }, { 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 32, + 0 + }, + { + 32, 0 }, { 0, - 0 + 2 }, { - 7, - 0 + 0, + 3 }, { - 7, - 0 + 0, + 5 }, { - 7, - 0 + 0, + 4 }, { - 7, - 0 + 0, + 3 }, { - 1, + 32, 0 }, { 0, - 0 + 5 }, { 0, - 0 + 2 }, { - 14, - 0 + 0, + 3 }, { - 7, - 0 + 0, + 3 }, { - 7, - 0 + 0, + 3 }, { - 1, - 0 + 0, + 5 + } + }, + ["grid_edge"]={ + { + ["pos"]=11, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=12, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=13, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=14, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=21, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=22, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=23, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=24, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=31, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=33, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=34, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=35, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=41, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=42, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=43, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=51, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=52, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=53, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=61, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=62, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=71, + ["type"]=5, + ["direction"]=4 } } }, [75]={ ["board"]={ { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 2, + 1, 0 }, { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 2, + 1, 0 }, { @@ -14851,43 +20534,295 @@ local chapter_board_rune = { }, { 0, - 4 + 1 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 34, + 1 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 3 }, { 0, 4 }, { - 2, + 1, 0 }, { - 2, + 34, + 1 + }, + { + 34, + 1 + }, + { + 1, 0 }, { - 2, + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 1, 0 }, { - 2, + 34, + 1 + }, + { + 34, + 1 + }, + { + 1, 0 }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 34, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, { 9, 0 }, { - 9, + 0, + 3 + }, + { + 1, 0 }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 0, + 0 + }, + { + 34, + 1 + }, + { + 3, + 0 + }, + { + 34, + 1 + }, + { + 2, + 0 + }, + { + 34, + 1 + }, + { + 3, + 0 + }, + { + 34, + 1 + } + } + }, + [76]={ + ["board"]={ + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, { 9, 0 }, { - 3, - 0 + 0, + 2 }, { 3, @@ -14897,97 +20832,81 @@ local chapter_board_rune = { 3, 0 }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, { 2, 0 }, { - 2, + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, { 2, 0 }, { - 2, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 + 0, + 2 }, { 3, @@ -14997,217 +20916,182 @@ local chapter_board_rune = { 3, 0 } - } - }, - [76]={ - ["board"]={ + }, + ["grid_edge"]={ { - 0, - 3 + ["pos"]=12, + ["type"]=5, + ["direction"]=4 }, { - 0, - 4 + ["pos"]=15, + ["type"]=5, + ["direction"]=4 }, { - 0, - 3 + ["pos"]=22, + ["type"]=5, + ["direction"]=4 }, { - 0, - 3 + ["pos"]=25, + ["type"]=5, + ["direction"]=4 }, { - 0, - 2 + ["pos"]=32, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=35, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=42, + ["type"]=5, + ["direction"]=4 }, { - 0, - 3 + ["pos"]=42, + ["type"]=5, + ["direction"]=2 }, { - 0, - 1 + ["pos"]=46, + ["type"]=5, + ["direction"]=3 }, { - 0, - 1 + ["pos"]=46, + ["type"]=5, + ["direction"]=2 }, { - 0, - 1 + ["pos"]=51, + ["type"]=5, + ["direction"]=4 }, { - 0, - 1 + ["pos"]=56, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=61, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=64, + ["type"]=5, + ["direction"]=1 }, { - 2, - 0 + ["pos"]=64, + ["type"]=5, + ["direction"]=3 }, { - 2, - 0 + ["pos"]=64, + ["type"]=5, + ["direction"]=4 }, { - 2, - 0 + ["pos"]=66, + ["type"]=5, + ["direction"]=4 }, { - 0, - 3 + ["pos"]=72, + ["type"]=5, + ["direction"]=1 }, { - 0, - 3 + ["pos"]=72, + ["type"]=5, + ["direction"]=4 }, { - 0, - 3 + ["pos"]=74, + ["type"]=5, + ["direction"]=3 }, { - 0, - 3 + ["pos"]=74, + ["type"]=5, + ["direction"]=4 }, { - 4, - 5 + ["pos"]=76, + ["type"]=5, + ["direction"]=3 }, { - 4, - 5 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 4, - 1 - }, - { - 4, - 1 - }, - { - 10, - 0 - }, - { - 11, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 14, - 0 - }, - { - 4, - 5 - }, - { - 4, - 5 - }, - { - 4, - 4 - }, - { - 4, - 4 - }, - { - 4, - 3 - }, - { - 4, - 3 - }, - { - 10, - 0 - }, - { - 11, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 14, - 0 + ["pos"]=76, + ["type"]=5, + ["direction"]=1 } } }, [77]={ ["board"]={ + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, { 0, 2 }, { 0, - 1 + 4 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 }, { 0, @@ -15218,17 +21102,21 @@ local chapter_board_rune = { 0 }, { - 2, + 0, + 0 + }, + { + 22, + 5 + }, + { + 0, 0 }, { 2, 0 }, - { - 1, - 0 - }, { 0, 1 @@ -15242,7 +21130,15 @@ local chapter_board_rune = { 0 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -15250,9 +21146,37 @@ local chapter_board_rune = { 0 }, { - 2, + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, { 1, 0 @@ -15261,53 +21185,29 @@ local chapter_board_rune = { 0, 1 }, + { + 0, + 4 + }, { 0, 1 }, { - 2, - 0 + 0, + 1 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 + 0, + 3 }, { 1, 0 }, { - 4, - 2 - }, - { - 4, - 2 - }, - { - 11, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 14, - 0 + 22, + 5 }, { 1, @@ -15315,182 +21215,150 @@ local chapter_board_rune = { }, { 0, - 0 + 3 }, { 0, - 0 + 4 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 + 0, + 3 }, { 1, 0 }, { - 1, - 0 + 22, + 5 + } + }, + ["grid_edge"]={ + { + ["pos"]=11, + ["type"]=6, + ["direction"]=4 }, { - 11, - 0 + ["pos"]=13, + ["type"]=6, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=13, + ["type"]=5, + ["direction"]=2 }, { - 3, - 0 + ["pos"]=14, + ["type"]=6, + ["direction"]=4 }, { - 3, - 0 + ["pos"]=14, + ["type"]=6, + ["direction"]=2 }, { - 14, - 0 + ["pos"]=15, + ["type"]=5, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=16, + ["type"]=6, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=21, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=22, + ["type"]=5, + ["direction"]=4 }, { - 7, - 0 + ["pos"]=25, + ["type"]=5, + ["direction"]=4 }, { - 7, - 0 + ["pos"]=26, + ["type"]=5, + ["direction"]=4 }, { - 7, - 0 + ["pos"]=32, + ["type"]=5, + ["direction"]=4 }, { - 7, - 0 + ["pos"]=33, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=34, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=34, + ["type"]=6, + ["direction"]=2 + }, + { + ["pos"]=35, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=42, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=45, + ["type"]=5, + ["direction"]=4 } } }, [78]={ ["board"]={ { - 0, - 2 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 9, + 29, 0 }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 4, - 2 - }, - { - 0, - 2 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 4, - 1 - }, { 1, 0 }, { - 3, + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 1, 0 }, { - 2, + 29, + 0 + }, + { + 29, 0 }, { @@ -15498,15 +21366,111 @@ local chapter_board_rune = { 0 }, { - 2, + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 3, 0 }, + { + 29, + 0 + }, + { + 4, + 2 + }, + { + 4, + 4 + }, + { + 0, + 5 + }, + { + 29, + 0 + }, + { + 0, + 4 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, { 4, 1 }, + { + 4, + 4 + }, + { + 4, + 5 + }, { 0, + 1 + }, + { + 4, + 1 + }, + { + 4, + 3 + }, + { + 4, + 5 + }, + { + 1, 0 }, { @@ -15517,80 +21481,44 @@ local chapter_board_rune = { 4, 4 }, + { + 0, + 2 + }, + { + 4, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 29, + 0 + }, { 4, 4 }, { - 4, - 3 + 0, + 5 }, { 4, - 3 + 1 }, { - 1, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 14, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 14, + 29, 0 }, { @@ -15601,176 +21529,44 @@ local chapter_board_rune = { }, [79]={ ["board"]={ - { - 25, - 0 - }, - { - 25, - 0 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 24, - 0 - }, { 1, 0 }, { - 1, - 0 - }, - { - 25, - 0 - }, - { - 25, + 3, 0 }, { 0, - 4 - }, - { - 0, - 3 - }, - { - 24, - 0 - }, - { - 9, - 0 - }, - { - 1, - 0 - }, - { - 25, - 0 - }, - { - 25, - 0 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 24, - 0 - }, - { - 25, - 0 - }, - { - 9, - 0 - }, - { - 25, - 0 - }, - { - 25, - 0 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 24, - 0 - }, - { - 25, - 0 - }, - { - 25, - 0 - }, - { - 11, - 0 - }, - { - 24, - 0 - }, - { - 0, - 4 - }, - { - 23, - 3 - }, - { - 23, - 2 - }, - { - 23, - 1 - }, - { - 23, 5 }, { - 1, + 3, 0 }, { - 11, - 0 - }, - { - 23, + 0, 4 }, { - 23, - 3 + 3, + 0 }, { - 23, - 2 + 1, + 0 }, { - 23, - 1 + 3, + 0 }, { - 23, + 0, 5 }, { - 1, + 3, 0 }, { @@ -15778,347 +21574,624 @@ local chapter_board_rune = { 0 }, { - 23, + 3, + 0 + }, + { + 0, 4 }, { - 23, - 3 + 3, + 0 }, { - 23, - 2 + 0, + 4 }, { - 23, - 1 + 3, + 0 }, { - 23, + 1, + 0 + }, + { + 37, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 0, 5 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 37, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=11, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=11, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=17, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=17, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=21, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=23, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=23, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=25, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=25, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=27, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=31, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=33, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=33, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=34, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=35, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=35, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=36, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=41, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=41, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=47, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=47, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=52, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=52, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=56, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=56, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=63, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=63, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=64, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=65, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=65, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=73, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=74, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=75, + ["type"]=2, + ["direction"]=2 } } }, [80]={ ["board"]={ { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 23, - 1 - }, - { - 25, - 0 - }, - { - 27, - 2 - }, - { - 27, - 2 - }, - { - 27, - 4 - }, - { - 25, - 0 - }, - { - 23, - 1 - }, - { - 23, - 1 - }, - { - 25, - 0 - }, - { - 27, + 4, 5 }, { - 27, - 4 - }, - { - 27, - 4 - }, - { - 25, - 0 - }, - { - 23, - 1 - }, - { - 23, - 1 - }, - { - 25, - 0 - }, - { - 27, + 4, 5 }, { - 27, + 4, + 1 + }, + { + 0, 5 }, { - 27, + 0, + 5 + }, + { + 0, 1 }, { - 25, + 0, + 5 + }, + { + 0, 0 }, { - 23, + 0, + 0 + }, + { + 4, 1 }, { - 23, + 0, + 5 + }, + { + 0, 1 }, { - 25, - 0 + 0, + 2 }, { - 25, - 0 - }, - { - 25, - 0 - }, - { - 25, - 0 - }, - { - 25, - 0 - }, - { - 23, + 0, 1 }, { - 1, + 0, 0 }, { - 1, + 9, 0 }, { - 14, - 0 - }, - { - 23, + 4, 1 }, { - 14, + 4, + 1 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=32, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=32, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=32, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=32, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=56, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=56, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=56, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=56, + ["type"]=3, + ["direction"]=4 } } }, [81]={ ["board"]={ { - 1, + 0, + 1 + }, + { + 0, + 3 + }, + { + 3, 0 }, { - 23, - 5 - }, - { - 0, - 2 - }, - { - 0, - 5 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 1, + 37, 0 }, { - 1, + 3, 0 }, { 0, - 5 - }, - { - 25, - 0 - }, - { - 23, - 4 + 3 }, { 0, - 2 + 1 }, { 0, - 4 - }, - { - 1, - 0 - }, - { - 1, 0 }, { 0, - 5 + 3 }, { - 25, + 2, + 0 + }, + { + 5, + 3 + }, + { + 2, 0 }, { 0, - 4 - }, - { - 25, - 0 - }, - { - 23, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 + 3 }, { 0, - 5 - }, - { - 25, - 0 - }, - { - 0, - 4 - }, - { - 25, - 0 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 24, 0 }, { @@ -16127,34 +22200,22 @@ local chapter_board_rune = { }, { 0, - 4 - }, - { - 25, 0 }, { 0, - 2 + 3 }, { - 1, + 0, 0 }, { - 1, - 0 + 0, + 3 }, { - 14, - 0 - }, - { - 1, - 0 - }, - { - 24, + 0, 0 }, { @@ -16163,39 +22224,237 @@ local chapter_board_rune = { }, { 0, - 2 - }, - { - 1, 0 }, { - 1, + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, 0 }, { - 1, + 25, 0 }, { - 1, + 0, 0 }, { - 14, + 3, 0 }, { - 1, + 2, 0 }, { - 1, + 3, 0 }, { - 1, + 0, 0 + }, + { + 25, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 25, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 37, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 25, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=14, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=14, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=21, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=21, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=27, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=27, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=32, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=32, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=32, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=36, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=36, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=36, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=41, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=46, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=52, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=52, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=52, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=56, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=56, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=56, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=61, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=66, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=71, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=76, + ["type"]=3, + ["direction"]=4 } } }, @@ -16206,95 +22465,119 @@ local chapter_board_rune = { 4 }, { - 1, + 3, 0 }, - { - 0, - 3 - }, { 1, 0 }, { - 0, - 3 + 37, + 0 }, { 1, 0 }, { - 0, - 4 + 3, + 0 }, { - 27, - 2 + 0, + 3 }, { 0, 4 }, { - 27, - 1 + 2, + 0 }, { - 0, - 1 + 3, + 0 }, { - 27, - 1 - }, - { - 0, - 4 - }, - { - 27, + 5, 5 }, { - 0, - 4 + 3, + 0 }, { - 27, - 2 + 2, + 0 }, { 0, - 2 - }, - { - 27, 1 }, { 0, + 3 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 5, 5 }, { - 27, - 5 + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 0, + 3 }, { 0, 4 }, { - 24, + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 3, 0 }, { - 25, + 0, 0 }, { - 24, + 2, 0 }, { @@ -16302,100 +22585,183 @@ local chapter_board_rune = { 3 }, { - 24, - 0 + 0, + 1 }, { - 25, - 0 - }, - { - 24, - 0 - }, - { - 25, - 0 - }, - { - 24, - 0 - }, - { - 23, + 0, 3 }, { - 23, - 3 - }, - { - 23, - 3 - }, - { - 24, + 2, 0 }, { - 25, + 0, 0 }, { - 14, + 0, 0 }, { - 25, + 0, 0 }, { - 23, - 3 - }, - { - 23, - 2 - }, - { - 23, - 3 - }, - { - 25, + 3, 0 }, { - 14, + 2, 0 }, { - 23, - 3 - }, - { - 25, + 3, 0 }, { - 23, - 2 - }, - { - 23, - 2 - }, - { - 23, - 2 - }, - { - 25, + 0, 0 }, { - 23, - 3 + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=13, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=13, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=14, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=15, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=15, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=23, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=23, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=25, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=25, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=34, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=34, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=41, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=46, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=51, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=52, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=55, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=56, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=63, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=63, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=65, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=65, + ["type"]=2, + ["direction"]=3 } } }, @@ -16403,247 +22769,370 @@ local chapter_board_rune = { ["board"]={ { 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 37, + 0 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 29, + 0 + }, + { + 29, + 0 + }, + { + 1, + 0 + }, + { + 21, 4 }, { 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 21, 4 }, { - 0, + 1, + 0 + }, + { + 21, 4 }, { - 0, - 3 + 21, + 4 }, { - 0, - 2 + 21, + 4 }, { - 0, - 3 + 21, + 4 }, { - 14, - 0 + 21, + 4 }, { - 24, - 0 + 21, + 4 }, { - 24, - 0 + 21, + 4 + } + }, + ["grid_edge"]={ + { + ["pos"]=14, + ["type"]=3, + ["direction"]=1 }, { - 0, - 3 + ["pos"]=14, + ["type"]=3, + ["direction"]=2 }, { - 0, - 3 + ["pos"]=14, + ["type"]=3, + ["direction"]=3 }, { - 0, - 2 + ["pos"]=14, + ["type"]=3, + ["direction"]=4 }, { - 0, - 3 + ["pos"]=31, + ["type"]=2, + ["direction"]=2 }, { - 24, - 0 + ["pos"]=32, + ["type"]=2, + ["direction"]=2 }, { - 24, - 0 + ["pos"]=33, + ["type"]=2, + ["direction"]=2 }, { - 24, - 0 + ["pos"]=34, + ["type"]=2, + ["direction"]=2 }, { - 9, - 0 + ["pos"]=35, + ["type"]=2, + ["direction"]=2 }, { - 24, - 0 + ["pos"]=36, + ["type"]=2, + ["direction"]=2 }, { - 24, - 0 + ["pos"]=37, + ["type"]=2, + ["direction"]=2 }, { - 24, - 0 + ["pos"]=51, + ["type"]=2, + ["direction"]=1 }, { - 24, - 0 + ["pos"]=52, + ["type"]=2, + ["direction"]=1 }, { - 25, - 0 + ["pos"]=53, + ["type"]=2, + ["direction"]=1 }, { - 24, - 0 + ["pos"]=53, + ["type"]=2, + ["direction"]=4 }, { - 24, - 0 + ["pos"]=55, + ["type"]=2, + ["direction"]=3 }, { - 24, - 0 + ["pos"]=55, + ["type"]=2, + ["direction"]=1 }, { - 24, - 0 + ["pos"]=56, + ["type"]=2, + ["direction"]=1 }, { - 24, - 0 + ["pos"]=57, + ["type"]=2, + ["direction"]=1 }, { - 23, - 2 + ["pos"]=62, + ["type"]=2, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=63, + ["type"]=2, + ["direction"]=2 }, { - 24, - 0 + ["pos"]=63, + ["type"]=2, + ["direction"]=4 }, { - 24, - 0 + ["pos"]=65, + ["type"]=2, + ["direction"]=3 }, { - 24, - 0 + ["pos"]=65, + ["type"]=2, + ["direction"]=2 }, { - 24, - 0 - }, - { - 23, - 2 - }, - { - 23, - 2 - }, - { - 1, - 0 - }, - { - 25, - 0 - }, - { - 24, - 0 - }, - { - 24, - 0 - }, - { - 23, - 1 - }, - { - 23, - 1 - }, - { - 23, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 25, - 0 - }, - { - 23, - 1 - }, - { - 23, - 3 - }, - { - 14, - 0 - }, - { - 1, - 0 + ["pos"]=66, + ["type"]=2, + ["direction"]=2 } } }, [84]={ ["board"]={ - { - 0, - 3 - }, - { - 0, - 2 - }, { 1, 0 }, - { - 0, - 2 - }, { 1, 0 }, - { - 0, - 3 - }, { 0, 1 }, { - 24, + 0, + 1 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, 0 }, { 0, - 3 + 1 }, { 0, - 2 - }, - { - 0, - 5 + 1 }, { 0, @@ -16654,115 +23143,95 @@ local chapter_board_rune = { 1 }, { - 24, - 0 - }, - { - 25, - 0 - }, - { - 24, - 0 - }, - { - 27, - 3 - }, - { - 27, - 2 - }, - { - 27, + 0, 1 }, { - 24, - 0 - }, - { - 25, - 0 - }, - { - 25, - 0 - }, - { - 25, - 0 - }, - { - 27, - 3 - }, - { - 27, - 2 - }, - { - 27, - 1 - }, - { - 25, - 0 - }, - { - 25, - 0 - }, - { - 25, - 0 - }, - { - 25, + 1, 0 }, { 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 25, - 0 - }, - { - 25, - 0 - }, - { - 1, - 0 - }, - { - 23, - 1 - }, - { - 23, - 1 - }, - { - 26, - 0 - }, - { - 23, 2 }, { - 23, + 0, + 2 + }, + { + 18, + 0 + }, + { + 0, + 2 + }, + { + 18, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 0, 2 }, { @@ -16770,244 +23239,364 @@ local chapter_board_rune = { 0 }, { - 1, + 0, + 1 + }, + { + 19, 0 }, + { + 12, + 2 + }, + { + 19, + 0 + }, + { + 0, + 1 + }, { 1, 0 }, { - 14, + 12, + 2 + }, + { + 19, 0 }, { - 1, + 18, 0 }, { - 14, + 0, + 2 + }, + { + 18, 0 }, { - 1, + 19, 0 }, { - 1, - 0 + 12, + 2 } } }, [85]={ ["board"]={ - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 23, - 5 - }, { 24, 0 }, { - 27, - 1 - }, - { - 27, + 0, 2 }, { - 27, - 1 - }, - { - 24, - 0 - }, - { - 23, - 5 - }, - { - 23, - 5 - }, - { - 23, - 5 - }, - { - 27, + 0, 3 }, { - 27, - 4 + 37, + 0 }, { - 27, + 0, 3 }, { - 23, - 5 - }, - { - 23, - 5 - }, - { - 23, - 5 + 0, + 2 }, { 24, 0 }, { - 27, + 0, 4 }, { - 27, + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 24, + 0 + }, + { + 0, 3 }, { - 27, + 0, + 1 + }, + { + 0, + 2 + }, + { + 24, + 0 + }, + { + 0, + 3 + }, + { + 0, 4 }, { - 24, - 0 + 0, + 4 }, { - 23, - 5 + 0, + 4 }, { - 1, - 0 + 0, + 4 }, { - 1, - 0 + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 2 }, { 24, 0 }, { - 14, - 0 + 0, + 1 }, { 24, 0 }, { - 1, + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 24, 0 }, { - 1, - 0 + 0, + 1 }, { - 1, - 0 + 0, + 3 }, { - 1, - 0 + 0, + 2 + } + }, + ["grid_edge"]={ + { + ["pos"]=11, + ["type"]=2, + ["direction"]=2 }, { - 23, - 5 + ["pos"]=14, + ["type"]=3, + ["direction"]=3 }, { - 23, - 5 + ["pos"]=14, + ["type"]=3, + ["direction"]=4 }, { - 23, - 5 + ["pos"]=14, + ["type"]=3, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=17, + ["type"]=2, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=32, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=32, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=36, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=36, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=53, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=53, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=55, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=55, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=74, + ["type"]=2, + ["direction"]=1 } } }, [86]={ ["board"]={ { - 14, + 0, + 2 + }, + { + 0, + 3 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 2, 0 }, { - 27, - 1 + 37, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 }, { 0, @@ -17019,14 +23608,18 @@ local chapter_board_rune = { }, { 0, - 4 + 0 }, { - 27, - 4 + 0, + 0 }, { - 14, + 2, + 0 + }, + { + 0, 0 }, { @@ -17039,27 +23632,51 @@ local chapter_board_rune = { }, { 0, - 5 + 2 }, { - 27, + 0, 3 }, { 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 5, + 4 + }, + { + 5, 4 }, { 0, - 1 + 0 }, { 0, - 1 - }, - { - 0, - 1 + 0 }, { 0, @@ -17071,136 +23688,210 @@ local chapter_board_rune = { }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 25, - 0 - }, - { - 25, - 0 - }, - { - 25, - 0 - }, - { - 25, - 0 - }, - { - 25, - 0 - }, - { - 25, - 0 - }, - { - 25, - 0 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 23, - 2 - }, - { - 23, 5 }, { - 23, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 3 }, { - 1, + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, 0 }, { - 1, + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, 0 }, { - 1, - 0 + 5, + 4 }, { - 1, - 0 + 5, + 4 + } + }, + ["grid_edge"]={ + { + ["pos"]=34, + ["type"]=2, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=35, + ["type"]=2, + ["direction"]=2 }, { - 1, - 0 + ["pos"]=36, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=37, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=43, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=53, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=63, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=74, + ["type"]=2, + ["direction"]=1 } } }, [87]={ ["board"]={ + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 23, + 3 + }, { 0, 2 @@ -17209,400 +23900,328 @@ local chapter_board_rune = { 0, 4 }, - { - 0, - 1 - }, { 0, 5 }, { - 0, + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 23, 3 }, { 0, - 4 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 28, - 0 - }, - { - 0, - 5 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 28, - 0 - }, - { - 29, - 0 - }, - { - 28, - 0 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 28, - 0 - }, - { - 29, - 0 - }, - { - 30, - 0 - }, - { - 29, - 0 - }, - { - 28, - 0 - }, - { - 0, - 1 - }, - { - 28, - 0 - }, - { - 29, - 0 - }, - { - 30, - 0 - }, - { - 30, - 0 - }, - { - 30, - 0 - }, - { - 29, - 0 - }, - { - 28, - 0 - }, - { - 5, - 3 - }, - { - 5, - 5 - }, - { - 21, - 3 - }, - { - 21, - 4 - }, - { - 21, - 1 - }, - { - 5, 2 }, { - 5, - 1 - }, - { - 5, - 5 - }, - { - 5, - 3 - }, - { - 21, - 5 - }, - { - 21, + 0, 4 }, { - 21, + 0, 2 }, { - 5, + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 23, + 3 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, 1 }, { - 5, + 1, + 0 + }, + { + 1, + 0 + }, + { + 23, + 3 + }, + { + 0, 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 } } }, [88]={ ["board"]={ - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 21, - 1 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 21, - 1 - }, - { - 1, - 0 - }, - { - 21, - 1 - }, - { - 21, - 1 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 21, - 1 - }, - { - 21, - 1 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 5, - 5 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 1 - }, - { - 14, - 0 - }, - { - 30, - 0 - }, - { - 5, - 5 - }, - { - 5, 2 }, { - 5, + 30, + 0 + }, + { + 4, + 1 + }, + { + 0, 5 }, { - 30, - 0 - }, - { - 14, - 0 - }, - { - 29, - 0 + 4, + 1 }, { 30, 0 }, { - 29, - 0 + 0, + 1 }, { - 5, + 4, 5 }, { - 29, - 0 + 0, + 1 }, { - 30, - 0 + 4, + 1 }, { - 29, - 0 + 0, + 1 }, { - 29, - 0 + 4, + 5 }, { - 30, - 0 + 0, + 4 }, { - 29, - 0 - }, - { - 5, + 4, 2 }, { - 29, - 0 + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 4, + 1 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 4, + 1 }, { 30, 0 }, { - 29, + 4, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 4, + 4 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 30, 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 30, + 0 + }, + { + 0, + 4 } } }, [89]={ ["board"]={ { - 1, + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { @@ -17610,8 +24229,16 @@ local chapter_board_rune = { 2 }, { - 0, - 3 + 2, + 0 + }, + { + 37, + 0 + }, + { + 3, + 0 }, { 0, @@ -17619,226 +24246,174 @@ local chapter_board_rune = { }, { 0, - 3 + 5 }, { 0, - 1 + 5 }, { - 1, + 3, 0 }, { - 1, + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 3, 0 }, { 0, 2 }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 5, + 3 + }, + { + 1, + 0 + }, + { + 5, + 3 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, { 0, 2 }, { - 0, + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, 3 }, { 0, - 1 + 4 }, { 0, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 28, - 0 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 1, - 0 - }, - { - 21, 4 }, { - 21, + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, 4 }, { - 28, - 0 - }, - { - 28, - 0 - }, - { - 28, - 0 - }, - { - 21, + 0, 4 }, { - 21, + 0, 4 }, { - 21, - 4 - }, - { - 21, - 4 - }, - { - 29, + 3, 0 }, { - 29, + 37, 0 }, { - 29, + 2, 0 }, { - 21, - 4 + 0, + 2 }, { - 21, - 4 - }, - { - 1, + 3, 0 }, { - 1, + 3, 0 }, { - 29, + 3, 0 }, { - 29, - 0 - }, - { - 29, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 + 0, + 2 } } }, [90]={ ["board"]={ { - 5, - 5 - }, - { - 5, - 2 - }, - { - 5, - 1 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 0, + 1, 0 }, { - 9, - 0 - }, - { - 5, + 0, 1 }, { @@ -17847,98 +24422,18 @@ local chapter_board_rune = { }, { 0, - 2 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 0, - 0 - }, - { - 28, - 0 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 0, - 0 - }, - { - 28, - 0 - }, - { - 21, 3 }, { - 21, - 3 - }, - { - 21, - 3 - }, - { - 9, - 0 + 0, + 1 }, { 0, - 0 + 1 }, { - 0, - 0 - }, - { - 28, - 0 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 28, - 0 - }, - { - 0, + 1, 0 }, { @@ -17946,23 +24441,139 @@ local chapter_board_rune = { 0 }, { - 28, + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, 0 }, { - 30, + 36, 0 }, { - 30, + 3, 0 }, { - 30, + 2, 0 }, { - 28, + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 36, + 0 + }, + { + 36, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 36, + 0 + }, + { + 36, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 36, + 0 + }, + { + 36, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 36, 0 }, { @@ -17974,23 +24585,19 @@ local chapter_board_rune = { 0 }, { - 28, + 36, 0 }, { - 14, + 36, 0 }, { - 30, + 36, 0 }, { - 14, - 0 - }, - { - 28, + 1, 0 }, { @@ -18002,9 +24609,85 @@ local chapter_board_rune = { [91]={ ["board"]={ { - 1, + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 3, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 37, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, { 0, 1 @@ -18015,358 +24698,164 @@ local chapter_board_rune = { }, { 0, - 5 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 28, - 0 - }, - { - 28, - 0 - }, - { - 28, - 0 - }, - { - 28, - 0 - }, - { - 28, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 21, - 1 - }, - { - 21, 2 }, { - 28, - 0 - }, - { - 21, - 3 - }, - { - 21, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 28, - 0 - }, - { - 29, - 0 - }, - { - 29, - 0 - }, - { - 29, - 0 - }, - { - 28, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 1 - }, - { - 5, + 0, 2 }, { - 14, + 31, 0 }, { - 5, - 3 - }, - { - 5, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, + 0, 1 }, { - 5, - 2 + 0, + 1 + }, + { + 0, + 1 }, { 1, 0 }, { - 5, - 3 + 3, + 0 }, { - 5, - 4 + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 }, { 1, 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 32, + 0 + }, + { + 31, + 0 + }, + { + 32, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=23, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=24, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=25, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=34, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=34, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=44, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=44, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=44, + ["type"]=3, + ["direction"]=2 } } }, [92]={ ["board"]={ - { - 29, - 0 - }, - { - 28, - 0 - }, - { - 0, - 2 - }, { 0, 3 }, { - 0, - 4 - }, - { - 28, - 0 - }, - { - 29, - 0 - }, - { - 29, - 0 - }, - { - 28, - 0 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 28, - 0 - }, - { - 29, - 0 - }, - { - 5, - 1 - }, - { - 5, - 5 - }, - { - 21, - 2 - }, - { - 0, - 3 - }, - { - 21, - 4 - }, - { - 5, - 2 - }, - { - 5, - 1 - }, - { - 5, - 5 - }, - { - 5, - 1 - }, - { - 21, - 2 - }, - { - 0, - 3 - }, - { - 21, - 4 - }, - { - 5, - 1 - }, - { - 5, - 2 - }, - { - 0, - 0 - }, - { - 5, - 5 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 2 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, + 2, 0 }, { @@ -18374,7 +24863,115 @@ local chapter_board_rune = { 0 }, { - 14, + 0, + 2 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 4, + 5 + }, + { + 2, + 0 + }, + { + 37, + 0 + }, + { + 2, + 0 + }, + { + 4, + 5 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 4, + 1 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 4, + 1 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 4, + 1 + }, + { + 4, + 3 + }, + { + 4, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, 0 }, { @@ -18385,12 +24982,64 @@ local chapter_board_rune = { 0, 0 }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, { 1, 0 }, { - 14, + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 3, 0 }, { @@ -18401,10 +25050,106 @@ local chapter_board_rune = { }, [93]={ ["board"]={ + { + 4, + 5 + }, + { + 4, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 4, + 2 + }, + { + 4, + 5 + }, + { + 24, + 0 + }, + { + 4, + 3 + }, { 0, 2 }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 4, + 3 + }, + { + 24, + 0 + }, + { + 4, + 3 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 4, + 3 + }, + { + 0, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, { 0, 2 @@ -18415,46 +25160,54 @@ local chapter_board_rune = { }, { 0, - 3 + 0 }, { 0, - 3 + 0 }, { 0, + 0 + }, + { + 0, + 4 + }, + { + 4, 2 }, { 0, - 2 + 5 }, { - 21, - 3 - }, - { - 21, - 3 - }, - { - 21, - 2 - }, - { - 9, + 0, 0 }, { - 21, - 2 + 0, + 0 }, { - 21, - 3 + 25, + 0 }, { - 21, + 0, + 0 + }, + { + 4, + 5 + }, + { + 0, + 0 + }, + { + 4, 3 }, { @@ -18462,87 +25215,7 @@ local chapter_board_rune = { 0 }, { - 21, - 3 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 21, - 3 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 21, - 3 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 21, - 3 - }, - { - 0, - 0 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 1, - 0 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 5, - 4 - }, - { - 14, + 25, 0 }, { @@ -18554,7 +25227,11 @@ local chapter_board_rune = { 0 }, { - 30, + 0, + 0 + }, + { + 25, 0 }, { @@ -18566,481 +25243,119 @@ local chapter_board_rune = { 0 }, { - 14, + 0, 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=22, + ["type"]=6, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=26, + ["type"]=6, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=31, + ["type"]=6, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=37, + ["type"]=6, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=41, + ["type"]=5, + ["direction"]=4 }, { - 1, - 0 + ["pos"]=47, + ["type"]=5, + ["direction"]=3 }, { - 1, - 0 + ["pos"]=52, + ["type"]=5, + ["direction"]=1 }, { - 1, - 0 + ["pos"]=52, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=54, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=3 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=63, + ["type"]=6, + ["direction"]=1 + }, + { + ["pos"]=63, + ["type"]=6, + ["direction"]=3 + }, + { + ["pos"]=65, + ["type"]=6, + ["direction"]=4 + }, + { + ["pos"]=65, + ["type"]=6, + ["direction"]=1 } } }, [94]={ ["board"]={ { - 29, - 0 - }, - { - 29, - 0 + 0, + 5 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 29, - 0 - }, - { - 29, - 0 - }, - { - 29, - 0 - }, - { - 29, - 0 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 29, - 0 - }, - { - 29, - 0 - }, - { - 28, - 0 - }, - { - 28, - 0 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 28, - 0 - }, - { - 28, - 0 - }, - { - 5, 1 }, { - 5, + 0, + 2 + }, + { + 0, 1 }, - { - 5, - 1 - }, - { - 5, - 5 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 21, - 3 - }, - { - 21, - 3 - }, - { - 21, - 5 - }, - { - 1, - 0 - }, - { - 21, - 5 - }, - { - 21, - 4 - }, - { - 21, - 4 - }, - { - 21, - 1 - }, - { - 1, - 0 - }, - { - 21, - 5 - }, - { - 1, - 0 - }, - { - 21, - 5 - }, - { - 1, - 0 - }, - { - 21, - 2 - }, - { - 21, - 1 - }, - { - 1, - 0 - }, - { - 21, - 5 - }, - { - 14, - 0 - }, - { - 21, - 5 - }, - { - 1, - 0 - }, - { - 21, - 2 - } - } - }, - [95]={ - ["board"]={ - { - 31, - 0 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 35, - 4 - }, - { - 0, - 5 - }, - { - 0, - 2 - }, - { - 31, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 5 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 31, - 0 - }, - { - 31, - 0 - }, - { - 31, - 0 - }, - { - 0, - 5 - }, - { - 31, - 0 - }, - { - 31, - 0 - }, - { - 31, - 0 - }, - { - 31, - 0 - }, - { - 31, - 0 - }, - { - 31, - 0 - }, - { - 31, - 0 - }, - { - 31, - 0 - }, - { - 31, - 0 - }, - { - 31, - 0 - }, - { - 35, - 4 - }, - { - 31, - 0 - }, - { - 35, - 4 - }, - { - 1, - 0 - }, - { - 35, - 4 - }, - { - 31, - 0 - }, - { - 35, - 4 - }, - { - 31, - 0 - }, - { - 31, - 0 - }, - { - 31, - 0 - }, - { - 1, - 0 - }, - { - 31, - 0 - }, - { - 31, - 0 - }, - { - 31, - 0 - }, - { - 31, - 0 - }, - { - 35, - 4 - }, - { - 14, - 0 - }, - { - 1, - 0 - }, - { - 14, - 0 - }, - { - 35, - 4 - }, - { - 31, - 0 - } - } - }, - [96]={ - ["board"]={ - { - 32, - 0 - }, - { - 32, - 0 - }, - { - 32, - 0 - }, - { - 31, - 0 - }, - { - 32, - 0 - }, - { - 32, - 0 - }, - { - 32, - 0 - }, - { - 32, - 0 - }, - { - 0, - 0 - }, { 0, 3 }, + { + 0, + 4 + }, { 0, 1 @@ -19051,15 +25366,19 @@ local chapter_board_rune = { }, { 0, - 0 + 2 }, { - 32, - 0 + 0, + 4 }, { - 32, - 0 + 0, + 5 + }, + { + 0, + 1 }, { 0, @@ -19067,86 +25386,154 @@ local chapter_board_rune = { }, { 0, - 2 + 4 }, { - 8, + 1, 0 }, + { + 0, + 5 + }, + { + 0, + 4 + }, { 0, 3 }, { 0, - 2 + 1 }, { - 32, + 0, + 3 + }, + { + 1, 0 }, { - 31, + 24, + 0 + }, + { + 1, 0 }, { 0, - 2 + 5 }, { 10, 0 }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 24, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, { 0, 3 }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 24, + 0 + }, + { + 1, + 0 + }, { 11, 0 }, { - 0, - 1 - }, - { - 31, + 1, 0 }, { - 14, + 24, 0 }, { - 33, + 1, 0 - }, + } + } + }, + [95]={ + ["board"]={ { - 0, - 3 - }, - { - 9, - 0 - }, - { - 0, - 2 - }, - { - 33, - 0 - }, - { - 14, - 0 - }, - { - 33, - 0 - }, - { - 33, + 1, 0 }, { @@ -19155,47 +25542,565 @@ local chapter_board_rune = { }, { 0, - 2 + 5 + }, + { + 0, + 1 }, { 0, 3 }, { - 33, + 0, + 1 + }, + { + 1, 0 }, { - 33, + 0, + 1 + }, + { + 0, + 5 + }, + { + 2, 0 }, { - 33, + 2, 0 }, { - 33, + 2, 0 }, { - 33, + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, 0 }, { - 31, + 36, 0 }, { - 33, + 2, 0 }, { - 33, + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 2, 0 }, { - 33, + 2, 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 13, + 5 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 13, + 5 + }, + { + 1, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=23, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=23, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=25, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=25, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=43, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=43, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=45, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=45, + ["type"]=3, + ["direction"]=3 + } + } + }, + [96]={ + ["board"]={ + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 35, + 3 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 5 + } + }, + ["grid_edge"]={ + { + ["pos"]=11, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=12, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=23, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=23, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=24, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=26, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=26, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=32, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=33, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=35, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=35, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=41, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=44, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=44, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=44, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=44, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=46, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=52, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=55, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=61, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=63, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=65, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=66, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=72, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=74, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=76, + ["type"]=2, + ["direction"]=1 } } }, @@ -19203,15 +26108,27 @@ local chapter_board_rune = { ["board"]={ { 0, - 1 + 2 }, { 0, - 1 + 4 }, { 0, - 1 + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 }, { 0, @@ -19223,248 +26140,410 @@ local chapter_board_rune = { }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 5 - }, - { - 4, - 3 - }, - { - 4, - 3 - }, - { - 4, - 3 - }, - { - 4, - 3 - }, - { - 4, 4 }, + { + 0, + 2 + }, + { + 3, + 0 + }, { 0, 4 }, { - 4, - 5 + 0, + 3 }, { - 4, + 0, 1 }, { - 9, - 0 - }, - { - 32, - 0 - }, - { - 10, - 0 - }, - { - 4, + 0, 1 }, { - 4, + 0, + 1 + }, + { + 0, + 1 + }, + { + 5, 4 }, { - 33, + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 12, + 2 + }, + { + 5, + 4 + }, + { + 3, 0 }, { 0, - 0 - }, - { - 32, - 0 - }, - { - 33, - 0 - }, - { - 32, - 0 + 1 }, { 0, - 0 - }, - { - 33, - 0 - }, - { - 35, 3 }, { 0, - 0 + 1 }, { - 10, - 0 + 0, + 2 }, { - 33, - 0 + 5, + 4 }, { - 11, + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 3, 0 }, { 0, - 0 + 2 }, { - 35, + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, 3 }, { - 35, - 3 + 0, + 4 + } + }, + ["grid_edge"]={ + { + ["pos"]=33, + ["type"]=2, + ["direction"]=3 }, { - 35, - 3 + ["pos"]=33, + ["type"]=2, + ["direction"]=1 }, { - 33, - 0 + ["pos"]=35, + ["type"]=2, + ["direction"]=1 }, { - 33, - 0 + ["pos"]=35, + ["type"]=2, + ["direction"]=4 }, { - 33, - 0 + ["pos"]=44, + ["type"]=2, + ["direction"]=1 }, { - 35, - 3 + ["pos"]=44, + ["type"]=2, + ["direction"]=2 }, { - 35, - 3 + ["pos"]=44, + ["type"]=2, + ["direction"]=3 }, { - 14, - 0 + ["pos"]=44, + ["type"]=2, + ["direction"]=4 }, { - 33, - 0 + ["pos"]=53, + ["type"]=2, + ["direction"]=3 }, { - 33, - 0 + ["pos"]=53, + ["type"]=2, + ["direction"]=2 }, { - 33, - 0 + ["pos"]=55, + ["type"]=2, + ["direction"]=4 }, { - 33, - 0 - }, - { - 33, - 0 - }, - { - 14, - 0 + ["pos"]=55, + ["type"]=2, + ["direction"]=2 } } }, [98]={ ["board"]={ - { - 1, - 0 - }, - { - 4, - 3 - }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 4, - 2 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 4, - 2 + 1 }, { 0, 1 }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 13, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, { 0, 3 }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 13, + 5 + }, { 0, 2 }, { - 4, - 4 + 0, + 2 }, { 0, - 0 + 2 }, { 0, - 0 + 2 + }, + { + 0, + 2 }, { 1, 0 }, + { + 0, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 13, + 5 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, { 0, 3 @@ -19484,293 +26563,221 @@ local chapter_board_rune = { { 0, 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=17, + ["type"]=3, + ["direction"]=1 }, { - 0, - 0 + ["pos"]=27, + ["type"]=3, + ["direction"]=1 }, { - 32, - 0 + ["pos"]=27, + ["type"]=3, + ["direction"]=2 }, { - 0, - 4 + ["pos"]=27, + ["type"]=3, + ["direction"]=3 }, { - 0, - 1 + ["pos"]=47, + ["type"]=3, + ["direction"]=1 }, { - 0, - 4 + ["pos"]=47, + ["type"]=3, + ["direction"]=2 }, { - 32, - 0 + ["pos"]=47, + ["type"]=3, + ["direction"]=3 }, { - 0, - 0 + ["pos"]=67, + ["type"]=3, + ["direction"]=1 }, { - 0, - 0 + ["pos"]=67, + ["type"]=3, + ["direction"]=2 }, { - 1, - 0 - }, - { - 35, - 3 - }, - { - 35, - 2 - }, - { - 35, - 4 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 14, - 0 - }, - { - 1, - 0 - }, - { - 4, - 2 - }, - { - 35, - 2 - }, - { - 4, - 1 - }, - { - 1, - 0 - }, - { - 14, - 0 - }, - { - 1, - 0 - }, - { - 4, - 1 - }, - { - 4, - 1 - }, - { - 35, - 2 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 1, - 0 + ["pos"]=67, + ["type"]=3, + ["direction"]=3 } } }, [99]={ ["board"]={ { - 31, + 3, 0 }, - { - 0, - 5 - }, - { - 0, - 1 - }, { 0, 3 }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, { 0, 3 }, { - 0, - 1 - }, - { - 31, - 0 - }, - { - 31, + 3, 0 }, { 0, 3 }, - { - 0, - 5 - }, { 0, 3 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 31, - 0 - }, - { - 35, - 3 - }, - { - 35, 2 }, { - 35, - 1 + 0, + 4 }, { - 35, - 1 - }, - { - 35, - 1 - }, - { - 35, + 0, 2 }, { - 35, - 2 - }, - { - 35, - 5 - }, - { - 4, - 5 - }, - { - 4, - 1 - }, - { - 1, - 0 - }, - { - 4, - 1 - }, - { - 4, - 5 - }, - { - 35, + 0, 3 }, { - 35, - 1 - }, - { - 4, - 1 - }, - { - 4, - 5 - }, - { - 1, - 0 - }, - { - 4, - 5 - }, - { - 4, - 1 - }, - { - 35, - 2 - }, - { - 35, - 1 - }, - { - 4, - 1 - }, - { - 4, - 5 - }, - { - 4, - 1 - }, - { - 4, - 5 - }, - { - 4, - 1 - }, - { - 35, + 0, 3 }, { - 14, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 19, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -19794,8 +26801,57 @@ local chapter_board_rune = { 0 }, { - 14, + 1, 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=31, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=32, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=33, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=34, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=35, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=36, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=37, + ["type"]=2, + ["direction"]=1 } } }, @@ -19805,152 +26861,44 @@ local chapter_board_rune = { 1, 0 }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 4, - 5 - }, - { - 0, - 2 - }, - { - 35, - 2 - }, - { - 14, - 0 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 4, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 0, - 5 - }, { 0, 1 }, - { - 4, - 4 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 4, - 3 - }, - { - 4, - 3 - }, - { - 4, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 5 - }, - { - 4, - 5 - }, { 0, 1 }, { 0, - 5 + 1 }, { 0, - 5 + 1 }, { - 14, + 0, + 2 + }, + { + 1, 0 }, { - 35, - 5 + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 }, { 0, - 5 - }, - { - 4, 3 }, { @@ -19970,16 +26918,20 @@ local chapter_board_rune = { 0 }, { - 1, + 2, 0 }, { - 1, + 2, 0 }, { - 4, - 5 + 2, + 0 + }, + { + 2, + 0 }, { 0, @@ -19987,7 +26939,111 @@ local chapter_board_rune = { }, { 0, - 4 + 2 + }, + { + 36, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 36, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 2 + }, + { + 36, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 36, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 36, + 0 + }, + { + 3, + 0 + }, + { + 36, + 0 }, { 1, @@ -19997,6 +27053,53 @@ local chapter_board_rune = { 1, 0 } + }, + ["grid_edge"]={ + { + ["pos"]=32, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=32, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=43, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=44, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=55, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=1 + }, + { + ["pos"]=56, + ["type"]=5, + ["direction"]=4 + }, + { + ["pos"]=66, + ["type"]=5, + ["direction"]=4 + } } } } diff --git a/lua/app/config/chapter_dungeon_rune.lua b/lua/app/config/chapter_dungeon_rune.lua index 472b62cc..369ecf14 100644 --- a/lua/app/config/chapter_dungeon_rune.lua +++ b/lua/app/config/chapter_dungeon_rune.lua @@ -70,19 +70,33 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 6 + }, { 1, + 5, + 25 + }, + { 1, - 1 + 4, + 20 } }, ["weights"]={ { - 1, + 5, + 200 + }, + { + 4, 200 } }, @@ -176,14 +190,30 @@ local chapter_dungeon_rune = { 6108, 6209 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { 2, - 2, + 31, 1 + }, + { + 3, + 0, + 7 + }, + { + 1, + 5, + 45 + } + }, + ["weights"]={ + { + 5, + 200 } }, ["first_reward"]={ @@ -276,14 +306,34 @@ local chapter_dungeon_rune = { 6108, 6210 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 3, - 1, + 2, + 21, 1 + }, + { + 1, + 3, + 30 + }, + { + 1, + 2, + 30 + } + }, + ["weights"]={ + { + 3, + 200 + }, + { + 2, + 200 } }, ["first_reward"]={ @@ -376,24 +426,29 @@ local chapter_dungeon_rune = { 6108, 6211 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 10 + 3, + 0, + 8 + }, + { + 2, + 28, + 2 }, { 1, - 2, - 10 + 3, + 35 } }, ["weights"]={ { - 1, + 3, 200 } }, @@ -487,24 +542,24 @@ local chapter_dungeon_rune = { 6108, 6212 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ - { - 2, - 2, - 1 - }, - { - 1, - 2, - 10 - }, { 3, 0, - 10 + 7 + }, + { + 2, + 35, + 2 + }, + { + 2, + 31, + 4 } }, ["first_reward"]={ @@ -597,20 +652,19 @@ local chapter_dungeon_rune = { 6108, 6213 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 1 - } - }, - ["weights"]={ + 3, + 0, + 8 + }, { - 1, - 200 + 2, + 32, + 3 } }, ["first_reward"]={ @@ -703,14 +757,19 @@ local chapter_dungeon_rune = { 6108, 6214 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 6 + }, { 2, - 2, - 1 + 35, + 2 } }, ["first_reward"]={ @@ -803,14 +862,34 @@ local chapter_dungeon_rune = { 6108, 6215 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 3, + 2, + 24, + 4 + }, + { 1, - 1 + 2, + 25 + }, + { + 1, + 4, + 25 + } + }, + ["weights"]={ + { + 2, + 200 + }, + { + 4, + 200 } }, ["first_reward"]={ @@ -903,25 +982,19 @@ local chapter_dungeon_rune = { 6108, 6216 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 10 + 2, + 32, + 3 }, { - 1, - 2, - 10 - } - }, - ["weights"]={ - { - 1, - 200 + 3, + 0, + 8 } }, ["first_reward"]={ @@ -953,9 +1026,9 @@ local chapter_dungeon_rune = { ["monster"]={ 6308 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["first_reward"]={ { ["type"]=1, @@ -1056,19 +1129,29 @@ local chapter_dungeon_rune = { 6108, 6218 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 8 + }, + { + 2, + 12, + 2 + }, { 1, - 1, - 1 + 5, + 40 } }, ["weights"]={ { - 1, + 5, 200 } }, @@ -1162,16 +1245,32 @@ local chapter_dungeon_rune = { 6108, 6219 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 8 + }, + { + 1, + 5, + 65 + }, { 2, - 2, + 25, 1 } }, + ["weights"]={ + { + 5, + 200 + } + }, ["first_reward"]={ { ["type"]=1, @@ -1262,14 +1361,34 @@ local chapter_dungeon_rune = { 6108, 6220 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 3, 1, - 1 + 5, + 35 + }, + { + 1, + 2, + 35 + }, + { + 2, + 21, + 3 + } + }, + ["weights"]={ + { + 5, + 200 + }, + { + 2, + 200 } }, ["first_reward"]={ @@ -1362,24 +1481,33 @@ local chapter_dungeon_rune = { 6108, 6221 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 10 + 3, + 0, + 4 }, { 1, - 2, - 10 + 3, + 50 + }, + { + 1, + 4, + 50 } }, ["weights"]={ { - 1, + 3, + 200 + }, + { + 4, 200 } }, @@ -1473,24 +1601,14 @@ local chapter_dungeon_rune = { 6108, 6222 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ - { - 2, - 2, - 1 - }, - { - 1, - 2, - 10 - }, { 3, 0, - 10 + 7 } }, ["first_reward"]={ @@ -1583,19 +1701,29 @@ local chapter_dungeon_rune = { 6108, 6223 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 8 + }, { 1, - 1, + 4, + 55 + }, + { + 2, + 12, 1 } }, ["weights"]={ { - 1, + 4, 200 } }, @@ -1689,13 +1817,18 @@ local chapter_dungeon_rune = { 6108, 6224 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 5 + }, { 2, - 2, + 26, 1 } }, @@ -1789,14 +1922,34 @@ local chapter_dungeon_rune = { 6108, 6225 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { 3, + 0, + 7 + }, + { 1, - 1 + 1, + 35 + }, + { + 1, + 2, + 55 + } + }, + ["weights"]={ + { + 2, + 200 + }, + { + 1, + 200 } }, ["first_reward"]={ @@ -1889,25 +2042,19 @@ local chapter_dungeon_rune = { 6108, 6226 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 10 + 3, + 0, + 7 }, { - 1, 2, - 10 - } - }, - ["weights"]={ - { - 1, - 200 + 21, + 2 } }, ["first_reward"]={ @@ -1939,9 +2086,9 @@ local chapter_dungeon_rune = { ["monster"]={ 6408 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["first_reward"]={ { ["type"]=1, @@ -2042,20 +2189,19 @@ local chapter_dungeon_rune = { 6108, 6228 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 1 - } - }, - ["weights"]={ + 3, + 0, + 8 + }, { - 1, - 200 + 2, + 25, + 7 } }, ["first_reward"]={ @@ -2148,14 +2294,30 @@ local chapter_dungeon_rune = { 6108, 6229 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 7 + }, { 2, - 2, - 1 + 12, + 3 + }, + { + 1, + 5, + 45 + } + }, + ["weights"]={ + { + 5, + 200 } }, ["first_reward"]={ @@ -2248,14 +2410,25 @@ local chapter_dungeon_rune = { 6108, 6230 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { 3, + 0, + 7 + }, + { 1, - 1 + 5, + 40 + } + }, + ["weights"]={ + { + 5, + 200 } }, ["first_reward"]={ @@ -2348,24 +2521,33 @@ local chapter_dungeon_rune = { 6108, 6231 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 2, + 32, + 6 + }, { 1, - 1, - 10 + 3, + 50 }, { 1, 2, - 10 + 50 } }, ["weights"]={ { - 1, + 2, + 200 + }, + { + 3, 200 } }, @@ -2459,24 +2641,19 @@ local chapter_dungeon_rune = { 6108, 6232 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ - { - 2, - 2, - 1 - }, - { - 1, - 2, - 10 - }, { 3, 0, - 10 + 3 + }, + { + 2, + 5, + 4 } }, ["first_reward"]={ @@ -2569,19 +2746,29 @@ local chapter_dungeon_rune = { 6108, 6233 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 8 + }, + { + 2, + 20, + 4 + }, { 1, - 1, - 1 + 4, + 50 } }, ["weights"]={ { - 1, + 4, 200 } }, @@ -2675,14 +2862,34 @@ local chapter_dungeon_rune = { 6108, 6234 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { + 3, + 0, + 6 + }, + { + 1, + 5, + 60 + }, + { + 1, 2, + 60 + } + }, + ["weights"]={ + { + 5, + 200 + }, + { 2, - 1 + 200 } }, ["first_reward"]={ @@ -2775,14 +2982,34 @@ local chapter_dungeon_rune = { 6108, 6235 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 3, - 1, + 2, + 30, 1 + }, + { + 1, + 5, + 50 + }, + { + 1, + 3, + 50 + } + }, + ["weights"]={ + { + 5, + 200 + }, + { + 3, + 200 } }, ["first_reward"]={ @@ -2875,25 +3102,19 @@ local chapter_dungeon_rune = { 6108, 6236 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 10 + 3, + 0, + 7 }, { - 1, 2, - 10 - } - }, - ["weights"]={ - { - 1, - 200 + 26, + 2 } }, ["first_reward"]={ @@ -2925,9 +3146,9 @@ local chapter_dungeon_rune = { ["monster"]={ 6508 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["first_reward"]={ { ["type"]=1, @@ -3028,19 +3249,29 @@ local chapter_dungeon_rune = { 6108, 6238 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 5 + }, + { + 2, + 32, + 4 + }, { 1, - 1, - 1 + 3, + 45 } }, ["weights"]={ { - 1, + 3, 200 } }, @@ -3134,14 +3365,30 @@ local chapter_dungeon_rune = { 6108, 6239 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 4 + }, { 2, + 34, + 4 + }, + { + 1, 2, - 1 + 80 + } + }, + ["weights"]={ + { + 2, + 200 } }, ["first_reward"]={ @@ -3234,14 +3481,25 @@ local chapter_dungeon_rune = { 6108, 6240 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { 3, + 0, + 4 + }, + { 1, - 1 + 2, + 40 + } + }, + ["weights"]={ + { + 2, + 200 } }, ["first_reward"]={ @@ -3334,24 +3592,29 @@ local chapter_dungeon_rune = { 6108, 6241 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 10 + 3, + 0, + 8 + }, + { + 2, + 32, + 3 }, { 1, - 2, - 10 + 5, + 40 } }, ["weights"]={ { - 1, + 5, 200 } }, @@ -3445,24 +3708,30 @@ local chapter_dungeon_rune = { 6108, 6242 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 7 + }, { 2, - 2, - 1 + 24, + 6 }, { 1, 2, - 10 - }, + 55 + } + }, + ["weights"]={ { - 3, - 0, - 10 + 2, + 200 } }, ["first_reward"]={ @@ -3555,19 +3824,29 @@ local chapter_dungeon_rune = { 6108, 6243 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 8 + }, + { + 2, + 12, + 4 + }, { 1, - 1, - 1 + 5, + 60 } }, ["weights"]={ { - 1, + 5, 200 } }, @@ -3661,14 +3940,25 @@ local chapter_dungeon_rune = { 6108, 6244 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 2, - 2, - 1 + 3, + 0, + 8 + }, + { + 1, + 3, + 70 + } + }, + ["weights"]={ + { + 3, + 200 } }, ["first_reward"]={ @@ -3761,14 +4051,34 @@ local chapter_dungeon_rune = { 6108, 6245 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 3, + 2, + 19, + 3 + }, + { 1, - 1 + 5, + 45 + }, + { + 1, + 3, + 45 + } + }, + ["weights"]={ + { + 5, + 200 + }, + { + 3, + 200 } }, ["first_reward"]={ @@ -3861,25 +4171,14 @@ local chapter_dungeon_rune = { 6108, 6246 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 10 - }, - { - 1, - 2, - 10 - } - }, - ["weights"]={ - { - 1, - 200 + 3, + 0, + 7 } }, ["first_reward"]={ @@ -3911,9 +4210,9 @@ local chapter_dungeon_rune = { ["monster"]={ 6608 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["first_reward"]={ { ["type"]=1, @@ -4014,20 +4313,19 @@ local chapter_dungeon_rune = { 6108, 6248 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 1 - } - }, - ["weights"]={ + 3, + 0, + 8 + }, { - 1, - 200 + 2, + 13, + 4 } }, ["first_reward"]={ @@ -4120,14 +4418,30 @@ local chapter_dungeon_rune = { 6108, 6249 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 6 + }, { 2, - 2, - 1 + 25, + 3 + }, + { + 1, + 5, + 60 + } + }, + ["weights"]={ + { + 5, + 200 } }, ["first_reward"]={ @@ -4220,14 +4534,30 @@ local chapter_dungeon_rune = { 6108, 6250 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 3, - 1, + 2, + 31, 1 + }, + { + 1, + 3, + 50 + }, + { + 1, + 2, + 50 + } + }, + ["weights"]={ + { + 2, + 200 } }, ["first_reward"]={ @@ -4320,24 +4650,29 @@ local chapter_dungeon_rune = { 6108, 6251 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 10 + 3, + 0, + 6 + }, + { + 2, + 26, + 1 }, { 1, - 2, - 10 + 4, + 40 } }, ["weights"]={ { - 1, + 4, 200 } }, @@ -4431,24 +4766,14 @@ local chapter_dungeon_rune = { 6108, 6252 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ - { - 2, - 2, - 1 - }, - { - 1, - 2, - 10 - }, { 3, 0, - 10 + 7 } }, ["first_reward"]={ @@ -4541,19 +4866,29 @@ local chapter_dungeon_rune = { 6108, 6253 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 8 + }, + { + 2, + 23, + 2 + }, { 1, - 1, - 1 + 5, + 45 } }, ["weights"]={ { - 1, + 5, 200 } }, @@ -4647,14 +4982,19 @@ local chapter_dungeon_rune = { 6108, 6254 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 8 + }, { 2, - 2, - 1 + 29, + 5 } }, ["first_reward"]={ @@ -4747,14 +5087,30 @@ local chapter_dungeon_rune = { 6108, 6255 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 3, + 2, + 35, + 4 + }, + { 1, - 1 + 3, + 60 + }, + { + 1, + 4, + 60 + } + }, + ["weights"]={ + { + 4, + 200 } }, ["first_reward"]={ @@ -4847,25 +5203,19 @@ local chapter_dungeon_rune = { 6108, 6256 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 10 + 3, + 0, + 7 }, { - 1, 2, - 10 - } - }, - ["weights"]={ - { - 1, - 200 + 31, + 5 } }, ["first_reward"]={ @@ -4897,9 +5247,9 @@ local chapter_dungeon_rune = { ["monster"]={ 6708 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["first_reward"]={ { ["type"]=1, @@ -5000,20 +5350,19 @@ local chapter_dungeon_rune = { 6108, 6258 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 1 - } - }, - ["weights"]={ + 3, + 0, + 6 + }, { - 1, - 200 + 2, + 24, + 4 } }, ["first_reward"]={ @@ -5106,14 +5455,19 @@ local chapter_dungeon_rune = { 6108, 6259 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 9 + }, { 2, - 2, - 1 + 33, + 4 } }, ["first_reward"]={ @@ -5206,14 +5560,30 @@ local chapter_dungeon_rune = { 6108, 6260 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { 3, + 0, + 7 + }, + { + 2, + 23, + 7 + }, + { 1, - 1 + 5, + 60 + } + }, + ["weights"]={ + { + 5, + 200 } }, ["first_reward"]={ @@ -5306,25 +5676,24 @@ local chapter_dungeon_rune = { 6108, 6261 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 10 + 3, + 0, + 7 }, { - 1, 2, - 10 - } - }, - ["weights"]={ + 24, + 4 + }, { - 1, - 200 + 2, + 31, + 4 } }, ["first_reward"]={ @@ -5417,24 +5786,19 @@ local chapter_dungeon_rune = { 6108, 6262 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ - { - 2, - 2, - 1 - }, - { - 1, - 2, - 10 - }, { 3, 0, - 10 + 4 + }, + { + 2, + 26, + 4 } }, ["first_reward"]={ @@ -5527,14 +5891,24 @@ local chapter_dungeon_rune = { 6108, 6263 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 6 + }, + { + 1, + 5, + 60 + }, { 1, 1, - 1 + 60 } }, ["weights"]={ @@ -5633,14 +6007,30 @@ local chapter_dungeon_rune = { 6108, 6264 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 5 + }, { 2, - 2, - 1 + 28, + 8 + }, + { + 1, + 3, + 75 + } + }, + ["weights"]={ + { + 3, + 200 } }, ["first_reward"]={ @@ -5733,14 +6123,30 @@ local chapter_dungeon_rune = { 6108, 6265 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { 3, + 0, + 6 + }, + { + 2, + 24, + 4 + }, + { 1, - 1 + 1, + 60 + } + }, + ["weights"]={ + { + 1, + 200 } }, ["first_reward"]={ @@ -5833,25 +6239,19 @@ local chapter_dungeon_rune = { 6108, 6266 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 10 + 3, + 0, + 6 }, { - 1, 2, - 10 - } - }, - ["weights"]={ - { - 1, - 200 + 24, + 3 } }, ["first_reward"]={ @@ -5883,9 +6283,9 @@ local chapter_dungeon_rune = { ["monster"]={ 6808 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["first_reward"]={ { ["type"]=1, @@ -5986,19 +6386,29 @@ local chapter_dungeon_rune = { 6108, 6268 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 6 + }, + { + 2, + 28, + 2 + }, { 1, - 1, - 1 + 5, + 60 } }, ["weights"]={ { - 1, + 5, 200 } }, @@ -6092,14 +6502,25 @@ local chapter_dungeon_rune = { 6108, 6269 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { 2, - 2, - 1 + 34, + 3 + }, + { + 1, + 5, + 70 + } + }, + ["weights"]={ + { + 5, + 200 } }, ["first_reward"]={ @@ -6192,14 +6613,30 @@ local chapter_dungeon_rune = { 6108, 6270 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { 3, + 0, + 3 + }, + { + 2, + 19, + 7 + }, + { 1, - 1 + 5, + 65 + } + }, + ["weights"]={ + { + 5, + 200 } }, ["first_reward"]={ @@ -6292,24 +6729,29 @@ local chapter_dungeon_rune = { 6108, 6271 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 10 + 3, + 0, + 7 + }, + { + 2, + 5, + 3 }, { 1, - 2, - 10 + 3, + 40 } }, ["weights"]={ { - 1, + 3, 200 } }, @@ -6403,24 +6845,14 @@ local chapter_dungeon_rune = { 6108, 6272 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ - { - 2, - 2, - 1 - }, - { - 1, - 2, - 10 - }, { 3, 0, - 10 + 8 } }, ["first_reward"]={ @@ -6513,14 +6945,24 @@ local chapter_dungeon_rune = { 6108, 6273 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 7 + }, + { + 2, + 12, + 4 + }, { 1, 1, - 1 + 50 } }, ["weights"]={ @@ -6619,14 +7061,25 @@ local chapter_dungeon_rune = { 6108, 6274 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { 2, + 25, + 3 + }, + { + 1, 2, - 1 + 100 + } + }, + ["weights"]={ + { + 2, + 200 } }, ["first_reward"]={ @@ -6719,14 +7172,19 @@ local chapter_dungeon_rune = { 6108, 6275 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { 3, - 1, - 1 + 0, + 5 + }, + { + 2, + 31, + 5 } }, ["first_reward"]={ @@ -6819,24 +7277,29 @@ local chapter_dungeon_rune = { 6108, 6276 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 10 + 3, + 0, + 6 + }, + { + 2, + 35, + 3 }, { 1, 2, - 10 + 70 } }, ["weights"]={ { - 1, + 2, 200 } }, @@ -6869,9 +7332,9 @@ local chapter_dungeon_rune = { ["monster"]={ 6908 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["first_reward"]={ { ["type"]=1, @@ -6972,19 +7435,33 @@ local chapter_dungeon_rune = { 6108, 6278 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { 1, + 5, + 60 + }, + { 1, - 1 + 3, + 80 + }, + { + 1, + 4, + 60 } }, ["weights"]={ { - 1, + 3, + 200 + }, + { + 4, 200 } }, @@ -7078,14 +7555,30 @@ local chapter_dungeon_rune = { 6108, 6279 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 6 + }, { 2, + 28, + 4 + }, + { + 1, 2, - 1 + 50 + } + }, + ["weights"]={ + { + 2, + 200 } }, ["first_reward"]={ @@ -7178,14 +7671,25 @@ local chapter_dungeon_rune = { 6108, 6280 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { 3, + 0, + 7 + }, + { 1, - 1 + 3, + 100 + } + }, + ["weights"]={ + { + 3, + 200 } }, ["first_reward"]={ @@ -7278,25 +7782,19 @@ local chapter_dungeon_rune = { 6108, 6281 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 10 + 3, + 0, + 7 }, { - 1, 2, - 10 - } - }, - ["weights"]={ - { - 1, - 200 + 31, + 25 } }, ["first_reward"]={ @@ -7389,23 +7887,18 @@ local chapter_dungeon_rune = { 6108, 6282 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ - { - 2, - 2, - 1 - }, - { - 1, - 2, - 10 - }, { 3, 0, + 5 + }, + { + 2, + 34, 10 } }, @@ -7499,20 +7992,38 @@ local chapter_dungeon_rune = { 6108, 6283 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { 1, 1, - 1 + 70 + }, + { + 1, + 3, + 70 + }, + { + 1, + 4, + 70 } }, ["weights"]={ { 1, 200 + }, + { + 3, + 200 + }, + { + 4, + 200 } }, ["first_reward"]={ @@ -7605,14 +8116,19 @@ local chapter_dungeon_rune = { 6108, 6284 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 6 + }, { 2, - 2, - 1 + 22, + 3 } }, ["first_reward"]={ @@ -7705,14 +8221,30 @@ local chapter_dungeon_rune = { 6108, 6285 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { 3, + 0, + 6 + }, + { + 2, + 28, + 7 + }, + { 1, - 1 + 4, + 90 + } + }, + ["weights"]={ + { + 4, + 200 } }, ["first_reward"]={ @@ -7805,24 +8337,33 @@ local chapter_dungeon_rune = { 6108, 6286 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 10 + 3, + 0, + 7 }, { 1, - 2, - 10 + 5, + 110 + }, + { + 1, + 4, + 110 } }, ["weights"]={ { - 1, + 5, + 200 + }, + { + 4, 200 } }, @@ -7855,9 +8396,9 @@ local chapter_dungeon_rune = { ["monster"]={ 7008 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["first_reward"]={ { ["type"]=1, @@ -7958,20 +8499,19 @@ local chapter_dungeon_rune = { 6108, 6288 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 1 - } - }, - ["weights"]={ + 3, + 0, + 8 + }, { - 1, - 200 + 2, + 24, + 6 } }, ["first_reward"]={ @@ -8064,14 +8604,34 @@ local chapter_dungeon_rune = { 6108, 6289 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { + 3, + 0, + 8 + }, + { + 1, + 1, + 65 + }, + { + 1, 2, + 65 + } + }, + ["weights"]={ + { + 1, + 200 + }, + { 2, - 1 + 200 } }, ["first_reward"]={ @@ -8164,14 +8724,24 @@ local chapter_dungeon_rune = { 6108, 6290 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { 3, - 1, - 1 + 0, + 6 + }, + { + 2, + 28, + 4 + }, + { + 2, + 21, + 9 } }, ["first_reward"]={ @@ -8264,25 +8834,34 @@ local chapter_dungeon_rune = { 6108, 6291 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 2, + 12, + 3 + }, { 1, 1, - 10 + 80 }, { 1, 2, - 10 + 80 } }, ["weights"]={ { 1, 200 + }, + { + 2, + 200 } }, ["first_reward"]={ @@ -8375,24 +8954,30 @@ local chapter_dungeon_rune = { 6108, 6292 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ - { - 2, - 2, - 1 - }, - { - 1, - 2, - 10 - }, { 3, 0, - 10 + 6 + }, + { + 2, + 24, + 7 + }, + { + 1, + 4, + 110 + } + }, + ["weights"]={ + { + 4, + 200 } }, ["first_reward"]={ @@ -8485,19 +9070,29 @@ local chapter_dungeon_rune = { 6108, 6293 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 5 + }, + { + 2, + 5, + 6 + }, { 1, - 1, - 1 + 3, + 80 } }, ["weights"]={ { - 1, + 3, 200 } }, @@ -8591,14 +9186,30 @@ local chapter_dungeon_rune = { 6108, 6294 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 6 + }, { 2, - 2, - 1 + 23, + 4 + }, + { + 1, + 1, + 40 + } + }, + ["weights"]={ + { + 1, + 200 } }, ["first_reward"]={ @@ -8691,14 +9302,30 @@ local chapter_dungeon_rune = { 6108, 6295 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { 3, + 0, + 5 + }, + { + 2, + 28, + 5 + }, + { 1, - 1 + 1, + 55 + } + }, + ["weights"]={ + { + 1, + 200 } }, ["first_reward"]={ @@ -8791,24 +9418,33 @@ local chapter_dungeon_rune = { 6108, 6296 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 10 + 3, + 0, + 6 }, { 1, - 2, - 10 + 5, + 70 + }, + { + 1, + 4, + 80 } }, ["weights"]={ { - 1, + 5, + 200 + }, + { + 4, 200 } }, @@ -8841,9 +9477,9 @@ local chapter_dungeon_rune = { ["monster"]={ 7108 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["first_reward"]={ { ["type"]=1, @@ -8944,19 +9580,29 @@ local chapter_dungeon_rune = { 6108, 6298 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 6 + }, + { + 2, + 31, + 4 + }, { 1, - 1, - 1 + 3, + 70 } }, ["weights"]={ { - 1, + 3, 200 } }, @@ -9050,14 +9696,34 @@ local chapter_dungeon_rune = { 6108, 6299 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { + 1, + 1, + 64 + }, + { + 1, + 3, + 64 + }, + { + 1, 2, + 64 + } + }, + ["weights"]={ + { 2, - 1 + 200 + }, + { + 3, + 200 } }, ["first_reward"]={ @@ -9150,14 +9816,30 @@ local chapter_dungeon_rune = { 6108, 6300 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { 3, + 0, + 7 + }, + { + 2, + 24, + 5 + }, + { 1, - 1 + 5, + 55 + } + }, + ["weights"]={ + { + 5, + 200 } }, ["first_reward"]={ @@ -9250,28 +9932,33 @@ local chapter_dungeon_rune = { 6108, 6301 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 10 + 2, + 24, + 5 }, { 1, - 2, - 10 + 4, + 55 + }, + { + 1, + 3, + 55 } }, ["weights"]={ { - 1, + 3, 200 }, { - 2, + 4, 200 } }, @@ -9365,24 +10052,30 @@ local chapter_dungeon_rune = { 6108, 6302 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ - { - 2, - 2, - 1 - }, - { - 1, - 2, - 10 - }, { 3, 0, - 10 + 7 + }, + { + 2, + 13, + 2 + }, + { + 1, + 1, + 60 + } + }, + ["weights"]={ + { + 1, + 200 } }, ["first_reward"]={ @@ -9475,19 +10168,33 @@ local chapter_dungeon_rune = { 6108, 6303 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, + 2, + 35, 1 + }, + { + 1, + 5, + 55 + }, + { + 1, + 3, + 55 } }, ["weights"]={ { - 1, + 5, + 200 + }, + { + 3, 200 } }, @@ -9581,14 +10288,30 @@ local chapter_dungeon_rune = { 6108, 6304 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ + { + 3, + 0, + 5 + }, { 2, - 2, + 12, 1 + }, + { + 1, + 4, + 55 + } + }, + ["weights"]={ + { + 4, + 200 } }, ["first_reward"]={ @@ -9681,14 +10404,30 @@ local chapter_dungeon_rune = { 6108, 6305 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { 3, + 0, + 5 + }, + { + 2, + 13, + 3 + }, + { 1, - 1 + 2, + 50 + } + }, + ["weights"]={ + { + 2, + 200 } }, ["first_reward"]={ @@ -9781,24 +10520,29 @@ local chapter_dungeon_rune = { 6108, 6306 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["requirement"]={ { - 1, - 1, - 10 + 3, + 0, + 6 + }, + { + 2, + 18, + 7 }, { 1, - 2, - 10 + 3, + 60 } }, ["weights"]={ { - 1, + 3, 200 } }, @@ -9831,9 +10575,9 @@ local chapter_dungeon_rune = { ["monster"]={ 7208 }, - ["hp"]=681920000, - ["atk"]=6080000, - ["round"]=30, + ["hp"]=2000000, + ["atk"]=10000, + ["round"]=25, ["first_reward"]={ { ["type"]=1, diff --git a/lua/app/config/grid_edge_type.lua b/lua/app/config/grid_edge_type.lua index e6487f1c..ca65690c 100644 --- a/lua/app/config/grid_edge_type.lua +++ b/lua/app/config/grid_edge_type.lua @@ -12,9 +12,23 @@ local grid_edge_type = { ["icon"]="battle_obstacle_coral_3", ["next_type"]=2, ["break_sfx"]="sfx_piece_shanhu_b01" + }, + [4]={ + ["icon"]="battle_obstacle_stick_3", + ["break_sfx"]="sfx_piece_shanhu_b01" + }, + [5]={ + ["icon"]="battle_obstacle_stick_2", + ["next_type"]=4, + ["break_sfx"]="sfx_piece_shanhu_b01" + }, + [6]={ + ["icon"]="battle_obstacle_stick_1", + ["next_type"]=5, + ["break_sfx"]="sfx_piece_shanhu_b01" } } local config = { -data=grid_edge_type,count=3 +data=grid_edge_type,count=6 } return config \ No newline at end of file diff --git a/lua/app/config/runes_level.lua b/lua/app/config/runes_level.lua index c580a256..ffc1462b 100644 --- a/lua/app/config/runes_level.lua +++ b/lua/app/config/runes_level.lua @@ -1,113 +1,113 @@ local runes_level = { [1]={ - ["weight_1"]=100, - ["weight_2"]=200, - ["weight_3"]=300, + ["weight_1"]=7950, + ["weight_2"]=2000, + ["weight_3"]=50, ["grid"]=1 }, [2]={ - ["weight_1"]=100, - ["weight_2"]=200, - ["weight_3"]=300, - ["weight_4"]=400, + ["weight_1"]=6620, + ["weight_2"]=3200, + ["weight_3"]=150, + ["weight_4"]=30, ["grid"]=2, - ["cost"]=200 + ["cost"]=100 }, [3]={ - ["weight_1"]=100, - ["weight_2"]=200, - ["weight_3"]=300, - ["weight_4"]=400, - ["weight_5"]=500, + ["weight_1"]=5754, + ["weight_2"]=3680, + ["weight_3"]=480, + ["weight_4"]=66, + ["weight_5"]=20, ["grid"]=3, - ["cost"]=500 + ["cost"]=1000 }, [4]={ - ["weight_1"]=100, - ["weight_2"]=200, - ["weight_3"]=300, - ["weight_4"]=400, - ["weight_5"]=500, - ["weight_6"]=600, + ["weight_1"]=4595, + ["weight_2"]=4260, + ["weight_3"]=980, + ["weight_4"]=112, + ["weight_5"]=45, + ["weight_6"]=8, ["grid"]=4, - ["cost"]=800 + ["cost"]=3000 }, [5]={ - ["weight_1"]=100, - ["weight_2"]=200, - ["weight_3"]=300, - ["weight_4"]=400, - ["weight_5"]=500, - ["weight_6"]=600, - ["weight_7"]=700, + ["weight_1"]=3784, + ["weight_2"]=4550, + ["weight_3"]=1360, + ["weight_4"]=198, + ["weight_5"]=88, + ["weight_6"]=18, + ["weight_7"]=2, ["grid"]=5, ["auto"]=1, - ["cost"]=1200 + ["cost"]=8000 }, [6]={ - ["weight_1"]=100, - ["weight_2"]=200, - ["weight_3"]=300, - ["weight_4"]=400, - ["weight_5"]=500, - ["weight_6"]=600, - ["weight_7"]=700, - ["weight_8"]=800, + ["weight_1"]=3312, + ["weight_2"]=4350, + ["weight_3"]=1780, + ["weight_4"]=366, + ["weight_5"]=156, + ["weight_6"]=29, + ["weight_7"]=6, + ["weight_8"]=1, ["grid"]=6, ["auto"]=1, - ["cost"]=1600 + ["cost"]=20000 }, [7]={ - ["weight_1"]=100, - ["weight_2"]=200, - ["weight_3"]=300, - ["weight_4"]=400, - ["weight_5"]=500, - ["weight_6"]=600, - ["weight_7"]=700, - ["weight_8"]=900, + ["weight_1"]=2738, + ["weight_2"]=4080, + ["weight_3"]=2250, + ["weight_4"]=612, + ["weight_5"]=268, + ["weight_6"]=40, + ["weight_7"]=10, + ["weight_8"]=2, ["grid"]=6, ["auto"]=1, - ["cost"]=2000 + ["cost"]=50000 }, [8]={ - ["weight_1"]=100, - ["weight_2"]=200, - ["weight_3"]=300, - ["weight_4"]=400, - ["weight_5"]=500, - ["weight_6"]=600, - ["weight_7"]=700, - ["weight_8"]=1000, + ["weight_1"]=1893, + ["weight_2"]=3780, + ["weight_3"]=2835, + ["weight_4"]=945, + ["weight_5"]=472, + ["weight_6"]=52, + ["weight_7"]=19, + ["weight_8"]=4, ["grid"]=6, ["auto"]=1, - ["cost"]=2400 + ["cost"]=100000 }, [9]={ - ["weight_1"]=100, - ["weight_2"]=200, - ["weight_3"]=300, - ["weight_4"]=400, - ["weight_5"]=500, - ["weight_6"]=600, - ["weight_7"]=700, - ["weight_8"]=1100, + ["weight_1"]=1886, + ["weight_2"]=2785, + ["weight_3"]=3325, + ["weight_4"]=1324, + ["weight_5"]=582, + ["weight_6"]=65, + ["weight_7"]=25, + ["weight_8"]=8, ["grid"]=6, ["auto"]=1, - ["cost"]=2800 + ["cost"]=200000 }, [10]={ - ["weight_1"]=100, - ["weight_2"]=200, - ["weight_3"]=300, - ["weight_4"]=400, - ["weight_5"]=500, - ["weight_6"]=600, - ["weight_7"]=700, - ["weight_8"]=1200, + ["weight_1"]=1436, + ["weight_2"]=2335, + ["weight_3"]=3778, + ["weight_4"]=1678, + ["weight_5"]=636, + ["weight_6"]=89, + ["weight_7"]=36, + ["weight_8"]=12, ["grid"]=6, ["auto"]=1, - ["cost"]=3200 + ["cost"]=500000 } } local config = { diff --git a/lua/app/config/runes_sub.lua b/lua/app/config/runes_sub.lua index 0df40356..007ab4c6 100644 --- a/lua/app/config/runes_sub.lua +++ b/lua/app/config/runes_sub.lua @@ -3,199 +3,199 @@ local runes_sub = { ["attr_1"]={ { ["type"]="atk_red", - ["num"]=10000 + ["num"]=600000 }, { ["type"]="atk_yellow", - ["num"]=10000 + ["num"]=600000 }, { ["type"]="atk_green", - ["num"]=10000 + ["num"]=600000 }, { ["type"]="atk_blue", - ["num"]=10000 + ["num"]=600000 }, { ["type"]="atk_purple", - ["num"]=10000 + ["num"]=600000 } }, ["attr_2"]={ { ["type"]="attr_hp_red", - ["num"]=10000 + ["num"]=900000 }, { ["type"]="attr_hp_yellow", - ["num"]=10000 + ["num"]=900000 }, { ["type"]="attr_hp_green", - ["num"]=10000 + ["num"]=900000 }, { ["type"]="attr_hp_blue", - ["num"]=10000 + ["num"]=900000 }, { ["type"]="attr_hp_purple", - ["num"]=10000 + ["num"]=900000 } }, ["attr_3"]={ { ["type"]="attr_atkp_red", - ["num"]=100 + ["num"]=200 }, { ["type"]="attr_atkp_yellow", - ["num"]=100 + ["num"]=200 }, { ["type"]="attr_atkp_green", - ["num"]=100 + ["num"]=200 }, { ["type"]="attr_atkp_blue", - ["num"]=100 + ["num"]=200 }, { ["type"]="attr_atkp_purple", - ["num"]=100 + ["num"]=200 } }, ["attr_4"]={ { ["type"]="attr_hpp_red", - ["num"]=100 + ["num"]=300 }, { ["type"]="attr_hpp_yellow", - ["num"]=100 + ["num"]=300 }, { ["type"]="attr_hpp_green", - ["num"]=100 + ["num"]=300 }, { ["type"]="attr_hpp_blue", - ["num"]=100 + ["num"]=300 }, { ["type"]="attr_hpp_purple", - ["num"]=100 + ["num"]=300 } }, ["attr_5"]={ { ["type"]="attr_normal_hurt_red", - ["num"]=10000 + ["num"]=600000 }, { ["type"]="attr_normal_hurt_yellow", - ["num"]=10000 + ["num"]=600000 }, { ["type"]="attr_normal_hurt_green", - ["num"]=10000 + ["num"]=600000 }, { ["type"]="attr_normal_hurt_blue", - ["num"]=10000 + ["num"]=600000 }, { ["type"]="attr_normal_hurt_purple", - ["num"]=10000 + ["num"]=600000 } }, ["attr_6"]={ { ["type"]="attr_skill_hurt_red", - ["num"]=10000 + ["num"]=600000 }, { ["type"]="attr_skill_hurt_yellow", - ["num"]=10000 + ["num"]=600000 }, { ["type"]="attr_skill_hurt_green", - ["num"]=10000 + ["num"]=600000 }, { ["type"]="attr_skill_hurt_blue", - ["num"]=10000 + ["num"]=600000 }, { ["type"]="attr_skill_hurt_purple", - ["num"]=10000 + ["num"]=600000 } }, ["attr_7"]={ { ["type"]="attr_normal_hurtp_red", - ["num"]=10000 + ["num"]=200 }, { ["type"]="attr_normal_hurtp_yellow", - ["num"]=10000 + ["num"]=200 }, { ["type"]="attr_normal_hurtp_green", - ["num"]=10000 + ["num"]=200 }, { ["type"]="attr_normal_hurtp_blue", - ["num"]=10000 + ["num"]=200 }, { ["type"]="attr_normal_hurtp_purple", - ["num"]=10000 + ["num"]=200 } }, ["attr_8"]={ { ["type"]="attr_skill_hurtp_red", - ["num"]=10000 + ["num"]=200 }, { ["type"]="attr_skill_hurtp_yellow", - ["num"]=10000 + ["num"]=200 }, { ["type"]="attr_skill_hurtp_green", - ["num"]=10000 + ["num"]=200 }, { ["type"]="attr_skill_hurtp_blue", - ["num"]=10000 + ["num"]=200 }, { ["type"]="attr_skill_hurtp_purple", - ["num"]=10000 + ["num"]=200 } }, ["attr_9"]={ { ["type"]="attr_cured_red", - ["num"]=10000 + ["num"]=100 }, { ["type"]="attr_cured_yellow", - ["num"]=10000 + ["num"]=100 }, { ["type"]="attr_cured_green", - ["num"]=10000 + ["num"]=100 }, { ["type"]="attr_cured_blue", - ["num"]=10000 + ["num"]=100 }, { ["type"]="attr_cured_purple", - ["num"]=10000 + ["num"]=100 } }, ["attr_10"]={ @@ -247,199 +247,199 @@ local runes_sub = { ["attr_1"]={ { ["type"]="atk_red", - ["num"]=20000 + ["num"]=1200000 }, { ["type"]="atk_yellow", - ["num"]=20000 + ["num"]=1200000 }, { ["type"]="atk_green", - ["num"]=20000 + ["num"]=1200000 }, { ["type"]="atk_blue", - ["num"]=20000 + ["num"]=1200000 }, { ["type"]="atk_purple", - ["num"]=20000 + ["num"]=1200000 } }, ["attr_2"]={ { ["type"]="attr_hp_red", - ["num"]=20000 + ["num"]=1800000 }, { ["type"]="attr_hp_yellow", - ["num"]=20000 + ["num"]=1800000 }, { ["type"]="attr_hp_green", - ["num"]=20000 + ["num"]=1800000 }, { ["type"]="attr_hp_blue", - ["num"]=20000 + ["num"]=1800000 }, { ["type"]="attr_hp_purple", - ["num"]=20000 + ["num"]=1800000 } }, ["attr_3"]={ { ["type"]="attr_atkp_red", - ["num"]=200 + ["num"]=400 }, { ["type"]="attr_atkp_yellow", - ["num"]=200 + ["num"]=400 }, { ["type"]="attr_atkp_green", - ["num"]=200 + ["num"]=400 }, { ["type"]="attr_atkp_blue", - ["num"]=200 + ["num"]=400 }, { ["type"]="attr_atkp_purple", - ["num"]=200 + ["num"]=400 } }, ["attr_4"]={ { ["type"]="attr_hpp_red", - ["num"]=200 + ["num"]=600 }, { ["type"]="attr_hpp_yellow", - ["num"]=200 + ["num"]=600 }, { ["type"]="attr_hpp_green", - ["num"]=200 + ["num"]=600 }, { ["type"]="attr_hpp_blue", - ["num"]=200 + ["num"]=600 }, { ["type"]="attr_hpp_purple", - ["num"]=200 + ["num"]=600 } }, ["attr_5"]={ { ["type"]="attr_normal_hurt_red", - ["num"]=20000 + ["num"]=1200000 }, { ["type"]="attr_normal_hurt_yellow", - ["num"]=20000 + ["num"]=1200000 }, { ["type"]="attr_normal_hurt_green", - ["num"]=20000 + ["num"]=1200000 }, { ["type"]="attr_normal_hurt_blue", - ["num"]=20000 + ["num"]=1200000 }, { ["type"]="attr_normal_hurt_purple", - ["num"]=20000 + ["num"]=1200000 } }, ["attr_6"]={ { ["type"]="attr_skill_hurt_red", - ["num"]=20000 + ["num"]=1200000 }, { ["type"]="attr_skill_hurt_yellow", - ["num"]=20000 + ["num"]=1200000 }, { ["type"]="attr_skill_hurt_green", - ["num"]=20000 + ["num"]=1200000 }, { ["type"]="attr_skill_hurt_blue", - ["num"]=20000 + ["num"]=1200000 }, { ["type"]="attr_skill_hurt_purple", - ["num"]=20000 + ["num"]=1200000 } }, ["attr_7"]={ { ["type"]="attr_normal_hurtp_red", - ["num"]=20000 + ["num"]=400 }, { ["type"]="attr_normal_hurtp_yellow", - ["num"]=20000 + ["num"]=400 }, { ["type"]="attr_normal_hurtp_green", - ["num"]=20000 + ["num"]=400 }, { ["type"]="attr_normal_hurtp_blue", - ["num"]=20000 + ["num"]=400 }, { ["type"]="attr_normal_hurtp_purple", - ["num"]=20000 + ["num"]=400 } }, ["attr_8"]={ { ["type"]="attr_skill_hurtp_red", - ["num"]=20000 + ["num"]=400 }, { ["type"]="attr_skill_hurtp_yellow", - ["num"]=20000 + ["num"]=400 }, { ["type"]="attr_skill_hurtp_green", - ["num"]=20000 + ["num"]=400 }, { ["type"]="attr_skill_hurtp_blue", - ["num"]=20000 + ["num"]=400 }, { ["type"]="attr_skill_hurtp_purple", - ["num"]=20000 + ["num"]=400 } }, ["attr_9"]={ { ["type"]="attr_cured_red", - ["num"]=20000 + ["num"]=200 }, { ["type"]="attr_cured_yellow", - ["num"]=20000 + ["num"]=200 }, { ["type"]="attr_cured_green", - ["num"]=20000 + ["num"]=200 }, { ["type"]="attr_cured_blue", - ["num"]=20000 + ["num"]=200 }, { ["type"]="attr_cured_purple", - ["num"]=20000 + ["num"]=200 } }, ["attr_10"]={ @@ -467,23 +467,23 @@ local runes_sub = { ["attr_11"]={ { ["type"]="attr_crit_time_red", - ["num"]=200 + ["num"]=300 }, { ["type"]="attr_crit_time_yellow", - ["num"]=200 + ["num"]=300 }, { ["type"]="attr_crit_time_green", - ["num"]=200 + ["num"]=300 }, { ["type"]="attr_crit_time_blue", - ["num"]=200 + ["num"]=300 }, { ["type"]="attr_crit_time_purple", - ["num"]=200 + ["num"]=300 } } }, @@ -491,199 +491,199 @@ local runes_sub = { ["attr_1"]={ { ["type"]="atk_red", - ["num"]=30000 + ["num"]=1800000 }, { ["type"]="atk_yellow", - ["num"]=30000 + ["num"]=1800000 }, { ["type"]="atk_green", - ["num"]=30000 + ["num"]=1800000 }, { ["type"]="atk_blue", - ["num"]=30000 + ["num"]=1800000 }, { ["type"]="atk_purple", - ["num"]=30000 + ["num"]=1800000 } }, ["attr_2"]={ { ["type"]="attr_hp_red", - ["num"]=30000 + ["num"]=2700000 }, { ["type"]="attr_hp_yellow", - ["num"]=30000 + ["num"]=2700000 }, { ["type"]="attr_hp_green", - ["num"]=30000 + ["num"]=2700000 }, { ["type"]="attr_hp_blue", - ["num"]=30000 + ["num"]=2700000 }, { ["type"]="attr_hp_purple", - ["num"]=30000 + ["num"]=2700000 } }, ["attr_3"]={ { ["type"]="attr_atkp_red", - ["num"]=300 + ["num"]=600 }, { ["type"]="attr_atkp_yellow", - ["num"]=300 + ["num"]=600 }, { ["type"]="attr_atkp_green", - ["num"]=300 + ["num"]=600 }, { ["type"]="attr_atkp_blue", - ["num"]=300 + ["num"]=600 }, { ["type"]="attr_atkp_purple", - ["num"]=300 + ["num"]=600 } }, ["attr_4"]={ { ["type"]="attr_hpp_red", - ["num"]=300 + ["num"]=900 }, { ["type"]="attr_hpp_yellow", - ["num"]=300 + ["num"]=900 }, { ["type"]="attr_hpp_green", - ["num"]=300 + ["num"]=900 }, { ["type"]="attr_hpp_blue", - ["num"]=300 + ["num"]=900 }, { ["type"]="attr_hpp_purple", - ["num"]=300 + ["num"]=900 } }, ["attr_5"]={ { ["type"]="attr_normal_hurt_red", - ["num"]=30000 + ["num"]=1800000 }, { ["type"]="attr_normal_hurt_yellow", - ["num"]=30000 + ["num"]=1800000 }, { ["type"]="attr_normal_hurt_green", - ["num"]=30000 + ["num"]=1800000 }, { ["type"]="attr_normal_hurt_blue", - ["num"]=30000 + ["num"]=1800000 }, { ["type"]="attr_normal_hurt_purple", - ["num"]=30000 + ["num"]=1800000 } }, ["attr_6"]={ { ["type"]="attr_skill_hurt_red", - ["num"]=30000 + ["num"]=1800000 }, { ["type"]="attr_skill_hurt_yellow", - ["num"]=30000 + ["num"]=1800000 }, { ["type"]="attr_skill_hurt_green", - ["num"]=30000 + ["num"]=1800000 }, { ["type"]="attr_skill_hurt_blue", - ["num"]=30000 + ["num"]=1800000 }, { ["type"]="attr_skill_hurt_purple", - ["num"]=30000 + ["num"]=1800000 } }, ["attr_7"]={ { ["type"]="attr_normal_hurtp_red", - ["num"]=30000 + ["num"]=600 }, { ["type"]="attr_normal_hurtp_yellow", - ["num"]=30000 + ["num"]=600 }, { ["type"]="attr_normal_hurtp_green", - ["num"]=30000 + ["num"]=600 }, { ["type"]="attr_normal_hurtp_blue", - ["num"]=30000 + ["num"]=600 }, { ["type"]="attr_normal_hurtp_purple", - ["num"]=30000 + ["num"]=600 } }, ["attr_8"]={ { ["type"]="attr_skill_hurtp_red", - ["num"]=30000 + ["num"]=600 }, { ["type"]="attr_skill_hurtp_yellow", - ["num"]=30000 + ["num"]=600 }, { ["type"]="attr_skill_hurtp_green", - ["num"]=30000 + ["num"]=600 }, { ["type"]="attr_skill_hurtp_blue", - ["num"]=30000 + ["num"]=600 }, { ["type"]="attr_skill_hurtp_purple", - ["num"]=30000 + ["num"]=600 } }, ["attr_9"]={ { ["type"]="attr_cured_red", - ["num"]=30000 + ["num"]=300 }, { ["type"]="attr_cured_yellow", - ["num"]=30000 + ["num"]=300 }, { ["type"]="attr_cured_green", - ["num"]=30000 + ["num"]=300 }, { ["type"]="attr_cured_blue", - ["num"]=30000 + ["num"]=300 }, { ["type"]="attr_cured_purple", - ["num"]=30000 + ["num"]=300 } }, ["attr_10"]={ @@ -711,23 +711,23 @@ local runes_sub = { ["attr_11"]={ { ["type"]="attr_crit_time_red", - ["num"]=300 + ["num"]=400 }, { ["type"]="attr_crit_time_yellow", - ["num"]=300 + ["num"]=400 }, { ["type"]="attr_crit_time_green", - ["num"]=300 + ["num"]=400 }, { ["type"]="attr_crit_time_blue", - ["num"]=300 + ["num"]=400 }, { ["type"]="attr_crit_time_purple", - ["num"]=300 + ["num"]=400 } } }, @@ -735,199 +735,199 @@ local runes_sub = { ["attr_1"]={ { ["type"]="atk_red", - ["num"]=40000 + ["num"]=2400000 }, { ["type"]="atk_yellow", - ["num"]=40000 + ["num"]=2400000 }, { ["type"]="atk_green", - ["num"]=40000 + ["num"]=2400000 }, { ["type"]="atk_blue", - ["num"]=40000 + ["num"]=2400000 }, { ["type"]="atk_purple", - ["num"]=40000 + ["num"]=2400000 } }, ["attr_2"]={ { ["type"]="attr_hp_red", - ["num"]=40000 + ["num"]=3600000 }, { ["type"]="attr_hp_yellow", - ["num"]=40000 + ["num"]=3600000 }, { ["type"]="attr_hp_green", - ["num"]=40000 + ["num"]=3600000 }, { ["type"]="attr_hp_blue", - ["num"]=40000 + ["num"]=3600000 }, { ["type"]="attr_hp_purple", - ["num"]=40000 + ["num"]=3600000 } }, ["attr_3"]={ { ["type"]="attr_atkp_red", - ["num"]=400 + ["num"]=800 }, { ["type"]="attr_atkp_yellow", - ["num"]=400 + ["num"]=800 }, { ["type"]="attr_atkp_green", - ["num"]=400 + ["num"]=800 }, { ["type"]="attr_atkp_blue", - ["num"]=400 + ["num"]=800 }, { ["type"]="attr_atkp_purple", - ["num"]=400 + ["num"]=800 } }, ["attr_4"]={ { ["type"]="attr_hpp_red", - ["num"]=400 + ["num"]=1200 }, { ["type"]="attr_hpp_yellow", - ["num"]=400 + ["num"]=1200 }, { ["type"]="attr_hpp_green", - ["num"]=400 + ["num"]=1200 }, { ["type"]="attr_hpp_blue", - ["num"]=400 + ["num"]=1200 }, { ["type"]="attr_hpp_purple", - ["num"]=400 + ["num"]=1200 } }, ["attr_5"]={ { ["type"]="attr_normal_hurt_red", - ["num"]=40000 + ["num"]=2400000 }, { ["type"]="attr_normal_hurt_yellow", - ["num"]=40000 + ["num"]=2400000 }, { ["type"]="attr_normal_hurt_green", - ["num"]=40000 + ["num"]=2400000 }, { ["type"]="attr_normal_hurt_blue", - ["num"]=40000 + ["num"]=2400000 }, { ["type"]="attr_normal_hurt_purple", - ["num"]=40000 + ["num"]=2400000 } }, ["attr_6"]={ { ["type"]="attr_skill_hurt_red", - ["num"]=40000 + ["num"]=2400000 }, { ["type"]="attr_skill_hurt_yellow", - ["num"]=40000 + ["num"]=2400000 }, { ["type"]="attr_skill_hurt_green", - ["num"]=40000 + ["num"]=2400000 }, { ["type"]="attr_skill_hurt_blue", - ["num"]=40000 + ["num"]=2400000 }, { ["type"]="attr_skill_hurt_purple", - ["num"]=40000 + ["num"]=2400000 } }, ["attr_7"]={ { ["type"]="attr_normal_hurtp_red", - ["num"]=40000 + ["num"]=800 }, { ["type"]="attr_normal_hurtp_yellow", - ["num"]=40000 + ["num"]=800 }, { ["type"]="attr_normal_hurtp_green", - ["num"]=40000 + ["num"]=800 }, { ["type"]="attr_normal_hurtp_blue", - ["num"]=40000 + ["num"]=800 }, { ["type"]="attr_normal_hurtp_purple", - ["num"]=40000 + ["num"]=800 } }, ["attr_8"]={ { ["type"]="attr_skill_hurtp_red", - ["num"]=40000 + ["num"]=800 }, { ["type"]="attr_skill_hurtp_yellow", - ["num"]=40000 + ["num"]=800 }, { ["type"]="attr_skill_hurtp_green", - ["num"]=40000 + ["num"]=800 }, { ["type"]="attr_skill_hurtp_blue", - ["num"]=40000 + ["num"]=800 }, { ["type"]="attr_skill_hurtp_purple", - ["num"]=40000 + ["num"]=800 } }, ["attr_9"]={ { ["type"]="attr_cured_red", - ["num"]=40000 + ["num"]=400 }, { ["type"]="attr_cured_yellow", - ["num"]=40000 + ["num"]=400 }, { ["type"]="attr_cured_green", - ["num"]=40000 + ["num"]=400 }, { ["type"]="attr_cured_blue", - ["num"]=40000 + ["num"]=400 }, { ["type"]="attr_cured_purple", - ["num"]=40000 + ["num"]=400 } }, ["attr_10"]={ @@ -955,23 +955,23 @@ local runes_sub = { ["attr_11"]={ { ["type"]="attr_crit_time_red", - ["num"]=400 + ["num"]=600 }, { ["type"]="attr_crit_time_yellow", - ["num"]=400 + ["num"]=600 }, { ["type"]="attr_crit_time_green", - ["num"]=400 + ["num"]=600 }, { ["type"]="attr_crit_time_blue", - ["num"]=400 + ["num"]=600 }, { ["type"]="attr_crit_time_purple", - ["num"]=400 + ["num"]=600 } } }, @@ -979,243 +979,243 @@ local runes_sub = { ["attr_1"]={ { ["type"]="atk_red", - ["num"]=50000 + ["num"]=3600000 }, { ["type"]="atk_yellow", - ["num"]=50000 + ["num"]=3600000 }, { ["type"]="atk_green", - ["num"]=50000 + ["num"]=3600000 }, { ["type"]="atk_blue", - ["num"]=50000 + ["num"]=3600000 }, { ["type"]="atk_purple", - ["num"]=50000 + ["num"]=3600000 } }, ["attr_2"]={ { ["type"]="attr_hp_red", - ["num"]=50000 + ["num"]=5400000 }, { ["type"]="attr_hp_yellow", - ["num"]=50000 + ["num"]=5400000 }, { ["type"]="attr_hp_green", - ["num"]=50000 + ["num"]=5400000 }, { ["type"]="attr_hp_blue", - ["num"]=50000 + ["num"]=5400000 }, { ["type"]="attr_hp_purple", - ["num"]=50000 + ["num"]=5400000 } }, ["attr_3"]={ { ["type"]="attr_atkp_red", - ["num"]=500 + ["num"]=1200 }, { ["type"]="attr_atkp_yellow", - ["num"]=500 + ["num"]=1200 }, { ["type"]="attr_atkp_green", - ["num"]=500 + ["num"]=1200 }, { ["type"]="attr_atkp_blue", - ["num"]=500 + ["num"]=1200 }, { ["type"]="attr_atkp_purple", - ["num"]=500 + ["num"]=1200 } }, ["attr_4"]={ { ["type"]="attr_hpp_red", - ["num"]=500 + ["num"]=1800 }, { ["type"]="attr_hpp_yellow", - ["num"]=500 + ["num"]=1800 }, { ["type"]="attr_hpp_green", - ["num"]=500 + ["num"]=1800 }, { ["type"]="attr_hpp_blue", - ["num"]=500 + ["num"]=1800 }, { ["type"]="attr_hpp_purple", - ["num"]=500 + ["num"]=1800 } }, ["attr_5"]={ { ["type"]="attr_normal_hurt_red", - ["num"]=50000 + ["num"]=3600000 }, { ["type"]="attr_normal_hurt_yellow", - ["num"]=50000 + ["num"]=3600000 }, { ["type"]="attr_normal_hurt_green", - ["num"]=50000 + ["num"]=3600000 }, { ["type"]="attr_normal_hurt_blue", - ["num"]=50000 + ["num"]=3600000 }, { ["type"]="attr_normal_hurt_purple", - ["num"]=50000 + ["num"]=3600000 } }, ["attr_6"]={ { ["type"]="attr_skill_hurt_red", - ["num"]=50000 + ["num"]=3600000 }, { ["type"]="attr_skill_hurt_yellow", - ["num"]=50000 + ["num"]=3600000 }, { ["type"]="attr_skill_hurt_green", - ["num"]=50000 + ["num"]=3600000 }, { ["type"]="attr_skill_hurt_blue", - ["num"]=50000 + ["num"]=3600000 }, { ["type"]="attr_skill_hurt_purple", - ["num"]=50000 + ["num"]=3600000 } }, ["attr_7"]={ { ["type"]="attr_normal_hurtp_red", - ["num"]=50000 + ["num"]=1200 }, { ["type"]="attr_normal_hurtp_yellow", - ["num"]=50000 + ["num"]=1200 }, { ["type"]="attr_normal_hurtp_green", - ["num"]=50000 + ["num"]=1200 }, { ["type"]="attr_normal_hurtp_blue", - ["num"]=50000 + ["num"]=1200 }, { ["type"]="attr_normal_hurtp_purple", - ["num"]=50000 + ["num"]=1200 } }, ["attr_8"]={ { ["type"]="attr_skill_hurtp_red", - ["num"]=50000 + ["num"]=1200 }, { ["type"]="attr_skill_hurtp_yellow", - ["num"]=50000 + ["num"]=1200 }, { ["type"]="attr_skill_hurtp_green", - ["num"]=50000 + ["num"]=1200 }, { ["type"]="attr_skill_hurtp_blue", - ["num"]=50000 + ["num"]=1200 }, { ["type"]="attr_skill_hurtp_purple", - ["num"]=50000 + ["num"]=1200 } }, ["attr_9"]={ { ["type"]="attr_cured_red", - ["num"]=50000 + ["num"]=600 }, { ["type"]="attr_cured_yellow", - ["num"]=50000 + ["num"]=600 }, { ["type"]="attr_cured_green", - ["num"]=50000 + ["num"]=600 }, { ["type"]="attr_cured_blue", - ["num"]=50000 + ["num"]=600 }, { ["type"]="attr_cured_purple", - ["num"]=50000 + ["num"]=600 } }, ["attr_10"]={ { ["type"]="attr_crit_red", - ["num"]=500 + ["num"]=600 }, { ["type"]="attr_crit_yellow", - ["num"]=500 + ["num"]=600 }, { ["type"]="attr_crit_green", - ["num"]=500 + ["num"]=600 }, { ["type"]="attr_crit_blue", - ["num"]=500 + ["num"]=600 }, { ["type"]="attr_crit_purple", - ["num"]=500 + ["num"]=600 } }, ["attr_11"]={ { ["type"]="attr_crit_time_red", - ["num"]=500 + ["num"]=900 }, { ["type"]="attr_crit_time_yellow", - ["num"]=500 + ["num"]=900 }, { ["type"]="attr_crit_time_green", - ["num"]=500 + ["num"]=900 }, { ["type"]="attr_crit_time_blue", - ["num"]=500 + ["num"]=900 }, { ["type"]="attr_crit_time_purple", - ["num"]=500 + ["num"]=900 } } }, @@ -1223,243 +1223,243 @@ local runes_sub = { ["attr_1"]={ { ["type"]="atk_red", - ["num"]=90000 + ["num"]=5400000 }, { ["type"]="atk_yellow", - ["num"]=90000 + ["num"]=5400000 }, { ["type"]="atk_green", - ["num"]=90000 + ["num"]=5400000 }, { ["type"]="atk_blue", - ["num"]=90000 + ["num"]=5400000 }, { ["type"]="atk_purple", - ["num"]=90000 + ["num"]=5400000 } }, ["attr_2"]={ { ["type"]="attr_hp_red", - ["num"]=90000 + ["num"]=8100000 }, { ["type"]="attr_hp_yellow", - ["num"]=90000 + ["num"]=8100000 }, { ["type"]="attr_hp_green", - ["num"]=90000 + ["num"]=8100000 }, { ["type"]="attr_hp_blue", - ["num"]=90000 + ["num"]=8100000 }, { ["type"]="attr_hp_purple", - ["num"]=90000 + ["num"]=8100000 } }, ["attr_3"]={ { ["type"]="attr_atkp_red", - ["num"]=600 + ["num"]=1800 }, { ["type"]="attr_atkp_yellow", - ["num"]=600 + ["num"]=1800 }, { ["type"]="attr_atkp_green", - ["num"]=600 + ["num"]=1800 }, { ["type"]="attr_atkp_blue", - ["num"]=600 + ["num"]=1800 }, { ["type"]="attr_atkp_purple", - ["num"]=600 + ["num"]=1800 } }, ["attr_4"]={ { ["type"]="attr_hpp_red", - ["num"]=600 + ["num"]=2700 }, { ["type"]="attr_hpp_yellow", - ["num"]=600 + ["num"]=2700 }, { ["type"]="attr_hpp_green", - ["num"]=600 + ["num"]=2700 }, { ["type"]="attr_hpp_blue", - ["num"]=600 + ["num"]=2700 }, { ["type"]="attr_hpp_purple", - ["num"]=600 + ["num"]=2700 } }, ["attr_5"]={ { ["type"]="attr_normal_hurt_red", - ["num"]=90000 + ["num"]=5400000 }, { ["type"]="attr_normal_hurt_yellow", - ["num"]=90000 + ["num"]=5400000 }, { ["type"]="attr_normal_hurt_green", - ["num"]=90000 + ["num"]=5400000 }, { ["type"]="attr_normal_hurt_blue", - ["num"]=90000 + ["num"]=5400000 }, { ["type"]="attr_normal_hurt_purple", - ["num"]=90000 + ["num"]=5400000 } }, ["attr_6"]={ { ["type"]="attr_skill_hurt_red", - ["num"]=90000 + ["num"]=5400000 }, { ["type"]="attr_skill_hurt_yellow", - ["num"]=90000 + ["num"]=5400000 }, { ["type"]="attr_skill_hurt_green", - ["num"]=90000 + ["num"]=5400000 }, { ["type"]="attr_skill_hurt_blue", - ["num"]=90000 + ["num"]=5400000 }, { ["type"]="attr_skill_hurt_purple", - ["num"]=90000 + ["num"]=5400000 } }, ["attr_7"]={ { ["type"]="attr_normal_hurtp_red", - ["num"]=90000 + ["num"]=1800 }, { ["type"]="attr_normal_hurtp_yellow", - ["num"]=90000 + ["num"]=1800 }, { ["type"]="attr_normal_hurtp_green", - ["num"]=90000 + ["num"]=1800 }, { ["type"]="attr_normal_hurtp_blue", - ["num"]=90000 + ["num"]=1800 }, { ["type"]="attr_normal_hurtp_purple", - ["num"]=90000 + ["num"]=1800 } }, ["attr_8"]={ { ["type"]="attr_skill_hurtp_red", - ["num"]=90000 + ["num"]=1800 }, { ["type"]="attr_skill_hurtp_yellow", - ["num"]=90000 + ["num"]=1800 }, { ["type"]="attr_skill_hurtp_green", - ["num"]=90000 + ["num"]=1800 }, { ["type"]="attr_skill_hurtp_blue", - ["num"]=90000 + ["num"]=1800 }, { ["type"]="attr_skill_hurtp_purple", - ["num"]=90000 + ["num"]=1800 } }, ["attr_9"]={ { ["type"]="attr_cured_red", - ["num"]=90000 + ["num"]=900 }, { ["type"]="attr_cured_yellow", - ["num"]=90000 + ["num"]=900 }, { ["type"]="attr_cured_green", - ["num"]=90000 + ["num"]=900 }, { ["type"]="attr_cured_blue", - ["num"]=90000 + ["num"]=900 }, { ["type"]="attr_cured_purple", - ["num"]=90000 + ["num"]=900 } }, ["attr_10"]={ { ["type"]="attr_crit_red", - ["num"]=600 + ["num"]=900 }, { ["type"]="attr_crit_yellow", - ["num"]=600 + ["num"]=900 }, { ["type"]="attr_crit_green", - ["num"]=600 + ["num"]=900 }, { ["type"]="attr_crit_blue", - ["num"]=600 + ["num"]=900 }, { ["type"]="attr_crit_purple", - ["num"]=600 + ["num"]=900 } }, ["attr_11"]={ { ["type"]="attr_crit_time_red", - ["num"]=600 + ["num"]=1400 }, { ["type"]="attr_crit_time_yellow", - ["num"]=600 + ["num"]=1400 }, { ["type"]="attr_crit_time_green", - ["num"]=600 + ["num"]=1400 }, { ["type"]="attr_crit_time_blue", - ["num"]=600 + ["num"]=1400 }, { ["type"]="attr_crit_time_purple", - ["num"]=600 + ["num"]=1400 } } }, @@ -1467,243 +1467,243 @@ local runes_sub = { ["attr_1"]={ { ["type"]="atk_red", - ["num"]=100000 + ["num"]=9000000 }, { ["type"]="atk_yellow", - ["num"]=100000 + ["num"]=9000000 }, { ["type"]="atk_green", - ["num"]=100000 + ["num"]=9000000 }, { ["type"]="atk_blue", - ["num"]=100000 + ["num"]=9000000 }, { ["type"]="atk_purple", - ["num"]=100000 + ["num"]=9000000 } }, ["attr_2"]={ { ["type"]="attr_hp_red", - ["num"]=100000 + ["num"]=13500000 }, { ["type"]="attr_hp_yellow", - ["num"]=100000 + ["num"]=13500000 }, { ["type"]="attr_hp_green", - ["num"]=100000 + ["num"]=13500000 }, { ["type"]="attr_hp_blue", - ["num"]=100000 + ["num"]=13500000 }, { ["type"]="attr_hp_purple", - ["num"]=100000 + ["num"]=13500000 } }, ["attr_3"]={ { ["type"]="attr_atkp_red", - ["num"]=700 + ["num"]=3000 }, { ["type"]="attr_atkp_yellow", - ["num"]=700 + ["num"]=3000 }, { ["type"]="attr_atkp_green", - ["num"]=700 + ["num"]=3000 }, { ["type"]="attr_atkp_blue", - ["num"]=700 + ["num"]=3000 }, { ["type"]="attr_atkp_purple", - ["num"]=700 + ["num"]=3000 } }, ["attr_4"]={ { ["type"]="attr_hpp_red", - ["num"]=700 + ["num"]=4500 }, { ["type"]="attr_hpp_yellow", - ["num"]=700 + ["num"]=4500 }, { ["type"]="attr_hpp_green", - ["num"]=700 + ["num"]=4500 }, { ["type"]="attr_hpp_blue", - ["num"]=700 + ["num"]=4500 }, { ["type"]="attr_hpp_purple", - ["num"]=700 + ["num"]=4500 } }, ["attr_5"]={ { ["type"]="attr_normal_hurt_red", - ["num"]=100000 + ["num"]=9000000 }, { ["type"]="attr_normal_hurt_yellow", - ["num"]=100000 + ["num"]=9000000 }, { ["type"]="attr_normal_hurt_green", - ["num"]=100000 + ["num"]=9000000 }, { ["type"]="attr_normal_hurt_blue", - ["num"]=100000 + ["num"]=9000000 }, { ["type"]="attr_normal_hurt_purple", - ["num"]=100000 + ["num"]=9000000 } }, ["attr_6"]={ { ["type"]="attr_skill_hurt_red", - ["num"]=100000 + ["num"]=9000000 }, { ["type"]="attr_skill_hurt_yellow", - ["num"]=100000 + ["num"]=9000000 }, { ["type"]="attr_skill_hurt_green", - ["num"]=100000 + ["num"]=9000000 }, { ["type"]="attr_skill_hurt_blue", - ["num"]=100000 + ["num"]=9000000 }, { ["type"]="attr_skill_hurt_purple", - ["num"]=100000 + ["num"]=9000000 } }, ["attr_7"]={ { ["type"]="attr_normal_hurtp_red", - ["num"]=100000 + ["num"]=3000 }, { ["type"]="attr_normal_hurtp_yellow", - ["num"]=100000 + ["num"]=3000 }, { ["type"]="attr_normal_hurtp_green", - ["num"]=100000 + ["num"]=3000 }, { ["type"]="attr_normal_hurtp_blue", - ["num"]=100000 + ["num"]=3000 }, { ["type"]="attr_normal_hurtp_purple", - ["num"]=100000 + ["num"]=3000 } }, ["attr_8"]={ { ["type"]="attr_skill_hurtp_red", - ["num"]=100000 + ["num"]=3000 }, { ["type"]="attr_skill_hurtp_yellow", - ["num"]=100000 + ["num"]=3000 }, { ["type"]="attr_skill_hurtp_green", - ["num"]=100000 + ["num"]=3000 }, { ["type"]="attr_skill_hurtp_blue", - ["num"]=100000 + ["num"]=3000 }, { ["type"]="attr_skill_hurtp_purple", - ["num"]=100000 + ["num"]=3000 } }, ["attr_9"]={ { ["type"]="attr_cured_red", - ["num"]=100000 + ["num"]=1500 }, { ["type"]="attr_cured_yellow", - ["num"]=100000 + ["num"]=1500 }, { ["type"]="attr_cured_green", - ["num"]=100000 + ["num"]=1500 }, { ["type"]="attr_cured_blue", - ["num"]=100000 + ["num"]=1500 }, { ["type"]="attr_cured_purple", - ["num"]=100000 + ["num"]=1500 } }, ["attr_10"]={ { ["type"]="attr_crit_red", - ["num"]=700 + ["num"]=1500 }, { ["type"]="attr_crit_yellow", - ["num"]=700 + ["num"]=1500 }, { ["type"]="attr_crit_green", - ["num"]=700 + ["num"]=1500 }, { ["type"]="attr_crit_blue", - ["num"]=700 + ["num"]=1500 }, { ["type"]="attr_crit_purple", - ["num"]=700 + ["num"]=1500 } }, ["attr_11"]={ { ["type"]="attr_crit_time_red", - ["num"]=700 + ["num"]=2200 }, { ["type"]="attr_crit_time_yellow", - ["num"]=700 + ["num"]=2200 }, { ["type"]="attr_crit_time_green", - ["num"]=700 + ["num"]=2200 }, { ["type"]="attr_crit_time_blue", - ["num"]=700 + ["num"]=2200 }, { ["type"]="attr_crit_time_purple", - ["num"]=700 + ["num"]=2200 } } }, @@ -1711,243 +1711,243 @@ local runes_sub = { ["attr_1"]={ { ["type"]="atk_red", - ["num"]=200000 + ["num"]=12000000 }, { ["type"]="atk_yellow", - ["num"]=200000 + ["num"]=12000000 }, { ["type"]="atk_green", - ["num"]=200000 + ["num"]=12000000 }, { ["type"]="atk_blue", - ["num"]=200000 + ["num"]=12000000 }, { ["type"]="atk_purple", - ["num"]=200000 + ["num"]=12000000 } }, ["attr_2"]={ { ["type"]="attr_hp_red", - ["num"]=200000 + ["num"]=18000000 }, { ["type"]="attr_hp_yellow", - ["num"]=200000 + ["num"]=18000000 }, { ["type"]="attr_hp_green", - ["num"]=200000 + ["num"]=18000000 }, { ["type"]="attr_hp_blue", - ["num"]=200000 + ["num"]=18000000 }, { ["type"]="attr_hp_purple", - ["num"]=200000 + ["num"]=18000000 } }, ["attr_3"]={ { ["type"]="attr_atkp_red", - ["num"]=800 + ["num"]=4000 }, { ["type"]="attr_atkp_yellow", - ["num"]=800 + ["num"]=4000 }, { ["type"]="attr_atkp_green", - ["num"]=800 + ["num"]=4000 }, { ["type"]="attr_atkp_blue", - ["num"]=800 + ["num"]=4000 }, { ["type"]="attr_atkp_purple", - ["num"]=800 + ["num"]=4000 } }, ["attr_4"]={ { ["type"]="attr_hpp_red", - ["num"]=800 + ["num"]=6000 }, { ["type"]="attr_hpp_yellow", - ["num"]=800 + ["num"]=6000 }, { ["type"]="attr_hpp_green", - ["num"]=800 + ["num"]=6000 }, { ["type"]="attr_hpp_blue", - ["num"]=800 + ["num"]=6000 }, { ["type"]="attr_hpp_purple", - ["num"]=800 + ["num"]=6000 } }, ["attr_5"]={ { ["type"]="attr_normal_hurt_red", - ["num"]=200000 + ["num"]=12000000 }, { ["type"]="attr_normal_hurt_yellow", - ["num"]=200000 + ["num"]=12000000 }, { ["type"]="attr_normal_hurt_green", - ["num"]=200000 + ["num"]=12000000 }, { ["type"]="attr_normal_hurt_blue", - ["num"]=200000 + ["num"]=12000000 }, { ["type"]="attr_normal_hurt_purple", - ["num"]=200000 + ["num"]=12000000 } }, ["attr_6"]={ { ["type"]="attr_skill_hurt_red", - ["num"]=200000 + ["num"]=12000000 }, { ["type"]="attr_skill_hurt_yellow", - ["num"]=200000 + ["num"]=12000000 }, { ["type"]="attr_skill_hurt_green", - ["num"]=200000 + ["num"]=12000000 }, { ["type"]="attr_skill_hurt_blue", - ["num"]=200000 + ["num"]=12000000 }, { ["type"]="attr_skill_hurt_purple", - ["num"]=200000 + ["num"]=12000000 } }, ["attr_7"]={ { ["type"]="attr_normal_hurtp_red", - ["num"]=200000 + ["num"]=4000 }, { ["type"]="attr_normal_hurtp_yellow", - ["num"]=200000 + ["num"]=4000 }, { ["type"]="attr_normal_hurtp_green", - ["num"]=200000 + ["num"]=4000 }, { ["type"]="attr_normal_hurtp_blue", - ["num"]=200000 + ["num"]=4000 }, { ["type"]="attr_normal_hurtp_purple", - ["num"]=200000 + ["num"]=4000 } }, ["attr_8"]={ { ["type"]="attr_skill_hurtp_red", - ["num"]=200000 + ["num"]=4000 }, { ["type"]="attr_skill_hurtp_yellow", - ["num"]=200000 + ["num"]=4000 }, { ["type"]="attr_skill_hurtp_green", - ["num"]=200000 + ["num"]=4000 }, { ["type"]="attr_skill_hurtp_blue", - ["num"]=200000 + ["num"]=4000 }, { ["type"]="attr_skill_hurtp_purple", - ["num"]=200000 + ["num"]=4000 } }, ["attr_9"]={ { ["type"]="attr_cured_red", - ["num"]=200000 + ["num"]=2000 }, { ["type"]="attr_cured_yellow", - ["num"]=200000 + ["num"]=2000 }, { ["type"]="attr_cured_green", - ["num"]=200000 + ["num"]=2000 }, { ["type"]="attr_cured_blue", - ["num"]=200000 + ["num"]=2000 }, { ["type"]="attr_cured_purple", - ["num"]=200000 + ["num"]=2000 } }, ["attr_10"]={ { ["type"]="attr_crit_red", - ["num"]=800 + ["num"]=2000 }, { ["type"]="attr_crit_yellow", - ["num"]=800 + ["num"]=2000 }, { ["type"]="attr_crit_green", - ["num"]=800 + ["num"]=2000 }, { ["type"]="attr_crit_blue", - ["num"]=800 + ["num"]=2000 }, { ["type"]="attr_crit_purple", - ["num"]=800 + ["num"]=2000 } }, ["attr_11"]={ { ["type"]="attr_crit_time_red", - ["num"]=800 + ["num"]=3000 }, { ["type"]="attr_crit_time_yellow", - ["num"]=800 + ["num"]=3000 }, { ["type"]="attr_crit_time_green", - ["num"]=800 + ["num"]=3000 }, { ["type"]="attr_crit_time_blue", - ["num"]=800 + ["num"]=3000 }, { ["type"]="attr_crit_time_purple", - ["num"]=800 + ["num"]=3000 } } } diff --git a/lua/app/config/runes_suit.lua b/lua/app/config/runes_suit.lua index e8051d79..cfd25a72 100644 --- a/lua/app/config/runes_suit.lua +++ b/lua/app/config/runes_suit.lua @@ -3,51 +3,51 @@ local runes_suit = { ["red_suit_attr"]={ { ["type"]="attr_hpp_red", - ["num"]=1000 + ["num"]=800 }, { ["type"]="attr_hpp_red", - ["num"]=2500 + ["num"]=1500 } }, ["yellow_suit_attr"]={ { ["type"]="attr_hpp_yellow", - ["num"]=1000 + ["num"]=800 }, { ["type"]="attr_hpp_yellow", - ["num"]=2500 + ["num"]=1500 } }, ["green_suit_attr"]={ { ["type"]="attr_hpp_green", - ["num"]=1000 + ["num"]=800 }, { ["type"]="attr_hpp_green", - ["num"]=2500 + ["num"]=1500 } }, ["blue_suit_attr"]={ { ["type"]="attr_hpp_blue", - ["num"]=1000 + ["num"]=800 }, { ["type"]="attr_hpp_blue", - ["num"]=2500 + ["num"]=1500 } }, ["purple_suit_attr"]={ { ["type"]="attr_hpp_purple", - ["num"]=1000 + ["num"]=800 }, { ["type"]="attr_hpp_purple", - ["num"]=2500 + ["num"]=1500 } } }, @@ -55,51 +55,51 @@ local runes_suit = { ["red_suit_attr"]={ { ["type"]="attr_atkp_red", - ["num"]=1000 + ["num"]=800 }, { ["type"]="attr_atkp_red", - ["num"]=2500 + ["num"]=1500 } }, ["yellow_suit_attr"]={ { ["type"]="attr_atkp_yellow", - ["num"]=1000 + ["num"]=800 }, { ["type"]="attr_atkp_yellow", - ["num"]=2500 + ["num"]=1500 } }, ["green_suit_attr"]={ { ["type"]="attr_atkp_green", - ["num"]=1000 + ["num"]=800 }, { ["type"]="attr_atkp_green", - ["num"]=2500 + ["num"]=1500 } }, ["blue_suit_attr"]={ { ["type"]="attr_atkp_blue", - ["num"]=1000 + ["num"]=800 }, { ["type"]="attr_atkp_blue", - ["num"]=2500 + ["num"]=1500 } }, ["purple_suit_attr"]={ { ["type"]="attr_atkp_purple", - ["num"]=1000 + ["num"]=800 }, { ["type"]="attr_atkp_purple", - ["num"]=2500 + ["num"]=1500 } } }, @@ -107,51 +107,51 @@ local runes_suit = { ["red_suit_attr"]={ { ["type"]="attr_crit_time_red", - ["num"]=2000 + ["num"]=1500 }, { ["type"]="attr_crit_time_red", - ["num"]=4000 + ["num"]=3000 } }, ["yellow_suit_attr"]={ { ["type"]="attr_crit_time_yellow", - ["num"]=2000 + ["num"]=1500 }, { ["type"]="attr_crit_time_yellow", - ["num"]=4000 + ["num"]=3000 } }, ["green_suit_attr"]={ { ["type"]="attr_crit_time_green", - ["num"]=2000 + ["num"]=1500 }, { ["type"]="attr_crit_time_green", - ["num"]=4000 + ["num"]=3000 } }, ["blue_suit_attr"]={ { ["type"]="attr_crit_time_blue", - ["num"]=2000 + ["num"]=1500 }, { ["type"]="attr_crit_time_blue", - ["num"]=4000 + ["num"]=3000 } }, ["purple_suit_attr"]={ { ["type"]="attr_crit_time_purple", - ["num"]=2000 + ["num"]=1500 }, { ["type"]="attr_crit_time_purple", - ["num"]=4000 + ["num"]=3000 } } }, @@ -159,51 +159,51 @@ local runes_suit = { ["red_suit_attr"]={ { ["type"]="attr_all_hurtp_red", - ["num"]=2000 + ["num"]=500 }, { ["type"]="attr_all_hurtp_red", - ["num"]=4000 + ["num"]=1000 } }, ["yellow_suit_attr"]={ { ["type"]="attr_all_hurtp_yellow", - ["num"]=2000 + ["num"]=500 }, { ["type"]="attr_all_hurtp_yellow", - ["num"]=4000 + ["num"]=1000 } }, ["green_suit_attr"]={ { ["type"]="attr_all_hurtp_green", - ["num"]=2000 + ["num"]=500 }, { ["type"]="attr_all_hurtp_green", - ["num"]=4000 + ["num"]=1000 } }, ["blue_suit_attr"]={ { ["type"]="attr_all_hurtp_blue", - ["num"]=2000 + ["num"]=500 }, { ["type"]="attr_all_hurtp_blue", - ["num"]=4000 + ["num"]=1000 } }, ["purple_suit_attr"]={ { ["type"]="attr_all_hurtp_purple", - ["num"]=2000 + ["num"]=500 }, { ["type"]="attr_all_hurtp_purple", - ["num"]=4000 + ["num"]=1000 } } }, @@ -211,51 +211,51 @@ local runes_suit = { ["red_suit_attr"]={ { ["type"]="attr_crit_red", - ["num"]=1000 + ["num"]=800 }, { ["type"]="attr_all_hurtp_red", - ["num"]=2000 + ["num"]=1500 } }, ["yellow_suit_attr"]={ { ["type"]="attr_crit_yellow", - ["num"]=1000 + ["num"]=800 }, { ["type"]="attr_all_hurtp_yellow", - ["num"]=2000 + ["num"]=1500 } }, ["green_suit_attr"]={ { ["type"]="attr_crit_green", - ["num"]=1000 + ["num"]=800 }, { ["type"]="attr_all_hurtp_green", - ["num"]=2000 + ["num"]=1500 } }, ["blue_suit_attr"]={ { ["type"]="attr_crit_blue", - ["num"]=1000 + ["num"]=800 }, { ["type"]="attr_all_hurtp_blue", - ["num"]=2000 + ["num"]=1500 } }, ["purple_suit_attr"]={ { ["type"]="attr_crit_purple", - ["num"]=1000 + ["num"]=800 }, { ["type"]="attr_all_hurtp_purple", - ["num"]=2000 + ["num"]=1500 } } } diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 62ecc59c..4dfcc90b 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -3863,10 +3863,10 @@ local skill = { ["trigger"]=5, ["effect"]={ { - ["type"]="hurt_yellow", - ["num"]=5000, - ["ratio"]=10000, - ["round"]=0 + ["type"]="stun", + ["num"]=0, + ["ratio"]=500, + ["round"]=1 } }, ["obj"]=2 @@ -3912,7 +3912,7 @@ local skill = { [2400423]={ ["position"]=2, ["effect_type"]=2, - ["trigger"]=6, + ["trigger"]=5, ["effect"]={ { ["type"]="stun", @@ -3923,6 +3923,20 @@ local skill = { }, ["obj"]=2 }, + [2400424]={ + ["position"]=2, + ["effect_type"]=2, + ["trigger"]=6, + ["effect"]={ + { + ["type"]="bleed", + ["num"]=3500, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=2 + }, [3200110]={ ["position"]=3, ["effect_type"]=1, @@ -5799,8 +5813,8 @@ local skill = { ["trigger"]=5, ["effect"]={ { - ["type"]="bleed", - ["num"]=3500, + ["type"]="poison", + ["num"]=2500, ["ratio"]=1000, ["round"]=2 } @@ -9285,34 +9299,14 @@ local skill = { }, [5400421]={ ["position"]=5, - ["buff_condition"]={ - { - { - ["type"]="state", - ["attr"]="normal_attack_dec", - ["op"]=">", - ["v"]=0, - ["side"]=2 - } - } - }, - ["condition_rel"]={ - { - 1, - 1 - } + ["skill_type"]=12, + ["skill_type_parameter"]={ + 5, + 3 }, ["effect_type"]=2, - ["trigger"]=5, - ["effect"]={ - { - ["type"]="frozen", - ["num"]=0, - ["ratio"]=1000, - ["round"]=1 - } - }, - ["obj"]=2 + ["trigger"]=3, + ["obj"]=1 }, [5400422]={ ["position"]=5, @@ -9358,34 +9352,14 @@ local skill = { }, [5400425]={ ["position"]=5, - ["buff_condition"]={ - { - { - ["type"]="state", - ["attr"]="normal_attack_dec", - ["op"]=">", - ["v"]=0, - ["side"]=2 - } - } - }, - ["condition_rel"]={ - { - 1, - 1 - } + ["skill_type"]=11, + ["skill_type_parameter"]={ + 0, + 2 }, ["effect_type"]=2, - ["trigger"]=5, - ["effect"]={ - { - ["type"]="frozen", - ["num"]=0, - ["ratio"]=1000, - ["round"]=2 - } - }, - ["obj"]=2 + ["trigger"]=3, + ["obj"]=1 }, [5400426]={ ["position"]=5, @@ -30487,6 +30461,6 @@ local skill = { } } local config = { -data=skill,count=1103 +data=skill,count=1104 } 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 e4a09b39..30b4e22c 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -2572,6 +2572,15 @@ local skill_rogue = { ["qlt"]=4, ["type"]=12, ["skill_position"]=2, + ["effect"]={ + { + ["type"]="add_skill", + ["num"]=2400424, + ["ratio"]=10000, + ["round"]=999 + } + }, + ["obj"]=4, ["icon"]="240" }, [2400406]={ @@ -5381,8 +5390,6 @@ local skill_rogue = { ["icon"]="261" }, [5400406]={ - ["unlock"]=5400402, - ["cover_unlock"]=5400402, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 135e6513..7b2b9cf2 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -517,9 +517,9 @@ local localization_global = ["DUNGEON_RUNE_DESC"] = "挑战极限，获取符文！", ["DUNGEON_RUNE_HELP"] = "1. 每30天为一个周期，每个周期会重置密室探索进度。/n2. 通关后可消耗【银羽毛】重复挑战，争取最小回合数，更新副本排行！/n3. 挑战道具【金羽毛】和重复挑战道具【银羽毛】每日重置。", ["DUNGEON_RUNE_MIN"] = "历史通关最小回合数：{0}", - ["DUNGEON_RUNE_QUEST_1"] = "{0}回合内通关", - ["DUNGEON_RUNE_QUEST_2"] = "通关时消除{0}个{1}", - ["DUNGEON_RUNE_QUEST_3"] = "通关时消除{0}个障碍物", + ["DUNGEON_RUNE_QUEST_1"] = "{0}回合内完成目标", + ["DUNGEON_RUNE_QUEST_2"] = "消除{0}个{1}", + ["DUNGEON_RUNE_QUEST_3"] = "消除{0}个此障碍物", ["DUNGEON_RUNE_QUEST_4"] = "击杀{0}个小怪", ["DUNGEON_RUNE_TIP_1"] = "塔中密室循环结算后，可在此领取奖励。", ["DUNGEON_RUNE_TIP_2"] = "还不能放弃……", diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index 3d2c2f78..ab9e92c8 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -954,7 +954,7 @@ local skill_rogue = { ["desc"]="武神意志随机消除元素+2。" }, [5400402]={ - ["desc"]="Combo:女武神普攻冰霜敌人有10%概率附加冻结效果，1回合。" + ["desc"]="武神意志使用后将场上随机3个元素变为紫色元素。" }, [5400403]={ ["desc"]="武神意志释放后为团队附加免疫效果，1回合。" @@ -966,7 +966,7 @@ local skill_rogue = { ["desc"]="武神意志附加的免疫效果，回合数+1。" }, [5400406]={ - ["desc"]="女武神普攻附加的冻结效果，回合数+1。" + ["desc"]="武神意志使用后随机增加一种技能的能量2点。" }, [5400407]={ ["desc"]="武神意志释放后为团队附加不死效果，2回合。" diff --git a/lua/app/config/task_type.lua b/lua/app/config/task_type.lua new file mode 100644 index 00000000..29aff9f1 --- /dev/null +++ b/lua/app/config/task_type.lua @@ -0,0 +1,132 @@ +local task_type = { + [1]={ + ["icon"]="10" + }, + [2]={ + ["icon"]="1" + }, + [3]={ + ["icon"]="2" + }, + [4]={ + ["icon"]="1" + }, + [5]={ + ["icon"]="2" + }, + [6]={ + ["icon"]="3" + }, + [7]={ + ["icon"]="4" + }, + [8]={ + ["icon"]="5" + }, + [9]={ + ["icon"]="7" + }, + [10]={ + ["icon"]="7" + }, + [11]={ + ["icon"]="7" + }, + [12]={ + ["icon"]="9" + }, + [13]={ + ["icon"]="9" + }, + [14]={ + ["icon"]="8" + }, + [15]={ + ["icon"]="8" + }, + [16]={ + ["icon"]="8" + }, + [17]={ + ["icon"]="8" + }, + [18]={ + ["icon"]="8" + }, + [19]={ + ["icon"]="20" + }, + [20]={ + ["icon"]="1" + }, + [21]={ + ["icon"]="10" + }, + [22]={ + ["icon"]="11" + }, + [23]={ + ["icon"]="6" + }, + [24]={ + ["icon"]="20" + }, + [25]={ + ["icon"]="6" + }, + [26]={ + ["icon"]="11" + }, + [27]={ + ["icon"]="7" + }, + [28]={ + ["icon"]="21" + }, + [29]={ + ["icon"]="4" + }, + [30]={ + ["icon"]="13" + }, + [31]={ + + }, + [32]={ + ["icon"]="16" + }, + [33]={ + ["icon"]="17" + }, + [34]={ + ["icon"]="18" + }, + [35]={ + ["icon"]="19" + }, + [36]={ + ["icon"]="20" + }, + [37]={ + ["icon"]="21" + }, + [38]={ + ["icon"]="22" + }, + [39]={ + ["icon"]="23" + }, + [40]={ + ["icon"]="23" + }, + [41]={ + ["icon"]="23" + }, + [42]={ + ["icon"]="23" + } +} +local config = { +data=task_type,count=42 +} +return config \ No newline at end of file diff --git a/lua/app/config/task_type.lua.meta b/lua/app/config/task_type.lua.meta new file mode 100644 index 00000000..915fd215 --- /dev/null +++ b/lua/app/config/task_type.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a1f8b50c03a5fd747b96cc18be330104 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} From 35d78447a899e034351d8b63ff5a154942fbddc8 Mon Sep 17 00:00:00 2001 From: Fang Date: Tue, 12 Sep 2023 18:42:54 +0800 Subject: [PATCH 10/35] bug fix --- lua/app/config/chapter_dungeon_rune.lua | 178 +++++++++--------- .../localization_global_const.lua | 1 + lua/app/config/strings/cn/global.lua | 5 +- lua/app/ui/hero/runes_info_comp.lua | 13 +- lua/app/ui/runes/runes_suit_ui.lua | 2 +- lua/app/userdata/runes/runes_data.lua | 2 +- lua/app/userdata/runes/runes_entity.lua | 9 + 7 files changed, 115 insertions(+), 95 deletions(-) diff --git a/lua/app/config/chapter_dungeon_rune.lua b/lua/app/config/chapter_dungeon_rune.lua index 369ecf14..9f387019 100644 --- a/lua/app/config/chapter_dungeon_rune.lua +++ b/lua/app/config/chapter_dungeon_rune.lua @@ -188,7 +188,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6209 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -304,7 +304,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6210 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -424,7 +424,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6211 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -540,7 +540,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6212 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -650,7 +650,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6213 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -755,7 +755,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6214 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -860,7 +860,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6215 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -980,7 +980,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6216 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -1127,7 +1127,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6218 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -1243,7 +1243,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6219 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -1359,7 +1359,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6220 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -1479,7 +1479,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6221 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -1599,7 +1599,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6222 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -1699,7 +1699,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6223 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -1815,7 +1815,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6224 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -1920,7 +1920,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6225 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -2040,7 +2040,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6226 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -2187,7 +2187,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6228 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -2292,7 +2292,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6229 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -2408,7 +2408,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6230 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -2519,7 +2519,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6231 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -2639,7 +2639,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6232 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -2744,7 +2744,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6233 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -2860,7 +2860,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6234 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -2980,7 +2980,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6235 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -3100,7 +3100,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6236 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -3247,7 +3247,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6238 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -3363,7 +3363,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6239 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -3479,7 +3479,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6240 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -3590,7 +3590,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6241 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -3706,7 +3706,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6242 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -3822,7 +3822,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6243 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -3938,7 +3938,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6244 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -4049,7 +4049,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6245 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -4169,7 +4169,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6246 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -4311,7 +4311,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6248 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -4416,7 +4416,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6249 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -4532,7 +4532,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6250 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -4648,7 +4648,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6251 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -4764,7 +4764,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6252 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -4864,7 +4864,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6253 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -4980,7 +4980,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6254 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -5085,7 +5085,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6255 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -5201,7 +5201,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6256 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -5348,7 +5348,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6258 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -5453,7 +5453,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6259 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -5558,7 +5558,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6260 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -5674,7 +5674,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6261 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -5784,7 +5784,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6262 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -5889,7 +5889,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6263 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -6005,7 +6005,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6264 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -6121,7 +6121,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6265 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -6237,7 +6237,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6266 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -6384,7 +6384,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6268 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -6500,7 +6500,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6269 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -6611,7 +6611,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6270 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -6727,7 +6727,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6271 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -6843,7 +6843,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6272 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -6943,7 +6943,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6273 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -7059,7 +7059,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6274 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -7170,7 +7170,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6275 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -7275,7 +7275,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6276 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -7433,7 +7433,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6278 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -7553,7 +7553,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6279 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -7669,7 +7669,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6280 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -7780,7 +7780,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6281 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -7885,7 +7885,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6282 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -7990,7 +7990,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6283 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -8114,7 +8114,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6284 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -8219,7 +8219,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6285 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -8335,7 +8335,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6286 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -8497,7 +8497,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6288 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -8602,7 +8602,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6289 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -8722,7 +8722,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6290 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -8832,7 +8832,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6291 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -8952,7 +8952,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6292 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -9068,7 +9068,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6293 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -9184,7 +9184,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6294 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -9300,7 +9300,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6295 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -9416,7 +9416,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6296 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -9578,7 +9578,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6298 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -9694,7 +9694,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6299 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -9814,7 +9814,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6300 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -9930,7 +9930,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6301 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -10050,7 +10050,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6302 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -10166,7 +10166,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6303 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -10286,7 +10286,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6304 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -10402,7 +10402,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6305 + 6208 }, ["hp"]=2000000, ["atk"]=10000, @@ -10518,7 +10518,7 @@ local chapter_dungeon_rune = { 5908, 6008, 6108, - 6306 + 6208 }, ["hp"]=2000000, ["atk"]=10000, diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index c221884f..59b1957a 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -552,6 +552,7 @@ local LocalizationGlobalConst = RUNES_DESC_23 = "RUNES_DESC_23", RUNES_DESC_24 = "RUNES_DESC_24", RUNES_DESC_25 = "RUNES_DESC_25", + RUNES_DESC_26 = "RUNES_DESC_26", DUNGEON_RUNE_DESC_1 = "DUNGEON_RUNE_DESC_1", DUNGEON_RUNE_DESC_2 = "DUNGEON_RUNE_DESC_2", DUNGEON_RUNE_DESC_3 = "DUNGEON_RUNE_DESC_3", diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 7b2b9cf2..277e4b96 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -541,8 +541,8 @@ local localization_global = ["RUNES_DESC_12"] = "增伤套装", ["RUNES_DESC_13"] = "暴击套装", ["RUNES_DESC_14"] = "爆伤套装", - ["RUNES_DESC_15"] = "Lv1-2件套:{0}", - ["RUNES_DESC_16"] = "Lv2-4件套:{0}", + ["RUNES_DESC_15"] = "Lv1:2件套:{0}", + ["RUNES_DESC_16"] = "Lv2:4件套:{0}", ["RUNES_DESC_17"] = "符文每日礼包", ["RUNES_DESC_18"] = "强化材料不足", ["RUNES_DESC_19"] = "符文精华不足，洋葱头也没办法", @@ -552,6 +552,7 @@ local localization_global = ["RUNES_DESC_23"] = "无套装效果", ["RUNES_DESC_24"] = "请先激活英雄", ["RUNES_DESC_25"] = "符文淬炼至少保留1个未锁符文", + ["RUNES_DESC_26"] = "Lv{0}", ["DUNGEON_RUNE_DESC_1"] = "目标", ["DUNGEON_RUNE_DESC_2"] = "再次挑战", ["DUNGEON_RUNE_DESC_3"] = "通关获得", diff --git a/lua/app/ui/hero/runes_info_comp.lua b/lua/app/ui/hero/runes_info_comp.lua index 9f3278a9..1f1af3fe 100644 --- a/lua/app/ui/hero/runes_info_comp.lua +++ b/lua/app/ui/hero/runes_info_comp.lua @@ -81,11 +81,17 @@ function RunesInfoComp:refresh() local curExp = DataManager.RunesData:getLevelExp() local maxExp = DataManager.RunesData:getNextLevelTotalExp() + if maxExp then + self.imgProg.value = curExp / maxExp + -- self.txProg:setText(curExp .. "/" .. maxExp) + else + self.imgProg.value = 1 + -- self.txProg:setText(I18N:getGlobalText(I18N.GlobalConst.STR_MAX)) + end self.txNum:setText(DataManager.RunesData:getMaterialCount()) self.txCost:setText(GFunc.getRewardNum(self.runesEntity:getMaterialCost())) self.txLevel:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_1, DataManager.RunesData:getLevel())) - self.imgProg.value = curExp / maxExp GFunc.centerImgAndTx(self.imgCost, self.txCost) self:refreshSuit() @@ -106,7 +112,10 @@ function RunesInfoComp:refreshRunes() if DataManager.RunesData:isUnlock(index) then lock:setActive(false) - imgQlt:setSprite(GConst.ATLAS_PATH.HERO, GConst.RunesConst.QUALITY_ICON[index]) + local qlt = self.runesEntity:getGridQuality(index) + if qlt then + imgQlt:setSprite(GConst.ATLAS_PATH.HERO, GConst.RunesConst.QUALITY_ICON[qlt]) + end local suit = self.runesEntity:getGridSuit(index) if suit then imgSuit:setSprite(GConst.ATLAS_PATH.HERO, "hero_rune_"..suit) diff --git a/lua/app/ui/runes/runes_suit_ui.lua b/lua/app/ui/runes/runes_suit_ui.lua index 0880155d..5d98e0a7 100644 --- a/lua/app/ui/runes/runes_suit_ui.lua +++ b/lua/app/ui/runes/runes_suit_ui.lua @@ -47,7 +47,7 @@ function RunesSuitUI:onRefresh() local attr1 = DataManager.RunesData:getSuitAttr(index, self.heroEntity:getMatchType(), 1) local attr2 = DataManager.RunesData:getSuitAttr(index, self.heroEntity:getMatchType(), 2) local level = self.runesEntity:getSuitLevel(index) - txLevel:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, level)) + txLevel:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_26, level)) local str1 = I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_15, GFunc.getAttrDesc(attr1.type, attr1.num)) local str2 = I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_16, GFunc.getAttrDesc(attr2.type, attr2.num)) diff --git a/lua/app/userdata/runes/runes_data.lua b/lua/app/userdata/runes/runes_data.lua index d3bfaa8d..7c288976 100644 --- a/lua/app/userdata/runes/runes_data.lua +++ b/lua/app/userdata/runes/runes_data.lua @@ -99,7 +99,7 @@ function RunesData:getNextLevelTotalExp() return cfg.cost or 0 end - return 0 + return nil end -- 获取相应铸台等级的品质概率 diff --git a/lua/app/userdata/runes/runes_entity.lua b/lua/app/userdata/runes/runes_entity.lua index 3cc979b6..4521be56 100644 --- a/lua/app/userdata/runes/runes_entity.lua +++ b/lua/app/userdata/runes/runes_entity.lua @@ -83,6 +83,15 @@ function RunesEntity:getGridAttr(index) return nil end +-- 获取格子的品质 +function RunesEntity:getGridQuality(index) + if self.grids[index] then + return self.grids[index].quality + end + + return nil +end + -- 获取格子的套装 function RunesEntity:getGridSuit(index) if self.grids[index] then From d4c7cf71b0877401a1dd1ad94ff8eb8e039830aa Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 12 Sep 2023 19:43:58 +0800 Subject: [PATCH 11/35] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E6=96=AD=E7=BA=BF=E7=BB=AD=E5=85=B3=EF=BC=8C=E5=B9=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/bi_report.lua | 8 ++++++++ lua/app/ui/main_city/main_city_ui.lua | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index 039da2d7..f334cf9c 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -272,6 +272,7 @@ BIReport.DIALY_CHALLENGE_OPT_TYPE = { BIReport.MISCELLANEOUS_OPT_TYPE = { EVALUATE_OPEN = "EvaluateOpen", EVALUATE_CLOSE = "EvaluateClose", + BATTLE_SNAP_SHOP_OPEN = "BattleSnapShopOpen", } BIReport.ARENA_OPT_TYPE = { @@ -1663,6 +1664,13 @@ function BIReport:postRateOpen() self:report(EVENT_NAME_MISCELLANEOUS_OPT, args) end +function BIReport:postBatttleSnapshotOpen() + local args = { + event_type = BIReport.MISCELLANEOUS_OPT_TYPE.BATTLE_SNAP_SHOP_OPEN, + } + self:report(EVENT_NAME_MISCELLANEOUS_OPT, args) +end + function BIReport:postPbAuthfailed(pbName, lastLoginInfo, authFailToLogin) local args = { event_type = BIReport.NETWORK_OPT_TYPE.AUTH_FAILED, diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 96ab9a30..b9dddb16 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -1050,16 +1050,20 @@ function MainCityUI:checkMainPop() -- 续关 if self.isFirstEnter then local battleSnapshot = LocalData:getBattleSnapshot() - LocalData:saveBattleSnapshot({}) if battleSnapshot.battleType then if battleSnapshot.currentVersion == Platform:getClientVersion() then local snapshotTime = battleSnapshot.snapShotTime if snapshotTime and Time:getOverOfServerToday(snapshotTime) >= Time:getOverOfServerToday() then + BIReport:postBatttleSnapshotOpen() local params = { content = I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_14), okFunc = function() + LocalData:saveBattleSnapshot({}) ModuleManager.BattleManager:playBattle(battleSnapshot.battleType, battleSnapshot.parmas, nil, battleSnapshot) end, + cancelFunc = function() + LocalData:saveBattleSnapshot({}) + end, boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, } GFunc.showMessageBox(params) From dd62b41f0025fc9e12b762754a200eb5ab68cd52 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 12 Sep 2023 19:46:37 +0800 Subject: [PATCH 12/35] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battle/controller/battle_controller_dungeon_rune.lua | 9 --------- lua/app/ui/battle/battle_ui.lua | 6 +----- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua index 7de6b4b7..cc6aa5a1 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua @@ -28,9 +28,6 @@ function BattleControllerDungeonRune:initOther() if self.battleUI then local desc = self.dungeonRuneRemainRoundCount - if not self.isBossChapter then - desc = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_6, self.chapterId) - end self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.COMMON, "common_dec_15") end @@ -161,9 +158,6 @@ function BattleControllerDungeonRune:enterRoundBegin() self.dungeonRuneRemainRoundCount = self.dungeonRuneRemainRoundCount - 1 if self.battleUI then local desc = self.dungeonRuneRemainRoundCount + 1 - if not self.isBossChapter then - desc = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_6, self.chapterId) - end self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.COMMON, "common_dec_15") end BattleController.enterRoundBegin(self) @@ -186,9 +180,6 @@ function BattleControllerDungeonRune:enterRoundBegin() end if self.battleUI then local desc = self.dungeonRuneRemainRoundCount + 1 - if not self.isBossChapter then - desc = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_6, self.chapterId) - end self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.COMMON, "common_dec_15") end BattleController.enterRoundBegin(self) diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index c7eab930..68cf0675 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -500,14 +500,10 @@ function BattleUI:refreshTaskNode() if self.battleController.battleType == GConst.BattleConst.BATTLE_TYPE.DUNGEON_RUNE then self.taskNode:setLocalScale(0.6, 0.6, 0.6) local runeData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.RUNES_OPEN) - local isBossChapter = runeData:isBossChapter(self.battleController.chapterId) local chapterCondition = runeData:getChapterCondition(self.battleController.chapterId) local taskProgress = ModuleManager.DungeonRuneManager:getTaskStatus(self.battleController, chapterCondition) for index, cell in ipairs(self.taskCells) do - local newIndex = index - if isBossChapter then - newIndex = index + 1 - end + local newIndex = index + 1 local condition = chapterCondition[newIndex] if condition then cell:getBaseObject():setActive(true) From d56fd65a70b3a166be11cc809bf4759f8dd101d5 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 12 Sep 2023 20:07:45 +0800 Subject: [PATCH 13/35] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dungeon_rune/cell/rune_chapter_cell.lua | 73 ++++++++++++------- 1 file changed, 48 insertions(+), 25 deletions(-) diff --git a/lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua b/lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua index 3b87e3b0..eba93927 100644 --- a/lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua +++ b/lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua @@ -37,34 +37,45 @@ function RuneChapterCell:refresh(id, index, isFinal, chapterListCount) lightImg:setVisible(false) sweep:setVisible(false) local passed = false - if runeData:curFight(id) then -- 正在可打的 - curBg:setVisible(true) - fightBg:setVisible(false) - - local layer = uiMap["chapter_cell.touch_node.bg_cur.desc"] - layer:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_6, id)) + local isBossChapter = runeData:isBossChapter(id) + curBg:setVisible(isBossChapter) + fightBg:setVisible(not isBossChapter) + local curLayerDecs + local curLock + local curMask + if isBossChapter then + curLayerDecs = uiMap["chapter_cell.touch_node.bg_cur.desc"] + curLock = uiMap["chapter_cell.touch_node.bg_cur.lock"] + curMask = uiMap["chapter_cell.touch_node.bg_cur.bg_mask"] else - curBg:setVisible(false) - fightBg:setVisible(true) + curLayerDecs = uiMap["chapter_cell.touch_node.bg.desc"] + curLock = uiMap["chapter_cell.touch_node.bg.lock"] + curMask = uiMap["chapter_cell.touch_node.bg.bg_mask"] + end - local layer = uiMap["chapter_cell.touch_node.bg.desc"] - layer:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_6, id)) - local lock = uiMap["chapter_cell.touch_node.bg.lock"] - if maxPassedId >= id then -- 已通关的 - passed = true - local canSweep = runeData:canSweep(id) - sweep:setVisible(canSweep) - if canSweep then - uiMap["chapter_cell.touch_node.sweep_bg.tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.SMASH)) - end - lock:setVisible(false) - layer:setAnchoredPositionX(0) - -- lightImg:setVisible(true) - -- descMinRound:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_MIN, runeData:getChapterPassRound(id))) - -- descMinRound:setVisible(true) + curLayerDecs:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_6, id)) + if maxPassedId >= id then -- 已通关的 + passed = true + local canSweep = runeData:canSweep(id) + sweep:setVisible(canSweep) + if canSweep then + uiMap["chapter_cell.touch_node.sweep_bg.tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.SMASH)) + end + curLock:setVisible(false) + curMask:setVisible(false) + curLayerDecs:setAnchoredPositionX(0) + -- lightImg:setVisible(true) + -- descMinRound:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_MIN, runeData:getChapterPassRound(id))) + -- descMinRound:setVisible(true) + else + if runeData:canFight(id) then + curLock:setVisible(false) + curMask:setVisible(false) + curLayerDecs:setAnchoredPositionX(0) else - lock:setVisible(true) - GFunc.centerImgAndTx(lock, layer, 5) + curLock:setVisible(true) + curMask:setVisible(true) + GFunc.centerImgAndTx(curLock, curLayerDecs, 5) end end @@ -79,8 +90,20 @@ function RuneChapterCell:refresh(id, index, isFinal, chapterListCount) for i, cell in ipairs(self.rewardCells) do if rewards[i] then cell:refreshByConfig(rewards[i], passed, passed) + if isBossChapter then + cell:getBaseObject():setLocalScale(0.6, 0.6, 0.6) + else + cell:getBaseObject():setLocalScale(0.5, 0.5, 0.5) + end end end + if isBossChapter then + self.rewardCells[1]:getBaseObject():setAnchoredPositionX(-43) + self.rewardCells[2]:getBaseObject():setAnchoredPositionX(43) + else + self.rewardCells[1]:getBaseObject():setAnchoredPositionX(-35) + self.rewardCells[2]:getBaseObject():setAnchoredPositionX(35) + end end function RuneChapterCell:addClickListener(func) From f7fe3e48abc4da1c67d3a1f742d200f17bf0c0c4 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 12 Sep 2023 20:10:12 +0800 Subject: [PATCH 14/35] =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua b/lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua index eba93927..424953db 100644 --- a/lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua +++ b/lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua @@ -95,6 +95,11 @@ function RuneChapterCell:refresh(id, index, isFinal, chapterListCount) else cell:getBaseObject():setLocalScale(0.5, 0.5, 0.5) end + cell:addClickListener(function() + if self.clickFunc then + self.clickFunc() + end + end) end end if isBossChapter then @@ -108,6 +113,7 @@ end function RuneChapterCell:addClickListener(func) local uiMap = self:getUIMap() + self.clickFunc = func uiMap["chapter_cell.touch_node"]:addClickListener(func) end From c8c30b9aecf97f178dba6a6f7ea0f7993b51ca55 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 12 Sep 2023 20:12:07 +0800 Subject: [PATCH 15/35] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua b/lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua index 424953db..2ac24c72 100644 --- a/lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua +++ b/lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua @@ -102,6 +102,7 @@ function RuneChapterCell:refresh(id, index, isFinal, chapterListCount) end) end end + if isBossChapter then self.rewardCells[1]:getBaseObject():setAnchoredPositionX(-43) self.rewardCells[2]:getBaseObject():setAnchoredPositionX(43) @@ -109,6 +110,12 @@ function RuneChapterCell:refresh(id, index, isFinal, chapterListCount) self.rewardCells[1]:getBaseObject():setAnchoredPositionX(-35) self.rewardCells[2]:getBaseObject():setAnchoredPositionX(35) end + + sweep:addClickListener(function() + if self.clickFunc then + self.clickFunc() + end + end) end function RuneChapterCell:addClickListener(func) From cc9f3a91375fcfcde452bef88a025c6d95629ed0 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 12 Sep 2023 20:13:29 +0800 Subject: [PATCH 16/35] =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/dungeon_rune/dungeon_rune_const.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/module/dungeon_rune/dungeon_rune_const.lua b/lua/app/module/dungeon_rune/dungeon_rune_const.lua index 23f29d2b..cf31da33 100644 --- a/lua/app/module/dungeon_rune/dungeon_rune_const.lua +++ b/lua/app/module/dungeon_rune/dungeon_rune_const.lua @@ -25,7 +25,7 @@ DungeonRuneConst.TASK_ICON = { [4] = "dungeon_rune_task_vine", [5] = "dungeon_rune_task_ice", [7] = "dungeon_rune_task_stone_3", - [12] = "dungeon_rune_task_stump_1", + [12] = "dungeon_rune_task_leaf", [13] = "dungeon_rune_task_jelly", [18] = "dungeon_rune_task_stump_1", [19] = "dungeon_rune_task_stump_2", From b20644f4cb4266764e944cac9824f83c12f9058a Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 12 Sep 2023 20:26:49 +0800 Subject: [PATCH 17/35] =?UTF-8?q?=E6=98=BE=E7=A4=BAbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/battle/battle_rune_result_ui.lua | 4 ++-- lua/app/ui/battle/battle_ui.lua | 5 +++-- lua/app/ui/battle/cell/battle_task_cell.lua | 7 +++---- lua/app/ui/dungeon_rune/dungeon_rune_task_ui.lua | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lua/app/ui/battle/battle_rune_result_ui.lua b/lua/app/ui/battle/battle_rune_result_ui.lua index 2a50ac78..bc86d883 100644 --- a/lua/app/ui/battle/battle_rune_result_ui.lua +++ b/lua/app/ui/battle/battle_rune_result_ui.lua @@ -211,8 +211,8 @@ function BattleRuneResultUI:refreshTaskNode() local condition = chapterCondition[newIndex] if condition then objs.cell:getBaseObject():setActive(true) - local taskNum = taskProgress[index] and taskProgress[index].progress - local desc = self.runeData:getConditionDesc(condition, taskNum) + local taskNum = taskProgress[newIndex] and taskProgress[newIndex].progress + local desc = self.runeData:getConditionDesc(condition) local over = false if taskProgress[newIndex] then local info = taskProgress[newIndex] diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index 68cf0675..8cd422f9 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -510,14 +510,15 @@ function BattleUI:refreshTaskNode() local atlast, iconName = runeData:getConditionIcon(condition) local taskNum = condition[3] or 0 - Logger.printTable(taskProgress) + local over = false if taskProgress[newIndex] then taskNum = taskProgress[newIndex].totalProgress - taskProgress[newIndex].progress if taskNum < 0 then taskNum = 0 end + over = taskProgress[newIndex].over end - cell:refresh(atlast, iconName, taskNum) + cell:refresh(atlast, iconName, taskNum, over) cell:addClickListener(function() ModuleManager.DungeonRuneManager:showTaskUI(self.battleController.chapterId) end) diff --git a/lua/app/ui/battle/cell/battle_task_cell.lua b/lua/app/ui/battle/cell/battle_task_cell.lua index e1969057..03b66dc1 100644 --- a/lua/app/ui/battle/cell/battle_task_cell.lua +++ b/lua/app/ui/battle/cell/battle_task_cell.lua @@ -2,18 +2,17 @@ local BattleTaskCell = class("BattleTaskCell", BaseCell) local BG = {"common_board_131", "common_board_132"} -- 紫绿 -function BattleTaskCell:refresh(iconAtlas, iconName, taskNum) +function BattleTaskCell:refresh(iconAtlas, iconName, taskNum, over) local uiMap = self:getUIMap() local bg = uiMap["battle_task_cell.bg"] local icon = uiMap["battle_task_cell.icon"] local point = uiMap["battle_task_cell.point"] local desc = uiMap["battle_task_cell.desc"] + local check = uiMap["battle_task_cell.check"] icon:setSprite(iconAtlas, iconName) - + check:setVisible(over == true) desc:setText(taskNum) self:hidePoint(not taskNum) - - self:hidePoint(false) end function BattleTaskCell:hidePoint(hide) diff --git a/lua/app/ui/dungeon_rune/dungeon_rune_task_ui.lua b/lua/app/ui/dungeon_rune/dungeon_rune_task_ui.lua index 6bfe8a59..825213a4 100644 --- a/lua/app/ui/dungeon_rune/dungeon_rune_task_ui.lua +++ b/lua/app/ui/dungeon_rune/dungeon_rune_task_ui.lua @@ -38,7 +38,7 @@ function DungeonRuneTaskUI:_display() local condition = chapterCondition[newIndex] if condition then cell:getBaseObject():setActive(true) - local taskNum = taskProgress[index] and taskProgress[index].progress + local taskNum = taskProgress[newIndex] and taskProgress[newIndex].progress local desc = self.runeData:getConditionDesc(condition, taskNum) local over = false if taskProgress[newIndex] then From 9b5c3ab2fcc787f339116be0fd232f4b7cc2339a Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 12 Sep 2023 20:34:26 +0800 Subject: [PATCH 18/35] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/dungeon_rune/dungeon_rune_fight_ui.lua | 8 +++++++- lua/app/ui/dungeon_rune/dungeon_rune_rebirth_ui.lua | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lua/app/ui/dungeon_rune/dungeon_rune_fight_ui.lua b/lua/app/ui/dungeon_rune/dungeon_rune_fight_ui.lua index 81d08f13..291395f4 100644 --- a/lua/app/ui/dungeon_rune/dungeon_rune_fight_ui.lua +++ b/lua/app/ui/dungeon_rune/dungeon_rune_fight_ui.lua @@ -72,6 +72,8 @@ function DungeonRuneFightUI:refreshRewardInfo() local descPassRound = uiMap["dungeon_rune_fight_ui.bg.desc_3"] local imgPassIcon = uiMap["dungeon_rune_fight_ui.bg.icon"] local rewardNode = uiMap["dungeon_rune_fight_ui.bg.reward_node"] + local lineR = uiMap["dungeon_rune_fight_ui.bg.line_r"] + local lineL = uiMap["dungeon_rune_fight_ui.bg.line_l"] rewardNode:setActive(not passed) descPassRound:setVisible(passed) imgPassIcon:setVisible(passed) @@ -81,7 +83,11 @@ function DungeonRuneFightUI:refreshRewardInfo() -- local round = self.runeData:getChapterPassRound(self.id) -- descPassRound:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_MIN, round)) -- GFunc.centerImgAndTx(imgPassIcon, descPassRound, 5) + lineR:setVisible(false) + lineL:setVisible(false) else + lineR:setVisible(true) + lineL:setVisible(true) if not self.rewardCells then self.rewardCells = {} for i = 1, 4 do @@ -124,7 +130,7 @@ function DungeonRuneFightUI:refreshFightBtn() if passed then descAgain:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_2)) -- title:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_6)) - title:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_3)) + title:setText(GConst.EMPTY_STRING) else desc:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_CHALLENGE)) num:setText(1) diff --git a/lua/app/ui/dungeon_rune/dungeon_rune_rebirth_ui.lua b/lua/app/ui/dungeon_rune/dungeon_rune_rebirth_ui.lua index 947dc208..a15809ee 100644 --- a/lua/app/ui/dungeon_rune/dungeon_rune_rebirth_ui.lua +++ b/lua/app/ui/dungeon_rune/dungeon_rune_rebirth_ui.lua @@ -23,13 +23,16 @@ end function DungeonRuneRebirthUI:_display() local uiMap = self.root:genAllChildren() uiMap["dungeon_rune_rebirth_ui.title_bg_img.title_text"]:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_TIP_2)) - uiMap["dungeon_rune_rebirth_ui.title_bg_img.content_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_TIP_3)) + local desc1 local desc2 if self.isHpOver then + desc1 = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_TIP_3) desc2 = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_TIP_4) else + desc1 = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_TIP_6) desc2 = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_TIP_5) end + uiMap["dungeon_rune_rebirth_ui.title_bg_img.content_tx"]:setText(desc1) uiMap["dungeon_rune_rebirth_ui.title_bg_img.content_tx_2"]:setText(desc2) uiMap["dungeon_rune_rebirth_ui.title_bg_img.desc_close"]:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_7)) From 24b8242de8e9d88b53ed4eaee50c5fa6c9cb339e Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 13 Sep 2023 09:19:02 +0800 Subject: [PATCH 19/35] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battle_controller_dungeon_rune.lua | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua index cc6aa5a1..dc15d990 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua @@ -230,6 +230,36 @@ function BattleControllerDungeonRune:getInitBoard() return self.boradList, self.fixedRandomGrid, self.mysteryBoxIndexMap end +function BattleControllerDungeonRune:getRandomGridInfo() + local list, fixedRandomGrid = self:getInitBoard() + local fixedRandomList = fixedRandomGrid[self.curBoardIndex] + + local gridType = 0 + local elementType + if fixedRandomList and fixedRandomList[1] then + elementType = table.remove(fixedRandomList, 1) + else + local map = self.battleData:getElementTypeMap() + self.getRandomGridInfoIndexs = table.clearOrCreate(self.getRandomGridInfoIndexs) + self.getRandomGridInfoTypeList = table.clearOrCreate(self.getRandomGridInfoTypeList) + for typeName, typeNum in pairs(BattleConst.ELEMENT_TYPE) do + if not self:getSealElementType()[typeNum] and self:getSkillEntityByElement(typeNum) then + local weight = 100 + if self.elementWeightMap and self.elementWeightMap[typeNum] then + weight = weight + self.elementWeightMap[typeNum] + end + table.insert(self.getRandomGridInfoIndexs, weight) + table.insert(self.getRandomGridInfoTypeList, typeNum) + end + end + + local index = GFunc.getRandomIndex(self.getRandomGridInfoIndexs) + elementType = self.getRandomGridInfoTypeList[index] + end + + return {gridType = gridType, elementType = elementType} +end + function BattleControllerDungeonRune:onLoadComplete(...) -- 处理技能 local unlockAllSkill = function(side) From 394a7a37ae75f370f101d7ebc03f5ecd12a96017 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 13 Sep 2023 09:43:32 +0800 Subject: [PATCH 20/35] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battle/controller/battle_controller_dungeon_rune.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua index dc15d990..2c4e52b3 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua @@ -230,6 +230,14 @@ function BattleControllerDungeonRune:getInitBoard() return self.boradList, self.fixedRandomGrid, self.mysteryBoxIndexMap end +function BattleControllerDungeonRune:refreshWave() + if not self.battleUI then + return + end + -- local desc = self.dungeonRuneRemainRoundCount + 1 + -- self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.COMMON, "common_dec_15") +end + function BattleControllerDungeonRune:getRandomGridInfo() local list, fixedRandomGrid = self:getInitBoard() local fixedRandomList = fixedRandomGrid[self.curBoardIndex] From 2d1349eae0d536dc51045154133f0a070033c12e Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 13 Sep 2023 10:35:54 +0800 Subject: [PATCH 21/35] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=93=B8=E9=80=A0?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E7=AD=89=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/chapter_board_rune.lua | 8 +- lua/app/config/chapter_dungeon_rune.lua | 174 +++++++------- lua/app/config/fx.lua | 128 +++++++++- lua/app/config/hero.lua | 23 +- lua/app/config/item.lua | 8 +- .../localization_global_const.lua | 2 + lua/app/config/skill.lua | 219 +++++++----------- lua/app/config/skin.lua | 38 ++- lua/app/config/skin_skill.lua | 77 +++++- lua/app/config/strings/cn/global.lua | 6 +- lua/app/config/strings/cn/skin.lua | 5 +- lua/app/config/strings/de/skin.lua | 5 +- lua/app/config/strings/en/skin.lua | 5 +- lua/app/config/strings/es/skin.lua | 5 +- lua/app/config/strings/fr/skin.lua | 5 +- lua/app/config/strings/id/skin.lua | 5 +- lua/app/config/strings/ja/skin.lua | 5 +- lua/app/config/strings/ko/skin.lua | 5 +- lua/app/config/strings/pt/skin.lua | 5 +- lua/app/config/strings/ru/skin.lua | 5 +- lua/app/config/strings/th/skin.lua | 5 +- lua/app/config/strings/vi/skin.lua | 5 +- lua/app/config/strings/zh/skin.lua | 5 +- lua/app/ui/hero/runes_info_comp.lua | 10 +- lua/app/userdata/runes/runes_data.lua | 11 + 25 files changed, 506 insertions(+), 263 deletions(-) diff --git a/lua/app/config/chapter_board_rune.lua b/lua/app/config/chapter_board_rune.lua index bc7c3281..475c18ff 100644 --- a/lua/app/config/chapter_board_rune.lua +++ b/lua/app/config/chapter_board_rune.lua @@ -544,11 +544,11 @@ local chapter_board_rune = { 3 }, { - 0, + 2, 0 }, { - 0, + 2, 0 }, { @@ -1703,7 +1703,7 @@ local chapter_board_rune = { 0 }, { - 35, + 24, 0 }, { @@ -1787,7 +1787,7 @@ local chapter_board_rune = { 0 }, { - 35, + 24, 0 }, { diff --git a/lua/app/config/chapter_dungeon_rune.lua b/lua/app/config/chapter_dungeon_rune.lua index 9f387019..e6b78bbb 100644 --- a/lua/app/config/chapter_dungeon_rune.lua +++ b/lua/app/config/chapter_dungeon_rune.lua @@ -93,11 +93,11 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 }, { 4, - 200 + 300 } }, ["first_reward"]={ @@ -213,7 +213,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 } }, ["first_reward"]={ @@ -312,7 +312,7 @@ local chapter_dungeon_rune = { ["requirement"]={ { 2, - 21, + 24, 1 }, { @@ -329,11 +329,11 @@ local chapter_dungeon_rune = { ["weights"]={ { 3, - 200 + 300 }, { 2, - 200 + 300 } }, ["first_reward"]={ @@ -449,7 +449,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 3, - 200 + 300 } }, ["first_reward"]={ @@ -663,7 +663,7 @@ local chapter_dungeon_rune = { }, { 2, - 32, + 31, 3 } }, @@ -768,7 +768,7 @@ local chapter_dungeon_rune = { }, { 2, - 35, + 24, 2 } }, @@ -885,11 +885,11 @@ local chapter_dungeon_rune = { ["weights"]={ { 2, - 200 + 300 }, { 4, - 200 + 300 } }, ["first_reward"]={ @@ -1152,7 +1152,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 } }, ["first_reward"]={ @@ -1268,7 +1268,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 } }, ["first_reward"]={ @@ -1384,11 +1384,11 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 }, { 2, - 200 + 300 } }, ["first_reward"]={ @@ -1504,11 +1504,11 @@ local chapter_dungeon_rune = { ["weights"]={ { 3, - 200 + 300 }, { 4, - 200 + 300 } }, ["first_reward"]={ @@ -1724,7 +1724,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 4, - 200 + 300 } }, ["first_reward"]={ @@ -1824,7 +1824,7 @@ local chapter_dungeon_rune = { { 3, 0, - 5 + 8 }, { 2, @@ -1945,11 +1945,11 @@ local chapter_dungeon_rune = { ["weights"]={ { 2, - 200 + 300 }, { 1, - 200 + 300 } }, ["first_reward"]={ @@ -2317,7 +2317,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 } }, ["first_reward"]={ @@ -2428,7 +2428,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 } }, ["first_reward"]={ @@ -2544,11 +2544,11 @@ local chapter_dungeon_rune = { ["weights"]={ { 2, - 200 + 300 }, { 3, - 200 + 300 } }, ["first_reward"]={ @@ -2769,7 +2769,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 4, - 200 + 300 } }, ["first_reward"]={ @@ -2885,11 +2885,11 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 }, { 2, - 200 + 300 } }, ["first_reward"]={ @@ -3005,11 +3005,11 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 }, { 3, - 200 + 300 } }, ["first_reward"]={ @@ -3272,7 +3272,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 3, - 200 + 300 } }, ["first_reward"]={ @@ -3388,7 +3388,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 2, - 200 + 300 } }, ["first_reward"]={ @@ -3499,7 +3499,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 2, - 200 + 300 } }, ["first_reward"]={ @@ -3615,7 +3615,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 } }, ["first_reward"]={ @@ -3731,7 +3731,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 2, - 200 + 300 } }, ["first_reward"]={ @@ -3847,7 +3847,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 } }, ["first_reward"]={ @@ -3958,7 +3958,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 3, - 200 + 300 } }, ["first_reward"]={ @@ -4074,11 +4074,11 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 }, { 3, - 200 + 300 } }, ["first_reward"]={ @@ -4441,7 +4441,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 } }, ["first_reward"]={ @@ -4557,7 +4557,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 2, - 200 + 300 } }, ["first_reward"]={ @@ -4673,7 +4673,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 4, - 200 + 300 } }, ["first_reward"]={ @@ -4889,7 +4889,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 } }, ["first_reward"]={ @@ -5110,7 +5110,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 4, - 200 + 300 } }, ["first_reward"]={ @@ -5583,7 +5583,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 } }, ["first_reward"]={ @@ -5914,7 +5914,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 1, - 200 + 300 } }, ["first_reward"]={ @@ -6030,7 +6030,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 3, - 200 + 300 } }, ["first_reward"]={ @@ -6146,7 +6146,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 1, - 200 + 300 } }, ["first_reward"]={ @@ -6409,7 +6409,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 } }, ["first_reward"]={ @@ -6520,7 +6520,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 } }, ["first_reward"]={ @@ -6636,7 +6636,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 } }, ["first_reward"]={ @@ -6752,7 +6752,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 3, - 200 + 300 } }, ["first_reward"]={ @@ -6968,7 +6968,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 1, - 200 + 300 } }, ["first_reward"]={ @@ -7079,7 +7079,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 2, - 200 + 300 } }, ["first_reward"]={ @@ -7300,7 +7300,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 2, - 200 + 300 } }, ["first_reward"]={ @@ -7458,11 +7458,11 @@ local chapter_dungeon_rune = { ["weights"]={ { 3, - 200 + 300 }, { 4, - 200 + 300 } }, ["first_reward"]={ @@ -7578,7 +7578,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 2, - 200 + 300 } }, ["first_reward"]={ @@ -7689,7 +7689,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 3, - 200 + 300 } }, ["first_reward"]={ @@ -8015,15 +8015,15 @@ local chapter_dungeon_rune = { ["weights"]={ { 1, - 200 + 300 }, { 3, - 200 + 300 }, { 4, - 200 + 300 } }, ["first_reward"]={ @@ -8244,7 +8244,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 4, - 200 + 300 } }, ["first_reward"]={ @@ -8360,11 +8360,11 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 }, { 4, - 200 + 300 } }, ["first_reward"]={ @@ -8627,11 +8627,11 @@ local chapter_dungeon_rune = { ["weights"]={ { 1, - 200 + 300 }, { 2, - 200 + 300 } }, ["first_reward"]={ @@ -8857,11 +8857,11 @@ local chapter_dungeon_rune = { ["weights"]={ { 1, - 200 + 300 }, { 2, - 200 + 300 } }, ["first_reward"]={ @@ -8977,7 +8977,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 4, - 200 + 300 } }, ["first_reward"]={ @@ -9093,7 +9093,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 3, - 200 + 300 } }, ["first_reward"]={ @@ -9209,7 +9209,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 1, - 200 + 300 } }, ["first_reward"]={ @@ -9325,7 +9325,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 1, - 200 + 300 } }, ["first_reward"]={ @@ -9441,11 +9441,11 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 }, { 4, - 200 + 300 } }, ["first_reward"]={ @@ -9603,7 +9603,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 3, - 200 + 300 } }, ["first_reward"]={ @@ -9719,11 +9719,11 @@ local chapter_dungeon_rune = { ["weights"]={ { 2, - 200 + 300 }, { 3, - 200 + 300 } }, ["first_reward"]={ @@ -9839,7 +9839,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 } }, ["first_reward"]={ @@ -9955,11 +9955,11 @@ local chapter_dungeon_rune = { ["weights"]={ { 3, - 200 + 300 }, { 4, - 200 + 300 } }, ["first_reward"]={ @@ -10075,7 +10075,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 1, - 200 + 300 } }, ["first_reward"]={ @@ -10191,11 +10191,11 @@ local chapter_dungeon_rune = { ["weights"]={ { 5, - 200 + 300 }, { 3, - 200 + 300 } }, ["first_reward"]={ @@ -10311,7 +10311,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 4, - 200 + 300 } }, ["first_reward"]={ @@ -10427,7 +10427,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 2, - 200 + 300 } }, ["first_reward"]={ @@ -10543,7 +10543,7 @@ local chapter_dungeon_rune = { ["weights"]={ { 3, - 200 + 300 } }, ["first_reward"]={ diff --git a/lua/app/config/fx.lua b/lua/app/config/fx.lua index 9c46cc42..d6b2e272 100644 --- a/lua/app/config/fx.lua +++ b/lua/app/config/fx.lua @@ -2007,6 +2007,62 @@ local fx = { ["res"]="sfx_p0036_b05", ["bind"]="root" }, + [300151]={ + ["res"]="sfx_p0037_b01", + ["bind"]="root" + }, + [300152]={ + ["res"]="sfx_p0037_b02", + ["bind"]="root" + }, + [300153]={ + ["res"]="sfx_p0037_b05", + ["bind"]="root" + }, + [300154]={ + ["res"]="sfx_p0038_b01", + ["bind"]="root" + }, + [300155]={ + ["res"]="sfx_p0038_b05", + ["bind"]="root" + }, + [300156]={ + ["res"]="sfx_p0039_b01", + ["bind"]="root" + }, + [300157]={ + ["res"]="sfx_p0039_b05", + ["bind"]="root" + }, + [300158]={ + ["res"]="sfx_p0040_b01", + ["bind"]="root" + }, + [300159]={ + ["res"]="sfx_p0040_b05", + ["bind"]="root" + }, + [300160]={ + ["res"]="sfx_p0041_b01", + ["bind"]="root" + }, + [300161]={ + ["res"]="sfx_p0041_b02", + ["bind"]="root" + }, + [300162]={ + ["res"]="sfx_p0041_b03", + ["bind"]="root" + }, + [300163]={ + ["res"]="sfx_p0041_b04", + ["bind"]="root" + }, + [300164]={ + ["res"]="sfx_p0041_b05", + ["bind"]="root" + }, [400000]={ ["res"]="sfx_p0012_b01", ["bind"]="root", @@ -2763,9 +2819,79 @@ local fx = { ["res"]="sfx_p0036_b05", ["bind"]="root", ["flip"]=1 + }, + [400151]={ + ["res"]="sfx_p0037_b01", + ["bind"]="root", + ["flip"]=1 + }, + [400152]={ + ["res"]="sfx_p0037_b02", + ["bind"]="root", + ["flip"]=1 + }, + [400153]={ + ["res"]="sfx_p0037_b05", + ["bind"]="root", + ["flip"]=1 + }, + [400154]={ + ["res"]="sfx_p0038_b01", + ["bind"]="root", + ["flip"]=1 + }, + [400155]={ + ["res"]="sfx_p0038_b05", + ["bind"]="root", + ["flip"]=1 + }, + [400156]={ + ["res"]="sfx_p0039_b01", + ["bind"]="root", + ["flip"]=1 + }, + [400157]={ + ["res"]="sfx_p0039_b05", + ["bind"]="root", + ["flip"]=1 + }, + [400158]={ + ["res"]="sfx_p0040_b01", + ["bind"]="root", + ["flip"]=1 + }, + [400159]={ + ["res"]="sfx_p0040_b05", + ["bind"]="root", + ["flip"]=1 + }, + [400160]={ + ["res"]="sfx_p0041_b01", + ["bind"]="root", + ["flip"]=1 + }, + [400161]={ + ["res"]="sfx_p0041_b02", + ["bind"]="root", + ["flip"]=1 + }, + [400162]={ + ["res"]="sfx_p0041_b03", + ["bind"]="root", + ["flip"]=1 + }, + [400163]={ + ["res"]="sfx_p0041_b04", + ["bind"]="root", + ["flip"]=1 + }, + [400164]={ + ["res"]="sfx_p0041_b05", + ["bind"]="root", + ["flip"]=1 } } local config = { -data=fx,count=649 +data=fx,count=677 } return config \ No newline at end of file diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index e0c60f3d..5c2d73e9 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -427,9 +427,9 @@ local hero = { 31780000, 36060000 }, - ["model_id"]="p0028", + ["model_id"]="p0037", ["icon"]="31", - ["item_id"]=14003, + ["item_id"]=14004, ["collection_point"]=5, ["skin"]={ 14004 @@ -620,7 +620,8 @@ local hero = { ["is_show"]=1, ["collection_point"]=3, ["skin"]={ - 23002 + 23002, + 2300201 } }, [24001]={ @@ -862,9 +863,9 @@ local hero = { 31780000, 36060000 }, - ["model_id"]="p0031", + ["model_id"]="p0039", ["icon"]="27", - ["item_id"]=24003, + ["item_id"]=24004, ["collection_point"]=5, ["skin"]={ 24004 @@ -1299,9 +1300,9 @@ local hero = { 31780000, 36060000 }, - ["model_id"]="p0027", + ["model_id"]="p0040", ["icon"]="28", - ["item_id"]=34003, + ["item_id"]=34004, ["is_show"]=1, ["collection_point"]=5, ["skin"]={ @@ -1736,9 +1737,9 @@ local hero = { 31780000, 36060000 }, - ["model_id"]="p0030", + ["model_id"]="p0038", ["icon"]="29", - ["item_id"]=44003, + ["item_id"]=44004, ["collection_point"]=5, ["skin"]={ 44004 @@ -2174,9 +2175,9 @@ local hero = { 31780000, 36060000 }, - ["model_id"]="p0029", + ["model_id"]="p0041", ["icon"]="30", - ["item_id"]=54003, + ["item_id"]=54004, ["collection_point"]=5, ["skin"]={ 54004 diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index f9e02731..1e7d4949 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -2440,9 +2440,15 @@ local item = { ["parameter"]=1400101, ["qlt"]=3, ["icon"]="1400101" + }, + [2300201]={ + ["type"]=12, + ["parameter"]=2300201, + ["qlt"]=2, + ["icon"]="2300201" } } local config = { -data=item,count=124 +data=item,count=125 } 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 59b1957a..a19af501 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -526,6 +526,7 @@ local LocalizationGlobalConst = DUNGEON_RUNE_TIP_3 = "DUNGEON_RUNE_TIP_3", DUNGEON_RUNE_TIP_4 = "DUNGEON_RUNE_TIP_4", DUNGEON_RUNE_TIP_5 = "DUNGEON_RUNE_TIP_5", + DUNGEON_RUNE_TIP_6 = "DUNGEON_RUNE_TIP_6", UNFINISHED = "UNFINISHED", RUNES_DESC_1 = "RUNES_DESC_1", RUNES_DESC_2 = "RUNES_DESC_2", @@ -553,6 +554,7 @@ local LocalizationGlobalConst = RUNES_DESC_24 = "RUNES_DESC_24", RUNES_DESC_25 = "RUNES_DESC_25", RUNES_DESC_26 = "RUNES_DESC_26", + RUNES_DESC_27 = "RUNES_DESC_27", DUNGEON_RUNE_DESC_1 = "DUNGEON_RUNE_DESC_1", DUNGEON_RUNE_DESC_2 = "DUNGEON_RUNE_DESC_2", DUNGEON_RUNE_DESC_3 = "DUNGEON_RUNE_DESC_3", diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 4dfcc90b..c7b67a79 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -1769,8 +1769,8 @@ local skill = { 53001202 }, ["name_act"]="attack01", - ["fx_self"]=300122, - ["fx_self_mirror"]=400122 + ["fx_self"]=300151, + ["fx_self_mirror"]=400152 }, [1400411]={ ["position"]=1, @@ -1795,8 +1795,8 @@ local skill = { 13001201 }, ["name_act"]="attack02", - ["fx_self"]=300123, - ["fx_self_mirror"]=400123 + ["fx_self"]=300152, + ["fx_self_mirror"]=400151 }, [1400412]={ ["position"]=1, @@ -1821,8 +1821,8 @@ local skill = { 5200113 }, ["name_act"]="attack03", - ["fx_self"]=300124, - ["fx_self_mirror"]=400124 + ["fx_self"]=300152, + ["fx_self_mirror"]=400151 }, [1400413]={ ["position"]=1, @@ -1847,8 +1847,8 @@ local skill = { 5200112 }, ["name_act"]="attack04", - ["fx_self"]=300125, - ["fx_self_mirror"]=400125 + ["fx_self"]=300152, + ["fx_self_mirror"]=400152 }, [1400420]={ ["energy"]=10, @@ -1880,36 +1880,12 @@ local skill = { ["effect"]={ { ["type"]="hurt_red", - ["num"]=10000, + ["num"]=50000, ["ratio"]=11000, ["round"]=0 - }, - { - ["type"]="hurt_red", - ["num"]=12000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="hurt_red", - ["num"]=15000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="hurt_red", - ["num"]=22000, - ["ratio"]=10000, - ["round"]=0 } }, ["obj"]=2, - ["effect_block"]={ - 1, - 2, - 3, - 5 - }, ["skill_position"]={ 1, 70 @@ -1919,13 +1895,8 @@ local skill = { ["sound"]=14003201, ["sound_delay"]=0.0, ["name_act"]="skill01", - ["fx_self"]=300126, - ["bullet_time"]={ - 2600, - 3000, - 400 - }, - ["fx_self_mirror"]=400126 + ["fx_self"]=300153, + ["fx_self_mirror"]=400153 }, [1400421]={ ["position"]=1, @@ -2070,13 +2041,8 @@ local skill = { ["sound"]=14003201, ["sound_delay"]=0.0, ["name_act"]="skill01", - ["fx_self"]=300126, - ["bullet_time"]={ - 2600, - 3000, - 400 - }, - ["fx_self_mirror"]=400126 + ["fx_self"]=300153, + ["fx_self_mirror"]=400153 }, [2200110]={ ["position"]=2, @@ -3718,8 +3684,8 @@ local skill = { 1000001 }, ["name_act"]="attack01", - ["fx_self"]=300135, - ["fx_self_mirror"]=400135 + ["fx_self"]=300156, + ["fx_self_mirror"]=400156 }, [2400411]={ ["position"]=2, @@ -3744,8 +3710,8 @@ local skill = { 1000002 }, ["name_act"]="attack02", - ["fx_self"]=300136, - ["fx_self_mirror"]=400136 + ["fx_self"]=300156, + ["fx_self_mirror"]=400156 }, [2400412]={ ["position"]=2, @@ -3770,8 +3736,8 @@ local skill = { 1000004 }, ["name_act"]="attack03", - ["fx_self"]=300137, - ["fx_self_mirror"]=400137 + ["fx_self"]=300156, + ["fx_self_mirror"]=400156 }, [2400413]={ ["position"]=2, @@ -3796,8 +3762,8 @@ local skill = { 1000021 }, ["name_act"]="attack04", - ["fx_self"]=300138, - ["fx_self_mirror"]=400138 + ["fx_self"]=300156, + ["fx_self_mirror"]=400156 }, [2400420]={ ["energy"]=10, @@ -3814,13 +3780,31 @@ local skill = { ["effect"]={ { ["type"]="hurt_yellow", - ["num"]=20000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, { ["type"]="hurt_yellow", - ["num"]=21600, + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_yellow", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_yellow", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_yellow", + ["num"]=11600, ["ratio"]=10000, ["round"]=0 } @@ -3837,7 +3821,10 @@ local skill = { ["eliminate_obj"]=1, ["effect_block"]={ 1, - 3 + 2, + 3, + 4, + 5 }, ["skill_position"]={ 2, @@ -3848,13 +3835,8 @@ local skill = { ["sound"]=2400311, ["sound_delay"]=0.0, ["name_act"]="skill01", - ["fx_self"]=300139, - ["bullet_time"]={ - 2400, - 3000, - 400 - }, - ["fx_self_mirror"]=400139 + ["fx_self"]=300157, + ["fx_self_mirror"]=400157 }, [2400421]={ ["position"]=2, @@ -5649,8 +5631,8 @@ local skill = { 2200111 }, ["name_act"]="attack01", - ["fx_self"]=300117, - ["fx_self_mirror"]=400117 + ["fx_self"]=300158, + ["fx_self_mirror"]=400158 }, [3400411]={ ["position"]=3, @@ -5675,8 +5657,8 @@ local skill = { 2200114 }, ["name_act"]="attack02", - ["fx_self"]=300118, - ["fx_self_mirror"]=400118 + ["fx_self"]=300158, + ["fx_self_mirror"]=400158 }, [3400412]={ ["position"]=3, @@ -5701,8 +5683,8 @@ local skill = { 3400311 }, ["name_act"]="attack03", - ["fx_self"]=300119, - ["fx_self_mirror"]=400119 + ["fx_self"]=300158, + ["fx_self_mirror"]=400158 }, [3400413]={ ["position"]=3, @@ -5727,8 +5709,8 @@ local skill = { 2200112 }, ["name_act"]="attack04", - ["fx_self"]=300120, - ["fx_self_mirror"]=400120 + ["fx_self"]=300158, + ["fx_self_mirror"]=400158 }, [3400420]={ ["energy"]=10, @@ -5743,12 +5725,6 @@ local skill = { ["effect_type"]=1, ["trigger"]=1, ["effect"]={ - { - ["type"]="hurt_green", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - }, { ["type"]="hurt_green", ["num"]=15000, @@ -5757,7 +5733,7 @@ local skill = { }, { ["type"]="hurt_green", - ["num"]=16600, + ["num"]=26600, ["ratio"]=10000, ["round"]=0 } @@ -5765,8 +5741,7 @@ local skill = { ["obj"]=2, ["effect_block"]={ 1, - 2, - 3 + 2 }, ["skill_position"]={ 1, @@ -5777,13 +5752,8 @@ local skill = { ["sound"]=3400321, ["sound_delay"]=0.0, ["name_act"]="skill01", - ["fx_self"]=300121, - ["bullet_time"]={ - 1900, - 3000, - 400 - }, - ["fx_self_mirror"]=400121 + ["fx_self"]=300159, + ["fx_self_mirror"]=400159 }, [3400421]={ ["position"]=3, @@ -7386,8 +7356,8 @@ local skill = { 54001203 }, ["name_act"]="attack01", - ["fx_self"]=300132, - ["fx_self_mirror"]=400132 + ["fx_self"]=300154, + ["fx_self_mirror"]=400154 }, [4400411]={ ["position"]=4, @@ -7412,8 +7382,8 @@ local skill = { 13001202 }, ["name_act"]="attack02", - ["fx_self"]=300133, - ["fx_self_mirror"]=400133 + ["fx_self"]=300154, + ["fx_self_mirror"]=400154 }, [4400412]={ ["position"]=4, @@ -7438,8 +7408,8 @@ local skill = { 3300114 }, ["name_act"]="attack03", - ["fx_self"]=300133, - ["fx_self_mirror"]=400133 + ["fx_self"]=300154, + ["fx_self_mirror"]=400154 }, [4400413]={ ["position"]=4, @@ -7464,8 +7434,8 @@ local skill = { 4400311 }, ["name_act"]="attack04", - ["fx_self"]=300133, - ["fx_self_mirror"]=400133 + ["fx_self"]=300154, + ["fx_self_mirror"]=400154 }, [4400420]={ ["energy"]=10, @@ -7488,19 +7458,13 @@ local skill = { }, { ["type"]="hurt_blue", - ["num"]=10000, + ["num"]=15000, ["ratio"]=10000, ["round"]=0 }, { ["type"]="hurt_blue", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="hurt_blue", - ["num"]=20000, + ["num"]=15000, ["ratio"]=10000, ["round"]=0 }, @@ -7515,8 +7479,7 @@ local skill = { ["effect_block"]={ 1, 2, - 3, - 5 + 4 }, ["skill_position"]={ 2, @@ -7527,13 +7490,8 @@ local skill = { ["sound"]=4400314, ["sound_delay"]=0.0, ["name_act"]="skill01", - ["fx_self"]=300134, - ["bullet_time"]={ - 2100, - 3000, - 400 - }, - ["fx_self_mirror"]=400134 + ["fx_self"]=300155, + ["fx_self_mirror"]=400155 }, [4400421]={ ["position"]=4, @@ -9169,8 +9127,8 @@ local skill = { 5400311 }, ["name_act"]="attack01", - ["fx_self"]=300127, - ["fx_self_mirror"]=400127 + ["fx_self"]=300160, + ["fx_self_mirror"]=400160 }, [5400411]={ ["position"]=5, @@ -9195,8 +9153,8 @@ local skill = { 5400312 }, ["name_act"]="attack02", - ["fx_self"]=300128, - ["fx_self_mirror"]=400128 + ["fx_self"]=300161, + ["fx_self_mirror"]=400161 }, [5400412]={ ["position"]=5, @@ -9221,8 +9179,8 @@ local skill = { 5400313 }, ["name_act"]="attack03", - ["fx_self"]=300129, - ["fx_self_mirror"]=400129 + ["fx_self"]=300162, + ["fx_self_mirror"]=400162 }, [5400413]={ ["position"]=5, @@ -9247,8 +9205,8 @@ local skill = { 5400314 }, ["name_act"]="attack04", - ["fx_self"]=300130, - ["fx_self_mirror"]=400130 + ["fx_self"]=300163, + ["fx_self_mirror"]=400163 }, [5400420]={ ["energy"]=10, @@ -9268,13 +9226,7 @@ local skill = { ["effect"]={ { ["type"]="hurt_purple", - ["num"]=25000, - ["ratio"]=10000, - ["round"]=0 - }, - { - ["type"]="hurt_purple", - ["num"]=25000, + ["num"]=50000, ["ratio"]=10000, ["round"]=0 } @@ -9289,13 +9241,8 @@ local skill = { ["sound"]=5400315, ["sound_delay"]=0.0, ["name_act"]="skill01", - ["fx_self"]=300131, - ["bullet_time"]={ - 1366, - 3000, - 400 - }, - ["fx_self_mirror"]=400131 + ["fx_self"]=300164, + ["fx_self_mirror"]=400164 }, [5400421]={ ["position"]=5, diff --git a/lua/app/config/skin.lua b/lua/app/config/skin.lua index 692a6c5f..548c582a 100644 --- a/lua/app/config/skin.lua +++ b/lua/app/config/skin.lua @@ -88,7 +88,7 @@ local skin = { ["hero_id"]=14003 }, [14004]={ - ["model_id"]="p0028", + ["model_id"]="p0037", ["qlt"]=1, ["skin_point"]=0, ["hero_id"]=14004 @@ -111,6 +111,32 @@ local skin = { ["skin_point"]=0, ["hero_id"]=23002 }, + [2300201]={ + ["model_id"]="p0042", + ["qlt"]=2, + ["bonus"]={ + { + ["type"]="atk_yellow", + ["num"]=300000 + }, + { + ["type"]="attr_hp_yellow", + ["num"]=1000000 + } + }, + ["icon"]="7_1", + ["got"]=1, + ["skin_point"]=5, + ["hero_id"]=23002, + ["item_id"]=2300201, + ["skill_show"]={ + 23002011, + 23002012, + 23002013, + 23002014, + 23002015 + } + }, [24001]={ ["model_id"]="p0007", ["qlt"]=1, @@ -130,7 +156,7 @@ local skin = { ["hero_id"]=24003 }, [24004]={ - ["model_id"]="p0031", + ["model_id"]="p0039", ["qlt"]=1, ["skin_point"]=0, ["hero_id"]=24004 @@ -198,7 +224,7 @@ local skin = { ["hero_id"]=34003 }, [34004]={ - ["model_id"]="p0027", + ["model_id"]="p0040", ["qlt"]=1, ["skin_point"]=0, ["hero_id"]=34004 @@ -240,7 +266,7 @@ local skin = { ["hero_id"]=44003 }, [44004]={ - ["model_id"]="p0030", + ["model_id"]="p0038", ["qlt"]=1, ["skin_point"]=0, ["hero_id"]=44004 @@ -334,13 +360,13 @@ local skin = { ["hero_id"]=54003 }, [54004]={ - ["model_id"]="p0029", + ["model_id"]="p0041", ["qlt"]=1, ["skin_point"]=0, ["hero_id"]=54004 } } local config = { -data=skin,count=40 +data=skin,count=41 } return config \ No newline at end of file diff --git a/lua/app/config/skin_skill.lua b/lua/app/config/skin_skill.lua index 759d0ee2..b3d93357 100644 --- a/lua/app/config/skin_skill.lua +++ b/lua/app/config/skin_skill.lua @@ -376,9 +376,84 @@ local skin_skill = { 200 }, ["fx_self_mirror"]=400150 + }, + [23002011]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000001 + }, + ["name_act"]="attack01", + ["fx_self"]=300050, + ["fx_self_mirror"]=400000 + }, + [23002012]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound_hit"]={ + 1000002 + }, + ["name_act"]="attack02", + ["fx_self"]=300051, + ["fx_self_mirror"]=400001 + }, + [23002013]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000003 + }, + ["name_act"]="attack03", + ["fx_self"]=300052, + ["fx_self_mirror"]=400002 + }, + [23002014]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000004 + }, + ["name_act"]="attack04", + ["fx_self"]=300053, + ["fx_self_mirror"]=400003 + }, + [23002015]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=200, + ["shake_type"]=5, + ["sound_hit"]={ + 2300220 + }, + ["name_act"]="skill01", + ["fx_self"]=300054, + ["bullet_time"]={ + 800, + 3000, + 400 + }, + ["fx_self_mirror"]=400004 } } local config = { -data=skin_skill,count=25 +data=skin_skill,count=30 } 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 277e4b96..82bc3318 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -523,9 +523,10 @@ local localization_global = ["DUNGEON_RUNE_QUEST_4"] = "击杀{0}个小怪", ["DUNGEON_RUNE_TIP_1"] = "塔中密室循环结算后，可在此领取奖励。", ["DUNGEON_RUNE_TIP_2"] = "还不能放弃……", - ["DUNGEON_RUNE_TIP_3"] = "观看广告即刻复活！", + ["DUNGEON_RUNE_TIP_3"] = "回合数用完，观看广告获得额外回合！", ["DUNGEON_RUNE_TIP_4"] = "血量回复至50%", ["DUNGEON_RUNE_TIP_5"] = "回合数+5！", + ["DUNGEON_RUNE_TIP_6"] = "生命值为0，观看广告即刻复活！", ["UNFINISHED"] = "未完成", ["RUNES_DESC_1"] = "符文铸台:{0}级", ["RUNES_DESC_2"] = "符文套装", @@ -553,13 +554,14 @@ local localization_global = ["RUNES_DESC_24"] = "请先激活英雄", ["RUNES_DESC_25"] = "符文淬炼至少保留1个未锁符文", ["RUNES_DESC_26"] = "Lv{0}", + ["RUNES_DESC_27"] = "符文铸台{0}级后开启", ["DUNGEON_RUNE_DESC_1"] = "目标", ["DUNGEON_RUNE_DESC_2"] = "再次挑战", ["DUNGEON_RUNE_DESC_3"] = "通关获得", ["DUNGEON_RUNE_DESC_4"] = "扫荡获得", ["DUNGEON_RUNE_DESC_5"] = "通关后可扫荡", ["DUNGEON_RUNE_DESC_6"] = "战绩", - ["DUNGEON_RUNE_DESC_7"] = "狠心拒绝", + ["DUNGEON_RUNE_DESC_7"] = "放弃机会", ["DUNGEON_RUNE_DESC_8"] = "本赛季", ["DUNGEON_RUNE_DESC_9"] = "上赛季", ["DUNGEON_RUNE_DESC_10"] = "最高：{0}", diff --git a/lua/app/config/strings/cn/skin.lua b/lua/app/config/strings/cn/skin.lua index 514de039..5f8bc7c7 100644 --- a/lua/app/config/strings/cn/skin.lua +++ b/lua/app/config/strings/cn/skin.lua @@ -35,6 +35,9 @@ local skin = { [23002]={ ["value"]="初始" }, + [2300201]={ + ["value"]="Z丫" + }, [24001]={ ["value"]="初始" }, @@ -121,6 +124,6 @@ local skin = { } } local config = { -data=skin,count=40 +data=skin,count=41 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/skin.lua b/lua/app/config/strings/de/skin.lua index 18e48160..ac13dc52 100644 --- a/lua/app/config/strings/de/skin.lua +++ b/lua/app/config/strings/de/skin.lua @@ -34,6 +34,9 @@ local skin = { }, [23002]={ + }, + [2300201]={ + }, [24001]={ @@ -121,6 +124,6 @@ local skin = { } } local config = { -data=skin,count=40 +data=skin,count=41 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/skin.lua b/lua/app/config/strings/en/skin.lua index fac7dcec..8a28401f 100644 --- a/lua/app/config/strings/en/skin.lua +++ b/lua/app/config/strings/en/skin.lua @@ -34,6 +34,9 @@ local skin = { }, [23002]={ ["value"]="Initial" + }, + [2300201]={ + }, [24001]={ ["value"]="Initial" @@ -121,6 +124,6 @@ local skin = { } } local config = { -data=skin,count=40 +data=skin,count=41 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/skin.lua b/lua/app/config/strings/es/skin.lua index 33a25e21..90f59dd4 100644 --- a/lua/app/config/strings/es/skin.lua +++ b/lua/app/config/strings/es/skin.lua @@ -34,6 +34,9 @@ local skin = { }, [23002]={ ["value"]="Inicial" + }, + [2300201]={ + }, [24001]={ ["value"]="Inicial" @@ -121,6 +124,6 @@ local skin = { } } local config = { -data=skin,count=40 +data=skin,count=41 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/skin.lua b/lua/app/config/strings/fr/skin.lua index 18e48160..ac13dc52 100644 --- a/lua/app/config/strings/fr/skin.lua +++ b/lua/app/config/strings/fr/skin.lua @@ -34,6 +34,9 @@ local skin = { }, [23002]={ + }, + [2300201]={ + }, [24001]={ @@ -121,6 +124,6 @@ local skin = { } } local config = { -data=skin,count=40 +data=skin,count=41 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/skin.lua b/lua/app/config/strings/id/skin.lua index 0aecebfa..6908b05b 100644 --- a/lua/app/config/strings/id/skin.lua +++ b/lua/app/config/strings/id/skin.lua @@ -34,6 +34,9 @@ local skin = { }, [23002]={ ["value"]="Awal" + }, + [2300201]={ + }, [24001]={ ["value"]="Awal" @@ -121,6 +124,6 @@ local skin = { } } local config = { -data=skin,count=40 +data=skin,count=41 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/skin.lua b/lua/app/config/strings/ja/skin.lua index b73e1604..032a18a5 100644 --- a/lua/app/config/strings/ja/skin.lua +++ b/lua/app/config/strings/ja/skin.lua @@ -34,6 +34,9 @@ local skin = { }, [23002]={ ["value"]="デフォルト" + }, + [2300201]={ + }, [24001]={ ["value"]="デフォルト" @@ -121,6 +124,6 @@ local skin = { } } local config = { -data=skin,count=40 +data=skin,count=41 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/skin.lua b/lua/app/config/strings/ko/skin.lua index 81dd695b..0061bb38 100644 --- a/lua/app/config/strings/ko/skin.lua +++ b/lua/app/config/strings/ko/skin.lua @@ -34,6 +34,9 @@ local skin = { }, [23002]={ ["value"]="초기" + }, + [2300201]={ + }, [24001]={ ["value"]="초기" @@ -121,6 +124,6 @@ local skin = { } } local config = { -data=skin,count=40 +data=skin,count=41 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/skin.lua b/lua/app/config/strings/pt/skin.lua index 4364ab61..c5114cef 100644 --- a/lua/app/config/strings/pt/skin.lua +++ b/lua/app/config/strings/pt/skin.lua @@ -34,6 +34,9 @@ local skin = { }, [23002]={ ["value"]="Inicial" + }, + [2300201]={ + }, [24001]={ ["value"]="Inicial" @@ -121,6 +124,6 @@ local skin = { } } local config = { -data=skin,count=40 +data=skin,count=41 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/skin.lua b/lua/app/config/strings/ru/skin.lua index 18e48160..ac13dc52 100644 --- a/lua/app/config/strings/ru/skin.lua +++ b/lua/app/config/strings/ru/skin.lua @@ -34,6 +34,9 @@ local skin = { }, [23002]={ + }, + [2300201]={ + }, [24001]={ @@ -121,6 +124,6 @@ local skin = { } } local config = { -data=skin,count=40 +data=skin,count=41 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/skin.lua b/lua/app/config/strings/th/skin.lua index 64f2d718..9228040e 100644 --- a/lua/app/config/strings/th/skin.lua +++ b/lua/app/config/strings/th/skin.lua @@ -34,6 +34,9 @@ local skin = { }, [23002]={ ["value"]="เริ่มต้น" + }, + [2300201]={ + }, [24001]={ ["value"]="เริ่มต้น" @@ -121,6 +124,6 @@ local skin = { } } local config = { -data=skin,count=40 +data=skin,count=41 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/skin.lua b/lua/app/config/strings/vi/skin.lua index c7ca8f75..d93240ae 100644 --- a/lua/app/config/strings/vi/skin.lua +++ b/lua/app/config/strings/vi/skin.lua @@ -34,6 +34,9 @@ local skin = { }, [23002]={ ["value"]="Ban Đầu" + }, + [2300201]={ + }, [24001]={ ["value"]="Ban Đầu" @@ -121,6 +124,6 @@ local skin = { } } local config = { -data=skin,count=40 +data=skin,count=41 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/skin.lua b/lua/app/config/strings/zh/skin.lua index 4b6c3e84..93112cd0 100644 --- a/lua/app/config/strings/zh/skin.lua +++ b/lua/app/config/strings/zh/skin.lua @@ -34,6 +34,9 @@ local skin = { }, [23002]={ ["value"]="初始" + }, + [2300201]={ + }, [24001]={ ["value"]="初始" @@ -121,6 +124,6 @@ local skin = { } } local config = { -data=skin,count=40 +data=skin,count=41 } return config \ No newline at end of file diff --git a/lua/app/ui/hero/runes_info_comp.lua b/lua/app/ui/hero/runes_info_comp.lua index 1f1af3fe..60b9d0c1 100644 --- a/lua/app/ui/hero/runes_info_comp.lua +++ b/lua/app/ui/hero/runes_info_comp.lua @@ -31,7 +31,6 @@ function RunesInfoComp:init() end self.mask:setActive(false) - self.spineAuto:playAnim("idle", true, true) self.txSuit:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_2)) self.txUse:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_5)) self.txAuto:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_4)) @@ -47,6 +46,10 @@ function RunesInfoComp:init() UIManager:showUI("app/ui/runes/runes_suit_ui", self.heroEntity) end) self.btnAuto:addClickListener(function() + if not DataManager.RunesData:canAutoMake() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_27, DataManager.RunesData:getAutoMakeOpenLevel())) + return + end if self.autoSid == nil then local params ={ content = I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_21), @@ -89,6 +92,11 @@ function RunesInfoComp:refresh() -- self.txProg:setText(I18N:getGlobalText(I18N.GlobalConst.STR_MAX)) end + if DataManager.RunesData:canAutoMake() then + self.spineAuto:playAnim("idle", true, true) + else + self.spineAuto:playAnim("idle2", true, true) + end self.txNum:setText(DataManager.RunesData:getMaterialCount()) self.txCost:setText(GFunc.getRewardNum(self.runesEntity:getMaterialCost())) self.txLevel:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_1, DataManager.RunesData:getLevel())) diff --git a/lua/app/userdata/runes/runes_data.lua b/lua/app/userdata/runes/runes_data.lua index 7c288976..dfb27aa5 100644 --- a/lua/app/userdata/runes/runes_data.lua +++ b/lua/app/userdata/runes/runes_data.lua @@ -153,6 +153,17 @@ function RunesData:canAutoMake() return cfg.auto and cfg.auto == 1 end +-- 获取自动铸造的开启等级 +function RunesData:getAutoMakeOpenLevel() + for level, data in ipairs(self:getLevelConfig()) do + if data.auto and data.auto == 1 then + return level + end + end + + return nil +end + -- 符文栏是否解锁 function RunesData:isUnlock(index) local level = self:getLevel() From b74a41ed00f2a59583ddcc0459d80bbc8968dc7a Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 13 Sep 2023 15:31:13 +0800 Subject: [PATCH 22/35] bug_fix --- lua/app/ui/hero/runes_info_comp.lua | 5 +++-- lua/app/userdata/hero/hero_entity.lua | 4 +++- lua/app/userdata/runes/runes_data.lua | 8 ++++---- lua/app/userdata/runes/runes_entity.lua | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lua/app/ui/hero/runes_info_comp.lua b/lua/app/ui/hero/runes_info_comp.lua index 60b9d0c1..4ccd24e3 100644 --- a/lua/app/ui/hero/runes_info_comp.lua +++ b/lua/app/ui/hero/runes_info_comp.lua @@ -7,6 +7,7 @@ function RunesInfoComp:init() local uiMap = self:getUIMap() self.btnHelp = uiMap["runes_info.btn_help"] self.imgProg = uiMap["runes_info.prog.img_prog"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) + self.txProg = uiMap["runes_info.prog.tx_prog"] self.txLevel = uiMap["runes_info.level.tx_level"] self.btnSuit = uiMap["runes_info.btn_suit"] self.txSuit = uiMap["runes_info.btn_suit.tx_suit"] @@ -86,10 +87,10 @@ function RunesInfoComp:refresh() local maxExp = DataManager.RunesData:getNextLevelTotalExp() if maxExp then self.imgProg.value = curExp / maxExp - -- self.txProg:setText(curExp .. "/" .. maxExp) + self.txProg:setText(curExp .. "/" .. maxExp) else self.imgProg.value = 1 - -- self.txProg:setText(I18N:getGlobalText(I18N.GlobalConst.STR_MAX)) + self.txProg:setText(I18N:getGlobalText(I18N.GlobalConst.STR_MAX)) end if DataManager.RunesData:canAutoMake() then diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index caba2d9f..55fd2317 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -567,9 +567,11 @@ function HeroEntity:getTotalBaseAtk() result = result + equipEntity:getBaseAttack() end end - -- Logger.logHighlight(logStr) + -- logStr = logStr .. "\nSKIN：" .. DataManager.SkinData:getBaseAttack(self) result = result + DataManager.SkinData:getBaseAttack(self) + -- logStr = logStr .. "\nRUNES：" .. self:getRunes():getAttrValue(GConst.MATCH_ATTACK_NAME, true) result = result + self:getRunes():getAttrValue(GConst.MATCH_ATTACK_NAME, true) + -- Logger.logHighlight(logStr) return result end diff --git a/lua/app/userdata/runes/runes_data.lua b/lua/app/userdata/runes/runes_data.lua index dfb27aa5..8c68430d 100644 --- a/lua/app/userdata/runes/runes_data.lua +++ b/lua/app/userdata/runes/runes_data.lua @@ -200,11 +200,11 @@ function RunesData:getSuitName(index) elseif index == 2 then return I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_11) elseif index == 3 then - return I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_12) - elseif index == 4 then - return I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_13) - elseif index == 5 then return I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_14) + elseif index == 4 then + return I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_12) + elseif index == 5 then + return I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_13) end return nil diff --git a/lua/app/userdata/runes/runes_entity.lua b/lua/app/userdata/runes/runes_entity.lua index 4521be56..51c46801 100644 --- a/lua/app/userdata/runes/runes_entity.lua +++ b/lua/app/userdata/runes/runes_entity.lua @@ -125,7 +125,7 @@ end -- 获取已有的套装id map function RunesEntity:getSuitIds() local typeCount = {} - for i = 1, GConst.RunesConst.MAX_SUITS_COUNT do + for i = 1, GConst.RunesConst.MAX_ATTR_GRID_COUNT do local t = self:getGridSuit(i) if t then local temp = table.find(typeCount, function(value) return value.id == t end) @@ -195,7 +195,7 @@ function RunesEntity:getAttrValue(attrType, isBase) return result elseif not isBase and attrType == GConst.MATCH_ATTACK_NAME[self:getHeroEntity():getMatchType()] then result = self:getAttrValue(GConst.MATCH_ATTACK_NAME[self:getHeroEntity():getMatchType()], true) - result = result + self:getHeroEntity():getTotalBaseAtk() * self:getAttrValue(GConst.MATCH_ATTACK_ADD_NAME) // DEFAULT_FACTOR + result = result + self:getHeroEntity():getTotalBaseAtk() * self:getAttrValue(GConst.MATCH_ATTACK_ADD_NAME[self:getHeroEntity():getMatchType()]) // DEFAULT_FACTOR return result elseif not isBase and (attrType == GConst.MATCH_NORMAL_HURTP_NAME[self:getHeroEntity():getMatchType()] or attrType == GConst.MATCH_SKILL_HURTP_NAME[self:getHeroEntity():getMatchType()]) then result = self:getAttrValue(attrType, true) From 3f17beb2f2866260c5c053f2da59334808564a83 Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 13 Sep 2023 15:44:54 +0800 Subject: [PATCH 23/35] =?UTF-8?q?=E6=B7=AC=E7=82=BC=E9=94=81=E5=AE=9A?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/activity.lua | 12 +- lua/app/config/activity_exchange.lua | 182 ++++++++++++++++- lua/app/config/activity_rank.lua | 191 +++++++++++++++++- lua/app/config/chapter_board_rune.lua | 12 +- lua/app/config/chapter_dungeon_rune.lua | 2 +- .../localization_global_const.lua | 1 + lua/app/config/skill.lua | 74 +++---- lua/app/config/skill_rogue.lua | 6 +- lua/app/config/strings/cn/global.lua | 1 + lua/app/config/strings/cn/skill.lua | 4 +- lua/app/config/strings/cn/skill_rogue.lua | 4 +- lua/app/module/runes/runes_const.lua | 3 + lua/app/ui/hero/runes_info_comp.lua | 25 ++- lua/app/userdata/runes/runes_entity.lua | 11 + 14 files changed, 463 insertions(+), 65 deletions(-) diff --git a/lua/app/config/activity.lua b/lua/app/config/activity.lua index 5716cbfd..ea3a3e3f 100644 --- a/lua/app/config/activity.lua +++ b/lua/app/config/activity.lua @@ -18,9 +18,19 @@ local activity = { ["act_type"]=4, ["start_time"]="2023-09-28 00:00:00", ["end_time"]="2023-10-08 00:00:00" + }, + [506]={ + ["act_type"]=2, + ["start_time"]="2023-09-27 00:00:00", + ["end_time"]="2023-10-05 00:00:00" + }, + [606]={ + ["act_type"]=3, + ["start_time"]="2023-10-04 00:00:00", + ["end_time"]="2023-10-12 00:00:00" } } local config = { -data=activity,count=4 +data=activity,count=6 } return config \ No newline at end of file diff --git a/lua/app/config/activity_exchange.lua b/lua/app/config/activity_exchange.lua index eb889061..d7a331cf 100644 --- a/lua/app/config/activity_exchange.lua +++ b/lua/app/config/activity_exchange.lua @@ -178,9 +178,189 @@ local activity_exchange = { ["num_for_nothing"]="Uw==" }, ["limit"]=999 + }, + [201]={ + ["activity"]=506, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14002, + ["id_for_nothing"]="VwxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + ["limit"]=10 + }, + [202]={ + ["activity"]=506, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34003, + ["id_for_nothing"]="VQxcA2Y=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["limit"]=10 + }, + [203]={ + ["activity"]=506, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44001, + ["id_for_nothing"]="UgxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["limit"]=10 + }, + [204]={ + ["activity"]=506, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54002, + ["id_for_nothing"]="UwxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["limit"]=10 + }, + [205]={ + ["activity"]=506, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=15, + ["id_for_nothing"]="Vw0=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=240, + ["num_for_nothing"]="VAxc" + }, + ["limit"]=3 + }, + [206]={ + ["activity"]=506, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14, + ["id_for_nothing"]="Vww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["limit"]=3 + }, + [207]={ + ["activity"]=506, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + ["limit"]=10 + }, + [208]={ + ["activity"]=506, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=800, + ["num_for_nothing"]="Xghc" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + ["limit"]=999 + }, + [209]={ + ["activity"]=506, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + ["limit"]=999 } } local config = { -data=activity_exchange,count=9 +data=activity_exchange,count=18 } return config \ No newline at end of file diff --git a/lua/app/config/activity_rank.lua b/lua/app/config/activity_rank.lua index 92b93e93..4ca084f9 100644 --- a/lua/app/config/activity_rank.lua +++ b/lua/app/config/activity_rank.lua @@ -1,5 +1,5 @@ local activity_rank = { - [1]={ + [101]={ ["act_id"]=306, ["ranking"]={ 1, @@ -24,7 +24,7 @@ local activity_rank = { } } }, - [2]={ + [102]={ ["act_id"]=306, ["ranking"]={ 2, @@ -49,7 +49,7 @@ local activity_rank = { } } }, - [3]={ + [103]={ ["act_id"]=306, ["ranking"]={ 3, @@ -74,7 +74,7 @@ local activity_rank = { } } }, - [4]={ + [104]={ ["act_id"]=306, ["ranking"]={ 4, @@ -99,7 +99,7 @@ local activity_rank = { } } }, - [5]={ + [105]={ ["act_id"]=306, ["ranking"]={ 11, @@ -124,7 +124,7 @@ local activity_rank = { } } }, - [6]={ + [106]={ ["act_id"]=306, ["ranking"]={ 51, @@ -149,7 +149,7 @@ local activity_rank = { } } }, - [7]={ + [107]={ ["act_id"]=306, ["ranking"]={ 501, @@ -173,9 +173,184 @@ local activity_rank = { ["num_for_nothing"]="VAg=" } } + }, + [201]={ + ["act_id"]=606, + ["ranking"]={ + 1, + 1 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=6, + ["num_for_nothing"]="UA==" + } + } + }, + [202]={ + ["act_id"]=606, + ["ranking"]={ + 2, + 2 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=5, + ["num_for_nothing"]="Uw==" + } + } + }, + [203]={ + ["act_id"]=606, + ["ranking"]={ + 3, + 3 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=70, + ["num_for_nothing"]="UQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=4, + ["num_for_nothing"]="Ug==" + } + } + }, + [204]={ + ["act_id"]=606, + ["ranking"]={ + 4, + 10 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + } + }, + [205]={ + ["act_id"]=606, + ["ranking"]={ + 11, + 50 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + } + }, + [206]={ + ["act_id"]=606, + ["ranking"]={ + 51, + 500 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [207]={ + ["act_id"]=606, + ["ranking"]={ + 501, + 99999999 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + } } } local config = { -data=activity_rank,count=7 +data=activity_rank,count=14 } return config \ No newline at end of file diff --git a/lua/app/config/chapter_board_rune.lua b/lua/app/config/chapter_board_rune.lua index 475c18ff..b2f98f4d 100644 --- a/lua/app/config/chapter_board_rune.lua +++ b/lua/app/config/chapter_board_rune.lua @@ -6540,7 +6540,7 @@ local chapter_board_rune = { [24]={ ["board"]={ { - 32, + 31, 0 }, { @@ -6564,7 +6564,7 @@ local chapter_board_rune = { 5 }, { - 32, + 31, 0 }, { @@ -6664,7 +6664,7 @@ local chapter_board_rune = { 0 }, { - 32, + 31, 0 }, { @@ -6712,7 +6712,7 @@ local chapter_board_rune = { 0 }, { - 32, + 31, 0 }, { @@ -6720,7 +6720,7 @@ local chapter_board_rune = { 0 }, { - 32, + 31, 0 }, { @@ -6728,7 +6728,7 @@ local chapter_board_rune = { 0 }, { - 32, + 31, 0 }, { diff --git a/lua/app/config/chapter_dungeon_rune.lua b/lua/app/config/chapter_dungeon_rune.lua index e6b78bbb..d7648954 100644 --- a/lua/app/config/chapter_dungeon_rune.lua +++ b/lua/app/config/chapter_dungeon_rune.lua @@ -2527,7 +2527,7 @@ local chapter_dungeon_rune = { ["requirement"]={ { 2, - 32, + 31, 6 }, { diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index a19af501..ff57bd4f 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -555,6 +555,7 @@ local LocalizationGlobalConst = RUNES_DESC_25 = "RUNES_DESC_25", RUNES_DESC_26 = "RUNES_DESC_26", RUNES_DESC_27 = "RUNES_DESC_27", + RUNES_DESC_28 = "RUNES_DESC_28", DUNGEON_RUNE_DESC_1 = "DUNGEON_RUNE_DESC_1", DUNGEON_RUNE_DESC_2 = "DUNGEON_RUNE_DESC_2", DUNGEON_RUNE_DESC_3 = "DUNGEON_RUNE_DESC_3", diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index c7b67a79..016b77fe 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -1760,8 +1760,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 70 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -1786,8 +1786,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 70 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -1812,8 +1812,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 70 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=4, @@ -1838,8 +1838,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 70 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -1887,8 +1887,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 70 + 2, + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -2033,8 +2033,8 @@ local skill = { 5 }, ["skill_position"]={ - 1, - 70 + 2, + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -3675,8 +3675,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 2, - 0 + 1, + 50 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3701,8 +3701,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 2, - 0 + 1, + 50 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3727,8 +3727,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 2, - 0 + 1, + 50 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3753,8 +3753,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 2, - 0 + 1, + 50 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3827,8 +3827,8 @@ local skill = { 5 }, ["skill_position"]={ - 2, - 0 + 1, + 50 }, ["shake_time"]=200, ["shake_type"]=6, @@ -5622,8 +5622,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 100 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5648,8 +5648,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 100 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5674,8 +5674,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 100 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5700,8 +5700,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 100 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5744,8 +5744,8 @@ local skill = { 2 }, ["skill_position"]={ - 1, - 100 + 2, + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -9119,7 +9119,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 100 + 25 }, ["shake_time"]=100, ["shake_type"]=2, @@ -9145,7 +9145,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 100 + 25 }, ["shake_time"]=100, ["shake_type"]=2, @@ -9171,7 +9171,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 100 + 25 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9197,7 +9197,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 100 + 25 }, ["shake_time"]=100, ["shake_type"]=2, @@ -9234,7 +9234,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 100 + 25 }, ["shake_time"]=200, ["shake_type"]=6, diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 30b4e22c..13ed1d92 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -5323,14 +5323,14 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, - ["type"]=9, + ["type"]=12, ["skill_position"]=5, ["effect"]={ { ["type"]="add_skill", ["num"]=5400421, ["ratio"]=10000, - ["round"]=999 + ["round"]=1 } }, ["obj"]=7, @@ -5400,7 +5400,7 @@ local skill_rogue = { ["type"]="add_skill", ["num"]=5400425, ["ratio"]=10000, - ["round"]=999 + ["round"]=1 } }, ["obj"]=7, diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 82bc3318..aa120fe1 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -555,6 +555,7 @@ local localization_global = ["RUNES_DESC_25"] = "符文淬炼至少保留1个未锁符文", ["RUNES_DESC_26"] = "Lv{0}", ["RUNES_DESC_27"] = "符文铸台{0}级后开启", + ["RUNES_DESC_28"] = "您有S级以上的属性未锁定，是否要继续淬炼？", ["DUNGEON_RUNE_DESC_1"] = "目标", ["DUNGEON_RUNE_DESC_2"] = "再次挑战", ["DUNGEON_RUNE_DESC_3"] = "通关获得", diff --git a/lua/app/config/strings/cn/skill.lua b/lua/app/config/strings/cn/skill.lua index cc55192a..2b772217 100644 --- a/lua/app/config/strings/cn/skill.lua +++ b/lua/app/config/strings/cn/skill.lua @@ -90,7 +90,7 @@ local skill = { ["desc"]="堕落之剑:额外造成一次大量技能伤害，附加腐败效果，1回合。" }, [1400420]={ - ["desc"]="九尾祥瑞：将周围4个元素变色，并造成多次大量技能伤害。" + ["desc"]="九尾祥瑞：将周围4个元素变色，并造成一次大量技能伤害。" }, [2400420]={ ["desc"]="啊，打！：使用后本次伤害提升，并额外造成多次大量技能伤害。" @@ -99,7 +99,7 @@ local skill = { ["desc"]="刺杀艺术：使用后本次伤害提升，并额外造成多次大量技能伤害。" }, [4400420]={ - ["desc"]="飞棺降物：额外造成一次技能伤害，附加冰霜效果，1回合。" + ["desc"]="飞棺降物：额外造成多次技能伤害，附加冰霜效果，1回合。" }, [5400420]={ ["desc"]="武神意志：随机消除3个元素，并造成一次技能伤害。" diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index ab9e92c8..4686e733 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -852,7 +852,7 @@ local skill_rogue = { ["desc"]="堕落之剑附加的昏睡效果，回合数+1。" }, [1400400]={ - ["desc"]="解锁九尾祥瑞：将周围4个元素变色，并造成多次大量技能伤害。" + ["desc"]="解锁九尾祥瑞：将周围4个元素变色，并造成一次大量技能伤害。" }, [1400401]={ ["desc"]="九尾祥瑞可附加魅惑效果，1回合。" @@ -924,7 +924,7 @@ local skill_rogue = { ["desc"]="绿意之刺链接6个元素及以上时，技能攻击额外释放一次。" }, [4400400]={ - ["desc"]="解锁飞棺降物：额外造成一次技能伤害，附加冰霜效果，1回合。" + ["desc"]="解锁飞棺降物：额外造成多次技能伤害，附加冰霜效果，1回合。" }, [4400401]={ ["desc"]="已逝行者普攻有10%概率附加腐败效果，2回合。" diff --git a/lua/app/module/runes/runes_const.lua b/lua/app/module/runes/runes_const.lua index ec960a1f..12a4ccec 100644 --- a/lua/app/module/runes/runes_const.lua +++ b/lua/app/module/runes/runes_const.lua @@ -17,6 +17,9 @@ RunesConst.QUALITY_ICON = { [8] = "hero_rune_ss", } +-- 检查锁定状态 +RunesConst.CHECK_QLT_LOCK = 7 + -- 最大属性栏位数 RunesConst.MAX_ATTR_GRID_COUNT = 6 -- 品质个数 diff --git a/lua/app/ui/hero/runes_info_comp.lua b/lua/app/ui/hero/runes_info_comp.lua index 4ccd24e3..aa6311f6 100644 --- a/lua/app/ui/hero/runes_info_comp.lua +++ b/lua/app/ui/hero/runes_info_comp.lua @@ -57,7 +57,7 @@ function RunesInfoComp:init() boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, showToday = GConst.MESSAGE_BOX_SHOW_TODAY.RUNES_AUTO, okFunc = function() - self:reqQuenching(true) + self:checkQuenching(true) end, } GFunc.showMessageBox(params) @@ -66,7 +66,7 @@ function RunesInfoComp:init() end end) self.btnUse:addClickListener(function() - self:reqQuenching(false) + self:checkQuenching(false) end) self:bind(DataManager.BagData.ItemData, "dirty", function() self:refresh() @@ -172,8 +172,8 @@ function RunesInfoComp:refreshSuit() self.txEmpty:setActive(isEmpty) end --- 请求淬炼 -function RunesInfoComp:reqQuenching(isAuto) +-- 检查淬炼 +function RunesInfoComp:checkQuenching(isAuto) -- 是否全部锁定 if DataManager.RunesData:getRunes(self.heroEntity:getCfgId()):getAttrLockCount() >= DataManager.RunesData:getUnlockCount() then GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_25)) @@ -186,6 +186,23 @@ function RunesInfoComp:reqQuenching(isAuto) return end + if self.runesEntity:isUnlockHighQlt() then + local params ={ + content = I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_28), + boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, + okText = I18N:getGlobalText(I18N.GlobalConst.CONTINUE_DESC), + okFunc = function() + self:reqQuenching(isAuto) + end, + } + GFunc.showMessageBox(params) + else + self:reqQuenching(isAuto) + end +end + +-- 请求淬炼 +function RunesInfoComp:reqQuenching(isAuto) if isAuto then -- 自动淬炼 self.mask:setActive(true) diff --git a/lua/app/userdata/runes/runes_entity.lua b/lua/app/userdata/runes/runes_entity.lua index 51c46801..fffb0d18 100644 --- a/lua/app/userdata/runes/runes_entity.lua +++ b/lua/app/userdata/runes/runes_entity.lua @@ -45,6 +45,17 @@ function RunesEntity:getAttrLockCount() return lock end +-- 是否存在品质大于s的未锁定 +function RunesEntity:isUnlockHighQlt() + for idx, data in ipairs(self.grids) do + if self:getGridQuality(idx) >= GConst.RunesConst.CHECK_QLT_LOCK and not self:isAttrLock(idx) then + return true + end + end + + return false +end + -- 获取锻造的材料消耗 function RunesEntity:getMaterialCost() local base = GFunc.getConstReward("runes_cost_base") From ae7e52d6ea1e50d6e17f524483699f344340befa Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 13 Sep 2023 17:58:57 +0800 Subject: [PATCH 24/35] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=8A=A0=E6=88=90?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/userdata/hero/hero_entity.lua | 13 ++++++++----- lua/app/userdata/runes/runes_entity.lua | 7 ++++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index 55fd2317..5e262400 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -211,9 +211,10 @@ function HeroEntity:updateRunesAttr() local skillHurt = self:getRunes():getAttrValue(GConst.MATCH_SKILL_HURT_NAME[self:getMatchType()]) local critPer = self:getRunes():getAttrValue(GConst.MATCH_CRIT_NAME[self:getMatchType()]) local critHurtPer = self:getRunes():getAttrValue(GConst.MATCH_CRIT_TIME_NAME[self:getMatchType()]) - local normalHurtPer = self:getRunes():getAttrValue(GConst.MATCH_NORMAL_HURTP_NAME[self:getMatchType()]) - local skillHurtPer = self:getRunes():getAttrValue(GConst.MATCH_SKILL_HURTP_NAME[self:getMatchType()]) + local normalHurtPer = self:getRunes():getAttrValue(GConst.MATCH_NORMAL_HURTP_NAME[self:getMatchType()], true) + local skillHurtPer = self:getRunes():getAttrValue(GConst.MATCH_SKILL_HURTP_NAME[self:getMatchType()], true) local healPer = self:getRunes():getAttrValue(GConst.MATCH_CURED_NAME[self:getMatchType()]) + local allHurtp = self:getRunes():getAttrValue(GConst.MATCH_ALL_HURTP_NAME[self:getMatchType()]) self.runesAttr[GConst.MATCH_HP_NAME[self:getMatchType()]] = hp self.runesAttr[GConst.MATCH_ATTACK_NAME[self:getMatchType()]] = atk @@ -224,6 +225,7 @@ function HeroEntity:updateRunesAttr() self.runesAttr[GConst.MATCH_NORMAL_HURTP_NAME[self:getMatchType()]] = normalHurtPer self.runesAttr[GConst.MATCH_SKILL_HURTP_NAME[self:getMatchType()]] = skillHurtPer self.runesAttr[GConst.MATCH_CURED_NAME[self:getMatchType()]] = healPer + self.runesAttr[GConst.MATCH_ALL_HURTP_NAME[self:getMatchType()]] = allHurtp if EDITOR_MODE then local printStr = "" @@ -237,6 +239,7 @@ function HeroEntity:updateRunesAttr() printStr = printStr .. "普攻增伤百分比：".. normalHurtPer .. "\n" printStr = printStr .. "技能增伤百分比：".. skillHurtPer .. "\n" printStr = printStr .. "治疗加成百分比：".. healPer .. "\n" + printStr = printStr .. "所有伤害百分比：".. allHurtp .. "\n" Logger.logHighlight(printStr) end end @@ -551,7 +554,7 @@ function HeroEntity:getTotalBaseHp() end end result = result + DataManager.SkinData:getBaseHp(self) - result = result + self:getRunes():getAttrValue(GConst.MATCH_HP_FIX_NAME, true) + result = result + self:getRunes():getAttrValue(GConst.MATCH_HP_FIX_NAME[self:getMatchType()], true) return result end @@ -569,8 +572,8 @@ function HeroEntity:getTotalBaseAtk() end -- logStr = logStr .. "\nSKIN：" .. DataManager.SkinData:getBaseAttack(self) result = result + DataManager.SkinData:getBaseAttack(self) - -- logStr = logStr .. "\nRUNES：" .. self:getRunes():getAttrValue(GConst.MATCH_ATTACK_NAME, true) - result = result + self:getRunes():getAttrValue(GConst.MATCH_ATTACK_NAME, true) + -- logStr = logStr .. "\nRUNES：" .. self:getRunes():getAttrValue(GConst.MATCH_ATTACK_NAME[self:getMatchType()], true) + result = result + self:getRunes():getAttrValue(GConst.MATCH_ATTACK_NAME[self:getMatchType()], true) -- Logger.logHighlight(logStr) return result end diff --git a/lua/app/userdata/runes/runes_entity.lua b/lua/app/userdata/runes/runes_entity.lua index fffb0d18..c3270c9a 100644 --- a/lua/app/userdata/runes/runes_entity.lua +++ b/lua/app/userdata/runes/runes_entity.lua @@ -199,6 +199,11 @@ end -- 获取属性 , isBase是否是基础配置的属性 function RunesEntity:getAttrValue(attrType, isBase) + if type(attrType) ~= "string" then + Logger.logError("获取符文属性传入格式错误") + return 0 + end + local result if not isBase and attrType == GConst.MATCH_HP_FIX_NAME[self:getHeroEntity():getMatchType()] then result = self:getAttrValue(GConst.MATCH_HP_FIX_NAME[self:getHeroEntity():getMatchType()], true) @@ -210,7 +215,7 @@ function RunesEntity:getAttrValue(attrType, isBase) return result elseif not isBase and (attrType == GConst.MATCH_NORMAL_HURTP_NAME[self:getHeroEntity():getMatchType()] or attrType == GConst.MATCH_SKILL_HURTP_NAME[self:getHeroEntity():getMatchType()]) then result = self:getAttrValue(attrType, true) - result = result + self:getAttrValue(GConst.MATCH_ALL_HURTP_NAME, true) + result = result + self:getAttrValue(GConst.MATCH_ALL_HURTP_NAME[self:getHeroEntity():getMatchType()], true) return result else local all = self:getAllAttr() From de1565f2c804cad40edb14aae31e052f48326ebe Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 13 Sep 2023 18:23:50 +0800 Subject: [PATCH 25/35] =?UTF-8?q?=E5=B1=9E=E6=80=A7fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/hero/cell/attr_cell.lua | 4 ++++ lua/app/userdata/battle/battle_base_data.lua | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lua/app/ui/hero/cell/attr_cell.lua b/lua/app/ui/hero/cell/attr_cell.lua index 6f2a4497..0095f2b5 100644 --- a/lua/app/ui/hero/cell/attr_cell.lua +++ b/lua/app/ui/hero/cell/attr_cell.lua @@ -200,6 +200,8 @@ function AttrCell:showNormalHurtp() local value = 0 if self.nodeType == GConst.HeroConst.ATTR_SHOW_TOTAL then value = self.heroEntity:getTotalAttrValue(self.attrName) + -- 特殊处理：显示总属性时，普攻百分比和技能百分比把所有伤害百分比加上 + value = value + self.heroEntity:getTotalAttrValue(GConst.MATCH_ALL_HURTP_NAME[self.heroEntity:getMatchType()]) elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_BASE then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then @@ -225,6 +227,8 @@ function AttrCell:showSkillHurtp() local value = 0 if self.nodeType == GConst.HeroConst.ATTR_SHOW_TOTAL then value = self.heroEntity:getTotalAttrValue(self.attrName) + -- 特殊处理：显示总属性时，普攻百分比和技能百分比把所有伤害百分比加上 + value = value + self.heroEntity:getTotalAttrValue(GConst.MATCH_ALL_HURTP_NAME[self.heroEntity:getMatchType()]) elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_BASE then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then diff --git a/lua/app/userdata/battle/battle_base_data.lua b/lua/app/userdata/battle/battle_base_data.lua index c8e78492..ccb29cb2 100644 --- a/lua/app/userdata/battle/battle_base_data.lua +++ b/lua/app/userdata/battle/battle_base_data.lua @@ -837,7 +837,7 @@ function BattleBaseData:initHeroData(formation) ---- 普攻\技能增伤百分比 for matchType, attrName in pairs(GConst.MATCH_ALL_HURTP_NAME) do - unitData.attr[attrName] = 2000--heroEntity:getTotalAttrValue(attrName) + unitData.attr[attrName] = heroEntity:getTotalAttrValue(attrName) end local skillInfo = skillCfg[skillId] From a2b2db3485277310f37c5c4af188b6e99d0102fc Mon Sep 17 00:00:00 2001 From: Fang Date: Thu, 14 Sep 2023 11:04:24 +0800 Subject: [PATCH 26/35] =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=8F=8A=E6=98=BE?= =?UTF-8?q?=E7=A4=BAfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/hero/runes_info_comp.lua | 10 ++++++---- lua/app/userdata/runes/runes_data.lua | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lua/app/ui/hero/runes_info_comp.lua b/lua/app/ui/hero/runes_info_comp.lua index aa6311f6..d7945169 100644 --- a/lua/app/ui/hero/runes_info_comp.lua +++ b/lua/app/ui/hero/runes_info_comp.lua @@ -93,10 +93,12 @@ function RunesInfoComp:refresh() self.txProg:setText(I18N:getGlobalText(I18N.GlobalConst.STR_MAX)) end - if DataManager.RunesData:canAutoMake() then - self.spineAuto:playAnim("idle", true, true) - else - self.spineAuto:playAnim("idle2", true, true) + if self.autoSid == nil then + if DataManager.RunesData:canAutoMake() then + self.spineAuto:playAnim("idle", true, true) + else + self.spineAuto:playAnim("idle2", true, true) + end end self.txNum:setText(DataManager.RunesData:getMaterialCount()) self.txCost:setText(GFunc.getRewardNum(self.runesEntity:getMaterialCost())) diff --git a/lua/app/userdata/runes/runes_data.lua b/lua/app/userdata/runes/runes_data.lua index 8c68430d..394c714d 100644 --- a/lua/app/userdata/runes/runes_data.lua +++ b/lua/app/userdata/runes/runes_data.lua @@ -96,7 +96,7 @@ end function RunesData:getNextLevelTotalExp() local cfg = self:getLevelConfig()[self:getLevel() + 1] if cfg then - return cfg.cost or 0 + return cfg.cost and cfg.cost - self:getLevelConfig()[self:getLevel()].cost or 0 end return nil From 93582b6d391c0e4d89914cae53cb743488f15be8 Mon Sep 17 00:00:00 2001 From: Fang Date: Thu, 14 Sep 2023 12:04:43 +0800 Subject: [PATCH 27/35] =?UTF-8?q?=E6=96=B0=E7=94=A8=E6=88=B7=E6=8A=A5?= =?UTF-8?q?=E9=94=99fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/userdata/runes/runes_data.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lua/app/userdata/runes/runes_data.lua b/lua/app/userdata/runes/runes_data.lua index 394c714d..5fc7161a 100644 --- a/lua/app/userdata/runes/runes_data.lua +++ b/lua/app/userdata/runes/runes_data.lua @@ -94,12 +94,14 @@ end -- 获取到下一档的总经验 function RunesData:getNextLevelTotalExp() + local nextExp local cfg = self:getLevelConfig()[self:getLevel() + 1] if cfg then - return cfg.cost and cfg.cost - self:getLevelConfig()[self:getLevel()].cost or 0 + nextExp = cfg.cost or 0 end + local curExp = self:getLevelConfig()[self:getLevel()].cost or 0 - return nil + return nextExp - curExp end -- 获取相应铸台等级的品质概率 From e5547541e3fb41a054e7c0b8008fb74410740ce2 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 15 Sep 2023 17:37:03 +0800 Subject: [PATCH 28/35] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=92=8C=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/act_gift.lua | 78 +- lua/app/config/activity_full_moon_quest.lua | 110 ++- lua/app/config/activity_full_moon_reward.lua | 4 +- lua/app/config/avatar_frame.lua | 12 +- lua/app/config/chapter_board_rune.lua | 70 +- lua/app/config/chapter_dungeon_rune.lua | 758 ++++++++++++------ lua/app/config/chapter_new_skin_fight.lua | 48 ++ .../config/chapter_new_skin_fight.lua.meta | 10 + lua/app/config/const.lua | 5 +- lua/app/config/item.lua | 7 +- .../localization_global_const.lua | 32 + lua/app/config/monster_activity.lua | 45 +- lua/app/config/monster_base.lua | 40 +- lua/app/config/monster_dungeon_rune.lua | 20 +- lua/app/config/runes_sub.lua | 140 ++-- lua/app/config/skill.lua | 396 ++++----- lua/app/config/skill_rogue.lua | 48 +- lua/app/config/strings/cn/func_open.lua | 5 +- lua/app/config/strings/cn/global.lua | 34 +- lua/app/config/strings/cn/hero.lua | 12 +- lua/app/config/strings/cn/item.lua | 6 +- lua/app/config/strings/cn/monster_base.lua | 30 +- lua/app/config/strings/cn/skill_rogue.lua | 8 +- lua/app/config/strings/cn/tutorial.lua | 17 +- lua/app/config/strings/de/func_open.lua | 5 +- lua/app/config/strings/de/item.lua | 5 +- lua/app/config/strings/de/tutorial.lua | 17 +- lua/app/config/strings/en/func_open.lua | 5 +- lua/app/config/strings/en/global.lua | 1 + lua/app/config/strings/en/item.lua | 5 +- lua/app/config/strings/en/tutorial.lua | 17 +- lua/app/config/strings/es/func_open.lua | 5 +- lua/app/config/strings/es/global.lua | 1 + lua/app/config/strings/es/item.lua | 5 +- lua/app/config/strings/es/tutorial.lua | 17 +- lua/app/config/strings/fr/func_open.lua | 5 +- lua/app/config/strings/fr/item.lua | 5 +- lua/app/config/strings/fr/tutorial.lua | 17 +- lua/app/config/strings/id/func_open.lua | 5 +- lua/app/config/strings/id/global.lua | 1 + lua/app/config/strings/id/item.lua | 5 +- lua/app/config/strings/id/tutorial.lua | 17 +- lua/app/config/strings/ja/func_open.lua | 5 +- lua/app/config/strings/ja/global.lua | 1 + lua/app/config/strings/ja/item.lua | 5 +- lua/app/config/strings/ja/tutorial.lua | 17 +- lua/app/config/strings/ko/func_open.lua | 5 +- lua/app/config/strings/ko/global.lua | 1 + lua/app/config/strings/ko/item.lua | 5 +- lua/app/config/strings/ko/tutorial.lua | 17 +- lua/app/config/strings/pt/func_open.lua | 5 +- lua/app/config/strings/pt/global.lua | 1 + lua/app/config/strings/pt/item.lua | 5 +- lua/app/config/strings/pt/tutorial.lua | 17 +- lua/app/config/strings/ru/func_open.lua | 5 +- lua/app/config/strings/ru/item.lua | 5 +- lua/app/config/strings/ru/tutorial.lua | 17 +- lua/app/config/strings/th/func_open.lua | 5 +- lua/app/config/strings/th/global.lua | 1 + lua/app/config/strings/th/item.lua | 5 +- lua/app/config/strings/th/tutorial.lua | 17 +- lua/app/config/strings/vi/func_open.lua | 5 +- lua/app/config/strings/vi/global.lua | 1 + lua/app/config/strings/vi/item.lua | 5 +- lua/app/config/strings/vi/tutorial.lua | 17 +- lua/app/config/strings/zh/func_open.lua | 5 +- lua/app/config/strings/zh/global.lua | 1 + lua/app/config/strings/zh/item.lua | 5 +- lua/app/config/strings/zh/tutorial.lua | 17 +- lua/app/config/tutorial.lua | 217 ++++- lua/app/config/tutorial_start.lua | 6 +- .../dungeon_rune/cell/rune_chapter_cell.lua | 9 + 72 files changed, 1829 insertions(+), 671 deletions(-) create mode 100644 lua/app/config/chapter_new_skin_fight.lua create mode 100644 lua/app/config/chapter_new_skin_fight.lua.meta diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua index 4c3bbb94..76afbe80 100644 --- a/lua/app/config/act_gift.lua +++ b/lua/app/config/act_gift.lua @@ -2890,7 +2890,8 @@ local act_gift = { ["num"]=8, ["num_for_nothing"]="Xg==" } - } + }, + ["limit"]=1 }, [180202]={ ["type"]=18, @@ -3034,7 +3035,8 @@ local act_gift = { ["num"]=10, ["num_for_nothing"]="Vwg=" } - } + }, + ["limit"]=1 }, [180302]={ ["type"]=18, @@ -3178,7 +3180,8 @@ local act_gift = { ["num"]=24, ["num_for_nothing"]="VAw=" } - } + }, + ["limit"]=1 }, [180402]={ ["type"]=18, @@ -3322,7 +3325,8 @@ local act_gift = { ["num"]=36, ["num_for_nothing"]="VQ4=" } - } + }, + ["limit"]=1 }, [180502]={ ["type"]=18, @@ -3466,7 +3470,8 @@ local act_gift = { ["num"]=96, ["num_for_nothing"]="Xw4=" } - } + }, + ["limit"]=1 }, [180602]={ ["type"]=18, @@ -3610,7 +3615,8 @@ local act_gift = { ["num"]=138, ["num_for_nothing"]="VwtU" } - } + }, + ["limit"]=1 }, [180702]={ ["type"]=18, @@ -3754,7 +3760,8 @@ local act_gift = { ["num"]=138, ["num_for_nothing"]="VwtU" } - } + }, + ["limit"]=1 }, [180802]={ ["type"]=18, @@ -3898,7 +3905,8 @@ local act_gift = { ["num"]=138, ["num_for_nothing"]="VwtU" } - } + }, + ["limit"]=1 }, [180902]={ ["type"]=18, @@ -4042,7 +4050,8 @@ local act_gift = { ["num"]=138, ["num_for_nothing"]="VwtU" } - } + }, + ["limit"]=1 }, [181002]={ ["type"]=18, @@ -4186,7 +4195,8 @@ local act_gift = { ["num"]=138, ["num_for_nothing"]="VwtU" } - } + }, + ["limit"]=1 }, [181102]={ ["type"]=18, @@ -4330,7 +4340,8 @@ local act_gift = { ["num"]=138, ["num_for_nothing"]="VwtU" } - } + }, + ["limit"]=1 }, [181202]={ ["type"]=18, @@ -4474,7 +4485,8 @@ local act_gift = { ["num"]=138, ["num_for_nothing"]="VwtU" } - } + }, + ["limit"]=1 }, [181302]={ ["type"]=18, @@ -4618,7 +4630,8 @@ local act_gift = { ["num"]=138, ["num_for_nothing"]="VwtU" } - } + }, + ["limit"]=1 }, [190102]={ ["type"]=19, @@ -4648,7 +4661,8 @@ local act_gift = { ["num"]=10, ["num_for_nothing"]="Vwg=" } - } + }, + ["limit"]=1 }, [190202]={ ["type"]=19, @@ -4678,7 +4692,8 @@ local act_gift = { ["num"]=10, ["num_for_nothing"]="Vwg=" } - } + }, + ["limit"]=1 }, [190302]={ ["type"]=19, @@ -4708,7 +4723,8 @@ local act_gift = { ["num"]=24, ["num_for_nothing"]="VAw=" } - } + }, + ["limit"]=1 }, [190402]={ ["type"]=19, @@ -4738,7 +4754,8 @@ local act_gift = { ["num"]=36, ["num_for_nothing"]="VQ4=" } - } + }, + ["limit"]=1 }, [190502]={ ["type"]=19, @@ -4768,7 +4785,8 @@ local act_gift = { ["num"]=96, ["num_for_nothing"]="Xw4=" } - } + }, + ["limit"]=1 }, [190602]={ ["type"]=19, @@ -4798,7 +4816,8 @@ local act_gift = { ["num"]=138, ["num_for_nothing"]="VwtU" } - } + }, + ["limit"]=1 }, [190702]={ ["type"]=19, @@ -4828,7 +4847,8 @@ local act_gift = { ["num"]=138, ["num_for_nothing"]="VwtU" } - } + }, + ["limit"]=1 }, [190802]={ ["type"]=19, @@ -4858,7 +4878,8 @@ local act_gift = { ["num"]=138, ["num_for_nothing"]="VwtU" } - } + }, + ["limit"]=1 }, [190902]={ ["type"]=19, @@ -4888,7 +4909,8 @@ local act_gift = { ["num"]=138, ["num_for_nothing"]="VwtU" } - } + }, + ["limit"]=1 }, [191002]={ ["type"]=19, @@ -4918,7 +4940,8 @@ local act_gift = { ["num"]=138, ["num_for_nothing"]="VwtU" } - } + }, + ["limit"]=1 }, [191102]={ ["type"]=19, @@ -4948,7 +4971,8 @@ local act_gift = { ["num"]=138, ["num_for_nothing"]="VwtU" } - } + }, + ["limit"]=1 }, [191202]={ ["type"]=19, @@ -4978,7 +5002,8 @@ local act_gift = { ["num"]=138, ["num_for_nothing"]="VwtU" } - } + }, + ["limit"]=1 }, [191302]={ ["type"]=19, @@ -5008,7 +5033,8 @@ local act_gift = { ["num"]=138, ["num_for_nothing"]="VwtU" } - } + }, + ["limit"]=1 }, [200102]={ ["type"]=20, diff --git a/lua/app/config/activity_full_moon_quest.lua b/lua/app/config/activity_full_moon_quest.lua index 232e7262..9998a193 100644 --- a/lua/app/config/activity_full_moon_quest.lua +++ b/lua/app/config/activity_full_moon_quest.lua @@ -2,57 +2,145 @@ local activity_full_moon_quest = { [1]={ ["type"]=40, ["number"]=1, - ["open_stage"]=0 + ["open_stage"]=0, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=56, + ["id_for_nothing"]="Uw4=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } }, [2]={ ["type"]=1, ["number"]=10, - ["open_stage"]=0 + ["open_stage"]=0, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=56, + ["id_for_nothing"]="Uw4=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } }, [3]={ ["type"]=5, ["number"]=100, - ["open_stage"]=0 + ["open_stage"]=0, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=56, + ["id_for_nothing"]="Uw4=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } }, [4]={ ["type"]=41, ["number"]=50, - ["open_stage"]=12 + ["open_stage"]=12, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=56, + ["id_for_nothing"]="Uw4=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } }, [5]={ ["type"]=38, ["number"]=10, - ["open_stage"]=8 + ["open_stage"]=8, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=56, + ["id_for_nothing"]="Uw4=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } }, [6]={ ["type"]=39, ["number"]=10, - ["open_stage"]=10 + ["open_stage"]=10, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=56, + ["id_for_nothing"]="Uw4=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } }, [7]={ ["type"]=30, ["number"]=3, - ["open_stage"]=5 + ["open_stage"]=5, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=56, + ["id_for_nothing"]="Uw4=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } }, [8]={ ["type"]=19, ["number"]=30, - ["open_stage"]=0 + ["open_stage"]=0, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=56, + ["id_for_nothing"]="Uw4=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } }, [9]={ ["type"]=12, ["number"]=6, - ["open_stage"]=0 + ["open_stage"]=0, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=56, + ["id_for_nothing"]="Uw4=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } }, [10]={ ["type"]=11, ["number"]=30, - ["open_stage"]=0 + ["open_stage"]=0, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=56, + ["id_for_nothing"]="Uw4=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } }, [11]={ ["type"]=42, ["number"]=10, - ["open_stage"]=12 + ["open_stage"]=12, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=56, + ["id_for_nothing"]="Uw4=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } } } local config = { diff --git a/lua/app/config/activity_full_moon_reward.lua b/lua/app/config/activity_full_moon_reward.lua index 59cee37c..93d22abd 100644 --- a/lua/app/config/activity_full_moon_reward.lua +++ b/lua/app/config/activity_full_moon_reward.lua @@ -114,8 +114,8 @@ local activity_full_moon_reward = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5300101, - ["id_for_nothing"]="UwtcA2RRfg==", + ["id"]=2300201, + ["id_for_nothing"]="VAtcA2dRfg==", ["num"]=1, ["num_for_nothing"]="Vw==" } diff --git a/lua/app/config/avatar_frame.lua b/lua/app/config/avatar_frame.lua index 2e235db8..8cbceaff 100644 --- a/lua/app/config/avatar_frame.lua +++ b/lua/app/config/avatar_frame.lua @@ -15,21 +15,21 @@ local avatar_frame = { }, [26]={ ["iconId"]="avatar_frame_4", - ["item"]=45 + ["item"]=45, + ["unlock_show"]=true }, [27]={ ["iconId"]="avatar_frame_5", - ["item"]=46 + ["item"]=46, + ["unlock_show"]=true }, [28]={ ["iconId"]="avatar_frame_6", - ["item"]=53, - ["unlock_show"]=true + ["item"]=53 }, [29]={ ["iconId"]="avatar_frame_7", - ["item"]=54, - ["unlock_show"]=true + ["item"]=54 } } local config = { diff --git a/lua/app/config/chapter_board_rune.lua b/lua/app/config/chapter_board_rune.lua index b2f98f4d..6c56e489 100644 --- a/lua/app/config/chapter_board_rune.lua +++ b/lua/app/config/chapter_board_rune.lua @@ -3125,7 +3125,7 @@ local chapter_board_rune = { { ["pos"]=16, ["type"]=5, - ["direction"]=4 + ["direction"]=3 } } }, @@ -14430,7 +14430,7 @@ local chapter_board_rune = { }, { 0, - 3 + 1 }, { 0, @@ -14438,7 +14438,7 @@ local chapter_board_rune = { }, { 0, - 5 + 1 }, { 1, @@ -14498,7 +14498,7 @@ local chapter_board_rune = { }, { 0, - 3 + 2 }, { 0, @@ -14514,7 +14514,7 @@ local chapter_board_rune = { }, { 0, - 1 + 2 }, { 1, @@ -14522,7 +14522,7 @@ local chapter_board_rune = { }, { 0, - 3 + 2 }, { 0, @@ -20204,23 +20204,23 @@ local chapter_board_rune = { [74]={ ["board"]={ { - 32, + 31, 0 }, { - 32, + 31, 0 }, { - 32, + 31, 0 }, { - 32, + 31, 0 }, { - 32, + 31, 0 }, { @@ -20232,23 +20232,23 @@ local chapter_board_rune = { 2 }, { - 32, + 31, 0 }, { - 32, + 31, 0 }, { - 32, + 31, 0 }, { - 32, + 31, 0 }, { - 32, + 31, 0 }, { @@ -20260,23 +20260,23 @@ local chapter_board_rune = { 4 }, { - 32, + 31, 0 }, { - 32, + 31, 0 }, { - 32, + 31, 0 }, { - 32, + 31, 0 }, { - 32, + 31, 0 }, { @@ -20288,19 +20288,19 @@ local chapter_board_rune = { 2 }, { - 32, + 31, 0 }, { - 32, + 31, 0 }, { - 32, + 31, 0 }, { - 32, + 31, 0 }, { @@ -20316,15 +20316,15 @@ local chapter_board_rune = { 4 }, { - 32, + 31, 0 }, { - 32, + 31, 0 }, { - 32, + 31, 0 }, { @@ -20344,11 +20344,11 @@ local chapter_board_rune = { 4 }, { - 32, + 31, 0 }, { - 32, + 31, 0 }, { @@ -20372,7 +20372,7 @@ local chapter_board_rune = { 3 }, { - 32, + 31, 0 }, { @@ -21740,7 +21740,7 @@ local chapter_board_rune = { { ["pos"]=17, ["type"]=2, - ["direction"]=4 + ["direction"]=3 }, { ["pos"]=17, @@ -21808,7 +21808,7 @@ local chapter_board_rune = { ["direction"]=2 }, { - ["pos"]=36, + ["pos"]=37, ["type"]=2, ["direction"]=4 }, @@ -23611,7 +23611,7 @@ local chapter_board_rune = { 0 }, { - 0, + 2, 0 }, { @@ -23619,7 +23619,7 @@ local chapter_board_rune = { 0 }, { - 0, + 2, 0 }, { diff --git a/lua/app/config/chapter_dungeon_rune.lua b/lua/app/config/chapter_dungeon_rune.lua index d7648954..7b8bdc0f 100644 --- a/lua/app/config/chapter_dungeon_rune.lua +++ b/lua/app/config/chapter_dungeon_rune.lua @@ -70,8 +70,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=416400000, + ["atk"]=2520000, ["round"]=25, ["requirement"]={ { @@ -109,14 +109,6 @@ local chapter_dungeon_rune = { ["num"]=1000, ["num_for_nothing"]="VwhcAw==" }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - } } }, [2]={ @@ -190,8 +182,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=416400000, + ["atk"]=2520000, ["round"]=25, ["requirement"]={ { @@ -306,8 +298,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=416400000, + ["atk"]=2520000, ["round"]=25, ["requirement"]={ { @@ -426,8 +418,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=416400000, + ["atk"]=2520000, ["round"]=25, ["requirement"]={ { @@ -542,8 +534,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=416400000, + ["atk"]=2520000, ["round"]=25, ["requirement"]={ { @@ -652,8 +644,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=416400000, + ["atk"]=2520000, ["round"]=25, ["requirement"]={ { @@ -757,8 +749,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=416400000, + ["atk"]=2520000, ["round"]=25, ["requirement"]={ { @@ -862,8 +854,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=416400000, + ["atk"]=2520000, ["round"]=25, ["requirement"]={ { @@ -982,8 +974,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=416400000, + ["atk"]=2520000, ["round"]=25, ["requirement"]={ { @@ -1026,8 +1018,8 @@ local chapter_dungeon_rune = { ["monster"]={ 6308 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=3331200000, + ["atk"]=4600000, ["round"]=25, ["first_reward"]={ { @@ -1129,8 +1121,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=521400000, + ["atk"]=3100000, ["round"]=25, ["requirement"]={ { @@ -1245,8 +1237,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=521400000, + ["atk"]=3100000, ["round"]=25, ["requirement"]={ { @@ -1361,8 +1353,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=521400000, + ["atk"]=3100000, ["round"]=25, ["requirement"]={ { @@ -1481,8 +1473,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=521400000, + ["atk"]=3100000, ["round"]=25, ["requirement"]={ { @@ -1601,8 +1593,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=521400000, + ["atk"]=3100000, ["round"]=25, ["requirement"]={ { @@ -1701,8 +1693,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=521400000, + ["atk"]=3100000, ["round"]=25, ["requirement"]={ { @@ -1817,8 +1809,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=521400000, + ["atk"]=3100000, ["round"]=25, ["requirement"]={ { @@ -1922,8 +1914,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=521400000, + ["atk"]=3100000, ["round"]=25, ["requirement"]={ { @@ -2042,8 +2034,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=521400000, + ["atk"]=3100000, ["round"]=25, ["requirement"]={ { @@ -2086,8 +2078,8 @@ local chapter_dungeon_rune = { ["monster"]={ 6408 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=4171200000, + ["atk"]=5670000, ["round"]=25, ["first_reward"]={ { @@ -2189,8 +2181,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=629700000, + ["atk"]=3670000, ["round"]=25, ["requirement"]={ { @@ -2294,8 +2286,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=629700000, + ["atk"]=3670000, ["round"]=25, ["requirement"]={ { @@ -2410,8 +2402,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=629700000, + ["atk"]=3670000, ["round"]=25, ["requirement"]={ { @@ -2521,8 +2513,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=629700000, + ["atk"]=3670000, ["round"]=25, ["requirement"]={ { @@ -2641,8 +2633,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=629700000, + ["atk"]=3670000, ["round"]=25, ["requirement"]={ { @@ -2746,8 +2738,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=629700000, + ["atk"]=3670000, ["round"]=25, ["requirement"]={ { @@ -2862,8 +2854,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=629700000, + ["atk"]=3670000, ["round"]=25, ["requirement"]={ { @@ -2982,8 +2974,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=629700000, + ["atk"]=3670000, ["round"]=25, ["requirement"]={ { @@ -3102,8 +3094,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=629700000, + ["atk"]=3670000, ["round"]=25, ["requirement"]={ { @@ -3115,6 +3107,17 @@ local chapter_dungeon_rune = { 2, 26, 2 + }, + { + 1, + 1, + 50 + } + }, + ["weights"]={ + { + 1, + 300 } }, ["first_reward"]={ @@ -3146,8 +3149,8 @@ local chapter_dungeon_rune = { ["monster"]={ 6508 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=5037600000, + ["atk"]=6710000, ["round"]=25, ["first_reward"]={ { @@ -3249,8 +3252,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=825600000, + ["atk"]=4690000, ["round"]=25, ["requirement"]={ { @@ -3365,8 +3368,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=825600000, + ["atk"]=4690000, ["round"]=25, ["requirement"]={ { @@ -3481,8 +3484,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=825600000, + ["atk"]=4690000, ["round"]=25, ["requirement"]={ { @@ -3494,12 +3497,21 @@ local chapter_dungeon_rune = { 1, 2, 40 + }, + { + 1, + 3, + 40 } }, ["weights"]={ { 2, 300 + }, + { + 3, + 300 } }, ["first_reward"]={ @@ -3592,8 +3604,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=825600000, + ["atk"]=4690000, ["round"]=25, ["requirement"]={ { @@ -3708,8 +3720,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=825600000, + ["atk"]=4690000, ["round"]=25, ["requirement"]={ { @@ -3824,8 +3836,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=825600000, + ["atk"]=4690000, ["round"]=25, ["requirement"]={ { @@ -3940,8 +3952,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=825600000, + ["atk"]=4690000, ["round"]=25, ["requirement"]={ { @@ -3953,12 +3965,21 @@ local chapter_dungeon_rune = { 1, 3, 70 + }, + { + 1, + 1, + 70 } }, ["weights"]={ { 3, 300 + }, + { + 1, + 300 } }, ["first_reward"]={ @@ -4051,24 +4072,24 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=825600000, + ["atk"]=4690000, ["round"]=25, ["requirement"]={ { 2, - 19, + 18, 3 }, { 1, 5, - 45 + 50 }, { 1, 3, - 45 + 50 } }, ["weights"]={ @@ -4171,14 +4192,34 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=825600000, + ["atk"]=4690000, ["round"]=25, ["requirement"]={ { 3, 0, 7 + }, + { + 1, + 4, + 50 + }, + { + 1, + 2, + 50 + } + }, + ["weights"]={ + { + 4, + 300 + }, + { + 2, + 300 } }, ["first_reward"]={ @@ -4210,8 +4251,8 @@ local chapter_dungeon_rune = { ["monster"]={ 6608 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=8704800000, + ["atk"]=10560000, ["round"]=25, ["first_reward"]={ { @@ -4313,8 +4354,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1088100000, + ["atk"]=5780000, ["round"]=25, ["requirement"]={ { @@ -4326,6 +4367,17 @@ local chapter_dungeon_rune = { 2, 13, 4 + }, + { + 1, + 4, + 65 + } + }, + ["weights"]={ + { + 4, + 300 } }, ["first_reward"]={ @@ -4418,8 +4470,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1088100000, + ["atk"]=5780000, ["round"]=25, ["requirement"]={ { @@ -4534,8 +4586,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1088100000, + ["atk"]=5780000, ["round"]=25, ["requirement"]={ { @@ -4558,6 +4610,10 @@ local chapter_dungeon_rune = { { 2, 300 + }, + { + 3, + 300 } }, ["first_reward"]={ @@ -4650,8 +4706,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1088100000, + ["atk"]=5780000, ["round"]=25, ["requirement"]={ { @@ -4667,7 +4723,7 @@ local chapter_dungeon_rune = { { 1, 4, - 40 + 60 } }, ["weights"]={ @@ -4766,14 +4822,34 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1088100000, + ["atk"]=5780000, ["round"]=25, ["requirement"]={ { 3, 0, 7 + }, + { + 1, + 2, + 60 + }, + { + 1, + 1, + 60 + } + }, + ["weights"]={ + { + 2, + 300 + }, + { + 1, + 300 } }, ["first_reward"]={ @@ -4866,8 +4942,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1088100000, + ["atk"]=5780000, ["round"]=25, ["requirement"]={ { @@ -4982,8 +5058,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1088100000, + ["atk"]=5780000, ["round"]=25, ["requirement"]={ { @@ -4995,6 +5071,17 @@ local chapter_dungeon_rune = { 2, 29, 5 + }, + { + 1, + 3, + 50 + } + }, + ["weights"]={ + { + 3, + 300 } }, ["first_reward"]={ @@ -5087,8 +5174,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1088100000, + ["atk"]=5780000, ["round"]=25, ["requirement"]={ { @@ -5111,6 +5198,10 @@ local chapter_dungeon_rune = { { 4, 300 + }, + { + 3, + 300 } }, ["first_reward"]={ @@ -5203,8 +5294,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1088100000, + ["atk"]=5780000, ["round"]=25, ["requirement"]={ { @@ -5216,6 +5307,17 @@ local chapter_dungeon_rune = { 2, 31, 5 + }, + { + 1, + 5, + 70 + } + }, + ["weights"]={ + { + 5, + 300 } }, ["first_reward"]={ @@ -5247,8 +5349,8 @@ local chapter_dungeon_rune = { ["monster"]={ 6708 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=10041600000, + ["atk"]=11770000, ["round"]=25, ["first_reward"]={ { @@ -5350,8 +5452,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1255200000, + ["atk"]=6440000, ["round"]=25, ["requirement"]={ { @@ -5363,6 +5465,17 @@ local chapter_dungeon_rune = { 2, 24, 4 + }, + { + 1, + 3, + 70 + } + }, + ["weights"]={ + { + 3, + 300 } }, ["first_reward"]={ @@ -5455,8 +5568,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1255200000, + ["atk"]=6440000, ["round"]=25, ["requirement"]={ { @@ -5468,6 +5581,17 @@ local chapter_dungeon_rune = { 2, 33, 4 + }, + { + 1, + 4, + 80 + } + }, + ["weights"]={ + { + 4, + 300 } }, ["first_reward"]={ @@ -5560,8 +5684,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1255200000, + ["atk"]=6440000, ["round"]=25, ["requirement"]={ { @@ -5572,7 +5696,7 @@ local chapter_dungeon_rune = { { 2, 23, - 7 + 6 }, { 1, @@ -5676,8 +5800,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1255200000, + ["atk"]=6440000, ["round"]=25, ["requirement"]={ { @@ -5786,8 +5910,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1255200000, + ["atk"]=6440000, ["round"]=25, ["requirement"]={ { @@ -5799,6 +5923,17 @@ local chapter_dungeon_rune = { 2, 26, 4 + }, + { + 1, + 4, + 60 + } + }, + ["weights"]={ + { + 4, + 300 } }, ["first_reward"]={ @@ -5891,8 +6026,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1255200000, + ["atk"]=6440000, ["round"]=25, ["requirement"]={ { @@ -5915,6 +6050,10 @@ local chapter_dungeon_rune = { { 1, 300 + }, + { + 5, + 300 } }, ["first_reward"]={ @@ -6007,8 +6146,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1255200000, + ["atk"]=6440000, ["round"]=25, ["requirement"]={ { @@ -6024,7 +6163,7 @@ local chapter_dungeon_rune = { { 1, 3, - 75 + 85 } }, ["weights"]={ @@ -6123,8 +6262,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1255200000, + ["atk"]=6440000, ["round"]=25, ["requirement"]={ { @@ -6140,7 +6279,7 @@ local chapter_dungeon_rune = { { 1, 1, - 60 + 70 } }, ["weights"]={ @@ -6239,8 +6378,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1255200000, + ["atk"]=6440000, ["round"]=25, ["requirement"]={ { @@ -6252,6 +6391,17 @@ local chapter_dungeon_rune = { 2, 24, 3 + }, + { + 1, + 2, + 60 + } + }, + ["weights"]={ + { + 2, + 300 } }, ["first_reward"]={ @@ -6283,8 +6433,8 @@ local chapter_dungeon_rune = { ["monster"]={ 6808 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=12484800000, + ["atk"]=15240000, ["round"]=25, ["first_reward"]={ { @@ -6386,8 +6536,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1560600000, + ["atk"]=8340000, ["round"]=25, ["requirement"]={ { @@ -6403,7 +6553,7 @@ local chapter_dungeon_rune = { { 1, 5, - 60 + 70 } }, ["weights"]={ @@ -6502,10 +6652,15 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1560600000, + ["atk"]=8340000, ["round"]=25, ["requirement"]={ + { + 3, + 0, + 7 + }, { 2, 34, @@ -6613,8 +6768,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1560600000, + ["atk"]=8340000, ["round"]=25, ["requirement"]={ { @@ -6630,7 +6785,7 @@ local chapter_dungeon_rune = { { 1, 5, - 65 + 75 } }, ["weights"]={ @@ -6729,8 +6884,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1560600000, + ["atk"]=8340000, ["round"]=25, ["requirement"]={ { @@ -6746,7 +6901,7 @@ local chapter_dungeon_rune = { { 1, 3, - 40 + 65 } }, ["weights"]={ @@ -6845,14 +7000,34 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1560600000, + ["atk"]=8340000, ["round"]=25, ["requirement"]={ { 3, 0, 8 + }, + { + 1, + 1, + 65 + }, + { + 1, + 2, + 65 + } + }, + ["weights"]={ + { + 1, + 300 + }, + { + 2, + 300 } }, ["first_reward"]={ @@ -6945,8 +7120,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1560600000, + ["atk"]=8340000, ["round"]=25, ["requirement"]={ { @@ -6962,7 +7137,7 @@ local chapter_dungeon_rune = { { 1, 1, - 50 + 65 } }, ["weights"]={ @@ -7061,8 +7236,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1560600000, + ["atk"]=8340000, ["round"]=25, ["requirement"]={ { @@ -7073,13 +7248,22 @@ local chapter_dungeon_rune = { { 1, 2, - 100 + 85 + }, + { + 1, + 3, + 85 } }, ["weights"]={ { 2, 300 + }, + { + 3, + 300 } }, ["first_reward"]={ @@ -7172,8 +7356,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1560600000, + ["atk"]=8340000, ["round"]=25, ["requirement"]={ { @@ -7185,6 +7369,17 @@ local chapter_dungeon_rune = { 2, 31, 5 + }, + { + 1, + 4, + 85 + } + }, + ["weights"]={ + { + 4, + 300 } }, ["first_reward"]={ @@ -7277,8 +7472,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1560600000, + ["atk"]=8340000, ["round"]=25, ["requirement"]={ { @@ -7294,7 +7489,7 @@ local chapter_dungeon_rune = { { 1, 2, - 70 + 80 } }, ["weights"]={ @@ -7332,8 +7527,8 @@ local chapter_dungeon_rune = { ["monster"]={ 6908 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=15681600000, + ["atk"]=19440000, ["round"]=25, ["first_reward"]={ { @@ -7435,8 +7630,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1960200000, + ["atk"]=10630000, ["round"]=25, ["requirement"]={ { @@ -7447,7 +7642,7 @@ local chapter_dungeon_rune = { { 1, 3, - 80 + 60 }, { 1, @@ -7463,6 +7658,10 @@ local chapter_dungeon_rune = { { 4, 300 + }, + { + 5, + 300 } }, ["first_reward"]={ @@ -7555,8 +7754,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1960200000, + ["atk"]=10630000, ["round"]=25, ["requirement"]={ { @@ -7572,7 +7771,7 @@ local chapter_dungeon_rune = { { 1, 2, - 50 + 70 } }, ["weights"]={ @@ -7671,8 +7870,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1960200000, + ["atk"]=10630000, ["round"]=25, ["requirement"]={ { @@ -7683,13 +7882,22 @@ local chapter_dungeon_rune = { { 1, 3, - 100 + 70 + }, + { + 1, + 4, + 70 } }, ["weights"]={ { 3, 300 + }, + { + 4, + 300 } }, ["first_reward"]={ @@ -7782,8 +7990,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1960200000, + ["atk"]=10630000, ["round"]=25, ["requirement"]={ { @@ -7795,6 +8003,17 @@ local chapter_dungeon_rune = { 2, 31, 25 + }, + { + 1, + 1, + 70 + } + }, + ["weights"]={ + { + 1, + 300 } }, ["first_reward"]={ @@ -7887,8 +8106,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1960200000, + ["atk"]=10630000, ["round"]=25, ["requirement"]={ { @@ -7900,6 +8119,17 @@ local chapter_dungeon_rune = { 2, 34, 10 + }, + { + 1, + 1, + 70 + } + }, + ["weights"]={ + { + 1, + 300 } }, ["first_reward"]={ @@ -7992,24 +8222,24 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1960200000, + ["atk"]=10630000, ["round"]=25, ["requirement"]={ { 1, 1, - 70 + 65 }, { 1, 3, - 70 + 65 }, { 1, 4, - 70 + 65 } }, ["weights"]={ @@ -8116,8 +8346,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1960200000, + ["atk"]=10630000, ["round"]=25, ["requirement"]={ { @@ -8129,6 +8359,17 @@ local chapter_dungeon_rune = { 2, 22, 3 + }, + { + 1, + 5, + 65 + } + }, + ["weights"]={ + { + 5, + 300 } }, ["first_reward"]={ @@ -8221,8 +8462,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1960200000, + ["atk"]=10630000, ["round"]=25, ["requirement"]={ { @@ -8337,8 +8578,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=1960200000, + ["atk"]=10630000, ["round"]=25, ["requirement"]={ { @@ -8349,12 +8590,12 @@ local chapter_dungeon_rune = { { 1, 5, - 110 + 60 }, { 1, 4, - 110 + 60 } }, ["weights"]={ @@ -8396,8 +8637,8 @@ local chapter_dungeon_rune = { ["monster"]={ 7008 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=19120800000, + ["atk"]=22640000, ["round"]=25, ["first_reward"]={ { @@ -8499,8 +8740,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=2390100000, + ["atk"]=12390000, ["round"]=25, ["requirement"]={ { @@ -8512,6 +8753,17 @@ local chapter_dungeon_rune = { 2, 24, 6 + }, + { + 1, + 3, + 65 + } + }, + ["weights"]={ + { + 3, + 300 } }, ["first_reward"]={ @@ -8604,8 +8856,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=2390100000, + ["atk"]=12390000, ["round"]=25, ["requirement"]={ { @@ -8616,12 +8868,12 @@ local chapter_dungeon_rune = { { 1, 1, - 65 + 75 }, { 1, 2, - 65 + 75 } }, ["weights"]={ @@ -8724,8 +8976,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=2390100000, + ["atk"]=12390000, ["round"]=25, ["requirement"]={ { @@ -8834,8 +9086,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=2390100000, + ["atk"]=12390000, ["round"]=25, ["requirement"]={ { @@ -8846,12 +9098,12 @@ local chapter_dungeon_rune = { { 1, 1, - 80 + 70 }, { 1, 2, - 80 + 70 } }, ["weights"]={ @@ -8954,8 +9206,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=2390100000, + ["atk"]=12390000, ["round"]=25, ["requirement"]={ { @@ -9070,8 +9322,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=2390100000, + ["atk"]=12390000, ["round"]=25, ["requirement"]={ { @@ -9087,7 +9339,7 @@ local chapter_dungeon_rune = { { 1, 3, - 80 + 90 } }, ["weights"]={ @@ -9186,8 +9438,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=2390100000, + ["atk"]=12390000, ["round"]=25, ["requirement"]={ { @@ -9203,7 +9455,7 @@ local chapter_dungeon_rune = { { 1, 1, - 40 + 60 } }, ["weights"]={ @@ -9302,14 +9554,14 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=2390100000, + ["atk"]=12390000, ["round"]=25, ["requirement"]={ { 3, 0, - 5 + 8 }, { 2, @@ -9319,7 +9571,7 @@ local chapter_dungeon_rune = { { 1, 1, - 55 + 75 } }, ["weights"]={ @@ -9418,8 +9670,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=2390100000, + ["atk"]=12390000, ["round"]=25, ["requirement"]={ { @@ -9430,12 +9682,12 @@ local chapter_dungeon_rune = { { 1, 5, - 70 + 65 }, { 1, 4, - 80 + 65 } }, ["weights"]={ @@ -9477,8 +9729,8 @@ local chapter_dungeon_rune = { ["monster"]={ 7108 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=21117600000, + ["atk"]=24530000, ["round"]=25, ["first_reward"]={ { @@ -9580,8 +9832,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=2639700000, + ["atk"]=13420000, ["round"]=25, ["requirement"]={ { @@ -9597,7 +9849,7 @@ local chapter_dungeon_rune = { { 1, 3, - 70 + 80 } }, ["weights"]={ @@ -9696,27 +9948,31 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=2639700000, + ["atk"]=13420000, ["round"]=25, ["requirement"]={ { 1, 1, - 64 + 40 }, { 1, 3, - 64 + 40 }, { 1, 2, - 64 + 40 } }, ["weights"]={ + { + 1, + 300 + }, { 2, 300 @@ -9816,8 +10072,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=2639700000, + ["atk"]=13420000, ["round"]=25, ["requirement"]={ { @@ -9833,7 +10089,7 @@ local chapter_dungeon_rune = { { 1, 5, - 55 + 70 } }, ["weights"]={ @@ -9932,14 +10188,14 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=2639700000, + ["atk"]=13420000, ["round"]=25, ["requirement"]={ { 2, 24, - 5 + 4 }, { 1, @@ -10052,8 +10308,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=2639700000, + ["atk"]=13420000, ["round"]=25, ["requirement"]={ { @@ -10069,7 +10325,7 @@ local chapter_dungeon_rune = { { 1, 1, - 60 + 80 } }, ["weights"]={ @@ -10168,8 +10424,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=2639700000, + ["atk"]=13420000, ["round"]=25, ["requirement"]={ { @@ -10180,12 +10436,12 @@ local chapter_dungeon_rune = { { 1, 5, - 55 + 65 }, { 1, 3, - 55 + 65 } }, ["weights"]={ @@ -10288,8 +10544,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=2639700000, + ["atk"]=13420000, ["round"]=25, ["requirement"]={ { @@ -10305,7 +10561,7 @@ local chapter_dungeon_rune = { { 1, 4, - 55 + 85 } }, ["weights"]={ @@ -10404,8 +10660,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=2639700000, + ["atk"]=13420000, ["round"]=25, ["requirement"]={ { @@ -10421,7 +10677,7 @@ local chapter_dungeon_rune = { { 1, 2, - 50 + 65 } }, ["weights"]={ @@ -10520,8 +10776,8 @@ local chapter_dungeon_rune = { 6108, 6208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=2639700000, + ["atk"]=13420000, ["round"]=25, ["requirement"]={ { @@ -10537,7 +10793,7 @@ local chapter_dungeon_rune = { { 1, 3, - 60 + 75 } }, ["weights"]={ @@ -10575,8 +10831,8 @@ local chapter_dungeon_rune = { ["monster"]={ 7208 }, - ["hp"]=2000000, - ["atk"]=10000, + ["hp"]=30405600000, + ["atk"]=32340000, ["round"]=25, ["first_reward"]={ { diff --git a/lua/app/config/chapter_new_skin_fight.lua b/lua/app/config/chapter_new_skin_fight.lua new file mode 100644 index 00000000..826c946a --- /dev/null +++ b/lua/app/config/chapter_new_skin_fight.lua @@ -0,0 +1,48 @@ +local chapter_new_skin_fight = { + [1]={ + ["board"]={ + 5 + }, + ["scene"]="bg_debris", + ["block_icon"]="battle_hinder_debris", + ["chess_board"]="chessboard_2", + ["monster"]={ + 10004 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + } + }, + [2]={ + ["board"]={ + 12 + }, + ["scene"]="bg_debris", + ["block_icon"]="battle_hinder_debris", + ["chess_board"]="chessboard_2", + ["monster"]={ + 10104 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + } + } +} +local config = { +data=chapter_new_skin_fight,count=2 +} +return config \ No newline at end of file diff --git a/lua/app/config/chapter_new_skin_fight.lua.meta b/lua/app/config/chapter_new_skin_fight.lua.meta new file mode 100644 index 00000000..b4685ffb --- /dev/null +++ b/lua/app/config/chapter_new_skin_fight.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a1aa547b9a9ed53469674937286789c6 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index af101080..99cbd95c 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -441,6 +441,9 @@ local const = { ["num_for_nothing"]="Uw==" } }, + ["runes_red_point"]={ + ["value"]=1000 + }, ["dungeon_rune_lvlimit"]={ ["value"]=20 }, @@ -523,6 +526,6 @@ local const = { } } local config = { -data=const,count=104 +data=const,count=105 } return config \ No newline at end of file diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index 1e7d4949..221bc2b8 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -1585,6 +1585,11 @@ local item = { ["qlt"]=4, ["icon"]="55" }, + [56]={ + ["type"]=1, + ["qlt"]=4, + ["icon"]="56" + }, [1001]={ ["type"]=2, ["qlt"]=1, @@ -2449,6 +2454,6 @@ local item = { } } local config = { -data=item,count=125 +data=item,count=126 } 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 ff57bd4f..9abb1a47 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -556,6 +556,8 @@ local LocalizationGlobalConst = RUNES_DESC_26 = "RUNES_DESC_26", RUNES_DESC_27 = "RUNES_DESC_27", RUNES_DESC_28 = "RUNES_DESC_28", + RUNES_DESC_29 = "RUNES_DESC_29", + RUNES_DESC_30 = "RUNES_DESC_30", DUNGEON_RUNE_DESC_1 = "DUNGEON_RUNE_DESC_1", DUNGEON_RUNE_DESC_2 = "DUNGEON_RUNE_DESC_2", DUNGEON_RUNE_DESC_3 = "DUNGEON_RUNE_DESC_3", @@ -567,6 +569,36 @@ local LocalizationGlobalConst = DUNGEON_RUNE_DESC_9 = "DUNGEON_RUNE_DESC_9", DUNGEON_RUNE_DESC_10 = "DUNGEON_RUNE_DESC_10", DUNGEON_RUNE_DESC_11 = "DUNGEON_RUNE_DESC_11", + ACTIVITY_MOON_DESC_1 = "ACTIVITY_MOON_DESC_1", + ACTIVITY_MOON_DESC_2 = "ACTIVITY_MOON_DESC_2", + ACTIVITY_MOON_DESC_3 = "ACTIVITY_MOON_DESC_3", + ACTIVITY_MOON_DESC_4 = "ACTIVITY_MOON_DESC_4", + ACTIVITY_MOON_DESC_5 = "ACTIVITY_MOON_DESC_5", + ACTIVITY_MOON_DESC_6 = "ACTIVITY_MOON_DESC_6", + ACTIVITY_MOON_DESC_7 = "ACTIVITY_MOON_DESC_7", + ACTIVITY_MOON_DESC_8 = "ACTIVITY_MOON_DESC_8", + ACTIVITY_MOON_DESC_9 = "ACTIVITY_MOON_DESC_9", + ACTIVITY_MOON_DESC_10 = "ACTIVITY_MOON_DESC_10", + ACTIVITY_MOON_DESC_11 = "ACTIVITY_MOON_DESC_11", + SEIZED_DESC_4 = "SEIZED_DESC_4", + ACT_PVP_DESC_1 = "ACT_PVP_DESC_1", + ACT_PVP_DESC_2 = "ACT_PVP_DESC_2", + ACT_PVP_DESC_3 = "ACT_PVP_DESC_3", + ACT_PVP_DESC_4 = "ACT_PVP_DESC_4", + ACT_PVP_DESC_5 = "ACT_PVP_DESC_5", + ACT_PVP_DESC_6 = "ACT_PVP_DESC_6", + ACT_PVP_DESC_7 = "ACT_PVP_DESC_7", + ACT_PVP_DESC_8 = "ACT_PVP_DESC_8", + ACT_PVP_DESC_9 = "ACT_PVP_DESC_9", + ACT_PVP_DESC_10 = "ACT_PVP_DESC_10", + ACT_PVP_DESC_11 = "ACT_PVP_DESC_11", + ACT_PVP_DESC_12 = "ACT_PVP_DESC_12", + ACT_PVP_DESC_13 = "ACT_PVP_DESC_13", + ACT_PVP_DESC_14 = "ACT_PVP_DESC_14", + ACT_PVP_DESC_15 = "ACT_PVP_DESC_15", + ACT_PVP_DESC_16 = "ACT_PVP_DESC_16", + ACT_PVP_DESC_17 = "ACT_PVP_DESC_17", + ACT_PVP_DESC_18 = "ACT_PVP_DESC_18", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/monster_activity.lua b/lua/app/config/monster_activity.lua index b94fef9f..66e9c286 100644 --- a/lua/app/config/monster_activity.lua +++ b/lua/app/config/monster_activity.lua @@ -769,9 +769,52 @@ local monster_activity = { 10009 }, ["monster_exp"]=15000 + }, + [10004]={ + ["monster_base"]=20047, + ["is_boss"]=1, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30156, + 30157, + 30158 + }, + ["skill"]={ + 10137, + 10138 + }, + ["passive_skill"]={ + 10013, + 10010 + }, + ["monster_exp"]=15000 + }, + [10104]={ + ["monster_base"]=20048, + ["is_boss"]=1, + ["hp"]=107230000, + ["atk"]=930000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30159, + 30160, + 30161 + }, + ["skill"]={ + 10139, + 10140 + }, + ["passive_skill"]={ + 10141, + 10014, + 10009 + }, + ["monster_exp"]=15000 } } local config = { -data=monster_activity,count=42 +data=monster_activity,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/monster_base.lua b/lua/app/config/monster_base.lua index 623b5f2e..a325b36f 100644 --- a/lua/app/config/monster_base.lua +++ b/lua/app/config/monster_base.lua @@ -620,34 +620,54 @@ local monster_base = { ["model_ui"]=1.0 }, [20049]={ - + ["model_id"]="m20049", + ["body"]=1, + ["model_ui"]=1.0 }, [20050]={ - + ["model_id"]="m20051", + ["body"]=1, + ["model_ui"]=1.0 }, [20051]={ - + ["model_id"]="m20053", + ["body"]=1, + ["model_ui"]=1.0 }, [20052]={ - + ["model_id"]="m20052", + ["body"]=1, + ["model_ui"]=1.0 }, [20053]={ - + ["model_id"]="m20056", + ["body"]=1, + ["model_ui"]=1.0 }, [20054]={ - + ["model_id"]="m20057", + ["body"]=1, + ["model_ui"]=1.0 }, [20055]={ - + ["model_id"]="m20058", + ["body"]=1, + ["model_ui"]=1.0 }, [20056]={ - + ["model_id"]="m20054", + ["body"]=1, + ["model_ui"]=1.0 }, [20057]={ - + ["model_id"]="m20055", + ["body"]=1, + ["model_ui"]=1.0 }, [20058]={ - + ["model_id"]="m20050", + ["body"]=1, + ["model_ui"]=1.0 }, [30001]={ ["model_id"]="p0001", diff --git a/lua/app/config/monster_dungeon_rune.lua b/lua/app/config/monster_dungeon_rune.lua index 151cd5c8..0e8baa13 100644 --- a/lua/app/config/monster_dungeon_rune.lua +++ b/lua/app/config/monster_dungeon_rune.lua @@ -807,7 +807,7 @@ local monster_dungeon_rune = { }, [6308]={ ["none"]="深潜者", - ["monster_base"]=20001, + ["monster_base"]=20049, ["hp"]=1463200000, ["atk"]=1000000, ["atk_times"]=4, @@ -826,7 +826,7 @@ local monster_dungeon_rune = { }, [6408]={ ["none"]="黑山羊幼崽", - ["monster_base"]=20002, + ["monster_base"]=20050, ["hp"]=1463200000, ["atk"]=1000000, ["atk_times"]=4, @@ -845,7 +845,7 @@ local monster_dungeon_rune = { }, [6508]={ ["none"]="莎布·尼古拉斯", - ["monster_base"]=20003, + ["monster_base"]=20051, ["hp"]=1463200000, ["atk"]=1000000, ["atk_times"]=4, @@ -862,7 +862,7 @@ local monster_dungeon_rune = { }, [6608]={ ["none"]="奈亚拉托提普", - ["monster_base"]=20004, + ["monster_base"]=20052, ["hp"]=1463200000, ["atk"]=1000000, ["atk_times"]=0, @@ -881,7 +881,7 @@ local monster_dungeon_rune = { }, [6708]={ ["none"]="神秘的兄弟神", - ["monster_base"]=20005, + ["monster_base"]=20053, ["hp"]=1463200000, ["atk"]=1000000, ["atk_times"]=4, @@ -900,7 +900,7 @@ local monster_dungeon_rune = { }, [6808]={ ["none"]="兰·提戈斯", - ["monster_base"]=20006, + ["monster_base"]=20054, ["hp"]=1463200000, ["atk"]=1000000, ["atk_times"]=4, @@ -920,7 +920,7 @@ local monster_dungeon_rune = { }, [6908]={ ["none"]="克希拉", - ["monster_base"]=20007, + ["monster_base"]=20055, ["hp"]=1463200000, ["atk"]=1000000, ["atk_times"]=0, @@ -946,7 +946,7 @@ local monster_dungeon_rune = { }, [7008]={ ["none"]="依德·雅", - ["monster_base"]=20008, + ["monster_base"]=20056, ["hp"]=1463200000, ["atk"]=1000000, ["atk_times"]=4, @@ -968,7 +968,7 @@ local monster_dungeon_rune = { }, [7108]={ ["none"]="旧日支配者", - ["monster_base"]=20009, + ["monster_base"]=20057, ["hp"]=1463200000, ["atk"]=1000000, ["atk_times"]=0, @@ -989,7 +989,7 @@ local monster_dungeon_rune = { }, [7208]={ ["none"]="阿撒托斯", - ["monster_base"]=20010, + ["monster_base"]=20058, ["hp"]=1463200000, ["atk"]=1000000, ["atk_times"]=4, diff --git a/lua/app/config/runes_sub.lua b/lua/app/config/runes_sub.lua index 007ab4c6..5a11bd60 100644 --- a/lua/app/config/runes_sub.lua +++ b/lua/app/config/runes_sub.lua @@ -247,45 +247,45 @@ local runes_sub = { ["attr_1"]={ { ["type"]="atk_red", - ["num"]=1200000 + ["num"]=1000000 }, { ["type"]="atk_yellow", - ["num"]=1200000 + ["num"]=1000000 }, { ["type"]="atk_green", - ["num"]=1200000 + ["num"]=1000000 }, { ["type"]="atk_blue", - ["num"]=1200000 + ["num"]=1000000 }, { ["type"]="atk_purple", - ["num"]=1200000 + ["num"]=1000000 } }, ["attr_2"]={ { ["type"]="attr_hp_red", - ["num"]=1800000 + ["num"]=1500000 }, { ["type"]="attr_hp_yellow", - ["num"]=1800000 + ["num"]=1500000 }, { ["type"]="attr_hp_green", - ["num"]=1800000 + ["num"]=1500000 }, { ["type"]="attr_hp_blue", - ["num"]=1800000 + ["num"]=1500000 }, { ["type"]="attr_hp_purple", - ["num"]=1800000 + ["num"]=1500000 } }, ["attr_3"]={ @@ -491,45 +491,45 @@ local runes_sub = { ["attr_1"]={ { ["type"]="atk_red", - ["num"]=1800000 + ["num"]=1500000 }, { ["type"]="atk_yellow", - ["num"]=1800000 + ["num"]=1500000 }, { ["type"]="atk_green", - ["num"]=1800000 + ["num"]=1500000 }, { ["type"]="atk_blue", - ["num"]=1800000 + ["num"]=1500000 }, { ["type"]="atk_purple", - ["num"]=1800000 + ["num"]=1500000 } }, ["attr_2"]={ { ["type"]="attr_hp_red", - ["num"]=2700000 + ["num"]=2250000 }, { ["type"]="attr_hp_yellow", - ["num"]=2700000 + ["num"]=2250000 }, { ["type"]="attr_hp_green", - ["num"]=2700000 + ["num"]=2250000 }, { ["type"]="attr_hp_blue", - ["num"]=2700000 + ["num"]=2250000 }, { ["type"]="attr_hp_purple", - ["num"]=2700000 + ["num"]=2250000 } }, ["attr_3"]={ @@ -735,45 +735,45 @@ local runes_sub = { ["attr_1"]={ { ["type"]="atk_red", - ["num"]=2400000 + ["num"]=1800000 }, { ["type"]="atk_yellow", - ["num"]=2400000 + ["num"]=1800000 }, { ["type"]="atk_green", - ["num"]=2400000 + ["num"]=1800000 }, { ["type"]="atk_blue", - ["num"]=2400000 + ["num"]=1800000 }, { ["type"]="atk_purple", - ["num"]=2400000 + ["num"]=1800000 } }, ["attr_2"]={ { ["type"]="attr_hp_red", - ["num"]=3600000 + ["num"]=2700000 }, { ["type"]="attr_hp_yellow", - ["num"]=3600000 + ["num"]=2700000 }, { ["type"]="attr_hp_green", - ["num"]=3600000 + ["num"]=2700000 }, { ["type"]="attr_hp_blue", - ["num"]=3600000 + ["num"]=2700000 }, { ["type"]="attr_hp_purple", - ["num"]=3600000 + ["num"]=2700000 } }, ["attr_3"]={ @@ -979,45 +979,45 @@ local runes_sub = { ["attr_1"]={ { ["type"]="atk_red", - ["num"]=3600000 + ["num"]=2400000 }, { ["type"]="atk_yellow", - ["num"]=3600000 + ["num"]=2400000 }, { ["type"]="atk_green", - ["num"]=3600000 + ["num"]=2400000 }, { ["type"]="atk_blue", - ["num"]=3600000 + ["num"]=2400000 }, { ["type"]="atk_purple", - ["num"]=3600000 + ["num"]=2400000 } }, ["attr_2"]={ { ["type"]="attr_hp_red", - ["num"]=5400000 + ["num"]=3600000 }, { ["type"]="attr_hp_yellow", - ["num"]=5400000 + ["num"]=3600000 }, { ["type"]="attr_hp_green", - ["num"]=5400000 + ["num"]=3600000 }, { ["type"]="attr_hp_blue", - ["num"]=5400000 + ["num"]=3600000 }, { ["type"]="attr_hp_purple", - ["num"]=5400000 + ["num"]=3600000 } }, ["attr_3"]={ @@ -1223,45 +1223,45 @@ local runes_sub = { ["attr_1"]={ { ["type"]="atk_red", - ["num"]=5400000 + ["num"]=3200000 }, { ["type"]="atk_yellow", - ["num"]=5400000 + ["num"]=3200000 }, { ["type"]="atk_green", - ["num"]=5400000 + ["num"]=3200000 }, { ["type"]="atk_blue", - ["num"]=5400000 + ["num"]=3200000 }, { ["type"]="atk_purple", - ["num"]=5400000 + ["num"]=3200000 } }, ["attr_2"]={ { ["type"]="attr_hp_red", - ["num"]=8100000 + ["num"]=4800000 }, { ["type"]="attr_hp_yellow", - ["num"]=8100000 + ["num"]=4800000 }, { ["type"]="attr_hp_green", - ["num"]=8100000 + ["num"]=4800000 }, { ["type"]="attr_hp_blue", - ["num"]=8100000 + ["num"]=4800000 }, { ["type"]="attr_hp_purple", - ["num"]=8100000 + ["num"]=4800000 } }, ["attr_3"]={ @@ -1467,45 +1467,45 @@ local runes_sub = { ["attr_1"]={ { ["type"]="atk_red", - ["num"]=9000000 + ["num"]=6000000 }, { ["type"]="atk_yellow", - ["num"]=9000000 + ["num"]=6000000 }, { ["type"]="atk_green", - ["num"]=9000000 + ["num"]=6000000 }, { ["type"]="atk_blue", - ["num"]=9000000 + ["num"]=6000000 }, { ["type"]="atk_purple", - ["num"]=9000000 + ["num"]=6000000 } }, ["attr_2"]={ { ["type"]="attr_hp_red", - ["num"]=13500000 + ["num"]=9000000 }, { ["type"]="attr_hp_yellow", - ["num"]=13500000 + ["num"]=9000000 }, { ["type"]="attr_hp_green", - ["num"]=13500000 + ["num"]=9000000 }, { ["type"]="attr_hp_blue", - ["num"]=13500000 + ["num"]=9000000 }, { ["type"]="attr_hp_purple", - ["num"]=13500000 + ["num"]=9000000 } }, ["attr_3"]={ @@ -1711,45 +1711,45 @@ local runes_sub = { ["attr_1"]={ { ["type"]="atk_red", - ["num"]=12000000 + ["num"]=9000000 }, { ["type"]="atk_yellow", - ["num"]=12000000 + ["num"]=9000000 }, { ["type"]="atk_green", - ["num"]=12000000 + ["num"]=9000000 }, { ["type"]="atk_blue", - ["num"]=12000000 + ["num"]=9000000 }, { ["type"]="atk_purple", - ["num"]=12000000 + ["num"]=9000000 } }, ["attr_2"]={ { ["type"]="attr_hp_red", - ["num"]=18000000 + ["num"]=13500000 }, { ["type"]="attr_hp_yellow", - ["num"]=18000000 + ["num"]=13500000 }, { ["type"]="attr_hp_green", - ["num"]=18000000 + ["num"]=13500000 }, { ["type"]="attr_hp_blue", - ["num"]=18000000 + ["num"]=13500000 }, { ["type"]="attr_hp_purple", - ["num"]=18000000 + ["num"]=13500000 } }, ["attr_3"]={ diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 016b77fe..ddf32dc8 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -1766,7 +1766,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 53001202 + 1400410 }, ["name_act"]="attack01", ["fx_self"]=300151, @@ -1792,7 +1792,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 13001201 + 1400411 }, ["name_act"]="attack02", ["fx_self"]=300152, @@ -1818,7 +1818,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=4, ["sound_hit"]={ - 5200113 + 1400410 }, ["name_act"]="attack03", ["fx_self"]=300152, @@ -1844,7 +1844,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1400411 }, ["name_act"]="attack04", ["fx_self"]=300152, @@ -1892,10 +1892,15 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=6, - ["sound"]=14003201, + ["sound"]=1400420, ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300153, + ["bullet_time"]={ + 2033, + 3000, + 400 + }, ["fx_self_mirror"]=400153 }, [1400421]={ @@ -2038,10 +2043,15 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=6, - ["sound"]=14003201, + ["sound"]=1400420, ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300153, + ["bullet_time"]={ + 2033, + 3000, + 400 + }, ["fx_self_mirror"]=400153 }, [2200110]={ @@ -2524,6 +2534,9 @@ local skill = { ["fx_self_mirror"]=400014 }, [2300123]={ + ["buff_id"]={ + "stun" + }, ["position"]=2, ["buff_condition"]={ { @@ -3680,9 +3693,8 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound_hit"]={ - 1000001 - }, + ["sound"]=2400410, + ["sound_delay"]=0.0, ["name_act"]="attack01", ["fx_self"]=300156, ["fx_self_mirror"]=400156 @@ -3706,9 +3718,8 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound_hit"]={ - 1000002 - }, + ["sound"]=2400411, + ["sound_delay"]=0.0, ["name_act"]="attack02", ["fx_self"]=300156, ["fx_self_mirror"]=400156 @@ -3732,9 +3743,8 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound_hit"]={ - 1000004 - }, + ["sound"]=2400412, + ["sound_delay"]=0.0, ["name_act"]="attack03", ["fx_self"]=300156, ["fx_self_mirror"]=400156 @@ -3758,9 +3768,8 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound_hit"]={ - 1000021 - }, + ["sound"]=2400413, + ["sound_delay"]=0.0, ["name_act"]="attack04", ["fx_self"]=300156, ["fx_self_mirror"]=400156 @@ -3832,10 +3841,15 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=6, - ["sound"]=2400311, + ["sound"]=2400420, ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300157, + ["bullet_time"]={ + 2866, + 3000, + 400 + }, ["fx_self_mirror"]=400157 }, [2400421]={ @@ -3880,16 +3894,16 @@ local skill = { } }, ["effect_type"]=2, - ["trigger"]=9, + ["trigger"]=5, ["effect"]={ { - ["type"]="atkp_color_add", - ["num"]=1000, + ["type"]="hurt_yellow", + ["num"]=5000, ["ratio"]=10000, - ["round"]=999 + ["round"]=0 } }, - ["obj"]=1 + ["obj"]=2 }, [2400423]={ ["position"]=2, @@ -5628,7 +5642,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2200111 + 3400410 }, ["name_act"]="attack01", ["fx_self"]=300158, @@ -5654,7 +5668,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2200114 + 3400411 }, ["name_act"]="attack02", ["fx_self"]=300158, @@ -5680,7 +5694,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 3400311 + 3400412 }, ["name_act"]="attack03", ["fx_self"]=300158, @@ -5706,7 +5720,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2200112 + 3400410 }, ["name_act"]="attack04", ["fx_self"]=300158, @@ -5749,10 +5763,15 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=5, - ["sound"]=3400321, + ["sound"]=3400420, ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300159, + ["bullet_time"]={ + 3966, + 3000, + 400 + }, ["fx_self_mirror"]=400159 }, [3400421]={ @@ -7352,9 +7371,8 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound_hit"]={ - 54001203 - }, + ["sound"]=4400411, + ["sound_delay"]=0.0, ["name_act"]="attack01", ["fx_self"]=300154, ["fx_self_mirror"]=400154 @@ -7379,7 +7397,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 13001202 + 4400412 }, ["name_act"]="attack02", ["fx_self"]=300154, @@ -7404,9 +7422,8 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound_hit"]={ - 3300114 - }, + ["sound"]=4400411, + ["sound_delay"]=0.0, ["name_act"]="attack03", ["fx_self"]=300154, ["fx_self_mirror"]=400154 @@ -7431,13 +7448,16 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 4400311 + 4400412 }, ["name_act"]="attack04", ["fx_self"]=300154, ["fx_self_mirror"]=400154 }, [4400420]={ + ["buff_id"]={ + "normal_attack_dec" + }, ["energy"]=10, ["link"]=1, ["position"]=4, @@ -7487,10 +7507,15 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=6, - ["sound"]=4400314, + ["sound"]=4400420, ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300155, + ["bullet_time"]={ + 1866, + 3000, + 400 + }, ["fx_self_mirror"]=400155 }, [4400421]={ @@ -7513,9 +7538,9 @@ local skill = { ["trigger"]=6, ["effect"]={ { - ["type"]="normal_attack_dec", - ["num"]=1, - ["ratio"]=1000, + ["type"]="weaken", + ["num"]=2500, + ["ratio"]=10000, ["round"]=2 } }, @@ -9123,9 +9148,8 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=2, - ["sound_hit"]={ - 5400311 - }, + ["sound"]=5400410, + ["sound_delay"]=0.0, ["name_act"]="attack01", ["fx_self"]=300160, ["fx_self_mirror"]=400160 @@ -9149,9 +9173,8 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=2, - ["sound_hit"]={ - 5400312 - }, + ["sound"]=5400411, + ["sound_delay"]=0.0, ["name_act"]="attack02", ["fx_self"]=300161, ["fx_self_mirror"]=400161 @@ -9175,9 +9198,8 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound_hit"]={ - 5400313 - }, + ["sound"]=5400412, + ["sound_delay"]=0.0, ["name_act"]="attack03", ["fx_self"]=300162, ["fx_self_mirror"]=400162 @@ -9201,9 +9223,8 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=2, - ["sound_hit"]={ - 5400314 - }, + ["sound"]=5400413, + ["sound_delay"]=0.0, ["name_act"]="attack04", ["fx_self"]=300163, ["fx_self_mirror"]=400163 @@ -9238,10 +9259,15 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=6, - ["sound"]=5400315, + ["sound"]=5400420, ["sound_delay"]=0.0, ["name_act"]="skill01", ["fx_self"]=300164, + ["bullet_time"]={ + 1666, + 3000, + 400 + }, ["fx_self_mirror"]=400164 }, [5400421]={ @@ -23895,16 +23921,15 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ 1000011 }, - ["name_act"]="attack01", - ["fx_self"]=200096 + ["name_act"]="attack01" }, [30166]={ ["effect_type"]=1, @@ -23919,16 +23944,15 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ 1000012 }, - ["name_act"]="attack02", - ["fx_self"]=200097 + ["name_act"]="attack02" }, [30167]={ ["effect_type"]=1, @@ -23943,16 +23967,15 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ 1000013 }, - ["name_act"]="attack03", - ["fx_self"]=200098 + ["name_act"]="attack03" }, [30168]={ ["buff_condition"]={ @@ -24021,6 +24044,18 @@ local skill = { ["effect_type"]=1, ["trigger"]=1, ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=15000, + ["ratio"]=10000, + ["round"]=0 + }, { ["type"]="hurt", ["num"]=20000, @@ -24035,6 +24070,11 @@ local skill = { } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 4 + }, ["skill_position"]={ 2, 0 @@ -24046,8 +24086,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill01" }, [30170]={ ["effect_type"]=1, @@ -24074,16 +24113,15 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ 1000011 }, - ["name_act"]="attack01", - ["fx_self"]=200096 + ["name_act"]="attack01" }, [30171]={ ["effect_type"]=1, @@ -24110,16 +24148,15 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ 1000012 }, - ["name_act"]="attack02", - ["fx_self"]=200097 + ["name_act"]="attack02" }, [30172]={ ["effect_type"]=1, @@ -24146,16 +24183,15 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ 1000013 }, - ["name_act"]="attack03", - ["fx_self"]=200098 + ["name_act"]="attack03" }, [30173]={ ["effect_type"]=1, @@ -24180,8 +24216,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill01" }, [30174]={ ["effect_type"]=1, @@ -24202,16 +24237,15 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ 1000011 }, - ["name_act"]="attack01", - ["fx_self"]=200096 + ["name_act"]="attack01" }, [30175]={ ["effect_type"]=1, @@ -24232,16 +24266,15 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ 1000012 }, - ["name_act"]="attack02", - ["fx_self"]=200097 + ["name_act"]="attack02" }, [30176]={ ["effect_type"]=1, @@ -24262,16 +24295,15 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ 1000013 }, - ["name_act"]="attack03", - ["fx_self"]=200098 + ["name_act"]="attack03" }, [30177]={ ["effect_type"]=1, @@ -24298,8 +24330,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill01" }, [30178]={ ["effect_type"]=1, @@ -24326,8 +24357,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill02" }, [30179]={ ["effect_type"]=1, @@ -24342,16 +24372,15 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ 1000011 }, - ["name_act"]="attack01", - ["fx_self"]=200096 + ["name_act"]="attack01" }, [30180]={ ["effect_type"]=1, @@ -24366,16 +24395,15 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ 1000012 }, - ["name_act"]="attack02", - ["fx_self"]=200097 + ["name_act"]="attack02" }, [30181]={ ["effect_type"]=1, @@ -24390,16 +24418,15 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ 1000013 }, - ["name_act"]="attack03", - ["fx_self"]=200098 + ["name_act"]="attack03" }, [30182]={ ["effect_type"]=1, @@ -24420,8 +24447,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill01" }, [30183]={ ["effect_type"]=1, @@ -24442,8 +24468,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill01" }, [30184]={ ["effect_type"]=1, @@ -24464,8 +24489,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill01" }, [30185]={ ["skill_type"]=3, @@ -24483,8 +24507,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill01" }, [30186]={ ["effect_type"]=1, @@ -24499,16 +24522,15 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ 1000011 }, - ["name_act"]="attack01", - ["fx_self"]=200096 + ["name_act"]="attack01" }, [30187]={ ["effect_type"]=1, @@ -24523,16 +24545,15 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ 1000012 }, - ["name_act"]="attack02", - ["fx_self"]=200097 + ["name_act"]="attack02" }, [30188]={ ["effect_type"]=1, @@ -24547,16 +24568,15 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ 1000013 }, - ["name_act"]="attack03", - ["fx_self"]=200098 + ["name_act"]="attack03" }, [30189]={ ["effect_type"]=2, @@ -24596,8 +24616,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill01" }, [30191]={ ["effect_type"]=1, @@ -24612,8 +24631,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -24635,8 +24654,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -24658,8 +24677,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -24712,8 +24731,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill01" }, [30196]={ ["effect_type"]=1, @@ -24749,8 +24767,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -24772,8 +24790,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -24795,8 +24813,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -24905,8 +24923,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill01" }, [30206]={ ["effect_type"]=1, @@ -24933,8 +24950,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill01" }, [30207]={ ["effect_type"]=1, @@ -24961,8 +24977,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill01" }, [30208]={ ["effect_type"]=1, @@ -24977,8 +24992,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -25000,8 +25015,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -25023,8 +25038,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -25069,8 +25084,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill01" }, [30213]={ ["effect_type"]=1, @@ -25095,8 +25109,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill01" }, [30214]={ ["effect_type"]=1, @@ -25121,8 +25134,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill01" }, [30215]={ ["effect_type"]=1, @@ -25137,8 +25149,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -25160,8 +25172,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -25183,8 +25195,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -25235,8 +25247,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill01" }, [30220]={ ["skill_type"]=9, @@ -25265,8 +25276,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill02" }, [30221]={ ["effect_type"]=1, @@ -25281,8 +25291,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -25304,8 +25314,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -25327,8 +25337,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -25379,8 +25389,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill02" }, [30226]={ ["skill_type"]=3, @@ -25391,6 +25400,11 @@ local skill = { ["effect_type"]=1, ["trigger"]=1, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3 + }, ["skill_position"]={ 2, 0 @@ -25408,6 +25422,11 @@ local skill = { ["effect_type"]=1, ["trigger"]=1, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3 + }, ["skill_position"]={ 2, 0 @@ -25425,6 +25444,11 @@ local skill = { ["effect_type"]=1, ["trigger"]=1, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3 + }, ["skill_position"]={ 2, 0 @@ -25442,6 +25466,11 @@ local skill = { ["effect_type"]=1, ["trigger"]=1, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3 + }, ["skill_position"]={ 2, 0 @@ -25479,8 +25508,7 @@ local skill = { ["sound_hit"]={ 10018 }, - ["name_act"]="skill01", - ["fx_self"]=200099 + ["name_act"]="skill02" }, [40001]={ ["effect_type"]=1, diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 13ed1d92..0be33447 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -1518,6 +1518,9 @@ local skill_rogue = { ["icon"]="235" }, [1400401]={ + ["buff_id"]={ + "charm" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -1578,6 +1581,9 @@ local skill_rogue = { ["icon"]="266" }, [1400404]={ + ["buff_id"]={ + "charm" + }, ["unlock"]=1400401, ["cover_unlock"]=1400401, ["limit_times"]=1, @@ -1597,6 +1603,9 @@ local skill_rogue = { ["icon"]="267" }, [1400405]={ + ["buff_id"]={ + "normal_attack_add" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -2523,6 +2532,9 @@ local skill_rogue = { ["icon"]="237" }, [2400403]={ + ["buff_id"]={ + "stun" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -2567,6 +2579,9 @@ local skill_rogue = { ["icon"]="239" }, [2400405]={ + ["buff_id"]={ + "bleed" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -2587,20 +2602,23 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, - ["type"]=12, + ["type"]=9, ["skill_position"]=2, ["effect"]={ { ["type"]="add_skill", ["num"]=2400422, ["ratio"]=10000, - ["round"]=1 + ["round"]=999 } }, ["obj"]=4, ["icon"]="241" }, [2400407]={ + ["buff_id"]={ + "stun" + }, ["unlock"]=2400403, ["cover_unlock"]=2400403, ["limit_times"]=1, @@ -3458,6 +3476,9 @@ local skill_rogue = { ["icon"]="243" }, [3400402]={ + ["buff_id"]={ + "poison" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -4398,13 +4419,16 @@ local skill_rogue = { ["qlt"]=3, ["type"]=8, ["parameter"]={ - 5, + 4, 1 }, ["skill_position"]=4, ["icon"]="252" }, [4400404]={ + ["buff_id"]={ + "corrupt" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -4422,6 +4446,9 @@ local skill_rogue = { ["icon"]="253" }, [4400405]={ + ["buff_id"]={ + "rebirth" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -4466,6 +4493,9 @@ local skill_rogue = { ["icon"]="255" }, [4400407]={ + ["buff_id"]={ + "rebirth" + }, ["unlock"]=4400405, ["cover_unlock"]=4400405, ["limit_times"]=1, @@ -5337,6 +5367,9 @@ local skill_rogue = { ["icon"]="258" }, [5400403]={ + ["buff_id"]={ + "immune" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -5354,6 +5387,9 @@ local skill_rogue = { ["icon"]="259" }, [5400404]={ + ["buff_id"]={ + "counterattack" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -5371,6 +5407,9 @@ local skill_rogue = { ["icon"]="260" }, [5400405]={ + ["buff_id"]={ + "immune" + }, ["unlock"]=5400403, ["cover_unlock"]=5400403, ["limit_times"]=1, @@ -5407,6 +5446,9 @@ local skill_rogue = { ["icon"]="262" }, [5400407]={ + ["buff_id"]={ + "undead" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, diff --git a/lua/app/config/strings/cn/func_open.lua b/lua/app/config/strings/cn/func_open.lua index 60e5833b..7d039736 100644 --- a/lua/app/config/strings/cn/func_open.lua +++ b/lua/app/config/strings/cn/func_open.lua @@ -52,9 +52,12 @@ local func_open = { }, ["equip_armor_open"]={ ["name"]="防具" + }, + ["runes_open"]={ + ["name"]="符文" } } local config = { -data=func_open,count=18 +data=func_open,count=19 } 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 aa120fe1..a240f017 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -515,7 +515,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_34"] = "退出将按照当前波次结算，是否退出？", ["DUNGEON_RUNE_TITLE"] = "塔中密室", ["DUNGEON_RUNE_DESC"] = "挑战极限，获取符文！", - ["DUNGEON_RUNE_HELP"] = "1. 每30天为一个周期，每个周期会重置密室探索进度。/n2. 通关后可消耗【银羽毛】重复挑战，争取最小回合数，更新副本排行！/n3. 挑战道具【金羽毛】和重复挑战道具【银羽毛】每日重置。", + ["DUNGEON_RUNE_HELP"] = "1. 每天将重置10枚【金羽毛】和10枚【银羽毛】。/n2.挑战未通关层将需要消耗1枚【金羽毛】，通关后可获得1次通关奖励。/n3. 每10层为首领层，首领层通关后可消耗【银羽毛】扫荡获得【符文精粹】。", ["DUNGEON_RUNE_MIN"] = "历史通关最小回合数：{0}", ["DUNGEON_RUNE_QUEST_1"] = "{0}回合内完成目标", ["DUNGEON_RUNE_QUEST_2"] = "消除{0}个{1}", @@ -556,6 +556,8 @@ local localization_global = ["RUNES_DESC_26"] = "Lv{0}", ["RUNES_DESC_27"] = "符文铸台{0}级后开启", ["RUNES_DESC_28"] = "您有S级以上的属性未锁定，是否要继续淬炼？", + ["RUNES_DESC_29"] = "停止", + ["RUNES_DESC_30"] = "自动淬炼中...", ["DUNGEON_RUNE_DESC_1"] = "目标", ["DUNGEON_RUNE_DESC_2"] = "再次挑战", ["DUNGEON_RUNE_DESC_3"] = "通关获得", @@ -567,6 +569,36 @@ local localization_global = ["DUNGEON_RUNE_DESC_9"] = "上赛季", ["DUNGEON_RUNE_DESC_10"] = "最高：{0}", ["DUNGEON_RUNE_DESC_11"] = "回合数：{0}", + ["ACTIVITY_MOON_DESC_1"] = "圆月庆典", + ["ACTIVITY_MOON_DESC_2"] = "自选礼包", + ["ACTIVITY_MOON_DESC_3"] = "新英雄", + ["ACTIVITY_MOON_DESC_4"] = "英雄自选礼包", + ["ACTIVITY_MOON_DESC_5"] = "新英雄-女武神", + ["ACTIVITY_MOON_DESC_6"] = "请先购买上一礼包", + ["ACTIVITY_MOON_DESC_7"] = "英雄自选", + ["ACTIVITY_MOON_DESC_8"] = "可自选已激活的英雄", + ["ACTIVITY_MOON_DESC_9"] = "圆月庆典皮肤，限时登场！", + ["ACTIVITY_MOON_DESC_10"] = "{0}皮肤礼包", + ["ACTIVITY_MOON_DESC_11"] = "所有任务均已完成！", + ["SEIZED_DESC_4"] = "我们检测到您正在使用非法客户端，您将无法进行游戏，请前往正规应用商店下载。", + ["ACT_PVP_DESC_1"] = "是否消耗{0}钻石进入酒馆", + ["ACT_PVP_DESC_2"] = "进入", + ["ACT_PVP_DESC_3"] = "胜场 {0}/{1} 输场{2}/{3}", + ["ACT_PVP_DESC_4"] = "酒馆基金", + ["ACT_PVP_DESC_5"] = "每日累胜奖励", + ["ACT_PVP_DESC_6"] = "梦魇酒馆", + ["ACT_PVP_DESC_7"] = "{0}胜", + ["ACT_PVP_DESC_8"] = "请选择{0}英雄", + ["ACT_PVP_DESC_9"] = "点击英雄可查看详情", + ["ACT_PVP_DESC_10"] = "免费刷新", + ["ACT_PVP_DESC_11"] = "下轮待选英雄", + ["ACT_PVP_DESC_12"] = "选择", + ["ACT_PVP_DESC_13"] = "是否消耗{0}钻石刷新", + ["ACT_PVP_DESC_14"] = "总胜场数", + ["ACT_PVP_DESC_15"] = "酒馆积分", + ["ACT_PVP_DESC_16"] = "欢迎入股酒馆基金，在酒馆挑战对手，累计积分可领取奖励分红哟~", + ["ACT_PVP_DESC_17"] = "累计胜场", + ["ACT_PVP_DESC_18"] = "1.活动前七天可以挑战，累计胜场排名。\n2.第八天可领取排行榜奖励，第八天无挑战。", } 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 81e43f55..a7689ff3 100644 --- a/lua/app/config/strings/cn/hero.lua +++ b/lua/app/config/strings/cn/hero.lua @@ -51,7 +51,8 @@ local hero = { ["desc"]="手中的太刀如龙飞舞那是无与伦比的剑术。" }, [24004]={ - ["name"]="李" + ["name"]="李", + ["desc"]="暂时不写，也用不到！" }, [32001]={ ["name"]="洋葱头", @@ -78,7 +79,8 @@ local hero = { ["desc"]="迅猛如风，保护水之王国免受邪恶势力的侵害。" }, [34004]={ - ["name"]="绿意之刺" + ["name"]="绿意之刺", + ["desc"]="暂时不写，也用不到！" }, [42001]={ ["name"]="冰心", @@ -105,7 +107,8 @@ local hero = { ["desc"]="在她的月轮双刃下，夜晚的星辰在她的指尖舞动，魔法的月光照亮了她无限的智慧~" }, [44004]={ - ["name"]="牧魂者" + ["name"]="牧魂者", + ["desc"]="暂时不写，也用不到！" }, [52001]={ ["name"]="忍者伦", @@ -132,7 +135,8 @@ local hero = { ["desc"]="曾经王国中最杰出的骑士之一，命运使他堕落成为一名诅咒巨剑的使用者。" }, [54004]={ - ["name"]="女武神" + ["name"]="女武神", + ["desc"]="暂时不写，也用不到！" } } local config = { diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index 10f2902c..069217f5 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -215,6 +215,10 @@ local item = { ["name"]="符文精粹", ["desc"]="淬炼符文所用" }, + [56]={ + ["name"]="圆月", + ["desc"]="圆月庆典用的任务积分。" + }, [1001]={ ["name"]="暗淡陨铁", ["desc"]="一块暗淡的陨铁，蕴含着神秘的能量。" @@ -473,6 +477,6 @@ local item = { } } local config = { -data=item,count=118 +data=item,count=119 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/monster_base.lua b/lua/app/config/strings/cn/monster_base.lua index 4b661929..a8b11714 100644 --- a/lua/app/config/strings/cn/monster_base.lua +++ b/lua/app/config/strings/cn/monster_base.lua @@ -318,34 +318,44 @@ local monster_base = { ["name"]="遗迹守护者" }, [20049]={ - ["name"]="深潜者" + ["name"]="深潜者", + ["desc"]="来自黑暗的野兽，他的啃噬让冒险家的每一步都带着【流血】的负面状态。当他的血量低于一定值时，他会陷入癫狂，伤害提升的同时也会让自己受伤加重，抓紧时机，与他速战速决！" }, [20050]={ - ["name"]="黑山羊幼崽" + ["name"]="黑山羊幼崽", + ["desc"]="它们无穷无尽，死而复生，尽情地释放【腐败】，抓住它们虚弱的一瞬，给予它们致命一击！" }, [20051]={ - ["name"]="莎布·尼古拉斯" + ["name"]="莎布·尼古拉斯", + ["desc"]="祂并不凶残，但你陷入泥沼奋力挣扎的模样令祂愉悦。" }, [20052]={ - ["name"]="奈亚拉托提普" + ["name"]="奈亚拉托提普", + ["desc"]="他愤怒，于是手起刀落；他哀怨，于是前进的路上铺满了荆棘；他欢愉，于是赐予治愈；他喜悦，于是藤蔓爬满来者的腿。你无法得知他面具下的真实表情，一如你无法得知他接下来的行动。" }, [20053]={ - ["name"]="神秘的兄弟神" + ["name"]="神秘的兄弟神", + ["desc"]="他们是一体两面，是铜墙铁壁，也是柔枝嫩条，唯有死亡能够给连枝带去分离。" }, [20054]={ - ["name"]="兰·提戈斯" + ["name"]="兰·提戈斯", + ["desc"]="邪恶会沉浸于血液带来的快感之中，而你正是为铲除邪恶而来。" }, [20055]={ - ["name"]="克希拉" + ["name"]="克希拉", + ["desc"]="它是原本密室的守护者，如今已步入失控，混乱地释放魔法保全自己，攻击一切来访者。" }, [20056]={ - ["name"]="依德·雅" + ["name"]="依德·雅", + ["desc"]="看上去没什么攻击性，但确确实实地拦在了你的路上，或许猛烈且集中的攻势能带走他。" }, [20057]={ - ["name"]="旧日支配者" + ["name"]="旧日支配者", + ["desc"]="祂只是静静地在那里，压迫感便袭来。祂不欢迎陌生的访者，轻轻抬手，便是一阵腥风血雨。" }, [20058]={ - ["name"]="阿撒托斯" + ["name"]="阿撒托斯", + ["desc"]="只是凝视着它，你就觉得有什么东西不一样了，记住，一味地莽攻并不可取。" }, [30001]={ ["name"]="洋葱头" diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index 4686e733..c6903b2c 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -885,7 +885,7 @@ local skill_rogue = { ["desc"]="啊，打！沿＋方向可额外消除4格。" }, [2400403]={ - ["desc"]="龙哥普攻有5%概率附加眩晕效果，1回合。" + ["desc"]="李普攻有5%概率附加眩晕效果，1回合。" }, [2400404]={ ["desc"]="啊，打！沿X方向可额外消除4格。" @@ -894,7 +894,7 @@ local skill_rogue = { ["desc"]="啊，打！可附加流血效果，2回合。" }, [2400406]={ - ["desc"]="Combo:龙哥普攻对冰霜和流血敌人额外增伤。" + ["desc"]="Combo:李普攻对冰霜和灼烧敌人额外增伤。" }, [2400407]={ ["desc"]="啊，打！附加的眩晕效果概率提高至10%，回合数+1。" @@ -927,7 +927,7 @@ local skill_rogue = { ["desc"]="解锁飞棺降物：额外造成多次技能伤害，附加冰霜效果，1回合。" }, [4400401]={ - ["desc"]="已逝行者普攻有10%概率附加腐败效果，2回合。" + ["desc"]="牧魂者普攻有10%概率附加腐败效果，2回合。" }, [4400402]={ ["desc"]="飞棺降物可附加虚弱效果，2回合。" @@ -936,7 +936,7 @@ local skill_rogue = { ["desc"]="飞棺降物附加的冰霜效果，回合数+1。" }, [4400404]={ - ["desc"]="Combo:已逝行者普攻腐败敌人将恢复生命。" + ["desc"]="Combo:牧魂者普攻腐败敌人将恢复生命。" }, [4400405]={ ["desc"]="飞棺降物释放后为团队附加重生效果，1回合。" diff --git a/lua/app/config/strings/cn/tutorial.lua b/lua/app/config/strings/cn/tutorial.lua index 673d99ef..87dff3fe 100644 --- a/lua/app/config/strings/cn/tutorial.lua +++ b/lua/app/config/strings/cn/tutorial.lua @@ -40,9 +40,24 @@ local tutorial = { }, ["tutorial_txt_14"]={ ["value"]="让我们去获取一下防具强化材料吧！" + }, + ["tutorial_txt_15"]={ + ["value"]="每名英雄可以最多拥有6个符文。" + }, + ["tutorial_txt_16"]={ + ["value"]="符文可以组成套装，提升额外属性。" + }, + ["tutorial_txt_17"]={ + ["value"]="符文品质将根据符文铸台的等级提升。" + }, + ["tutorial_txt_18"]={ + ["value"]="符文铸台等级所有英雄共享。" + }, + ["tutorial_txt_19"]={ + ["value"]="让我们先去获取一下符文材料【符文精粹】吧！" } } local config = { -data=tutorial,count=14 +data=tutorial,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/func_open.lua b/lua/app/config/strings/de/func_open.lua index 2ac61e54..2580c127 100644 --- a/lua/app/config/strings/de/func_open.lua +++ b/lua/app/config/strings/de/func_open.lua @@ -52,9 +52,12 @@ local func_open = { }, ["equip_armor_open"]={ + }, + ["runes_open"]={ + } } local config = { -data=func_open,count=18 +data=func_open,count=19 } 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 dbdc3897..9cc79563 100644 --- a/lua/app/config/strings/de/item.lua +++ b/lua/app/config/strings/de/item.lua @@ -160,6 +160,9 @@ local item = { }, [55]={ + }, + [56]={ + }, [1001]={ @@ -355,6 +358,6 @@ local item = { } } local config = { -data=item,count=118 +data=item,count=119 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/tutorial.lua b/lua/app/config/strings/de/tutorial.lua index 40d6718c..ca523565 100644 --- a/lua/app/config/strings/de/tutorial.lua +++ b/lua/app/config/strings/de/tutorial.lua @@ -40,9 +40,24 @@ local tutorial = { }, ["tutorial_txt_14"]={ + }, + ["tutorial_txt_15"]={ + + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + + }, + ["tutorial_txt_18"]={ + + }, + ["tutorial_txt_19"]={ + } } local config = { -data=tutorial,count=14 +data=tutorial,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/func_open.lua b/lua/app/config/strings/en/func_open.lua index b6b3e22e..2454341a 100644 --- a/lua/app/config/strings/en/func_open.lua +++ b/lua/app/config/strings/en/func_open.lua @@ -52,9 +52,12 @@ local func_open = { }, ["equip_armor_open"]={ ["name"]="Armor" + }, + ["runes_open"]={ + } } local config = { -data=func_open,count=18 +data=func_open,count=19 } 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 8baa97e4..3c6ebd80 100644 --- a/lua/app/config/strings/en/global.lua +++ b/lua/app/config/strings/en/global.lua @@ -512,6 +512,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_33"] = "Stage {0} Unlocked", ["NOT_POP_TODAY"] = "Don't remind me today", ["ACT_BOSS_RUSH_DESC_34"] = "When you quit, the battle will be settled according to the current wave, do you quit?", + ["SEIZED_DESC_4"] = "We have detected that you are using an illegal client. You cannot continue playing the game. Please download the game from an authorized app store.", } return localization_global \ 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 5d419d06..fb125d9f 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -211,6 +211,9 @@ local item = { }, [55]={ + }, + [56]={ + }, [1001]={ ["name"]="Dim Meteorite", @@ -470,6 +473,6 @@ local item = { } } local config = { -data=item,count=118 +data=item,count=119 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/tutorial.lua b/lua/app/config/strings/en/tutorial.lua index 4335ba82..19e4bba5 100644 --- a/lua/app/config/strings/en/tutorial.lua +++ b/lua/app/config/strings/en/tutorial.lua @@ -40,9 +40,24 @@ local tutorial = { }, ["tutorial_txt_14"]={ ["value"]="Let's obtain some armor enhancement materials first!" + }, + ["tutorial_txt_15"]={ + + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + + }, + ["tutorial_txt_18"]={ + + }, + ["tutorial_txt_19"]={ + } } local config = { -data=tutorial,count=14 +data=tutorial,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/func_open.lua b/lua/app/config/strings/es/func_open.lua index 440c2fa7..86052ddf 100644 --- a/lua/app/config/strings/es/func_open.lua +++ b/lua/app/config/strings/es/func_open.lua @@ -52,9 +52,12 @@ local func_open = { }, ["equip_armor_open"]={ ["name"]="Armadura" + }, + ["runes_open"]={ + } } local config = { -data=func_open,count=18 +data=func_open,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/global.lua b/lua/app/config/strings/es/global.lua index 4b4be0a1..82261002 100644 --- a/lua/app/config/strings/es/global.lua +++ b/lua/app/config/strings/es/global.lua @@ -512,6 +512,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_33"] = "Desbloqueo de la etapa {0}", ["NOT_POP_TODAY"] = "No más notas por hoy", ["ACT_BOSS_RUSH_DESC_34"] = "¿Después de la salida, la batalla se liquidará de acuerdo con la ola actual, ¿ se retirará?", + ["SEIZED_DESC_4"] = "Hemos detectado que estás utilizando un cliente ilegal, que no te permitirá seguir jugando. Por favor descarga la aplicación correcta en la tienda oficial de aplicaciones.", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/es/item.lua b/lua/app/config/strings/es/item.lua index 0a63708a..a84048f0 100644 --- a/lua/app/config/strings/es/item.lua +++ b/lua/app/config/strings/es/item.lua @@ -211,6 +211,9 @@ local item = { }, [55]={ + }, + [56]={ + }, [1001]={ ["name"]="Meteorito Opaco", @@ -470,6 +473,6 @@ local item = { } } local config = { -data=item,count=118 +data=item,count=119 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/tutorial.lua b/lua/app/config/strings/es/tutorial.lua index 6b364860..8f52bb35 100644 --- a/lua/app/config/strings/es/tutorial.lua +++ b/lua/app/config/strings/es/tutorial.lua @@ -40,9 +40,24 @@ local tutorial = { }, ["tutorial_txt_14"]={ ["value"]="Consigue primero los materiales para refuerzo de armadura." + }, + ["tutorial_txt_15"]={ + + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + + }, + ["tutorial_txt_18"]={ + + }, + ["tutorial_txt_19"]={ + } } local config = { -data=tutorial,count=14 +data=tutorial,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/func_open.lua b/lua/app/config/strings/fr/func_open.lua index 2ac61e54..2580c127 100644 --- a/lua/app/config/strings/fr/func_open.lua +++ b/lua/app/config/strings/fr/func_open.lua @@ -52,9 +52,12 @@ local func_open = { }, ["equip_armor_open"]={ + }, + ["runes_open"]={ + } } local config = { -data=func_open,count=18 +data=func_open,count=19 } 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 dbdc3897..9cc79563 100644 --- a/lua/app/config/strings/fr/item.lua +++ b/lua/app/config/strings/fr/item.lua @@ -160,6 +160,9 @@ local item = { }, [55]={ + }, + [56]={ + }, [1001]={ @@ -355,6 +358,6 @@ local item = { } } local config = { -data=item,count=118 +data=item,count=119 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/tutorial.lua b/lua/app/config/strings/fr/tutorial.lua index 40d6718c..ca523565 100644 --- a/lua/app/config/strings/fr/tutorial.lua +++ b/lua/app/config/strings/fr/tutorial.lua @@ -40,9 +40,24 @@ local tutorial = { }, ["tutorial_txt_14"]={ + }, + ["tutorial_txt_15"]={ + + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + + }, + ["tutorial_txt_18"]={ + + }, + ["tutorial_txt_19"]={ + } } local config = { -data=tutorial,count=14 +data=tutorial,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/func_open.lua b/lua/app/config/strings/id/func_open.lua index 6f25fe74..b7ef6b9b 100644 --- a/lua/app/config/strings/id/func_open.lua +++ b/lua/app/config/strings/id/func_open.lua @@ -52,9 +52,12 @@ local func_open = { }, ["equip_armor_open"]={ ["name"]="Armor" + }, + ["runes_open"]={ + } } local config = { -data=func_open,count=18 +data=func_open,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/global.lua b/lua/app/config/strings/id/global.lua index bb211131..429c1424 100644 --- a/lua/app/config/strings/id/global.lua +++ b/lua/app/config/strings/id/global.lua @@ -512,6 +512,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_33"] = "Fase {0} membuka kunci", ["NOT_POP_TODAY"] = "Jangan ingatkan lagi hari ini", ["ACT_BOSS_RUSH_DESC_34"] = "Setelah keluar, pertempuran akan diselesaikan menurut gelombang saat ini. Apakah Anda ingin keluar?", + ["SEIZED_DESC_4"] = "Anda terdeteksi telah menggunakan platform tidak resmi, sehingga Anda tidak akan dapat memainkan game ini. Harap kunjungi aplikasi resmi untuk mengunduh. Terima kasih.", } return localization_global \ 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 05a1def2..c6e1b55f 100644 --- a/lua/app/config/strings/id/item.lua +++ b/lua/app/config/strings/id/item.lua @@ -211,6 +211,9 @@ local item = { }, [55]={ + }, + [56]={ + }, [1001]={ ["name"]="Chondrite", @@ -470,6 +473,6 @@ local item = { } } local config = { -data=item,count=118 +data=item,count=119 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/tutorial.lua b/lua/app/config/strings/id/tutorial.lua index fef43f94..3f370713 100644 --- a/lua/app/config/strings/id/tutorial.lua +++ b/lua/app/config/strings/id/tutorial.lua @@ -40,9 +40,24 @@ local tutorial = { }, ["tutorial_txt_14"]={ ["value"]="Dapatkan material booster DEF!" + }, + ["tutorial_txt_15"]={ + + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + + }, + ["tutorial_txt_18"]={ + + }, + ["tutorial_txt_19"]={ + } } local config = { -data=tutorial,count=14 +data=tutorial,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/func_open.lua b/lua/app/config/strings/ja/func_open.lua index 597cf1b0..42fc1f9f 100644 --- a/lua/app/config/strings/ja/func_open.lua +++ b/lua/app/config/strings/ja/func_open.lua @@ -52,9 +52,12 @@ local func_open = { }, ["equip_armor_open"]={ ["name"]="防具" + }, + ["runes_open"]={ + } } local config = { -data=func_open,count=18 +data=func_open,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/global.lua b/lua/app/config/strings/ja/global.lua index 8923914e..a040fb97 100644 --- a/lua/app/config/strings/ja/global.lua +++ b/lua/app/config/strings/ja/global.lua @@ -512,6 +512,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_33"] = "フェーズ{0}ロック解除", ["NOT_POP_TODAY"] = "今日は見ない", ["ACT_BOSS_RUSH_DESC_34"] = "撤退後は、現在の波次決済に従って戦いますが、撤退しますか？", + ["SEIZED_DESC_4"] = "不正なクライアントを使用していることが判明したため、引き続きプレイできません。アプリストアにてゲームをダウンロードしてください。", } return localization_global \ 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 8a46027f..78e926b2 100644 --- a/lua/app/config/strings/ja/item.lua +++ b/lua/app/config/strings/ja/item.lua @@ -211,6 +211,9 @@ local item = { }, [55]={ + }, + [56]={ + }, [1001]={ ["name"]="薄暗い隕石", @@ -470,6 +473,6 @@ local item = { } } local config = { -data=item,count=118 +data=item,count=119 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/tutorial.lua b/lua/app/config/strings/ja/tutorial.lua index 1ba894d0..5a07c36e 100644 --- a/lua/app/config/strings/ja/tutorial.lua +++ b/lua/app/config/strings/ja/tutorial.lua @@ -40,9 +40,24 @@ local tutorial = { }, ["tutorial_txt_14"]={ ["value"]="防具の強化材料を入手しましょう！" + }, + ["tutorial_txt_15"]={ + + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + + }, + ["tutorial_txt_18"]={ + + }, + ["tutorial_txt_19"]={ + } } local config = { -data=tutorial,count=14 +data=tutorial,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/func_open.lua b/lua/app/config/strings/ko/func_open.lua index 9eb9d9f9..8c535928 100644 --- a/lua/app/config/strings/ko/func_open.lua +++ b/lua/app/config/strings/ko/func_open.lua @@ -52,9 +52,12 @@ local func_open = { }, ["equip_armor_open"]={ ["name"]="방어구" + }, + ["runes_open"]={ + } } local config = { -data=func_open,count=18 +data=func_open,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/global.lua b/lua/app/config/strings/ko/global.lua index 2b91aaeb..7fe59a6c 100644 --- a/lua/app/config/strings/ko/global.lua +++ b/lua/app/config/strings/ko/global.lua @@ -512,6 +512,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_33"] = "{0}단계 잠금 해제", ["NOT_POP_TODAY"] = "오늘 더 이상 알림 받지 않음", ["ACT_BOSS_RUSH_DESC_34"] = "퇴장 후, 현재 라운드 결산에 따라 전투, 퇴장하시겠습니까?", + ["SEIZED_DESC_4"] = "불법 클라이언트 사용이 감지되었습니다. 게임을 진행할 수 없으며 스토어에 가서 공식 게임 어플을 다운 받아 주세요.", } return localization_global \ 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 471d5e0e..da4c04b8 100644 --- a/lua/app/config/strings/ko/item.lua +++ b/lua/app/config/strings/ko/item.lua @@ -211,6 +211,9 @@ local item = { }, [55]={ + }, + [56]={ + }, [1001]={ ["name"]="알렌데 운석", @@ -470,6 +473,6 @@ local item = { } } local config = { -data=item,count=118 +data=item,count=119 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/tutorial.lua b/lua/app/config/strings/ko/tutorial.lua index d41a840f..92827bf1 100644 --- a/lua/app/config/strings/ko/tutorial.lua +++ b/lua/app/config/strings/ko/tutorial.lua @@ -40,9 +40,24 @@ local tutorial = { }, ["tutorial_txt_14"]={ ["value"]="함께 방어구 강화 재료를 획득해 보아요!" + }, + ["tutorial_txt_15"]={ + + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + + }, + ["tutorial_txt_18"]={ + + }, + ["tutorial_txt_19"]={ + } } local config = { -data=tutorial,count=14 +data=tutorial,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/func_open.lua b/lua/app/config/strings/pt/func_open.lua index 1d73e8d9..c444ecfe 100644 --- a/lua/app/config/strings/pt/func_open.lua +++ b/lua/app/config/strings/pt/func_open.lua @@ -52,9 +52,12 @@ local func_open = { }, ["equip_armor_open"]={ ["name"]="Armadura" + }, + ["runes_open"]={ + } } local config = { -data=func_open,count=18 +data=func_open,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/global.lua b/lua/app/config/strings/pt/global.lua index 199b975b..7b368637 100644 --- a/lua/app/config/strings/pt/global.lua +++ b/lua/app/config/strings/pt/global.lua @@ -512,6 +512,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_33"] = "Fase {0} desbloqueando", ["NOT_POP_TODAY"] = "Não me notifique por hoje.", ["ACT_BOSS_RUSH_DESC_34"] = "Depois de sair, a batalha será resolvida de acordo com a onda actual. Você quer sair?", + ["SEIZED_DESC_4"] = "Detectamos que está operando um programa não oficial e, por isso, você não pode continuar jogando. Por favor, vá até a uma loja de aplicativos oficial para baixar nosso jogo.", } return localization_global \ 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 df7fa6d3..e1f6a0a4 100644 --- a/lua/app/config/strings/pt/item.lua +++ b/lua/app/config/strings/pt/item.lua @@ -211,6 +211,9 @@ local item = { }, [55]={ + }, + [56]={ + }, [1001]={ ["name"]="Ferro Meteórico Opaco", @@ -470,6 +473,6 @@ local item = { } } local config = { -data=item,count=118 +data=item,count=119 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/tutorial.lua b/lua/app/config/strings/pt/tutorial.lua index c833b718..71481e6e 100644 --- a/lua/app/config/strings/pt/tutorial.lua +++ b/lua/app/config/strings/pt/tutorial.lua @@ -40,9 +40,24 @@ local tutorial = { }, ["tutorial_txt_14"]={ ["value"]="Vamos buscar alguns materiais de reforço para as armaduras!" + }, + ["tutorial_txt_15"]={ + + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + + }, + ["tutorial_txt_18"]={ + + }, + ["tutorial_txt_19"]={ + } } local config = { -data=tutorial,count=14 +data=tutorial,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/func_open.lua b/lua/app/config/strings/ru/func_open.lua index 2ac61e54..2580c127 100644 --- a/lua/app/config/strings/ru/func_open.lua +++ b/lua/app/config/strings/ru/func_open.lua @@ -52,9 +52,12 @@ local func_open = { }, ["equip_armor_open"]={ + }, + ["runes_open"]={ + } } local config = { -data=func_open,count=18 +data=func_open,count=19 } 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 dbdc3897..9cc79563 100644 --- a/lua/app/config/strings/ru/item.lua +++ b/lua/app/config/strings/ru/item.lua @@ -160,6 +160,9 @@ local item = { }, [55]={ + }, + [56]={ + }, [1001]={ @@ -355,6 +358,6 @@ local item = { } } local config = { -data=item,count=118 +data=item,count=119 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/tutorial.lua b/lua/app/config/strings/ru/tutorial.lua index 40d6718c..ca523565 100644 --- a/lua/app/config/strings/ru/tutorial.lua +++ b/lua/app/config/strings/ru/tutorial.lua @@ -40,9 +40,24 @@ local tutorial = { }, ["tutorial_txt_14"]={ + }, + ["tutorial_txt_15"]={ + + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + + }, + ["tutorial_txt_18"]={ + + }, + ["tutorial_txt_19"]={ + } } local config = { -data=tutorial,count=14 +data=tutorial,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/func_open.lua b/lua/app/config/strings/th/func_open.lua index 87e0b28f..657e61af 100644 --- a/lua/app/config/strings/th/func_open.lua +++ b/lua/app/config/strings/th/func_open.lua @@ -52,9 +52,12 @@ local func_open = { }, ["equip_armor_open"]={ ["name"]="เกราะ" + }, + ["runes_open"]={ + } } local config = { -data=func_open,count=18 +data=func_open,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/global.lua b/lua/app/config/strings/th/global.lua index 95fe44f0..17a0b92d 100644 --- a/lua/app/config/strings/th/global.lua +++ b/lua/app/config/strings/th/global.lua @@ -512,6 +512,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_33"] = "ขั้นตอนที่ {0} ปลดล็อค", ["NOT_POP_TODAY"] = "วันนี้ไม่เตือนอีก", ["ACT_BOSS_RUSH_DESC_34"] = "เมื่อออกแล้วจะชำระค่าต่อสู้ตามคลื่นปัจจุบัน จะออกหรือไม่", + ["SEIZED_DESC_4"] = "เราตรวจพบว่าคุณกำลังใช้ไคลเอนต์ที่ผิดกฎหมาย คุณจะไม่สามารถเล่นเกมได้ โปรดไปที่ App Store อย่างเป็นทางการเพื่อดาวน์โหลด", } return localization_global \ 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 33e17ab5..50f2004f 100644 --- a/lua/app/config/strings/th/item.lua +++ b/lua/app/config/strings/th/item.lua @@ -211,6 +211,9 @@ local item = { }, [55]={ + }, + [56]={ + }, [1001]={ ["name"]="อุกกาบาตทื่อ", @@ -470,6 +473,6 @@ local item = { } } local config = { -data=item,count=118 +data=item,count=119 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/tutorial.lua b/lua/app/config/strings/th/tutorial.lua index c4d7d496..fa224bbd 100644 --- a/lua/app/config/strings/th/tutorial.lua +++ b/lua/app/config/strings/th/tutorial.lua @@ -40,9 +40,24 @@ local tutorial = { }, ["tutorial_txt_14"]={ ["value"]="ไปหาวัสดุตีบวกเกราะกันเถอะ!" + }, + ["tutorial_txt_15"]={ + + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + + }, + ["tutorial_txt_18"]={ + + }, + ["tutorial_txt_19"]={ + } } local config = { -data=tutorial,count=14 +data=tutorial,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/func_open.lua b/lua/app/config/strings/vi/func_open.lua index 190f2d17..844b94a0 100644 --- a/lua/app/config/strings/vi/func_open.lua +++ b/lua/app/config/strings/vi/func_open.lua @@ -52,9 +52,12 @@ local func_open = { }, ["equip_armor_open"]={ ["name"]="Phòng Cụ" + }, + ["runes_open"]={ + } } local config = { -data=func_open,count=18 +data=func_open,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/global.lua b/lua/app/config/strings/vi/global.lua index 1bc3e1cc..1e7de602 100644 --- a/lua/app/config/strings/vi/global.lua +++ b/lua/app/config/strings/vi/global.lua @@ -512,6 +512,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_33"] = "Giai đoạn {0} Mở khóa", ["NOT_POP_TODAY"] = "Hôm nay không nhắc lại", ["ACT_BOSS_RUSH_DESC_34"] = "Sau khi rút lui, sẽ dựa theo sóng hiện tại thanh toán chiến đấu, có rút lui hay không?", + ["SEIZED_DESC_4"] = "Chúng tôi phát hiện bạn đang sử dụng client không hợp lệ, không thể vào game được, hãy đến Cửa Hàng ứng dụng chính thống tải về", } return localization_global \ 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 84ceab3b..207020e3 100644 --- a/lua/app/config/strings/vi/item.lua +++ b/lua/app/config/strings/vi/item.lua @@ -211,6 +211,9 @@ local item = { }, [55]={ + }, + [56]={ + }, [1001]={ ["name"]="Thiên Thạch Ảm Đạm", @@ -470,6 +473,6 @@ local item = { } } local config = { -data=item,count=118 +data=item,count=119 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/tutorial.lua b/lua/app/config/strings/vi/tutorial.lua index 7f7903b6..a374a4ce 100644 --- a/lua/app/config/strings/vi/tutorial.lua +++ b/lua/app/config/strings/vi/tutorial.lua @@ -40,9 +40,24 @@ local tutorial = { }, ["tutorial_txt_14"]={ ["value"]="Tiếp theo chúng ta hãy nhận vật liệu cường hóa phòng cụ!" + }, + ["tutorial_txt_15"]={ + + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + + }, + ["tutorial_txt_18"]={ + + }, + ["tutorial_txt_19"]={ + } } local config = { -data=tutorial,count=14 +data=tutorial,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/func_open.lua b/lua/app/config/strings/zh/func_open.lua index 4c685ee4..b0991704 100644 --- a/lua/app/config/strings/zh/func_open.lua +++ b/lua/app/config/strings/zh/func_open.lua @@ -52,9 +52,12 @@ local func_open = { }, ["equip_armor_open"]={ ["name"]="防具" + }, + ["runes_open"]={ + } } local config = { -data=func_open,count=18 +data=func_open,count=19 } 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 c5a009b3..0d433d8f 100644 --- a/lua/app/config/strings/zh/global.lua +++ b/lua/app/config/strings/zh/global.lua @@ -512,6 +512,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_33"] = "階段{0}解鎖", ["NOT_POP_TODAY"] = "今日不再提醒", ["ACT_BOSS_RUSH_DESC_34"] = "退出後，將按照當前波次結算戰鬥，是否退出？", + ["SEIZED_DESC_4"] = "我們檢測到您正在使用非法客戶端，您將無法進行遊戲，請前往正規應用商店下載。", } return localization_global \ 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 e11fa7d1..40872dbc 100644 --- a/lua/app/config/strings/zh/item.lua +++ b/lua/app/config/strings/zh/item.lua @@ -211,6 +211,9 @@ local item = { }, [55]={ + }, + [56]={ + }, [1001]={ ["name"]="暗淡隕鐵", @@ -470,6 +473,6 @@ local item = { } } local config = { -data=item,count=118 +data=item,count=119 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/tutorial.lua b/lua/app/config/strings/zh/tutorial.lua index 2540a6d9..5557bf52 100644 --- a/lua/app/config/strings/zh/tutorial.lua +++ b/lua/app/config/strings/zh/tutorial.lua @@ -40,9 +40,24 @@ local tutorial = { }, ["tutorial_txt_14"]={ ["value"]="讓我們去獲取一下防具強化的材料吧" + }, + ["tutorial_txt_15"]={ + + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + + }, + ["tutorial_txt_18"]={ + + }, + ["tutorial_txt_19"]={ + } } local config = { -data=tutorial,count=14 +data=tutorial,count=19 } return config \ No newline at end of file diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua index 306612ba..c0107664 100644 --- a/lua/app/config/tutorial.lua +++ b/lua/app/config/tutorial.lua @@ -871,9 +871,224 @@ local tutorial = { 20, 0 } + }, + [100000]={ + ["next_id"]=100010, + ["type"]=2, + ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2", + ["func_id"]="runes_open", + ["arrow_direction"]=2, + ["arrow_offset"]={ + 0, + 50 + }, + ["show_mask"]=1, + ["square_size"]={ + 50, + 50 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [100010]={ + ["next_id"]=100020, + ["delay"]=0.5, + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/formation/hero_3", + ["func_id"]="runes_open", + ["arrow_direction"]=2, + ["arrow_offset"]={ + 0, + 50 + }, + ["show_mask"]=1 + }, + [100020]={ + ["next_id"]=100030, + ["type"]=2, + ["target_name"]="hero_detail_ui(Clone)/common/btns/btn_runes", + ["func_id"]="runes_open", + ["arrow_direction"]=1, + ["arrow_offset"]={ + 0, + -50 + } + }, + [100030]={ + ["next_id"]=100040, + ["type"]=1, + ["txt"]="tutorial_txt_15", + ["txt_offset"]={ + 0, + 200 + }, + ["func_id"]="runes_open" + }, + [100040]={ + ["next_id"]=100050, + ["type"]=2, + ["target_name"]="hero_detail_ui(Clone)/runes_info/btn_suit", + ["func_id"]="runes_open", + ["arrow_direction"]=1, + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1, + ["square_size"]={ + 50, + 50 + } + }, + [100050]={ + ["next_id"]=100060, + ["type"]=1, + ["txt"]="tutorial_txt_16", + ["txt_offset"]={ + 0, + 200 + }, + ["func_id"]="runes_open" + }, + [100060]={ + ["next_id"]=100070, + ["type"]=2, + ["target_name"]="runes_suit_ui(Clone)/bg/close_btn", + ["func_id"]="runes_open", + ["arrow_direction"]=1, + ["arrow_offset"]={ + 0, + 0 + } + }, + [100070]={ + ["next_id"]=100080, + ["type"]=2, + ["target_name"]="hero_detail_ui(Clone)/runes_info/btn_help", + ["func_id"]="runes_open", + ["arrow_direction"]=1, + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=2, + ["circle_r"]=50 + }, + [100080]={ + ["next_id"]=100090, + ["type"]=1, + ["txt"]="tutorial_txt_17", + ["txt_offset"]={ + 0, + 200 + }, + ["func_id"]="runes_open" + }, + [100090]={ + ["next_id"]=100100, + ["type"]=1, + ["txt"]="tutorial_txt_18", + ["txt_offset"]={ + 0, + 200 + }, + ["func_id"]="runes_open" + }, + [100100]={ + ["next_id"]=100110, + ["type"]=2, + ["target_name"]="runes_level_ui(Clone)/bg/close_btn", + ["func_id"]="runes_open", + ["arrow_direction"]=1, + ["arrow_offset"]={ + 0, + 0 + } + }, + [100110]={ + ["next_id"]=100120, + ["type"]=3, + ["txt"]="tutorial_txt_19", + ["txt_offset"]={ + 0, + 200 + }, + ["target_name"]="hero_detail_ui(Clone)/common/btn_close", + ["func_id"]="runes_open", + ["arrow_direction"]=1, + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=2, + ["circle_r"]=100, + ["circle_offset"]={ + 0, + 0 + } + }, + [100120]={ + ["next_id"]=100130, + ["type"]=2, + ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_1", + ["func_id"]="runes_open", + ["arrow_direction"]=1, + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1, + ["square_size"]={ + 50, + 50 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [100130]={ + ["next_id"]=100140, + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/right/dungeon", + ["func_id"]="runes_open", + ["arrow_direction"]=1, + ["arrow_offset"]={ + 0, + -50 + }, + ["show_mask"]=2, + ["circle_r"]=150, + ["circle_offset"]={ + 0, + 0 + } + }, + [100140]={ + ["next_id"]=100150, + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/dungeon_comp/scrollrect/viewport/content/runes_open/btn_start", + ["func_id"]="runes_open", + ["arrow_direction"]=2, + ["arrow_offset"]={ + 0, + 50 + } + }, + [100150]={ + ["type"]=2, + ["target_name"]="dungeon_rune_main_ui(Clone)/scrollrect/viewport/content/scroll_cell_1/touch_node", + ["func_id"]="runes_open", + ["arrow_direction"]=4, + ["arrow_offset"]={ + 20, + 0 + } } } local config = { -data=tutorial,count=63 +data=tutorial,count=79 } return config \ No newline at end of file diff --git a/lua/app/config/tutorial_start.lua b/lua/app/config/tutorial_start.lua index ad9bc53e..6d55067d 100644 --- a/lua/app/config/tutorial_start.lua +++ b/lua/app/config/tutorial_start.lua @@ -34,9 +34,13 @@ local tutorial_start = { [9]={ ["start_id"]=90000, ["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab" + }, + [10]={ + ["start_id"]=100000, + ["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab" } } local config = { -data=tutorial_start,count=9 +data=tutorial_start,count=10 } return config \ No newline at end of file diff --git a/lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua b/lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua index 2ac24c72..c382436e 100644 --- a/lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua +++ b/lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua @@ -87,8 +87,10 @@ function RuneChapterCell:refresh(id, index, isFinal, chapterListCount) end local rewards = runeData:getChapterRewards(id) + local rewardCount = 0 for i, cell in ipairs(self.rewardCells) do if rewards[i] then + rewardCount = rewardCount + 1 cell:refreshByConfig(rewards[i], passed, passed) if isBossChapter then cell:getBaseObject():setLocalScale(0.6, 0.6, 0.6) @@ -100,6 +102,9 @@ function RuneChapterCell:refresh(id, index, isFinal, chapterListCount) self.clickFunc() end end) + cell:getBaseObject():setActive(true) + else + cell:getBaseObject():setActive(false) end end @@ -111,6 +116,10 @@ function RuneChapterCell:refresh(id, index, isFinal, chapterListCount) self.rewardCells[2]:getBaseObject():setAnchoredPositionX(35) end + if rewardCount < 2 then + self.rewardCells[1]:getBaseObject():setAnchoredPositionX(0) + end + sweep:addClickListener(function() if self.clickFunc then self.clickFunc() From 77191e570751dc2e7e40d3d20f130d39be9501bb Mon Sep 17 00:00:00 2001 From: Fang Date: Fri, 15 Sep 2023 17:37:43 +0800 Subject: [PATCH 29/35] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=9C=BA=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E6=97=B6=E5=90=8C=E6=AD=A5=E5=BD=93=E5=89=8D=E7=A7=AF?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/arena/arena_manager.lua | 2 +- lua/app/userdata/arena/arena_data.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/app/module/arena/arena_manager.lua b/lua/app/module/arena/arena_manager.lua index eb9b7bda..10047321 100644 --- a/lua/app/module/arena/arena_manager.lua +++ b/lua/app/module/arena/arena_manager.lua @@ -127,7 +127,7 @@ function ArenaManager:rspSettlement(result) if result.err_code == GConst.ERROR_STR.SUCCESS then local reqData = result.reqData - DataManager.ArenaData:onBattleResultReceived(result.settlement, result) + DataManager.ArenaData:onBattleResultReceived(result.score, result.settlement, result) DataManager.ArenaData:initGiftInfo(result.act_arena_gift) local checkCount = 0 if result.settlement.win then diff --git a/lua/app/userdata/arena/arena_data.lua b/lua/app/userdata/arena/arena_data.lua index 45f5a7cc..1eb4c4b6 100644 --- a/lua/app/userdata/arena/arena_data.lua +++ b/lua/app/userdata/arena/arena_data.lua @@ -705,7 +705,7 @@ function ArenaData:onMatchInfoReceived(match) end -- 结算战斗数据 -function ArenaData:onBattleResultReceived(settlement, result) +function ArenaData:onBattleResultReceived(score, settlement, result) self.matchInfo = nil -- 战斗记录改变 if self.recentBattle == nil then @@ -714,7 +714,7 @@ function ArenaData:onBattleResultReceived(settlement, result) table.remove(self.recentBattle, #self.recentBattle) table.insert(self.recentBattle, 1, settlement) -- 积分改变 - self.score = self.score + settlement.incr_score + self.score = score self.curGradingId = self:getGradingIdFromScore(self.score) local beforeMaxGrading = self.maxScore From afb44e8661bd89f4c03c28fef2de3b0ea0ee1853 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 15 Sep 2023 17:38:44 +0800 Subject: [PATCH 30/35] =?UTF-8?q?=E7=AC=A6=E6=96=87=E5=BC=95=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/tutorial/tutorial_const.lua | 1 + lua/app/ui/main_city/main_city_ui.lua | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/lua/app/module/tutorial/tutorial_const.lua b/lua/app/module/tutorial/tutorial_const.lua index 0b5f2c65..59d3a112 100644 --- a/lua/app/module/tutorial/tutorial_const.lua +++ b/lua/app/module/tutorial/tutorial_const.lua @@ -12,6 +12,7 @@ TutorialConst.UNLOCK_DUNGEON = 6 TutorialConst.UNLOCK_ARENA = 7 TutorialConst.WEAPON_DUNGEON = 8 TutorialConst.ARMOR_DUNGEON = 9 +TutorialConst.RUNE_DUNGEON = 10 TutorialConst.TUTORIAL_TYPE = { CLICK = 1, -- 点击任意区域 diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index b9dddb16..46a09eb5 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -1180,6 +1180,12 @@ function MainCityUI:checkTutorial(onlyCheck) return true end end + + if DataManager.DungeonData:isOpen(ModuleManager.MODULE_KEY.RUNES_OPEN) then + if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.RUNE_DUNGEON, onlyCheck) then + return true + end + end end -- 检查礼包(首充(作废)/入门/章节/新手/助力/成长/金币顺序) From 37f93d1cd127cae1c12951146cf41c68b7b50fc4 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 15 Sep 2023 17:41:29 +0800 Subject: [PATCH 31/35] =?UTF-8?q?pvp=E6=88=98=E6=96=97=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=85=83=E7=B4=A0=E9=9A=8F=E6=9C=BA=E5=8A=A0=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/battle_controller_pvp.lua | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/lua/app/module/battle/controller/battle_controller_pvp.lua b/lua/app/module/battle/controller/battle_controller_pvp.lua index edc3da4b..ef91dfb1 100644 --- a/lua/app/module/battle/controller/battle_controller_pvp.lua +++ b/lua/app/module/battle/controller/battle_controller_pvp.lua @@ -320,4 +320,37 @@ function BattleControllerPVP:refreshWave() self.battleUI:refreshWave(self.waveRoundCount[self:getWaveIndex()] or 0) end +function BattleControllerPVP:getRandomGridInfo() + local list, fixedRandomGrid = self:getInitBoard() + local fixedRandomList = fixedRandomGrid[self.curBoardIndex] + + local gridType = 0 + local elementType + if fixedRandomList and fixedRandomList[1] then + elementType = table.remove(fixedRandomList, 1) + else + local map = self.battleData:getElementTypeMap() + self.getRandomGridInfoIndexs = table.clearOrCreate(self.getRandomGridInfoIndexs) + self.getRandomGridInfoTypeList = table.clearOrCreate(self.getRandomGridInfoTypeList) + for typeName, typeNum in pairs(BattleConst.ELEMENT_TYPE) do + if not self:getSealElementType()[typeNum] and self:getSkillEntityByElement(typeNum) then + local weight = BattleConst.ELEMENT_WIGHT -- 改为平等权重 + if self.elementWeightMap and self.elementWeightMap[typeNum] then + weight = weight + self.elementWeightMap[typeNum] + end + if weight > BattleConst.MAX_ELEMENT_WIGHT then + weight = BattleConst.MAX_ELEMENT_WIGHT + end + table.insert(self.getRandomGridInfoIndexs, weight) + table.insert(self.getRandomGridInfoTypeList, typeNum) + end + end + + local index = GFunc.getRandomIndex(self.getRandomGridInfoIndexs) + elementType = self.getRandomGridInfoTypeList[index] + end + + return {gridType = gridType, elementType = elementType} +end + return BattleControllerPVP \ No newline at end of file From 8c1082793e5bff75b256d5508d54a72211fa44ef Mon Sep 17 00:00:00 2001 From: Fang Date: Tue, 12 Sep 2023 14:53:46 +0800 Subject: [PATCH 32/35] =?UTF-8?q?=E5=9C=86=E6=9C=88=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/bi_report.lua | 10 + lua/app/common/data_manager.lua | 14 +- lua/app/common/event_manager.lua | 1 + lua/app/common/module_manager.lua | 2 + lua/app/common/pay_manager.lua | 11 +- lua/app/config/act_gift.lua | 8 +- lua/app/config/avatar.lua | 14 +- lua/app/config/chapter_dungeon_rune.lua | 1582 +++++------------ lua/app/config/hero.lua | 6 +- lua/app/config/item.lua | 14 +- lua/app/config/monster_activity.lua | 46 +- lua/app/config/monster_base.lua | 12 +- lua/app/config/skill.lua | 335 +++- lua/app/config/skin.lua | 54 +- lua/app/config/skin_skill.lua | 146 +- lua/app/config/strings/cn/avatar.lua | 11 +- lua/app/config/strings/cn/item.lua | 11 +- lua/app/config/strings/cn/skin.lua | 10 +- lua/app/config/strings/de/avatar.lua | 11 +- lua/app/config/strings/de/item.lua | 11 +- lua/app/config/strings/de/skin.lua | 8 +- lua/app/config/strings/en/avatar.lua | 11 +- lua/app/config/strings/en/item.lua | 11 +- lua/app/config/strings/en/skin.lua | 8 +- lua/app/config/strings/es/avatar.lua | 11 +- lua/app/config/strings/es/item.lua | 11 +- lua/app/config/strings/es/skin.lua | 8 +- lua/app/config/strings/fr/avatar.lua | 11 +- lua/app/config/strings/fr/item.lua | 11 +- lua/app/config/strings/fr/skin.lua | 8 +- lua/app/config/strings/id/avatar.lua | 11 +- lua/app/config/strings/id/item.lua | 11 +- lua/app/config/strings/id/skin.lua | 8 +- lua/app/config/strings/ja/avatar.lua | 11 +- lua/app/config/strings/ja/item.lua | 11 +- lua/app/config/strings/ja/skin.lua | 8 +- lua/app/config/strings/ko/avatar.lua | 11 +- lua/app/config/strings/ko/item.lua | 11 +- lua/app/config/strings/ko/skin.lua | 8 +- lua/app/config/strings/pt/avatar.lua | 11 +- lua/app/config/strings/pt/item.lua | 11 +- lua/app/config/strings/pt/skin.lua | 8 +- lua/app/config/strings/ru/avatar.lua | 11 +- lua/app/config/strings/ru/item.lua | 11 +- lua/app/config/strings/ru/skin.lua | 8 +- lua/app/config/strings/th/avatar.lua | 11 +- lua/app/config/strings/th/item.lua | 11 +- lua/app/config/strings/th/skin.lua | 8 +- lua/app/config/strings/vi/avatar.lua | 11 +- lua/app/config/strings/vi/item.lua | 11 +- lua/app/config/strings/vi/skin.lua | 8 +- lua/app/config/strings/zh/avatar.lua | 11 +- lua/app/config/strings/zh/item.lua | 11 +- lua/app/config/strings/zh/skin.lua | 8 +- lua/app/global/global_const.lua | 1 + lua/app/global/global_func.lua | 31 + lua/app/module/activity/full_moon.meta | 8 + .../activity/full_moon/full_moon_const.lua | 28 + .../full_moon/full_moon_const.lua.meta | 10 + .../activity/full_moon/full_moon_manager.lua | 102 ++ .../full_moon/full_moon_manager.lua.meta | 10 + lua/app/module/battle/battle_const.lua | 1 + lua/app/module/battle/battle_manager.lua | 1 + .../battle_controller_full_moon_skin.lua | 67 + .../battle_controller_full_moon_skin.lua.meta | 10 + lua/app/module/item/item_const.lua | 1 + lua/app/module/maincity/maincity_const.lua | 1 + lua/app/module/runes/runes_manager.lua | 6 + lua/app/module/task/task_const.lua | 3 + lua/app/module/task/task_manager.lua | 15 + lua/app/module/tips/tips_manager.lua | 10 + lua/app/proto/proto_msg_type.lua | 36 + lua/app/ui/activity/full_moon.meta | 8 + lua/app/ui/activity/full_moon/cell.meta | 8 + .../full_moon/cell/full_moon_task_cell.lua | 60 + .../cell/full_moon_task_cell.lua.meta | 10 + .../cell/full_moon_task_prog_cell.lua | 34 + .../cell/full_moon_task_prog_cell.lua.meta | 10 + .../full_moon/full_moon_choose_hero_comp.lua | 130 ++ .../full_moon_choose_hero_comp.lua.meta | 10 + .../full_moon/full_moon_new_hero_comp.lua | 100 ++ .../full_moon_new_hero_comp.lua.meta | 10 + .../full_moon/full_moon_skin_comp.lua | 144 ++ .../full_moon/full_moon_skin_comp.lua.meta | 10 + .../full_moon/full_moon_task_comp.lua | 74 + .../full_moon/full_moon_task_comp.lua.meta | 10 + .../ui/activity/full_moon/full_moon_ui.lua | 232 +++ .../activity/full_moon/full_moon_ui.lua.meta | 10 + lua/app/ui/common/cell/reward_cell.lua | 19 + .../cell/side_bar_full_moon_cell.lua | 46 + .../cell/side_bar_full_moon_cell.lua.meta | 10 + lua/app/ui/main_city/main_city_ui.lua | 7 + lua/app/ui/shop/cell/pop_reward_cell.lua | 29 +- lua/app/ui/tips/choose_reward_tips.lua | 69 + lua/app/ui/tips/choose_reward_tips.lua.meta | 10 + lua/app/userdata/activity/full_moon.meta | 8 + .../activity/full_moon/full_moon_data.lua | 584 ++++++ .../full_moon/full_moon_data.lua.meta | 10 + lua/app/userdata/bag/item_data.lua | 4 + lua/app/userdata/player/player_data.lua | 1 + lua/app/userdata/skin/skin_data.lua | 8 + 101 files changed, 3423 insertions(+), 1230 deletions(-) create mode 100644 lua/app/module/activity/full_moon.meta create mode 100644 lua/app/module/activity/full_moon/full_moon_const.lua create mode 100644 lua/app/module/activity/full_moon/full_moon_const.lua.meta create mode 100644 lua/app/module/activity/full_moon/full_moon_manager.lua create mode 100644 lua/app/module/activity/full_moon/full_moon_manager.lua.meta create mode 100644 lua/app/module/battle/controller/battle_controller_full_moon_skin.lua create mode 100644 lua/app/module/battle/controller/battle_controller_full_moon_skin.lua.meta create mode 100644 lua/app/ui/activity/full_moon.meta create mode 100644 lua/app/ui/activity/full_moon/cell.meta create mode 100644 lua/app/ui/activity/full_moon/cell/full_moon_task_cell.lua create mode 100644 lua/app/ui/activity/full_moon/cell/full_moon_task_cell.lua.meta create mode 100644 lua/app/ui/activity/full_moon/cell/full_moon_task_prog_cell.lua create mode 100644 lua/app/ui/activity/full_moon/cell/full_moon_task_prog_cell.lua.meta create mode 100644 lua/app/ui/activity/full_moon/full_moon_choose_hero_comp.lua create mode 100644 lua/app/ui/activity/full_moon/full_moon_choose_hero_comp.lua.meta create mode 100644 lua/app/ui/activity/full_moon/full_moon_new_hero_comp.lua create mode 100644 lua/app/ui/activity/full_moon/full_moon_new_hero_comp.lua.meta create mode 100644 lua/app/ui/activity/full_moon/full_moon_skin_comp.lua create mode 100644 lua/app/ui/activity/full_moon/full_moon_skin_comp.lua.meta create mode 100644 lua/app/ui/activity/full_moon/full_moon_task_comp.lua create mode 100644 lua/app/ui/activity/full_moon/full_moon_task_comp.lua.meta create mode 100644 lua/app/ui/activity/full_moon/full_moon_ui.lua create mode 100644 lua/app/ui/activity/full_moon/full_moon_ui.lua.meta create mode 100644 lua/app/ui/main_city/cell/side_bar_full_moon_cell.lua create mode 100644 lua/app/ui/main_city/cell/side_bar_full_moon_cell.lua.meta create mode 100644 lua/app/ui/tips/choose_reward_tips.lua create mode 100644 lua/app/ui/tips/choose_reward_tips.lua.meta create mode 100644 lua/app/userdata/activity/full_moon.meta create mode 100644 lua/app/userdata/activity/full_moon/full_moon_data.lua create mode 100644 lua/app/userdata/activity/full_moon/full_moon_data.lua.meta diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index f334cf9c..c847b58f 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -150,12 +150,18 @@ BIReport.ITEM_GET_TYPE = { ACT_FOURTEEN_DAY_TASK = "ActFourteenDayTask", ACT_FOURTEEN_DAY_EXCHANGE = "ActFourteenDayExchange", FOURTEEN_DAY_GIFT = "FourteenDayGift", + FULL_MOON_HERO_GIFT = "FullMoonHeroGift", + FULL_MOON_NEW_HERO_GIFT = "FullMoonNewHeroGift", + FULL_MOON_SKIN_GIFT = "FullMoonSkinGift", DUNGEON_RUNE_START = "DungeonRuneStart", DUNGEON_RUNE_SETTLEMENT = "DungeonRuneSettlement", DUNGEON_RUNE_SWEEP = "DungeonRuneSweep", DUNGEON_RUNE_BUY_WING = "DungeonRunebuyWing", RUNES_QUENCHING = "RuneQuenching", RUNES_GIFT = "RuneGift", + FULL_MOON_TASK = "FullMoonTask", + FULL_MOON_TASK_PROG_REWARD = "FullMoonTaskProgReward", + FULL_MOON_SKIN_CHALLENGE_REWARD = "FullMoonSkinChallengeReward", } BIReport.ADS_CLICK_TYPE = { @@ -207,6 +213,7 @@ BIReport.BATTLE_TYPE = { ["7"] = "DungeonArmor", ["8"] = "ActBossRush", ["9"] = "DungeonRune", + ["10"] = "FullMoonSkin", } BIReport.GIFT_TYPE = { @@ -229,6 +236,9 @@ BIReport.GIFT_TYPE = { ACT_SUMMER = "ActSummer", ACT_HERO_FUND = "ActHeroFund", FOURTEEN_DAY_GIFT = "FourteenDayGift", + FULL_MOON_HERO_GIFT = "FullMoonHeroGift", + FULL_MOON_NEW_HERO_GIFT = "FullMoonNewHeroGift", + FULL_MOON_SKIN_GIFT = "FullMoonSkinGift", RUNES_GIFT = "RunesGift", } diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index e68db3fb..f1191f28 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -33,6 +33,7 @@ function DataManager:init() self:initManager("SevenDayData", "app/userdata/activity/seven_day/seven_day_data") self:initManager("ShopData", "app/userdata/shop/shop_data") self:initManager("SummonData", "app/userdata/summon/summon_data") + self:initManager("FullMoonData", "app/userdata/activity/full_moon/full_moon_data") self:initManager("AIHelperData", "app/userdata/game_setting/ai_helper_data") self:initManager("HeroFundData", "app/userdata/activity/hero_fund/hero_fund_data") self:initManager("ActBossRushData", "app/userdata/activity/act_boss_rush/act_boss_rush_data") @@ -120,6 +121,7 @@ function DataManager:clear() self.SevenDayData:clear() self.ShopData:clear() self.SummonData:clear() + self.FullMoonData:clear() -- 任务数据最后清理 self.TaskData:clear() self.AIHelperData:clear() @@ -485,14 +487,22 @@ DataManager.activityOpenFunc = { [2] = function(params) ModuleManager.ActBossRushManager:reqActData() DataManager.ActBossRushData:setActivityInfo(params) - end + end, + [4] = function(params) + DataManager.FullMoonData:setActStatus(params) + ModuleManager.FullMoonManager:reqActData() + end, } DataManager.waitOpenActivity = { [2] = function(params) DataManager.ActBossRushData:init({activity_id = params.id}) -- 默认初始化 DataManager.ActBossRushData:setActivityInfo(params) - end + end, + [4] = function(params) + DataManager.FullMoonData:setActStatus(params) + ModuleManager.FullMoonManager:initTimer() + end, } return DataManager \ No newline at end of file diff --git a/lua/app/common/event_manager.lua b/lua/app/common/event_manager.lua index 52ea3a5a..ac66b230 100644 --- a/lua/app/common/event_manager.lua +++ b/lua/app/common/event_manager.lua @@ -60,6 +60,7 @@ EventManager.CUSTOM_EVENT = { -- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER" DUNGEON_ARMOR_TO_TARGET_ID = "DUNGEON_ARMOR_TO_TARGET_ID", ACTIVITY_SUMMER_END = "ACTIVITY_SUMMER_END", + ACTIVITY_FULL_MOON_END = "ACTIVITY_FULL_MOON_END", MAIN_UI_CHECK_SIDE_BAR = "MAIN_UI_CHECK_SIDE_BAR", FORMATION_CHANGE = "FORMATION_CHANGE", BATTLE_REBIRTH = "BATTLE_REBIRTH", diff --git a/lua/app/common/module_manager.lua b/lua/app/common/module_manager.lua index e7561401..aea539d3 100644 --- a/lua/app/common/module_manager.lua +++ b/lua/app/common/module_manager.lua @@ -77,6 +77,8 @@ local MODULE_PATHS = { ActBossRushManager = "app/module/activity/act_boss_rush/act_boss_rush_manager", -- 新手14天乐 FourteenDayManager = "app/module/activity/fourteen_day/fourteen_day_manager", + -- 圆月活动 + FullMoonManager = "app/module/activity/full_moon/full_moon_manager", -- 符文副本 DungeonRuneManager = "app/module/dungeon_rune/dungeon_rune_manager", } diff --git a/lua/app/common/pay_manager.lua b/lua/app/common/pay_manager.lua index 1e860e1c..4e06c584 100644 --- a/lua/app/common/pay_manager.lua +++ b/lua/app/common/pay_manager.lua @@ -27,6 +27,9 @@ PayManager.PURCHARSE_ACT_TYPE = { WEAPON_UPGRADE_GIFT = 15, ARMOR_UPGRADE_GIFT = 16, FOURTEEN_DAY_GIFT = 17, + FULL_MOON_HERO_GIFT = 18, + FULL_MOON_NEW_HERO_GIFT = 19, + FULL_MOON_SKIN_GIFT = 20, RUNES_GIFT = 21, } @@ -57,6 +60,9 @@ PayManager.BI_ITEM_GET_TYPE = { [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.WEAPON_GIFT, [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.ARMOR_GIFT, [PayManager.PURCHARSE_ACT_TYPE.FOURTEEN_DAY_GIFT] = BIReport.ITEM_GET_TYPE.FOURTEEN_DAY_GIFT, + [PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_HERO_GIFT] = BIReport.ITEM_GET_TYPE.FULL_MOON_HERO_GIFT, + [PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_NEW_HERO_GIFT] = BIReport.ITEM_GET_TYPE.FULL_MOON_NEW_HERO_GIFT, + [PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_SKIN_GIFT] = BIReport.ITEM_GET_TYPE.FULL_MOON_SKIN_GIFT, [PayManager.PURCHARSE_ACT_TYPE.RUNES_GIFT] = BIReport.ITEM_GET_TYPE.RUNES_GIFT, }, [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.ITEM_GET_TYPE.GOLD_PIG, @@ -80,10 +86,13 @@ PayManager.BI_GIFT_TYPE = { [PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = BIReport.GIFT_TYPE.WEAPON_GIFT, [PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = BIReport.GIFT_TYPE.ARMOR_GIFT, [PayManager.PURCHARSE_ACT_TYPE.ACT_SUMMER] = BIReport.GIFT_TYPE.ACT_SUMMER, - [PayManager.PURCHARSE_ACT_TYPE.ACT_HERO_FUND] = BIReport.ITEM_GET_TYPE.ACT_HERO_FUND, + [PayManager.PURCHARSE_ACT_TYPE.ACT_HERO_FUND] = BIReport.GIFT_TYPE.ACT_HERO_FUND, [PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.GIFT_TYPE.WEAPON_GIFT, [PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.GIFT_TYPE.ARMOR_GIFT, [PayManager.PURCHARSE_ACT_TYPE.FOURTEEN_DAY_GIFT] = BIReport.GIFT_TYPE.FOURTEEN_DAY_GIFT, + [PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_HERO_GIFT] = BIReport.GIFT_TYPE.FULL_MOON_HERO_GIFT, + [PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_NEW_HERO_GIFT] = BIReport.GIFT_TYPE.FULL_MOON_NEW_HERO_GIFT, + [PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_SKIN_GIFT] = BIReport.GIFT_TYPE.FULL_MOON_SKIN_GIFT, [PayManager.PURCHARSE_ACT_TYPE.RUNES_GIFT] = BIReport.GIFT_TYPE.RUNES_GIFT, }, [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.GIFT_TYPE.GOLD_PIG, diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua index 76afbe80..5888d69d 100644 --- a/lua/app/config/act_gift.lua +++ b/lua/app/config/act_gift.lua @@ -5059,8 +5059,8 @@ local act_gift = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3400101, - ["id_for_nothing"]="VQxcA2RRfg==", + ["id"]=5400401, + ["id_for_nothing"]="UwxcA2FRfg==", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -5091,8 +5091,8 @@ local act_gift = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5400101, - ["id_for_nothing"]="UwxcA2RRfg==", + ["id"]=4400201, + ["id_for_nothing"]="UgxcA2dRfg==", ["num"]=1, ["num_for_nothing"]="Vw==" } diff --git a/lua/app/config/avatar.lua b/lua/app/config/avatar.lua index 3e7a631d..93ee837d 100644 --- a/lua/app/config/avatar.lua +++ b/lua/app/config/avatar.lua @@ -171,9 +171,21 @@ local avatar = { [1400101]={ ["iconId"]="16_1", ["item"]=1400101 + }, + [2300201]={ + ["iconId"]="10_1", + ["item"]=2300201 + }, + [4400201]={ + ["iconId"]="20_1", + ["item"]=4400201 + }, + [5400401]={ + ["iconId"]="16_1", + ["item"]=5400401 } } local config = { -data=avatar,count=42 +data=avatar,count=45 } return config \ No newline at end of file diff --git a/lua/app/config/chapter_dungeon_rune.lua b/lua/app/config/chapter_dungeon_rune.lua index 7b8bdc0f..213be4ce 100644 --- a/lua/app/config/chapter_dungeon_rune.lua +++ b/lua/app/config/chapter_dungeon_rune.lua @@ -106,9 +106,9 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } } }, [2]={ @@ -212,18 +212,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -332,18 +324,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, @@ -445,21 +429,13 @@ local chapter_dungeon_rune = { } }, ["first_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, @@ -558,18 +534,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=1001, + ["id_for_nothing"]="VwhcAg==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, @@ -665,16 +633,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } } }, @@ -768,18 +728,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -888,18 +840,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, @@ -993,18 +937,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=38, + ["id_for_nothing"]="VQA=", + ["num"]=5, + ["num_for_nothing"]="Uw==" } } }, @@ -1012,8 +948,8 @@ local chapter_dungeon_rune = { ["season"]=1, ["stage"]=10, ["chapter_board"]=10, - ["scene"]="bg_14", - ["block_icon"]="battle_hinder_14", + ["scene"]="bg_21", + ["block_icon"]="battle_hinder_21", ["chess_board"]="chessboard_1", ["monster"]={ 6308 @@ -1025,28 +961,28 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=50, + ["num_for_nothing"]="Uwg=" } }, ["sweep_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1009, - ["num_for_nothing"]="VwhcCg==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=20, + ["num_for_nothing"]="VAg=" } } }, @@ -1153,16 +1089,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" } } }, @@ -1267,18 +1195,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -1387,18 +1307,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, @@ -1504,21 +1416,13 @@ local chapter_dungeon_rune = { } }, ["first_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, @@ -1607,18 +1511,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=1001, + ["id_for_nothing"]="VwhcAg==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, @@ -1725,16 +1621,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" } } }, @@ -1828,18 +1716,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -1948,18 +1828,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, @@ -2053,18 +1925,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=38, + ["id_for_nothing"]="VQA=", + ["num"]=5, + ["num_for_nothing"]="Uw==" } } }, @@ -2072,9 +1936,9 @@ local chapter_dungeon_rune = { ["season"]=1, ["stage"]=20, ["chapter_board"]=20, - ["scene"]="bg_23", - ["block_icon"]="battle_hinder_23", - ["chess_board"]="chessboard_2", + ["scene"]="bg_26", + ["block_icon"]="battle_hinder_26", + ["chess_board"]="chessboard_1", ["monster"]={ 6408 }, @@ -2085,28 +1949,28 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=100, + ["num_for_nothing"]="Vwhc" } }, ["sweep_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1019, - ["num_for_nothing"]="VwhdCg==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=25, + ["num_for_nothing"]="VA0=" } } }, @@ -2202,16 +2066,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" } } }, @@ -2316,18 +2172,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -2427,18 +2275,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, @@ -2544,21 +2384,13 @@ local chapter_dungeon_rune = { } }, ["first_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, @@ -2652,18 +2484,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=1002, + ["id_for_nothing"]="VwhcAQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, @@ -2770,16 +2594,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" } } }, @@ -2888,18 +2704,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -3008,18 +2816,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, @@ -3124,18 +2924,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=39, + ["id_for_nothing"]="VQE=", + ["num"]=5, + ["num_for_nothing"]="Uw==" } } }, @@ -3156,28 +2948,28 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=150, + ["num_for_nothing"]="Vw1c" } }, ["sweep_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1029, - ["num_for_nothing"]="VwheCg==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=30, + ["num_for_nothing"]="VQg=" } } }, @@ -3284,16 +3076,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=6000, + ["num_for_nothing"]="UAhcAw==" } } }, @@ -3398,18 +3182,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -3518,18 +3294,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" } } }, @@ -3631,21 +3399,13 @@ local chapter_dungeon_rune = { } }, ["first_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=15, + ["num_for_nothing"]="Vw0=" } } }, @@ -3750,18 +3510,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=1002, + ["id_for_nothing"]="VwhcAQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, @@ -3868,16 +3620,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=6000, + ["num_for_nothing"]="UAhcAw==" } } }, @@ -3986,18 +3730,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=30, + ["num_for_nothing"]="VQg=" } } }, @@ -4106,18 +3842,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" } } }, @@ -4226,18 +3954,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=39, + ["id_for_nothing"]="VQE=", + ["num"]=5, + ["num_for_nothing"]="Uw==" } } }, @@ -4245,8 +3965,8 @@ local chapter_dungeon_rune = { ["season"]=1, ["stage"]=40, ["chapter_board"]=40, - ["scene"]="bg_7", - ["block_icon"]="battle_hinder_7", + ["scene"]="bg_31", + ["block_icon"]="battle_hinder_33", ["chess_board"]="chessboard_2", ["monster"]={ 6608 @@ -4258,28 +3978,28 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["sweep_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1039, - ["num_for_nothing"]="VwhfCg==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=35, + ["num_for_nothing"]="VQ0=" } } }, @@ -4386,16 +4106,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=7000, + ["num_for_nothing"]="UQhcAw==" } } }, @@ -4500,18 +4212,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -4620,18 +4324,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" } } }, @@ -4733,21 +4429,13 @@ local chapter_dungeon_rune = { } }, ["first_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=15, + ["num_for_nothing"]="Vw0=" } } }, @@ -4856,18 +4544,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=1002, + ["id_for_nothing"]="VwhcAQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" } } }, @@ -4974,16 +4654,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=7000, + ["num_for_nothing"]="UQhcAw==" } } }, @@ -5088,18 +4760,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -5208,18 +4872,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" } } }, @@ -5324,18 +4980,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=39, + ["id_for_nothing"]="VQE=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, @@ -5343,8 +4991,8 @@ local chapter_dungeon_rune = { ["season"]=1, ["stage"]=50, ["chapter_board"]=50, - ["scene"]="bg_7", - ["block_icon"]="battle_hinder_7", + ["scene"]="bg_13", + ["block_icon"]="battle_hinder_13", ["chess_board"]="chessboard_2", ["monster"]={ 6708 @@ -5356,28 +5004,28 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=300, + ["num_for_nothing"]="VQhc" } }, ["sweep_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1049, - ["num_for_nothing"]="VwhYCg==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" } } }, @@ -5484,16 +5132,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" } } }, @@ -5598,18 +5238,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -5714,18 +5346,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" } } }, @@ -5821,21 +5445,13 @@ local chapter_dungeon_rune = { } }, ["first_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=15, + ["num_for_nothing"]="Vw0=" } } }, @@ -5940,18 +5556,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=1002, + ["id_for_nothing"]="VwhcAQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" } } }, @@ -6062,16 +5670,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" } } }, @@ -6176,18 +5776,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -6292,18 +5884,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" } } }, @@ -6408,18 +5992,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=39, + ["id_for_nothing"]="VQE=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, @@ -6440,28 +6016,28 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=70, + ["num_for_nothing"]="UQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=400, + ["num_for_nothing"]="Ughc" } }, ["sweep_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1059, - ["num_for_nothing"]="VwhZCg==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=45, + ["num_for_nothing"]="Ug0=" } } }, @@ -6568,16 +6144,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=9000, + ["num_for_nothing"]="XwhcAw==" } } }, @@ -6682,18 +6250,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -6798,18 +6358,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" } } }, @@ -6911,21 +6463,13 @@ local chapter_dungeon_rune = { } }, ["first_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=20, + ["num_for_nothing"]="VAg=" } } }, @@ -7034,18 +6578,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=1003, + ["id_for_nothing"]="VwhcAA==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" } } }, @@ -7152,16 +6688,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=9000, + ["num_for_nothing"]="XwhcAw==" } } }, @@ -7270,18 +6798,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -7386,18 +6906,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=50, + ["num_for_nothing"]="Uwg=" } } }, @@ -7502,18 +7014,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=40, + ["id_for_nothing"]="Ugg=", + ["num"]=8, + ["num_for_nothing"]="Xg==" } } }, @@ -7521,8 +7025,8 @@ local chapter_dungeon_rune = { ["season"]=1, ["stage"]=70, ["chapter_board"]=70, - ["scene"]="bg_14", - ["block_icon"]="battle_hinder_14", + ["scene"]="bg_17", + ["block_icon"]="battle_hinder_17", ["chess_board"]="chessboard_1", ["monster"]={ 6908 @@ -7534,28 +7038,28 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=600, + ["num_for_nothing"]="UAhc" } }, ["sweep_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1069, - ["num_for_nothing"]="VwhaCg==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=50, + ["num_for_nothing"]="Uwg=" } } }, @@ -7670,16 +7174,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" } } }, @@ -7784,18 +7280,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -7904,18 +7392,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" } } }, @@ -8017,21 +7497,13 @@ local chapter_dungeon_rune = { } }, ["first_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=20, + ["num_for_nothing"]="VAg=" } } }, @@ -8136,18 +7608,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=1003, + ["id_for_nothing"]="VwhcAA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" } } }, @@ -8262,16 +7726,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" } } }, @@ -8376,18 +7832,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=50, + ["num_for_nothing"]="Uwg=" } } }, @@ -8492,18 +7940,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" } } }, @@ -8612,18 +8052,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=40, + ["id_for_nothing"]="Ugg=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, @@ -8644,28 +8076,28 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=90, + ["num_for_nothing"]="Xwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=800, + ["num_for_nothing"]="Xghc" } }, ["sweep_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1079, - ["num_for_nothing"]="VwhbCg==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=55, + ["num_for_nothing"]="Uw0=" } } }, @@ -8772,16 +8204,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=12000, + ["num_for_nothing"]="VwpcA2U=" } } }, @@ -8890,18 +8314,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -9000,18 +8416,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=25, + ["num_for_nothing"]="VA0=" } } }, @@ -9117,21 +8525,13 @@ local chapter_dungeon_rune = { } }, ["first_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=20, + ["num_for_nothing"]="VAg=" } } }, @@ -9236,18 +8636,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=1003, + ["id_for_nothing"]="VwhcAA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" } } }, @@ -9354,16 +8746,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=12000, + ["num_for_nothing"]="VwpcA2U=" } } }, @@ -9468,18 +8852,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -9584,18 +8960,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=25, + ["num_for_nothing"]="VA0=" } } }, @@ -9704,18 +9072,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=40, + ["id_for_nothing"]="Ugg=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, @@ -9736,28 +9096,28 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["sweep_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1089, - ["num_for_nothing"]="VwhUCg==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=60, + ["num_for_nothing"]="UAg=" } } }, @@ -9864,16 +9224,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=14000, + ["num_for_nothing"]="VwxcA2U=" } } }, @@ -9986,18 +9338,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -10102,18 +9446,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=25, + ["num_for_nothing"]="VA0=" } } }, @@ -10219,21 +9555,13 @@ local chapter_dungeon_rune = { } }, ["first_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=20, + ["num_for_nothing"]="VAg=" } } }, @@ -10338,18 +9666,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=1004, + ["id_for_nothing"]="VwhcBw==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" } } }, @@ -10460,16 +9780,8 @@ local chapter_dungeon_rune = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=14000, + ["num_for_nothing"]="VwxcA2U=" } } }, @@ -10574,18 +9886,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }, @@ -10690,18 +9994,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=25, + ["num_for_nothing"]="VA0=" } } }, @@ -10806,18 +10102,10 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=41, + ["id_for_nothing"]="Ugk=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, @@ -10825,9 +10113,9 @@ local chapter_dungeon_rune = { ["season"]=1, ["stage"]=100, ["chapter_board"]=100, - ["scene"]="bg_7", - ["block_icon"]="battle_hinder_7", - ["chess_board"]="chessboard_2", + ["scene"]="bg_22", + ["block_icon"]="battle_hinder_22", + ["chess_board"]="chessboard_1", ["monster"]={ 7208 }, @@ -10838,28 +10126,28 @@ local chapter_dungeon_rune = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=1200, + ["num_for_nothing"]="VwpcAw==" } }, ["sweep_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1099, - ["num_for_nothing"]="VwhVCg==" + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=65, + ["num_for_nothing"]="UA0=" } } } diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index 5c2d73e9..51a5a430 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -1620,7 +1620,8 @@ local hero = { ["is_show"]=1, ["collection_point"]=5, ["skin"]={ - 44002 + 44002, + 4400201 } }, [44003]={ @@ -2180,7 +2181,8 @@ local hero = { ["item_id"]=54004, ["collection_point"]=5, ["skin"]={ - 54004 + 54004, + 5400401 } } } diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index 221bc2b8..f1a4fead 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -2451,9 +2451,21 @@ local item = { ["parameter"]=2300201, ["qlt"]=2, ["icon"]="2300201" + }, + [4400201]={ + ["type"]=12, + ["parameter"]=4400201, + ["qlt"]=4, + ["icon"]="4400201" + }, + [5400401]={ + ["type"]=12, + ["parameter"]=5400401, + ["qlt"]=4, + ["icon"]="5400401" } } local config = { -data=item,count=126 +data=item,count=128 } return config \ No newline at end of file diff --git a/lua/app/config/monster_activity.lua b/lua/app/config/monster_activity.lua index 66e9c286..35ff3bed 100644 --- a/lua/app/config/monster_activity.lua +++ b/lua/app/config/monster_activity.lua @@ -771,47 +771,39 @@ local monster_activity = { ["monster_exp"]=15000 }, [10004]={ - ["monster_base"]=20047, + ["monster_base"]=30043, ["is_boss"]=1, - ["hp"]=107230000, - ["atk"]=930000, + ["hp"]=245450000, + ["atk"]=910000, ["atk_times"]=4, ["hurt_skill"]={ - 30156, - 30157, - 30158 + 50138, + 50139, + 50140, + 50141 }, ["skill"]={ - 10137, - 10138 + 50142, + 50143 }, - ["passive_skill"]={ - 10013, - 10010 - }, - ["monster_exp"]=15000 + ["monster_exp"]=350000 }, [10104]={ - ["monster_base"]=20048, + ["monster_base"]=30044, ["is_boss"]=1, - ["hp"]=107230000, - ["atk"]=930000, + ["hp"]=245450000, + ["atk"]=910000, ["atk_times"]=4, ["hurt_skill"]={ - 30159, - 30160, - 30161 + 50144, + 50145, + 50146, + 50147 }, ["skill"]={ - 10139, - 10140 + 50148 }, - ["passive_skill"]={ - 10141, - 10014, - 10009 - }, - ["monster_exp"]=15000 + ["monster_exp"]=350000 } } local config = { diff --git a/lua/app/config/monster_base.lua b/lua/app/config/monster_base.lua index a325b36f..7389ebff 100644 --- a/lua/app/config/monster_base.lua +++ b/lua/app/config/monster_base.lua @@ -793,9 +793,19 @@ local monster_base = { ["model_id"]="p0026", ["body"]=2, ["model_ui"]=1.0 + }, + [30043]={ + ["model_id"]="p0043", + ["body"]=2, + ["model_ui"]=1.0 + }, + [30044]={ + ["model_id"]="p0044", + ["body"]=2, + ["model_ui"]=1.0 } } local config = { -data=monster_base,count=159 +data=monster_base,count=161 } return config \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index ddf32dc8..ad1f8967 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -30334,6 +30334,339 @@ local skill = { ["cd"]=3, ["cd_start"]=0 }, + [50138]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_purple", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 25 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound"]=5400410, + ["sound_delay"]=0.0, + ["name_act"]="attack01", + ["fx_self"]=400160 + }, + [50139]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_purple", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 25 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound"]=5400411, + ["sound_delay"]=0.0, + ["name_act"]="attack02", + ["fx_self"]=400161 + }, + [50140]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_purple", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 25 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound"]=5400412, + ["sound_delay"]=0.0, + ["name_act"]="attack03", + ["fx_self"]=400162 + }, + [50141]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_purple", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 25 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound"]=5400413, + ["sound_delay"]=0.0, + ["name_act"]="attack04", + ["fx_self"]=400163 + }, + [50142]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_purple", + ["num"]=50000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 1, + 25 + }, + ["cd"]=3, + ["cd_start"]=0, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound"]=5400420, + ["sound_delay"]=0.0, + ["name_act"]="skill01", + ["fx_self"]=400164, + ["bullet_time"]={ + 1666, + 3000, + 400 + } + }, + [50143]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="immune", + ["num"]=0, + ["ratio"]=10000, + ["round"]=2 + }, + { + ["type"]="counterattack", + ["num"]=2500, + ["ratio"]=10000, + ["round"]=2 + }, + { + ["type"]="undead", + ["num"]=0, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=1, + ["skill_position"]={ + 1, + 25 + }, + ["cd"]=3, + ["cd_start"]=0 + }, + [50144]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="corrupt", + ["num"]=7500, + ["ratio"]=1000, + ["round"]=2 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 10005 + }, + ["name_act"]="attack01", + ["fx_self"]=400110 + }, + [50145]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="corrupt", + ["num"]=7500, + ["ratio"]=1000, + ["round"]=2 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 10006 + }, + ["name_act"]="attack02", + ["fx_self"]=400110 + }, + [50146]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="corrupt", + ["num"]=7500, + ["ratio"]=1000, + ["round"]=2 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 10023 + }, + ["name_act"]="attack03", + ["fx_self"]=400110 + }, + [50147]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="corrupt", + ["num"]=7500, + ["ratio"]=1000, + ["round"]=2 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 10048 + }, + ["name_act"]="attack04", + ["fx_self"]=400110 + }, + [50148]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="curse", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3, + 5 + }, + ["skill_position"]={ + 2, + 0 + }, + ["cd"]=3, + ["cd_start"]=0, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound"]=44002200, + ["sound_delay"]=0.0, + ["name_act"]="skill01", + ["fx_self"]=400111, + ["bullet_time"]={ + 1600, + 3000, + 200 + } + }, [110001]={ ["skill_type"]=5, ["skill_position"]={ @@ -30436,6 +30769,6 @@ local skill = { } } local config = { -data=skill,count=1104 +data=skill,count=1115 } return config \ No newline at end of file diff --git a/lua/app/config/skin.lua b/lua/app/config/skin.lua index 548c582a..afee9d67 100644 --- a/lua/app/config/skin.lua +++ b/lua/app/config/skin.lua @@ -259,6 +259,32 @@ local skin = { ["skin_point"]=0, ["hero_id"]=44002 }, + [4400201]={ + ["model_id"]="p0044", + ["qlt"]=4, + ["bonus"]={ + { + ["type"]="attr_crit_blue", + ["num"]=500 + }, + { + ["type"]="attr_crit_time_blue", + ["num"]=2000 + } + }, + ["icon"]="20_1", + ["got"]=1, + ["skin_point"]=15, + ["hero_id"]=44002, + ["item_id"]=4400201, + ["skill_show"]={ + 44002011, + 44002012, + 44002013, + 44002014, + 44002015 + } + }, [44003]={ ["model_id"]="p0030", ["qlt"]=1, @@ -364,9 +390,35 @@ local skin = { ["qlt"]=1, ["skin_point"]=0, ["hero_id"]=54004 + }, + [5400401]={ + ["model_id"]="p0043", + ["qlt"]=4, + ["bonus"]={ + { + ["type"]="attr_crit_purple", + ["num"]=500 + }, + { + ["type"]="attr_crit_time_purple", + ["num"]=2000 + } + }, + ["icon"]="20_1", + ["got"]=1, + ["skin_point"]=15, + ["hero_id"]=54004, + ["item_id"]=5400401, + ["skill_show"]={ + 54004011, + 54004012, + 54004013, + 54004014, + 54004015 + } } } local config = { -data=skin,count=41 +data=skin,count=43 } return config \ No newline at end of file diff --git a/lua/app/config/skin_skill.lua b/lua/app/config/skin_skill.lua index b3d93357..4f44f683 100644 --- a/lua/app/config/skin_skill.lua +++ b/lua/app/config/skin_skill.lua @@ -451,9 +451,153 @@ local skin_skill = { 400 }, ["fx_self_mirror"]=400004 + }, + [44002011]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 10005 + }, + ["name_act"]="attack01", + ["fx_self"]=300110, + ["fx_self_mirror"]=400110 + }, + [44002012]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 10006 + }, + ["name_act"]="attack02", + ["fx_self"]=300110, + ["fx_self_mirror"]=400110 + }, + [44002013]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 10023 + }, + ["name_act"]="attack03", + ["fx_self"]=300110, + ["fx_self_mirror"]=400110 + }, + [44002014]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 10048 + }, + ["name_act"]="attack04", + ["fx_self"]=300110, + ["fx_self_mirror"]=400110 + }, + [44002015]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound"]=44002200, + ["sound_delay"]=0.0, + ["name_act"]="skill01", + ["fx_self"]=300111, + ["bullet_time"]={ + 1333, + 3000, + 400 + }, + ["fx_self_mirror"]=400111 + }, + [54004011]={ + ["skill_position"]={ + 1, + 25 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound"]=5400410, + ["sound_delay"]=0.0, + ["name_act"]="attack01", + ["fx_self"]=300160, + ["fx_self_mirror"]=400160 + }, + [54004012]={ + ["skill_position"]={ + 1, + 25 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound"]=5400411, + ["sound_delay"]=0.0, + ["name_act"]="attack02", + ["fx_self"]=300161, + ["fx_self_mirror"]=400161 + }, + [54004013]={ + ["skill_position"]={ + 1, + 25 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound"]=5400412, + ["sound_delay"]=0.0, + ["name_act"]="attack03", + ["fx_self"]=300162, + ["fx_self_mirror"]=400162 + }, + [54004014]={ + ["skill_position"]={ + 1, + 25 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound"]=5400413, + ["sound_delay"]=0.0, + ["name_act"]="attack04", + ["fx_self"]=300163, + ["fx_self_mirror"]=400163 + }, + [54004015]={ + ["skill_position"]={ + 1, + 25 + }, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound"]=5400420, + ["sound_delay"]=0.0, + ["name_act"]="skill01", + ["fx_self"]=300164, + ["bullet_time"]={ + 1666, + 3000, + 400 + }, + ["fx_self_mirror"]=400164 } } local config = { -data=skin_skill,count=30 +data=skin_skill,count=40 } 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 index c9f6c9f4..dd6b7d73 100644 --- a/lua/app/config/strings/cn/avatar.lua +++ b/lua/app/config/strings/cn/avatar.lua @@ -124,9 +124,18 @@ local avatar = { }, [1400101]={ ["desc"]="遗迹战甲" + }, + [2300201]={ + ["desc"]="黑剑士" + }, + [4400201]={ + ["desc"]="新月女王" + }, + [5400401]={ + ["desc"]="暗月武神" } } local config = { -data=avatar,count=42 +data=avatar,count=45 } 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 069217f5..791a4041 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -474,9 +474,18 @@ local item = { [5400101]={ ["name"]="翩然起舞", ["desc"]="蝴蝶的新衣装。" + }, + [2300201]={ + ["name"]="黑剑士" + }, + [4400201]={ + ["name"]="新月女王" + }, + [5400401]={ + ["name"]="暗月武神" } } local config = { -data=item,count=119 +data=item,count=122 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/skin.lua b/lua/app/config/strings/cn/skin.lua index 5f8bc7c7..d150dcfb 100644 --- a/lua/app/config/strings/cn/skin.lua +++ b/lua/app/config/strings/cn/skin.lua @@ -36,7 +36,7 @@ local skin = { ["value"]="初始" }, [2300201]={ - ["value"]="Z丫" + ["value"]="黑剑士" }, [24001]={ ["value"]="初始" @@ -89,6 +89,9 @@ local skin = { [44002]={ ["value"]="初始" }, + [4400201]={ + ["value"]="新月女王" + }, [44003]={ ["value"]="初始" }, @@ -121,9 +124,12 @@ local skin = { }, [54004]={ ["value"]="初始" + }, + [5400401]={ + ["value"]="暗月武神" } } local config = { -data=skin,count=41 +data=skin,count=43 } 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 index 734fab36..437eb5db 100644 --- a/lua/app/config/strings/de/avatar.lua +++ b/lua/app/config/strings/de/avatar.lua @@ -124,9 +124,18 @@ local avatar = { }, [1400101]={ + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=avatar,count=42 +data=avatar,count=45 } 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 9cc79563..60496521 100644 --- a/lua/app/config/strings/de/item.lua +++ b/lua/app/config/strings/de/item.lua @@ -355,9 +355,18 @@ local item = { }, [5400101]={ + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=item,count=119 +data=item,count=122 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/skin.lua b/lua/app/config/strings/de/skin.lua index ac13dc52..91905e66 100644 --- a/lua/app/config/strings/de/skin.lua +++ b/lua/app/config/strings/de/skin.lua @@ -88,6 +88,9 @@ local skin = { }, [44002]={ + }, + [4400201]={ + }, [44003]={ @@ -121,9 +124,12 @@ local skin = { }, [54004]={ + }, + [5400401]={ + } } local config = { -data=skin,count=41 +data=skin,count=43 } 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 index da346002..7e0a20cf 100644 --- a/lua/app/config/strings/en/avatar.lua +++ b/lua/app/config/strings/en/avatar.lua @@ -124,9 +124,18 @@ local avatar = { }, [1400101]={ ["desc"]="Relic Armor" + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=avatar,count=42 +data=avatar,count=45 } 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 fb125d9f..099e23df 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -470,9 +470,18 @@ local item = { [5400101]={ ["name"]="Graceful Dance", ["desc"]="Butterfly's new outfit." + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=item,count=119 +data=item,count=122 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/skin.lua b/lua/app/config/strings/en/skin.lua index 8a28401f..f90b2560 100644 --- a/lua/app/config/strings/en/skin.lua +++ b/lua/app/config/strings/en/skin.lua @@ -88,6 +88,9 @@ local skin = { }, [44002]={ ["value"]="Initial" + }, + [4400201]={ + }, [44003]={ ["value"]="Initial" @@ -121,9 +124,12 @@ local skin = { }, [54004]={ ["value"]="Initial" + }, + [5400401]={ + } } local config = { -data=skin,count=41 +data=skin,count=43 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/avatar.lua b/lua/app/config/strings/es/avatar.lua index f30588c3..95d27b24 100644 --- a/lua/app/config/strings/es/avatar.lua +++ b/lua/app/config/strings/es/avatar.lua @@ -124,9 +124,18 @@ local avatar = { }, [1400101]={ ["desc"]="Armadura de Ruinas" + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=avatar,count=42 +data=avatar,count=45 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/item.lua b/lua/app/config/strings/es/item.lua index a84048f0..a55637cc 100644 --- a/lua/app/config/strings/es/item.lua +++ b/lua/app/config/strings/es/item.lua @@ -470,9 +470,18 @@ local item = { [5400101]={ ["name"]="Danza Elegante", ["desc"]="Traje nuevo de Mariposa." + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=item,count=119 +data=item,count=122 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/skin.lua b/lua/app/config/strings/es/skin.lua index 90f59dd4..ed6b63d2 100644 --- a/lua/app/config/strings/es/skin.lua +++ b/lua/app/config/strings/es/skin.lua @@ -88,6 +88,9 @@ local skin = { }, [44002]={ ["value"]="Inicial" + }, + [4400201]={ + }, [44003]={ ["value"]="Inicial" @@ -121,9 +124,12 @@ local skin = { }, [54004]={ ["value"]="Inicial" + }, + [5400401]={ + } } local config = { -data=skin,count=41 +data=skin,count=43 } 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 index 734fab36..437eb5db 100644 --- a/lua/app/config/strings/fr/avatar.lua +++ b/lua/app/config/strings/fr/avatar.lua @@ -124,9 +124,18 @@ local avatar = { }, [1400101]={ + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=avatar,count=42 +data=avatar,count=45 } 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 9cc79563..60496521 100644 --- a/lua/app/config/strings/fr/item.lua +++ b/lua/app/config/strings/fr/item.lua @@ -355,9 +355,18 @@ local item = { }, [5400101]={ + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=item,count=119 +data=item,count=122 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/skin.lua b/lua/app/config/strings/fr/skin.lua index ac13dc52..91905e66 100644 --- a/lua/app/config/strings/fr/skin.lua +++ b/lua/app/config/strings/fr/skin.lua @@ -88,6 +88,9 @@ local skin = { }, [44002]={ + }, + [4400201]={ + }, [44003]={ @@ -121,9 +124,12 @@ local skin = { }, [54004]={ + }, + [5400401]={ + } } local config = { -data=skin,count=41 +data=skin,count=43 } 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 index 97b79e5a..faf2771e 100644 --- a/lua/app/config/strings/id/avatar.lua +++ b/lua/app/config/strings/id/avatar.lua @@ -124,9 +124,18 @@ local avatar = { }, [1400101]={ ["desc"]="Armor Relik" + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=avatar,count=42 +data=avatar,count=45 } 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 c6e1b55f..cd72615f 100644 --- a/lua/app/config/strings/id/item.lua +++ b/lua/app/config/strings/id/item.lua @@ -470,9 +470,18 @@ local item = { [5400101]={ ["name"]="Tarian Anggun", ["desc"]="Outfit baru Kupu-kupu." + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=item,count=119 +data=item,count=122 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/skin.lua b/lua/app/config/strings/id/skin.lua index 6908b05b..32d88252 100644 --- a/lua/app/config/strings/id/skin.lua +++ b/lua/app/config/strings/id/skin.lua @@ -88,6 +88,9 @@ local skin = { }, [44002]={ ["value"]="Awal" + }, + [4400201]={ + }, [44003]={ ["value"]="Awal" @@ -121,9 +124,12 @@ local skin = { }, [54004]={ ["value"]="Awal" + }, + [5400401]={ + } } local config = { -data=skin,count=41 +data=skin,count=43 } 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 index 9f0298b4..68219f8d 100644 --- a/lua/app/config/strings/ja/avatar.lua +++ b/lua/app/config/strings/ja/avatar.lua @@ -124,9 +124,18 @@ local avatar = { }, [1400101]={ ["desc"]="レリックアーマー" + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=avatar,count=42 +data=avatar,count=45 } 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 78e926b2..980b7760 100644 --- a/lua/app/config/strings/ja/item.lua +++ b/lua/app/config/strings/ja/item.lua @@ -470,9 +470,18 @@ local item = { [5400101]={ ["name"]="グレイスフルダンス", ["desc"]="蝴蝶の新スキン。" + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=item,count=119 +data=item,count=122 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/skin.lua b/lua/app/config/strings/ja/skin.lua index 032a18a5..e7e5e1af 100644 --- a/lua/app/config/strings/ja/skin.lua +++ b/lua/app/config/strings/ja/skin.lua @@ -88,6 +88,9 @@ local skin = { }, [44002]={ ["value"]="デフォルト" + }, + [4400201]={ + }, [44003]={ ["value"]="デフォルト" @@ -121,9 +124,12 @@ local skin = { }, [54004]={ ["value"]="デフォルト" + }, + [5400401]={ + } } local config = { -data=skin,count=41 +data=skin,count=43 } 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 index d6003432..bd96be72 100644 --- a/lua/app/config/strings/ko/avatar.lua +++ b/lua/app/config/strings/ko/avatar.lua @@ -124,9 +124,18 @@ local avatar = { }, [1400101]={ ["desc"]="유적 갑옷" + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=avatar,count=42 +data=avatar,count=45 } 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 da4c04b8..2b2e0460 100644 --- a/lua/app/config/strings/ko/item.lua +++ b/lua/app/config/strings/ko/item.lua @@ -470,9 +470,18 @@ local item = { [5400101]={ ["name"]="날아오르는 춤", ["desc"]="나비의 새 옷" + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=item,count=119 +data=item,count=122 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/skin.lua b/lua/app/config/strings/ko/skin.lua index 0061bb38..152f4df7 100644 --- a/lua/app/config/strings/ko/skin.lua +++ b/lua/app/config/strings/ko/skin.lua @@ -88,6 +88,9 @@ local skin = { }, [44002]={ ["value"]="초기" + }, + [4400201]={ + }, [44003]={ ["value"]="초기" @@ -121,9 +124,12 @@ local skin = { }, [54004]={ ["value"]="초기" + }, + [5400401]={ + } } local config = { -data=skin,count=41 +data=skin,count=43 } 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 index e4258495..92eaf905 100644 --- a/lua/app/config/strings/pt/avatar.lua +++ b/lua/app/config/strings/pt/avatar.lua @@ -124,9 +124,18 @@ local avatar = { }, [1400101]={ ["desc"]="Armadura das Ruínas" + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=avatar,count=42 +data=avatar,count=45 } 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 e1f6a0a4..f5a2a670 100644 --- a/lua/app/config/strings/pt/item.lua +++ b/lua/app/config/strings/pt/item.lua @@ -470,9 +470,18 @@ local item = { [5400101]={ ["name"]="Dança Fluida", ["desc"]="A nova roupa da Borboleta." + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=item,count=119 +data=item,count=122 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/skin.lua b/lua/app/config/strings/pt/skin.lua index c5114cef..3a986068 100644 --- a/lua/app/config/strings/pt/skin.lua +++ b/lua/app/config/strings/pt/skin.lua @@ -88,6 +88,9 @@ local skin = { }, [44002]={ ["value"]="Inicial" + }, + [4400201]={ + }, [44003]={ ["value"]="Inicial" @@ -121,9 +124,12 @@ local skin = { }, [54004]={ ["value"]="Inicial" + }, + [5400401]={ + } } local config = { -data=skin,count=41 +data=skin,count=43 } 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 index 734fab36..437eb5db 100644 --- a/lua/app/config/strings/ru/avatar.lua +++ b/lua/app/config/strings/ru/avatar.lua @@ -124,9 +124,18 @@ local avatar = { }, [1400101]={ + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=avatar,count=42 +data=avatar,count=45 } 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 9cc79563..60496521 100644 --- a/lua/app/config/strings/ru/item.lua +++ b/lua/app/config/strings/ru/item.lua @@ -355,9 +355,18 @@ local item = { }, [5400101]={ + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=item,count=119 +data=item,count=122 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/skin.lua b/lua/app/config/strings/ru/skin.lua index ac13dc52..91905e66 100644 --- a/lua/app/config/strings/ru/skin.lua +++ b/lua/app/config/strings/ru/skin.lua @@ -88,6 +88,9 @@ local skin = { }, [44002]={ + }, + [4400201]={ + }, [44003]={ @@ -121,9 +124,12 @@ local skin = { }, [54004]={ + }, + [5400401]={ + } } local config = { -data=skin,count=41 +data=skin,count=43 } 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 index f3d0fa76..67d52663 100644 --- a/lua/app/config/strings/th/avatar.lua +++ b/lua/app/config/strings/th/avatar.lua @@ -124,9 +124,18 @@ local avatar = { }, [1400101]={ ["desc"]="เกราะรบซาก" + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=avatar,count=42 +data=avatar,count=45 } 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 50f2004f..7338e96e 100644 --- a/lua/app/config/strings/th/item.lua +++ b/lua/app/config/strings/th/item.lua @@ -470,9 +470,18 @@ local item = { [5400101]={ ["name"]="เยื้องกรายเต้นรำ", ["desc"]="ชุดใหม่ของผีเสื้อ" + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=item,count=119 +data=item,count=122 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/skin.lua b/lua/app/config/strings/th/skin.lua index 9228040e..cf61741f 100644 --- a/lua/app/config/strings/th/skin.lua +++ b/lua/app/config/strings/th/skin.lua @@ -88,6 +88,9 @@ local skin = { }, [44002]={ ["value"]="เริ่มต้น" + }, + [4400201]={ + }, [44003]={ ["value"]="เริ่มต้น" @@ -121,9 +124,12 @@ local skin = { }, [54004]={ ["value"]="เริ่มต้น" + }, + [5400401]={ + } } local config = { -data=skin,count=41 +data=skin,count=43 } 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 index 1bab61c3..30be4a00 100644 --- a/lua/app/config/strings/vi/avatar.lua +++ b/lua/app/config/strings/vi/avatar.lua @@ -124,9 +124,18 @@ local avatar = { }, [1400101]={ ["desc"]="Giáp Di Tích" + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=avatar,count=42 +data=avatar,count=45 } 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 207020e3..d3f5b5c5 100644 --- a/lua/app/config/strings/vi/item.lua +++ b/lua/app/config/strings/vi/item.lua @@ -470,9 +470,18 @@ local item = { [5400101]={ ["name"]="Nhảy Múa Nhanh Nhẹn", ["desc"]="Quần áo mới của Bươm Bướm." + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=item,count=119 +data=item,count=122 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/skin.lua b/lua/app/config/strings/vi/skin.lua index d93240ae..90a0c858 100644 --- a/lua/app/config/strings/vi/skin.lua +++ b/lua/app/config/strings/vi/skin.lua @@ -88,6 +88,9 @@ local skin = { }, [44002]={ ["value"]="Ban Đầu" + }, + [4400201]={ + }, [44003]={ ["value"]="Ban Đầu" @@ -121,9 +124,12 @@ local skin = { }, [54004]={ ["value"]="Ban Đầu" + }, + [5400401]={ + } } local config = { -data=skin,count=41 +data=skin,count=43 } 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 index b48d856d..3c685777 100644 --- a/lua/app/config/strings/zh/avatar.lua +++ b/lua/app/config/strings/zh/avatar.lua @@ -124,9 +124,18 @@ local avatar = { }, [1400101]={ ["desc"]="遺跡戰甲" + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=avatar,count=42 +data=avatar,count=45 } 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 40872dbc..db5b7f6b 100644 --- a/lua/app/config/strings/zh/item.lua +++ b/lua/app/config/strings/zh/item.lua @@ -470,9 +470,18 @@ local item = { [5400101]={ ["name"]="翩然起舞", ["desc"]="蝴蝶的新服裝。" + }, + [2300201]={ + + }, + [4400201]={ + + }, + [5400401]={ + } } local config = { -data=item,count=119 +data=item,count=122 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/skin.lua b/lua/app/config/strings/zh/skin.lua index 93112cd0..3a4755dd 100644 --- a/lua/app/config/strings/zh/skin.lua +++ b/lua/app/config/strings/zh/skin.lua @@ -88,6 +88,9 @@ local skin = { }, [44002]={ ["value"]="初始" + }, + [4400201]={ + }, [44003]={ ["value"]="初始" @@ -121,9 +124,12 @@ local skin = { }, [54004]={ ["value"]="初始" + }, + [5400401]={ + } } local config = { -data=skin,count=41 +data=skin,count=43 } 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 cb5e20be..f2ab7726 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -23,6 +23,7 @@ local CONST_PATHS = { ActivityConst = "app/module/activity/activity_const", FourteenDayConst = "app/module/activity/fourteen_day/fourteen_day_const", DungeonRuneConst = "app/module/dungeon_rune/dungeon_rune_const", + FullMoonConst = "app/module/activity/full_moon/full_moon_const", } if EDITOR_MODE then diff --git a/lua/app/global/global_func.lua b/lua/app/global/global_func.lua index 2fcbcb00..5eb4df2f 100644 --- a/lua/app/global/global_func.lua +++ b/lua/app/global/global_func.lua @@ -460,6 +460,37 @@ function GFunc.getAttrName(key) return I18N:getText("attr", key, "name") end +-- 获取任务icon +function GFunc.getTaskIcon(taskType, taskTarget) + if taskType == GConst.TaskConst.TASK_TYPE.X_ARENA_GRADING then + local name = DataManager.ArenaData:getGradingIconName(DataManager.ArenaData:getGradingIdFromScore(taskTarget)) + if name == "arena_dan_1" then + return "13" + elseif name == "arena_dan_2" then + return "14" + elseif name == "arena_dan_3" then + return "12" + end + else + return ConfigManager:getConfig("task_type")[taskType].icon + end +end + +-- 获取任务描述 +function GFunc.getTaskDesc(taskType, taskTarget) + if taskType == GConst.TaskConst.TASK_TYPE.X_ARENA_GRADING then + -- 段位显示文本 + local grading = DataManager.ArenaData:getGradingName(DataManager.ArenaData:getGradingIdFromScore(taskTarget)) + return I18N:getText("task_type", taskType, "desc", grading) + elseif taskType == GConst.TaskConst.TASK_TYPE.X_DUNGEON_ARMOR then + -- 防具副本显示章节和关卡 + local cfg = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_ARMOR):getConfig(taskTarget) + return I18N:getText("task_type", taskType, "desc", cfg.chapter, cfg.stage) + else + return I18N:getText("task_type", taskType, "desc", taskTarget) + end +end + function GFunc.getTimeStrWithMS(time) local m = math.floor(time/60) local s = time%60 diff --git a/lua/app/module/activity/full_moon.meta b/lua/app/module/activity/full_moon.meta new file mode 100644 index 00000000..0d157e21 --- /dev/null +++ b/lua/app/module/activity/full_moon.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0ee2abea36076ae4d8463dff225a1234 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/module/activity/full_moon/full_moon_const.lua b/lua/app/module/activity/full_moon/full_moon_const.lua new file mode 100644 index 00000000..826e3f09 --- /dev/null +++ b/lua/app/module/activity/full_moon/full_moon_const.lua @@ -0,0 +1,28 @@ +local FullMoonConst = {} + +-- 活动id +FullMoonConst.ACT_ID = 406 + + +FullMoonConst.ACT_DAYS = 10 + +-- 英雄自选礼包分页显示个数 +FullMoonConst.HERO_GIFT_SHOW_STEP = { + 4,4,5 +} + +-- 界面 +FullMoonConst.PANEL_TYPE = { + TASK = 1, + CHOOSE_HERO = 2, + NEW_HERO = 3, + SKIN = 4, +} + +FullMoonConst.SKIN_CHALLENGE_ID_1 = 1 +FullMoonConst.SKIN_CHALLENGE_ID_2 = 2 + +FullMoonConst.SKIN_GIFT_ID_1 = 200102 +FullMoonConst.SKIN_GIFT_ID_2 = 200202 + +return FullMoonConst \ No newline at end of file diff --git a/lua/app/module/activity/full_moon/full_moon_const.lua.meta b/lua/app/module/activity/full_moon/full_moon_const.lua.meta new file mode 100644 index 00000000..e03c47f8 --- /dev/null +++ b/lua/app/module/activity/full_moon/full_moon_const.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2ce3abbd5316c744c9ea4254adf1a947 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/activity/full_moon/full_moon_manager.lua b/lua/app/module/activity/full_moon/full_moon_manager.lua new file mode 100644 index 00000000..9c298343 --- /dev/null +++ b/lua/app/module/activity/full_moon/full_moon_manager.lua @@ -0,0 +1,102 @@ +local FullMoonManager = class("FullMoonManager", BaseModule) + +function FullMoonManager:showActMainUI(panelType) + UIManager:showUI("app/ui/activity/full_moon/full_moon_ui", panelType) +end + +-- 初始化计时器 +function FullMoonManager:initTimer() + self:unscheduleGlobal(self.actSid) + + if DataManager.FullMoonData:isOpenTime() then + Logger.logHighlight("圆月活动结束倒计时："..DataManager.FullMoonData:getEndRemainTime()) + self.actSid = self:performWithDelayGlobal(function() + Logger.logHighlight("圆月活动结束") + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.ACTIVITY_FULL_MOON_END) + end, DataManager.FullMoonData:getEndRemainTime()) + elseif DataManager.FullMoonData:getStartRemainTime() > 0 then + Logger.logHighlight("圆月活动开始倒计时："..DataManager.FullMoonData:getStartRemainTime()) + self.actSid = self:performWithDelayGlobal(function() + Logger.logHighlight("圆月活动开始") + self:reqActData() + end, DataManager.FullMoonData:getStartRemainTime()) + end +end + +-- 请求活动数据 +function FullMoonManager:reqActData() + if not DataManager.FullMoonData:isOpen() then + return + end + self:sendMessage(ProtoMsgType.FromMsgEnum.FullMoonInfoReq, {}, {}, self.rspActData, nil) +end + +function FullMoonManager:rspActData(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.FullMoonData:onGetActData(result.full_moon) + end +end + +-- 请求任务奖励 +function FullMoonManager:reqTaskReward(id) + self:sendMessage(ProtoMsgType.FromMsgEnum.FullMoonTaskClaimReq, {id = id}, {}, self.rspTaskReward, BIReport.ITEM_GET_TYPE.FULL_MOON_TASK) +end + +function FullMoonManager:rspTaskReward(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.FullMoonData:onReceivedTaskReward(result.reqData.id, result.finished) + GFunc.showRewardBox(result.rewards) + end +end + +-- 请求任务进度奖励 +function FullMoonManager:reqTaskProgressReward(id) + self:sendMessage(ProtoMsgType.FromMsgEnum.FullMoonRewardClaimReq, {id = id}, {}, self.rspTaskProgressReward, BIReport.ITEM_GET_TYPE.FULL_MOON_TASK_PROG_REWARD) +end + +function FullMoonManager:rspTaskProgressReward(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.FullMoonData:onReceivedTaskProgressReward(result.reqData.id) + GFunc.showRewardBox(result.rewards) + end +end + +-- 自选礼包选择 +function FullMoonManager:reqGiftChooseHero(index) + self:sendMessage(ProtoMsgType.FromMsgEnum.FullMoonCustomGiftChooseReq, {index = index}, {}, self.rspGiftChooseHero, nil) +end + +function FullMoonManager:rspGiftChooseHero(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.FullMoonData:onChooseHeroSuccess(result.reqData.index) + end +end + +-- 皮肤挑战 +function FullMoonManager:skinChallenge(id) + DataManager.FullMoonData:setCurSkinChallengeId(id) + ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.FULL_MOON_SKIN, nil, function() + UIManager:closeAllUI() + ModuleManager.MaincityManager:showMainCityUI() + self:showActMainUI(GConst.FullMoonConst.PANEL_TYPE.SKIN) + end) +end + +-- 请求皮肤关卡挑战奖励 +function FullMoonManager:reqChapterSkinClaim(id, combatReport) + if DataManager.FullMoonData:isReceivedSkinFirstChallengeReward(id) then + ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.FULL_MOON_SKIN, {}, combatReport or {}, nil, nil, true) + return + end + + self:sendMessage(ProtoMsgType.FromMsgEnum.FullMoonChapterSkinClaimReq, {id = id, combatReport = combatReport}, {}, self.rspChapterSkinClaim, BIReport.ITEM_GET_TYPE.FULL_MOON_SKIN_CHALLENGE_REWARD) +end + +function FullMoonManager:rspChapterSkinClaim(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.FullMoonData:onReceivedSkinChallengeReward(result.reqData.id) + ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.FULL_MOON_SKIN, result.rewards, result.reqData and result.reqData.combatReport or {}, nil, nil, true) + end +end + +return FullMoonManager \ No newline at end of file diff --git a/lua/app/module/activity/full_moon/full_moon_manager.lua.meta b/lua/app/module/activity/full_moon/full_moon_manager.lua.meta new file mode 100644 index 00000000..96c45dbe --- /dev/null +++ b/lua/app/module/activity/full_moon/full_moon_manager.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5b71325bf902494459246e0b6b8b0799 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 4726a9d5..0e014144 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -91,6 +91,7 @@ BattleConst.BATTLE_TYPE = { DUNGEON_ARMOR = "7", ACT_BOSS_RUSH = "8", DUNGEON_RUNE = "9", + FULL_MOON_SKIN = "10", } BattleConst.IS_PVP_BATTLE = { diff --git a/lua/app/module/battle/battle_manager.lua b/lua/app/module/battle/battle_manager.lua index 2452aff6..ec917992 100644 --- a/lua/app/module/battle/battle_manager.lua +++ b/lua/app/module/battle/battle_manager.lua @@ -16,6 +16,7 @@ local BATTLE_CONTROLLER = { [BattleConst.BATTLE_TYPE.DUNGEON_ARMOR] = "app/module/battle/controller/battle_controller_dungeon_armor", [BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH] = "app/module/battle/controller/battle_controller_boss_rush", [BattleConst.BATTLE_TYPE.DUNGEON_RUNE] = "app/module/battle/controller/battle_controller_dungeon_rune", + [BattleConst.BATTLE_TYPE.FULL_MOON_SKIN] = "app/module/battle/controller/battle_controller_full_moon_skin", } function BattleManager:showPauseUI(battleType, battleController) diff --git a/lua/app/module/battle/controller/battle_controller_full_moon_skin.lua b/lua/app/module/battle/controller/battle_controller_full_moon_skin.lua new file mode 100644 index 00000000..946e67a3 --- /dev/null +++ b/lua/app/module/battle/controller/battle_controller_full_moon_skin.lua @@ -0,0 +1,67 @@ +local BattleController = require "app/module/battle/controller/battle_controller" +local BattleControllerFullMoonSkin = class("BattleControllerFullMoonSkin", BattleController) + +function BattleControllerFullMoonSkin:getBoardConfig() + return ConfigManager:getConfig("chapter_board_dungeon_shards") +end + +function BattleControllerFullMoonSkin:getChapterConfig() + return ConfigManager:getConfig("chapter_new_skin_fight") +end + +function BattleControllerFullMoonSkin:getChapterId() + return DataManager.FullMoonData:getCurSkinChallengeId() +end + +function BattleControllerFullMoonSkin:controllBattleEnd() + self.combatReport = { + battleType = GConst.BattleConst.BATTLE_TYPE.FULL_MOON_SKIN, + wave = self:getWaveIndex(), + victory = self.victory, + } + local atkReport = {} + local teamEntity = self.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 self.victory then + ModuleManager.FullMoonManager:reqChapterSkinClaim(self.chapterId, self.combatReport, totalDamage) + end +end + +function BattleControllerFullMoonSkin: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 isFianlStep = self:getWaveIndex() >= self.maxWaveIndex + + BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.FULL_MOON_SKIN, self.battleData, self.chapterId, self:getWaveIndex(), duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, 0, true, isFianlStep, self.maxLinkCount) +end + +function BattleControllerFullMoonSkin:postFightStart() + BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.FULL_MOON_SKIN, self:getWaveIndex(), self.chapterId, 0, 0) +end + +return BattleControllerFullMoonSkin \ No newline at end of file diff --git a/lua/app/module/battle/controller/battle_controller_full_moon_skin.lua.meta b/lua/app/module/battle/controller/battle_controller_full_moon_skin.lua.meta new file mode 100644 index 00000000..f49f8bd0 --- /dev/null +++ b/lua/app/module/battle/controller/battle_controller_full_moon_skin.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4d3f99278cc5ab44e81190f7b9819a0b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/item/item_const.lua b/lua/app/module/item/item_const.lua index c66a9cba..96390175 100644 --- a/lua/app/module/item/item_const.lua +++ b/lua/app/module/item/item_const.lua @@ -20,6 +20,7 @@ ItemConst.ITEM_ID_FOURTEEN_DAY_EXCHANGE = 51 ItemConst.ITEM_ID_GLOD_WING = 49 ItemConst.ITEM_ID_SLIVER_WING = 50 ItemConst.ITEM_ID_RUNES = 55 +ItemConst.ITEM_ID_FULL_MOON = 56 ItemConst.ITEM_TYPE = { RES = 1, diff --git a/lua/app/module/maincity/maincity_const.lua b/lua/app/module/maincity/maincity_const.lua index befe56f5..ccdfd868 100644 --- a/lua/app/module/maincity/maincity_const.lua +++ b/lua/app/module/maincity/maincity_const.lua @@ -35,6 +35,7 @@ MainCityConst.LEFT_SIDE_BARS = { "app/ui/main_city/cell/side_bar_hero_fund_cell", "app/ui/main_city/cell/side_bar_seven_days_cell", "app/ui/main_city/cell/side_bar_activity_cell", + "app/ui/main_city/cell/side_bar_full_moon_cell", -- gm放最后一个 "app/ui/main_city/cell/side_bar_gm_cell" } diff --git a/lua/app/module/runes/runes_manager.lua b/lua/app/module/runes/runes_manager.lua index 68958747..67426a1f 100644 --- a/lua/app/module/runes/runes_manager.lua +++ b/lua/app/module/runes/runes_manager.lua @@ -31,6 +31,12 @@ function RunesManager:rspQuenching(result) self.isReqQuenching = false if result.err_code == GConst.ERROR_STR.SUCCESS then DataManager.RunesData:onQuenchingSuccess(result.level, result.exp, result.reqData.hero_id, result.hero_girds.grids) + + if result.auto_count and result.auto_count > 0 then + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_RUNES_QUENCHING, result.auto_count) + else + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_RUNES_QUENCHING, 1) + end end end diff --git a/lua/app/module/task/task_const.lua b/lua/app/module/task/task_const.lua index c2a102d5..af2ab1a6 100644 --- a/lua/app/module/task/task_const.lua +++ b/lua/app/module/task/task_const.lua @@ -40,6 +40,9 @@ TaskConst.TASK_TYPE = { X_OPEN_CHAPTER_BOX = 37, -- 开启主线宝箱x个 X_UPGRADE_WEAPON = 38, -- 武器升级x次 X_UPGRADE_ARMOR = 39, -- 防具升级x次 + X_BUY_ANYONE = 40, -- 任意购买行为x次 + X_RUNES_GETED_MATERIALS = 41, -- 获得符文材料x个 + X_RUNES_QUENCHING = 42, -- 符文锻造x次 } return TaskConst \ No newline at end of file diff --git a/lua/app/module/task/task_manager.lua b/lua/app/module/task/task_manager.lua index 0f6ad958..662e5666 100644 --- a/lua/app/module/task/task_manager.lua +++ b/lua/app/module/task/task_manager.lua @@ -310,6 +310,18 @@ function TaskManager:xUpgradeArmor() self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_UPGRADE_ARMOR, 1) end +function TaskManager:xBuyAnyone() + self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_BUY_ANYONE, 1) +end + +function TaskManager:xRunesGetedMaterials(count) + self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_RUNES_GETED_MATERIALS, count) +end + +function TaskManager:xRunesQuenching(count) + self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_RUNES_QUENCHING, count) +end + ---- 没有特殊说明，方法均返回任务增量 TaskManager.TYPE_DEAL_FUNC = { [GConst.TaskConst.TASK_TYPE.X_WATCH_AD] = TaskManager.xWatchAd, @@ -349,6 +361,9 @@ TaskManager.TYPE_DEAL_FUNC = { [GConst.TaskConst.TASK_TYPE.X_OPEN_CHAPTER_BOX] = TaskManager.xOpenChapterBox, [GConst.TaskConst.TASK_TYPE.X_UPGRADE_WEAPON] = TaskManager.xUpgradeWeapon, [GConst.TaskConst.TASK_TYPE.X_UPGRADE_ARMOR] = TaskManager.xUpgradeArmor, + [GConst.TaskConst.TASK_TYPE.X_BUY_ANYONE] = TaskManager.xBuyAnyone, + [GConst.TaskConst.TASK_TYPE.X_RUNES_GETED_MATERIALS] = TaskManager.xRunesGetedMaterials, + [GConst.TaskConst.TASK_TYPE.X_RUNES_QUENCHING] = TaskManager.xRunesQuenching, } function TaskManager:taskGoto(taskType) diff --git a/lua/app/module/tips/tips_manager.lua b/lua/app/module/tips/tips_manager.lua index dde5d2d7..a54bb73e 100644 --- a/lua/app/module/tips/tips_manager.lua +++ b/lua/app/module/tips/tips_manager.lua @@ -110,6 +110,16 @@ function TipsManager:showDescTips(desc, tarPrefabObj, alignType) UIManager:showUI("app/ui/tips/desc_tips", params) end +function TipsManager:showChooseRewardTips(title, desc, rewards, callback) + local params = { + title = title, + desc = desc, + rewards = rewards, + callback = callback, + } + UIManager:showUI("app/ui/tips/choose_reward_tips", params) +end + function TipsManager:showHeroFragmentTips(itemId) local params = { itemId = itemId diff --git a/lua/app/proto/proto_msg_type.lua b/lua/app/proto/proto_msg_type.lua index 45f655cc..0a3ffde0 100644 --- a/lua/app/proto/proto_msg_type.lua +++ b/lua/app/proto/proto_msg_type.lua @@ -1,5 +1,7 @@ local ProtoMsgType = { FromMsgId = { + [5949102] = "FullMoonCustomGiftChooseReq", + [5950935] = "FullMoonCustomGiftChooseRsp", [109633552] = "PigLevelDownNtf", [109700242] = "PigLevelDownReq", [109702075] = "PigLevelDownRsp", @@ -77,6 +79,8 @@ local ProtoMsgType = { [1433354371] = "ChapterDailyChallengeResetRsp", [1435947790] = "AppStorePaidReq", [1435949623] = "AppStorePaidRsp", + [1459267856] = "FullMoonChapterSkinClaimReq", + [1459269689] = "FullMoonChapterSkinClaimRsp", [1471116409] = "BindReq", [1471118242] = "BindRsp", [1478006910] = "BossRushBountyClaimReq", @@ -106,6 +110,8 @@ local ProtoMsgType = { [1800420732] = "ChapterRuneChallengeStartReq", [1800422565] = "ChapterRuneChallengeStartRsp", [1901321540] = "PipedReq", + [1975350605] = "ActivityPVPRankRewardsReq", + [1975352438] = "ActivityPVPRankRewardsRsp", [2017336372] = "BossRushSettlementReq", [2017338205] = "BossRushSettlementRsp", [2060508030] = "ChangeAvatarFrameReq", @@ -121,6 +127,8 @@ local ProtoMsgType = { [2140119902] = "ActivityPVPDecideHeroRsp", [2164009445] = "BossRushStartReq", [2164011278] = "BossRushStartRsp", + [2194306819] = "FullMoonTaskClaimReq", + [2194308652] = "FullMoonTaskClaimRsp", [2198847028] = "BossRushBoughtNtf", [2224825865] = "ChapterRuneChallengeSettlementReq", [2224827698] = "ChapterRuneChallengeSettlementRsp", @@ -181,6 +189,8 @@ local ProtoMsgType = { [3038153756] = "TaskDailyRefreshRsp", [3039097236] = "SummerBountyClaimReq", [3039099069] = "SummerBountyClaimRsp", + [3050641832] = "FullMoonInfoReq", + [3050643665] = "FullMoonInfoRsp", [3058879524] = "PVPRankReq", [3058881357] = "PVPRankRsp", [3062745642] = "FundAwardReq", @@ -262,6 +272,8 @@ local ProtoMsgType = { [3904150593] = "GMRsp", [3933875617] = "ChapterStartReq", [3933877450] = "ChapterStartRsp", + [3991710133] = "FullMoonRewardClaimReq", + [3991711966] = "FullMoonRewardClaimRsp", [4010728288] = "ChapterRuneBuySliverReq", [4010730121] = "ChapterRuneBuySliverRsp", [4015942008] = "RuneQuenchingReq", @@ -288,6 +300,8 @@ local ProtoMsgType = { [4256335780] = "ExistRsp", }, FromMsgToId = { + FullMoonCustomGiftChooseReq = 5949102, + FullMoonCustomGiftChooseRsp = 5950935, PigLevelDownNtf = 109633552, PigLevelDownReq = 109700242, PigLevelDownRsp = 109702075, @@ -365,6 +379,8 @@ local ProtoMsgType = { ChapterDailyChallengeResetRsp = 1433354371, AppStorePaidReq = 1435947790, AppStorePaidRsp = 1435949623, + FullMoonChapterSkinClaimReq = 1459267856, + FullMoonChapterSkinClaimRsp = 1459269689, BindReq = 1471116409, BindRsp = 1471118242, BossRushBountyClaimReq = 1478006910, @@ -394,6 +410,8 @@ local ProtoMsgType = { ChapterRuneChallengeStartReq = 1800420732, ChapterRuneChallengeStartRsp = 1800422565, PipedReq = 1901321540, + ActivityPVPRankRewardsReq = 1975350605, + ActivityPVPRankRewardsRsp = 1975352438, BossRushSettlementReq = 2017336372, BossRushSettlementRsp = 2017338205, ChangeAvatarFrameReq = 2060508030, @@ -409,6 +427,8 @@ local ProtoMsgType = { ActivityPVPDecideHeroRsp = 2140119902, BossRushStartReq = 2164009445, BossRushStartRsp = 2164011278, + FullMoonTaskClaimReq = 2194306819, + FullMoonTaskClaimRsp = 2194308652, BossRushBoughtNtf = 2198847028, ChapterRuneChallengeSettlementReq = 2224825865, ChapterRuneChallengeSettlementRsp = 2224827698, @@ -469,6 +489,8 @@ local ProtoMsgType = { TaskDailyRefreshRsp = 3038153756, SummerBountyClaimReq = 3039097236, SummerBountyClaimRsp = 3039099069, + FullMoonInfoReq = 3050641832, + FullMoonInfoRsp = 3050643665, PVPRankReq = 3058879524, PVPRankRsp = 3058881357, FundAwardReq = 3062745642, @@ -550,6 +572,8 @@ local ProtoMsgType = { GMRsp = 3904150593, ChapterStartReq = 3933875617, ChapterStartRsp = 3933877450, + FullMoonRewardClaimReq = 3991710133, + FullMoonRewardClaimRsp = 3991711966, ChapterRuneBuySliverReq = 4010728288, ChapterRuneBuySliverRsp = 4010730121, RuneQuenchingReq = 4015942008, @@ -576,6 +600,8 @@ local ProtoMsgType = { ExistRsp = 4256335780, }, FromMsgEnum = { + FullMoonCustomGiftChooseReq = "FullMoonCustomGiftChooseReq", + FullMoonCustomGiftChooseRsp = "FullMoonCustomGiftChooseRsp", PigLevelDownNtf = "PigLevelDownNtf", PigLevelDownReq = "PigLevelDownReq", PigLevelDownRsp = "PigLevelDownRsp", @@ -653,6 +679,8 @@ local ProtoMsgType = { ChapterDailyChallengeResetRsp = "ChapterDailyChallengeResetRsp", AppStorePaidReq = "AppStorePaidReq", AppStorePaidRsp = "AppStorePaidRsp", + FullMoonChapterSkinClaimReq = "FullMoonChapterSkinClaimReq", + FullMoonChapterSkinClaimRsp = "FullMoonChapterSkinClaimRsp", BindReq = "BindReq", BindRsp = "BindRsp", BossRushBountyClaimReq = "BossRushBountyClaimReq", @@ -682,6 +710,8 @@ local ProtoMsgType = { ChapterRuneChallengeStartReq = "ChapterRuneChallengeStartReq", ChapterRuneChallengeStartRsp = "ChapterRuneChallengeStartRsp", PipedReq = "PipedReq", + ActivityPVPRankRewardsReq = "ActivityPVPRankRewardsReq", + ActivityPVPRankRewardsRsp = "ActivityPVPRankRewardsRsp", BossRushSettlementReq = "BossRushSettlementReq", BossRushSettlementRsp = "BossRushSettlementRsp", ChangeAvatarFrameReq = "ChangeAvatarFrameReq", @@ -697,6 +727,8 @@ local ProtoMsgType = { ActivityPVPDecideHeroRsp = "ActivityPVPDecideHeroRsp", BossRushStartReq = "BossRushStartReq", BossRushStartRsp = "BossRushStartRsp", + FullMoonTaskClaimReq = "FullMoonTaskClaimReq", + FullMoonTaskClaimRsp = "FullMoonTaskClaimRsp", BossRushBoughtNtf = "BossRushBoughtNtf", ChapterRuneChallengeSettlementReq = "ChapterRuneChallengeSettlementReq", ChapterRuneChallengeSettlementRsp = "ChapterRuneChallengeSettlementRsp", @@ -757,6 +789,8 @@ local ProtoMsgType = { TaskDailyRefreshRsp = "TaskDailyRefreshRsp", SummerBountyClaimReq = "SummerBountyClaimReq", SummerBountyClaimRsp = "SummerBountyClaimRsp", + FullMoonInfoReq = "FullMoonInfoReq", + FullMoonInfoRsp = "FullMoonInfoRsp", PVPRankReq = "PVPRankReq", PVPRankRsp = "PVPRankRsp", FundAwardReq = "FundAwardReq", @@ -838,6 +872,8 @@ local ProtoMsgType = { GMRsp = "GMRsp", ChapterStartReq = "ChapterStartReq", ChapterStartRsp = "ChapterStartRsp", + FullMoonRewardClaimReq = "FullMoonRewardClaimReq", + FullMoonRewardClaimRsp = "FullMoonRewardClaimRsp", ChapterRuneBuySliverReq = "ChapterRuneBuySliverReq", ChapterRuneBuySliverRsp = "ChapterRuneBuySliverRsp", RuneQuenchingReq = "RuneQuenchingReq", diff --git a/lua/app/ui/activity/full_moon.meta b/lua/app/ui/activity/full_moon.meta new file mode 100644 index 00000000..2905de6f --- /dev/null +++ b/lua/app/ui/activity/full_moon.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1332d53647109d0499e22a6659ce1f1e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/ui/activity/full_moon/cell.meta b/lua/app/ui/activity/full_moon/cell.meta new file mode 100644 index 00000000..4dbd0df8 --- /dev/null +++ b/lua/app/ui/activity/full_moon/cell.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd6f0549559c9064790b07dc590f84a4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/ui/activity/full_moon/cell/full_moon_task_cell.lua b/lua/app/ui/activity/full_moon/cell/full_moon_task_cell.lua new file mode 100644 index 00000000..2afbfc74 --- /dev/null +++ b/lua/app/ui/activity/full_moon/cell/full_moon_task_cell.lua @@ -0,0 +1,60 @@ +local FullMoonTaskCell = class("FullMoonTaskCell", BaseCell) + +function FullMoonTaskCell:init() + local uiMap = self:getUIMap() + self.imgTaskBg = uiMap["full_moon_task_cell.img_task_bg"] + self.imgTask = uiMap["full_moon_task_cell.img_task_bg.img_task"] + self.txDesc = uiMap["full_moon_task_cell.tx_desc"] + self.imgProg = uiMap["full_moon_task_cell.prog.img_prog"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) + self.txProg = uiMap["full_moon_task_cell.prog.tx_prog"] + self.txRewardName = uiMap["full_moon_task_cell.tx_reward_name"] + self.imgRewardIcon = uiMap["full_moon_task_cell.icon_reward"] + self.txNum = uiMap["full_moon_task_cell.tx_num"] + self.finish = uiMap["full_moon_task_cell.finish"] + self.txFinish = uiMap["full_moon_task_cell.finish.bg.tx_finish"] + + self:addClickListener(function() + if DataManager.FullMoonData:canGetTaskReward(self.taskId) and not DataManager.FullMoonData:isReceivedTaskReward(self.taskId) then + ModuleManager.FullMoonManager:reqTaskReward(self.taskId) + end + end) +end + +function FullMoonTaskCell:refresh(id) + self.taskId = id + local taskType = DataManager.FullMoonData:getTaskType(self.taskId) + local total = DataManager.FullMoonData:getTaskTarget(self.taskId) + local cur = DataManager.FullMoonData:getTaskProgress(self.taskId) + local reward = DataManager.FullMoonData:getTaskReward(self.taskId) + self.imgTask:setSprite(GConst.ATLAS_PATH.ICON_TASK, GFunc.getTaskIcon(taskType, total)) + self.txDesc:setText(GFunc.getTaskDesc(taskType, total)) + self.imgProg.value = cur / total + self.txProg:setText(cur .. "/" .. total) + self.txRewardName:setText(GFunc.getRewardName(reward.type, reward.id)) + self.imgRewardIcon:setSprite(GFunc.getRewardIconRes(reward.type, reward.id)) + self.txNum:setText(GFunc.getRewardNum(reward)) + self.txFinish:setText(I18N:getGlobalText(I18N.GlobalConst.STR_COMPLETED)) + + self.finish:setActive(false) + self.baseObject:removeRedPoint() + if DataManager.FullMoonData:canGetTaskReward(self.taskId) then + -- 已完成 + if DataManager.FullMoonData:isReceivedTaskReward(self.taskId) then + -- 已领取 + self.baseObject:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_bg_2") + self.imgTaskBg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_board_3") + self.finish:setActive(true) + else + -- 未领取 + self.baseObject:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_bg_3") + self.imgTaskBg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_board_4") + self.baseObject:addRedPoint(260, 70, 0.8) + end + else + --未完成 + self.baseObject:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_bg_2") + self.imgTaskBg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_board_3") + end +end + +return FullMoonTaskCell \ No newline at end of file diff --git a/lua/app/ui/activity/full_moon/cell/full_moon_task_cell.lua.meta b/lua/app/ui/activity/full_moon/cell/full_moon_task_cell.lua.meta new file mode 100644 index 00000000..34a17de7 --- /dev/null +++ b/lua/app/ui/activity/full_moon/cell/full_moon_task_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7f22f15dc9b4a6d4385ac1f17fd683b4 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/full_moon/cell/full_moon_task_prog_cell.lua b/lua/app/ui/activity/full_moon/cell/full_moon_task_prog_cell.lua new file mode 100644 index 00000000..b2054696 --- /dev/null +++ b/lua/app/ui/activity/full_moon/cell/full_moon_task_prog_cell.lua @@ -0,0 +1,34 @@ +local FullMoonTaskProgCell = class("FullMoonTaskProgCell", BaseCell) + +function FullMoonTaskProgCell:init() + local uiMap = self:getUIMap() + self.imgProg = uiMap["prog_reward.img_prog"] + self.txProg = uiMap["prog_reward.img_prog.tx_prog"] + self.rewardCell = uiMap["prog_reward.reward_cell"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) +end + +function FullMoonTaskProgCell:refresh(id) + local canGet = DataManager.FullMoonData:isReachTaskProgressReward(id) + local isReceived = DataManager.FullMoonData:isReceivedTaskProgressReward(id) + + self.txProg:setText(DataManager.FullMoonData:getTaskProgressTarget(id)) + self.rewardCell:refreshByConfig(DataManager.FullMoonData:getTaskProgressReward(id), isReceived, isReceived) + if canGet then + self.imgProg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_bg_7") + if not isReceived then + self.rewardCell.baseObject:addRedPoint(50, 50, 0.6) + self.rewardCell:addClickListener(function() + ModuleManager.FullMoonManager:reqTaskProgressReward(id) + end) + else + self.rewardCell.baseObject:removeRedPoint() + self.rewardCell:addClickListener(nil) + end + else + self.imgProg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_bg_8") + self.rewardCell.baseObject:removeRedPoint() + self.rewardCell:addClickListener(nil) + end +end + +return FullMoonTaskProgCell \ No newline at end of file diff --git a/lua/app/ui/activity/full_moon/cell/full_moon_task_prog_cell.lua.meta b/lua/app/ui/activity/full_moon/cell/full_moon_task_prog_cell.lua.meta new file mode 100644 index 00000000..aaef64f4 --- /dev/null +++ b/lua/app/ui/activity/full_moon/cell/full_moon_task_prog_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 77ab55a8c675c344f86e75e0c68481dc +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/full_moon/full_moon_choose_hero_comp.lua b/lua/app/ui/activity/full_moon/full_moon_choose_hero_comp.lua new file mode 100644 index 00000000..9da49232 --- /dev/null +++ b/lua/app/ui/activity/full_moon/full_moon_choose_hero_comp.lua @@ -0,0 +1,130 @@ +local FullMoonChooseHeroComp = class("FullMoonChooseHeroComp", LuaComponent) + +function FullMoonChooseHeroComp:init() + local uiMap = self:getUIMap() + -- self.spineBanner = uiMap["choose_hero_panel.spine_banner"] + self.txTitle = uiMap["choose_hero_panel.tx_title"] + self.txTips = uiMap["choose_hero_panel.tx_tips"] + self.btnBuy = uiMap["choose_hero_panel.btn_buy"] + self.txBuy = uiMap["choose_hero_panel.btn_buy.tx_buy"] + self.rewards = uiMap["choose_hero_panel.rewards"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT) + self.rewardCells = {} + for i = 1, 3 do + table.insert(self.rewardCells, uiMap["choose_hero_panel.rewards.pop_reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.POP_REWARD_CELL)) + end + self.gifts = uiMap["choose_hero_panel.gifts"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT) + self.giftItems = {} + for i = 1, 5 do + table.insert(self.giftItems, uiMap["choose_hero_panel.gifts.gift_" .. i]) + end + + -- self.spineBanner:playAnim("animation", true, true) + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_4)) + self.txTips:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_6)) + + self.btnBuy:addClickListener(function() + if not DataManager.FullMoonData:getChooseHeroIndex() then + self:showChoose() + return + end + PayManager:purchasePackage(self.selectGiftId, PayManager.PURCHARSE_TYPE.ACT_GIFT) + end) +end + +function FullMoonChooseHeroComp:refresh() + self.curGiftId = DataManager.FullMoonData:getCurChooseHeroGiftId() + self.selectGiftId = self.curGiftId + self:refreshGifts() +end + +-- 刷新礼包显示 +function FullMoonChooseHeroComp:refreshGifts() + local chooseFunc = function() + self:showChoose() + end + local gift = DataManager.ShopData:getActGiftConfig()[self.selectGiftId] + + self.txTips:setActive(self.selectGiftId ~= self.curGiftId) + self.btnBuy:setActive(self.selectGiftId == self.curGiftId) + if not DataManager.FullMoonData:isGiftBought(self.selectGiftId) then + self.btnBuy:setTouchEnable(true) + self.btnBuy:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_green_1") + self.txBuy:setText(GFunc.getFormatPrice(gift.recharge_id)) + else + self.btnBuy:setTouchEnable(false) + self.btnBuy:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_1") + self.txBuy:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20)) + end + + for index, cell in ipairs(self.rewardCells) do + if gift.reward[index] then + cell:setVisible(true) + cell:refresh(gift.reward[index].id, gift.reward[index].num, true) + elseif index == #gift.reward + 1 then + cell:setVisible(true) + if DataManager.FullMoonData:getChooseHeroIndex() then + local choose = DataManager.FullMoonData:getChooseRewards(self.selectGiftId, true)[DataManager.FullMoonData:getChooseHeroIndex()] + -- Logger.logHighlight(DataManager.FullMoonData:getChooseHeroIndex()) + cell:refresh(choose.id, choose.num, true) + cell:refreshChoose(chooseFunc) + else + cell:refreshOnlyChoose(chooseFunc) + end + else + cell:setVisible(false) + end + end + self.rewards:RefreshLayout() + + local ids = DataManager.FullMoonData:getCurStepChooseHeroGiftIds() + for index, item in ipairs(self.giftItems) do + if ids[index] then + item:setActive(true) + local map = item:genAllChildren() + local imgGift = map["img_gift"] + local imgBught = map["img_bught"] + local imgSelect = map["img_select"] + + if ids[index] == self.curGiftId then + imgGift:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_chest_2") + elseif ids[index] > self.curGiftId then + imgGift:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_chest_3") + else + imgGift:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_chest_1") + end + imgSelect:setActive(ids[index] == self.selectGiftId) + imgBught:setActive(DataManager.FullMoonData:isGiftBought(ids[index])) + item:addClickListener(function() + self:onSelectGift(ids[index]) + end) + else + item:setActive(false) + end + end + self.gifts:RefreshLayout() +end + +-- 选择礼包 +function FullMoonChooseHeroComp:onSelectGift(id) + if id < self.curGiftId then + -- 已购礼包不允许点击 + return + end + self.selectGiftId = id + self:refreshGifts() +end + +-- 自选弹窗 +function FullMoonChooseHeroComp:showChoose() + ModuleManager.TipsManager:showChooseRewardTips( + I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_7), + I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_8), + DataManager.FullMoonData:getChooseRewards(self.selectGiftId), + function(index) + index = DataManager.FullMoonData:getChooseRewardsIndexByCanChooseIndex(index) + ModuleManager.FullMoonManager:reqGiftChooseHero(index) + end + ) +end + +return FullMoonChooseHeroComp \ No newline at end of file diff --git a/lua/app/ui/activity/full_moon/full_moon_choose_hero_comp.lua.meta b/lua/app/ui/activity/full_moon/full_moon_choose_hero_comp.lua.meta new file mode 100644 index 00000000..c139f7ee --- /dev/null +++ b/lua/app/ui/activity/full_moon/full_moon_choose_hero_comp.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ff32f3cd22038324e8daab0f06524093 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/full_moon/full_moon_new_hero_comp.lua b/lua/app/ui/activity/full_moon/full_moon_new_hero_comp.lua new file mode 100644 index 00000000..0f496bac --- /dev/null +++ b/lua/app/ui/activity/full_moon/full_moon_new_hero_comp.lua @@ -0,0 +1,100 @@ +local FullMoonNewHeroComp = class("FullMoonNewHeroComp", LuaComponent) + +function FullMoonNewHeroComp:init() + local uiMap = self:getUIMap() + -- self.spineBanner = uiMap["new_hero_panel.spine_banner"] + self.txTitle = uiMap["new_hero_panel.tx_title"] + self.txTips = uiMap["new_hero_panel.tx_tips"] + self.btnBuy = uiMap["new_hero_panel.btn_buy"] + self.txBuy = uiMap["new_hero_panel.btn_buy.tx_buy"] + self.rewards = uiMap["new_hero_panel.rewards"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT) + self.rewardCells = {} + for i = 1, 3 do + table.insert(self.rewardCells, uiMap["new_hero_panel.rewards.pop_reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.POP_REWARD_CELL)) + end + self.gifts = uiMap["new_hero_panel.gifts"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT) + self.giftItems = {} + for i = 1, 5 do + table.insert(self.giftItems, uiMap["new_hero_panel.gifts.gift_" .. i]) + end + + -- self.spineBanner:playAnim("animation", true, true) + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_5)) + self.txTips:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_6)) + + self.btnBuy:addClickListener(function() + PayManager:purchasePackage(self.selectGiftId, PayManager.PURCHARSE_TYPE.ACT_GIFT) + end) +end + +function FullMoonNewHeroComp:refresh() + self.curGiftId = DataManager.FullMoonData:getCurNewHeroGiftId() + self.selectGiftId = self.curGiftId + self:refreshGifts() +end + +-- 刷新礼包显示 +function FullMoonNewHeroComp:refreshGifts() + local gift = DataManager.ShopData:getActGiftConfig()[self.selectGiftId] + + self.txTips:setActive(self.selectGiftId ~= self.curGiftId) + self.btnBuy:setActive(self.selectGiftId == self.curGiftId) + if not DataManager.FullMoonData:isGiftBought(self.selectGiftId) then + self.btnBuy:setTouchEnable(true) + self.btnBuy:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_green_1") + self.txBuy:setText(GFunc.getFormatPrice(gift.recharge_id)) + else + self.btnBuy:setTouchEnable(false) + self.btnBuy:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_1") + self.txBuy:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20)) + end + + for index, cell in ipairs(self.rewardCells) do + if gift.reward[index] then + cell:setVisible(true) + cell:refresh(gift.reward[index].id, gift.reward[index].num, true) + else + cell:setVisible(false) + end + end + self.rewards:RefreshLayout() + + local ids = DataManager.FullMoonData:getCurStepNewHeroGiftIds() + for index, item in ipairs(self.giftItems) do + if ids[index] then + item:setActive(true) + local map = item:genAllChildren() + local imgGift = map["img_gift"] + local imgBught = map["img_bught"] + local imgSelect = map["img_select"] + + if ids[index] == self.curGiftId then + imgGift:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_chest_2") + elseif ids[index] > self.curGiftId then + imgGift:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_chest_3") + else + imgGift:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_chest_1") + end + imgSelect:setActive(ids[index] == self.selectGiftId) + imgBught:setActive(DataManager.FullMoonData:isGiftBought(ids[index])) + item:addClickListener(function() + self:onSelectGift(ids[index]) + end) + else + item:setActive(false) + end + end + self.gifts:RefreshLayout() +end + +-- 选择礼包 +function FullMoonNewHeroComp:onSelectGift(id) + if id < self.curGiftId then + -- 已购礼包不允许点击 + return + end + self.selectGiftId = id + self:refreshGifts() +end + +return FullMoonNewHeroComp \ No newline at end of file diff --git a/lua/app/ui/activity/full_moon/full_moon_new_hero_comp.lua.meta b/lua/app/ui/activity/full_moon/full_moon_new_hero_comp.lua.meta new file mode 100644 index 00000000..981d90b7 --- /dev/null +++ b/lua/app/ui/activity/full_moon/full_moon_new_hero_comp.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8d0203e3e0bcce8458287cbbb13b18be +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/full_moon/full_moon_skin_comp.lua b/lua/app/ui/activity/full_moon/full_moon_skin_comp.lua new file mode 100644 index 00000000..e1c43dde --- /dev/null +++ b/lua/app/ui/activity/full_moon/full_moon_skin_comp.lua @@ -0,0 +1,144 @@ +local FullMoonSkinComp = class("FullMoonSkinComp", LuaComponent) + +function FullMoonSkinComp:init() + local uiMap = self:getUIMap() + self.txTitle = uiMap["skin_panel.banner.title.tx_title"] + self.txBannerDesc1 = uiMap["skin_panel.banner.content.desc1.tx_desc1"] + self.txBannerDesc2 = uiMap["skin_panel.banner.content.desc2.tx_desc2"] + -- 礼包1 + self.spineSkin1 = uiMap["skin_panel.skin1.spine_skin1"] + self.txDesc1 = uiMap["skin_panel.skin1.bg_title.tx_title"] + self.btnBuy1 = uiMap["skin_panel.skin1.btn_buy"] + self.txBuy1 = uiMap["skin_panel.skin1.btn_buy.tx_buy"] + self.challenge1 = uiMap["skin_panel.skin1.challenge"] + self.challengeTag1 = uiMap["skin_panel.skin1.challenge.tag"] + self.imgChallengeTag1 = uiMap["skin_panel.skin1.challenge.tag.content.img"] + self.txChallengeTag1 = uiMap["skin_panel.skin1.challenge.tag.content.tx_num"] + self.rewardCells1 = {} + for i = 1, 3 do + table.insert(self.rewardCells1, uiMap["skin_panel.skin1.rewards.reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)) + end + -- 礼包2 + self.spineSkin2 = uiMap["skin_panel.skin2.spine_skin2"] + self.txDesc2 = uiMap["skin_panel.skin2.bg_title.tx_title"] + self.btnBuy2 = uiMap["skin_panel.skin2.btn_buy"] + self.txBuy2 = uiMap["skin_panel.skin2.btn_buy.tx_buy"] + self.challenge2 = uiMap["skin_panel.skin2.challenge"] + self.challengeTag2 = uiMap["skin_panel.skin2.challenge.tag"] + self.imgChallengeTag2 = uiMap["skin_panel.skin2.challenge.tag.content.img"] + self.txChallengeTag2 = uiMap["skin_panel.skin2.challenge.tag.content.tx_num"] + self.rewardCells2 = {} + for i = 1, 3 do + table.insert(self.rewardCells2, uiMap["skin_panel.skin2.rewards.reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)) + end + + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_9)) + + self.challenge1:addClickListener(function() + ModuleManager.FullMoonManager:skinChallenge(GConst.FullMoonConst.SKIN_CHALLENGE_ID_1) + end) + self.challenge2:addClickListener(function() + ModuleManager.FullMoonManager:skinChallenge(GConst.FullMoonConst.SKIN_CHALLENGE_ID_2) + end) + self.btnBuy1:addClickListener(function() + PayManager:purchasePackage(GConst.FullMoonConst.SKIN_GIFT_ID_1, PayManager.PURCHARSE_TYPE.ACT_GIFT) + end) + self.btnBuy2:addClickListener(function() + PayManager:purchasePackage(GConst.FullMoonConst.SKIN_GIFT_ID_2, PayManager.PURCHARSE_TYPE.ACT_GIFT) + end) + LocalData:recordTodayActSummerWatchedSkin() +end + +function FullMoonSkinComp:refresh() + -- 礼包1 + if not DataManager.FullMoonData:isReceivedSkinFirstChallengeReward(GConst.FullMoonConst.SKIN_CHALLENGE_ID_1) then + self.challengeTag1:setActive(true) + local reward = DataManager.FullMoonData:getSkinFirstChallengeReward(GConst.FullMoonConst.SKIN_CHALLENGE_ID_1) + self.imgChallengeTag1:setSprite(GFunc.getIconRes(reward.id)) + self.txChallengeTag1:setText(reward.num) + GFunc.centerImgAndTx(self.imgChallengeTag1, self.txChallengeTag1) + else + self.challengeTag1:setActive(false) + end + local gift1 = DataManager.ShopData:getActGiftConfig()[GConst.FullMoonConst.SKIN_GIFT_ID_1] + local skinId1,heroId1 + for idx, reward in ipairs(gift1.reward) do + if ConfigManager:getConfig("item")[reward.id].type == GConst.ItemConst.ITEM_TYPE.SKIN then + skinId1 = DataManager.SkinData:getSkinIdByItemId(reward.id) + heroId1 = DataManager.SkinData:getHeroIdBySkinId(skinId1) + end + end + if skinId1 and heroId1 then + self.spineSkin1:getSkeletonGraphic().enabled = false + self.spineSkin1:loadAssetAsync(DataManager.SkinData:getModelId(skinId1), function() + self.spineSkin1:getSkeletonGraphic().enabled = true + self.spineSkin1:playAnim("idle", true, true, true) + end, true) + self.txBannerDesc1:setText(DataManager.HeroData:getHeroById(heroId1):getName() .. "-" .. DataManager.SkinData:getName(skinId1) .. "(" .. I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_9) .. ")") + end + self.txDesc1:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_10, DataManager.HeroData:getHeroById(heroId1):getName())) + for index, cell in ipairs(self.rewardCells1) do + if gift1.reward[index] then + cell:setVisible(true) + cell:refreshByConfig(gift1.reward[index]) + else + cell:setVisible(false) + end + end + if DataManager.ShopData:getGiftRemainBuyNum(GConst.FullMoonConst.SKIN_GIFT_ID_1) > 0 then + self.btnBuy1:setTouchEnable(true) + self.btnBuy1:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_green_2") + self.txBuy1:setText(GFunc.getFormatPrice(gift1.recharge_id)) + else + self.btnBuy1:setTouchEnable(false) + self.btnBuy1:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_2") + self.txBuy1:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20)) + end + + -- 礼包2 + if not DataManager.FullMoonData:isReceivedSkinFirstChallengeReward(GConst.FullMoonConst.SKIN_CHALLENGE_ID_2) then + self.challengeTag2:setActive(true) + local reward = DataManager.FullMoonData:getSkinFirstChallengeReward(GConst.FullMoonConst.SKIN_CHALLENGE_ID_2) + self.imgChallengeTag2:setSprite(GFunc.getIconRes(reward.id)) + self.txChallengeTag2:setText(reward.num) + GFunc.centerImgAndTx(self.imgChallengeTag2, self.txChallengeTag2) + else + self.challengeTag2:setActive(false) + end + local gift2 = DataManager.ShopData:getActGiftConfig()[GConst.FullMoonConst.SKIN_GIFT_ID_2] + local skinId2,heroId2 + for idx, reward in ipairs(gift2.reward) do + if ConfigManager:getConfig("item")[reward.id].type == GConst.ItemConst.ITEM_TYPE.SKIN then + skinId2 = DataManager.SkinData:getSkinIdByItemId(reward.id) + heroId2 = DataManager.SkinData:getHeroIdBySkinId(skinId2) + end + end + if skinId2 and heroId2 then + self.spineSkin2:getSkeletonGraphic().enabled = false + self.spineSkin2:loadAssetAsync(DataManager.SkinData:getModelId(skinId2), function() + self.spineSkin2:getSkeletonGraphic().enabled = true + self.spineSkin2:playAnim("idle", true, true, true) + end, true) + self.txBannerDesc2:setText(DataManager.HeroData:getHeroById(heroId2):getName() .. "-" .. DataManager.SkinData:getName(skinId2) .. "(" .. I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_9) .. ")") + end + self.txDesc2:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_10, DataManager.HeroData:getHeroById(heroId2):getName())) + for index, cell in ipairs(self.rewardCells2) do + if gift2.reward[index] then + cell:setVisible(true) + cell:refreshByConfig(gift2.reward[index]) + else + cell:setVisible(false) + end + end + if DataManager.ShopData:getGiftRemainBuyNum(GConst.FullMoonConst.SKIN_GIFT_ID_2) > 0 then + self.btnBuy2:setTouchEnable(true) + self.btnBuy2:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_green_2") + self.txBuy2:setText(GFunc.getFormatPrice(gift2.recharge_id)) + else + self.btnBuy2:setTouchEnable(false) + self.btnBuy2:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_2") + self.txBuy2:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20)) + end +end + +return FullMoonSkinComp \ No newline at end of file diff --git a/lua/app/ui/activity/full_moon/full_moon_skin_comp.lua.meta b/lua/app/ui/activity/full_moon/full_moon_skin_comp.lua.meta new file mode 100644 index 00000000..4f42ad11 --- /dev/null +++ b/lua/app/ui/activity/full_moon/full_moon_skin_comp.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2bdec32481442b648a69cea1bf0a2bc9 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/full_moon/full_moon_task_comp.lua b/lua/app/ui/activity/full_moon/full_moon_task_comp.lua new file mode 100644 index 00000000..3bc6111f --- /dev/null +++ b/lua/app/ui/activity/full_moon/full_moon_task_comp.lua @@ -0,0 +1,74 @@ +local FullMoonTaskComp = class("FullMoonTaskComp", LuaComponent) + +function FullMoonTaskComp:init() + local uiMap = self:getUIMap() + self.listProg = uiMap["task_panel.prog.list_prog"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.content = uiMap["task_panel.prog.list_prog.viewport.content"] + self.prog = uiMap["task_panel.prog.list_prog.viewport.content.prog"] + self.imgProg = uiMap["task_panel.prog.list_prog.viewport.content.prog.img_prog"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) + self.listTask = uiMap["task_panel.list_task"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.spineSkin = uiMap["task_panel.prog.spine_skin"] + self.imgScore = uiMap["task_panel.prog.score.img_score"] + self.txScore = uiMap["task_panel.prog.score.tx_score"] + self.txSkin = uiMap["task_panel.prog.skin_desc.skin.tx_skin"] + self.txAllFinish = uiMap["task_panel.tx_all_finish"] + + local skinId,heroId + for id, data in pairs(ConfigManager:getConfig("activity_full_moon_reward")) do + if ConfigManager:getConfig("item")[data.reward.id].type == GConst.ItemConst.ITEM_TYPE.SKIN then + skinId = DataManager.SkinData:getSkinIdByItemId(data.reward.id) + heroId = DataManager.SkinData:getHeroIdBySkinId(skinId) + end + end + if heroId and skinId then + self.txSkin:setText(DataManager.HeroData:getHeroById(heroId):getName() .. "-" .. DataManager.SkinData:getName(skinId) .. "(" .. I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_9) .. ")") + + self.spineSkin:getSkeletonGraphic().enabled = false + self.spineSkin:loadAssetAsync(DataManager.SkinData:getModelId(skinId), function() + self.spineSkin:getSkeletonGraphic().enabled = true + self.spineSkin:playAnim("idle", true, true, true) + end, true) + end +end + +function FullMoonTaskComp:refresh() + self.txScore:setText(DataManager.FullMoonData:getTaskFinishNum()) + GFunc.centerImgAndTx(self.imgScore, self.txScore) + + -- 任务列表 + local tasks = DataManager.FullMoonData:getTaskListSort() + if tasks then + self.txAllFinish:setActive(false) + self.listTask:addInitCallback(function() + return "app/ui/activity/full_moon/cell/full_moon_task_cell" + end) + self.listTask:addRefreshCallback(function(index, cell) + cell:refresh(tasks[index].id) + end) + self.listTask:clearCells() + self.listTask:refillCells(#tasks) + else + self.txAllFinish:setActive(true) + self.txAllFinish:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_11)) + end + + -- 任务进度奖励列表 + self.listProg:addInitCallback(function() + return "app/ui/activity/full_moon/cell/full_moon_task_prog_cell" + end) + self.listProg:addRefreshCallback(function(index, cell) + cell:refresh(DataManager.FullMoonData:getTaskProgressRewardIdByIndex(index)) + end) + self.listProg:clearCells() + self.listProg:refillCells(DataManager.FullMoonData:getTaskProgressRewardTotalNum()) + local idx = DataManager.FullMoonData:getCurTaskProgressRewardIndex() + -- Logger.logHighlight(idx) + self.listProg:moveToIndex(idx) + + local maxIndex = DataManager.FullMoonData:getTaskProgressRewardTotalNum() + local cellWidth = self.listProg:getCellWidth() + self.prog:setSizeDeltaX(cellWidth * maxIndex) + self.imgProg.value = DataManager.FullMoonData:getTaskFinishNum() / DataManager.FullMoonData:getTaskTotalNum() +end + +return FullMoonTaskComp \ No newline at end of file diff --git a/lua/app/ui/activity/full_moon/full_moon_task_comp.lua.meta b/lua/app/ui/activity/full_moon/full_moon_task_comp.lua.meta new file mode 100644 index 00000000..034c2582 --- /dev/null +++ b/lua/app/ui/activity/full_moon/full_moon_task_comp.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c992c98a31d8ac74398f2cba0db13c33 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/full_moon/full_moon_ui.lua b/lua/app/ui/activity/full_moon/full_moon_ui.lua new file mode 100644 index 00000000..8e4cdbf0 --- /dev/null +++ b/lua/app/ui/activity/full_moon/full_moon_ui.lua @@ -0,0 +1,232 @@ +local FullMoonUI = class("FullMoonUI", BaseUI) +local COMP_TASK = "app/ui/activity/full_moon/full_moon_task_comp" +local COMP_CHOOSE_HERO = "app/ui/activity/full_moon/full_moon_choose_hero_comp" +local COMP_NEW_HERO = "app/ui/activity/full_moon/full_moon_new_hero_comp" +local COMP_SKIN = "app/ui/activity/full_moon/full_moon_skin_comp" + +function FullMoonUI:isFullScreen() + return false +end + +function FullMoonUI:getPrefabPath() + return "assets/prefabs/ui/activity/full_moon/full_moon_ui.prefab" +end + +function FullMoonUI:onPressBackspace() + self:closeUI() +end + +function FullMoonUI:ctor(param) + if param then + self.panelType = param + else + self.panelType = GConst.FullMoonConst.PANEL_TYPE.TASK -- 默认进入任务页签 + end +end + +function FullMoonUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + -- 通用 + self.txTitle = uiMap["full_moon_ui.img_title.tx_title"] + self.btnClose = uiMap["full_moon_ui.common.btn_close"] + self.txCountdown = uiMap["full_moon_ui.countdown.tx_countdown"] + self.bg_task = uiMap["full_moon_ui.common.bg_task"] + self.bg_gift = uiMap["full_moon_ui.common.bg_gift"] + -- 子界面 + self.taskPanel = uiMap["full_moon_ui.task_panel"] + self.chooseHeroPanel = uiMap["full_moon_ui.choose_hero_panel"] + self.newHeroPanel = uiMap["full_moon_ui.new_hero_panel"] + self.skinPanel = uiMap["full_moon_ui.skin_panel"] + -- 任务标签 + self.btnTask = uiMap["full_moon_ui.common.btns.btn_task"] + self.txTask1 = uiMap["full_moon_ui.common.btns.btn_task.tx_btn"] + self.txTask2 = uiMap["full_moon_ui.common.btns.btn_task.select.tx_select"] + self.selectTask = uiMap["full_moon_ui.common.btns.btn_task.select"] + -- 自选英雄礼包标签 + self.btnChooseHero = uiMap["full_moon_ui.common.btns.btn_choose_hero"] + self.txChooseHero1 = uiMap["full_moon_ui.common.btns.btn_choose_hero.tx_btn"] + self.txChooseHero2 = uiMap["full_moon_ui.common.btns.btn_choose_hero.select.tx_select"] + self.selectChooseHero = uiMap["full_moon_ui.common.btns.btn_choose_hero.select"] + -- 新英雄礼包标签 + self.btnNewHero = uiMap["full_moon_ui.common.btns.btn_new_hero"] + self.txNewHero1 = uiMap["full_moon_ui.common.btns.btn_new_hero.tx_btn"] + self.txNewHero2 = uiMap["full_moon_ui.common.btns.btn_new_hero.select.tx_select"] + self.selectNewHero = uiMap["full_moon_ui.common.btns.btn_new_hero.select"] + -- 皮肤标签 + self.btnSkin = uiMap["full_moon_ui.common.btns.btn_skin"] + self.txSkin1 = uiMap["full_moon_ui.common.btns.btn_skin.tx_btn"] + self.txSkin2 = uiMap["full_moon_ui.common.btns.btn_skin.select.tx_select"] + self.selectSkin = uiMap["full_moon_ui.common.btns.btn_skin.select"] + + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_1)) + self.txTask1:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_NAME)) + self.txTask2:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_NAME)) + self.txChooseHero1:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_2)) + self.txChooseHero2:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_2)) + self.txNewHero1:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_3)) + self.txNewHero2:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_3)) + self.txSkin1:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_3)) + self.txSkin2:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_3)) + DataManager.FullMoonData:showActPanel() + + self.btnTask:addClickListener(function() + self.panelType = GConst.FullMoonConst.PANEL_TYPE.TASK + self:onRefresh() + end) + self.btnChooseHero:addClickListener(function() + self.panelType = GConst.FullMoonConst.PANEL_TYPE.CHOOSE_HERO + self:onRefresh() + end) + self.btnNewHero:addClickListener(function() + self.panelType = GConst.FullMoonConst.PANEL_TYPE.NEW_HERO + self:onRefresh() + end) + self.btnSkin:addClickListener(function() + self.panelType = GConst.FullMoonConst.PANEL_TYPE.SKIN + self:onRefresh() + end) + self.btnClose:addClickListener(function() + self:closeUI() + end) + self:addEventListener(EventManager.CUSTOM_EVENT.ACTIVITY_FULL_MOON_END, function() + self:closeUI() + end) + self:bind(DataManager.FullMoonData, "isDirty", function() + self:onRefresh() + end) + self:bind(DataManager.ShopData, "isDirty", function() + self:onRefresh() + end) +end + +function FullMoonUI:onRefresh() + -- 倒计时 + if self.actCountdownSid then + self.txCountdown:unscheduleGlobal(self.actCountdownSid) + end + self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.FullMoonData:getEndRemainTime())) + self.actCountdownSid = self.txCountdown:scheduleGlobal(function() + self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.FullMoonData:getEndRemainTime())) + end, 1) + + if self.panelType == GConst.FullMoonConst.PANEL_TYPE.TASK then + self:showTaskInfo() + elseif self.panelType == GConst.FullMoonConst.PANEL_TYPE.CHOOSE_HERO then + self:showChooseHeroInfo() + elseif self.panelType == GConst.FullMoonConst.PANEL_TYPE.NEW_HERO then + self:showNewHeroInfo() + elseif self.panelType == GConst.FullMoonConst.PANEL_TYPE.SKIN then + self:showSkinInfo() + end + self:refreshRedPoint() +end + +-- 刷新标签红点 +function FullMoonUI:refreshRedPoint() + -- if DataManager.FullMoonData:hasTaskRedPoint() then + -- self.btnTask:addRedPoint(-65, -5, 0.6) + -- else + -- self.btnTask:removeRedPoint() + -- end + -- if DataManager.FullMoonData:hasBountyRedPoint() then + -- self.btnBounty:addRedPoint(-65, -5, 0.6) + -- else + -- self.btnBounty:removeRedPoint() + -- end + -- if DataManager.FullMoonData:hasSkinRedPoint() then + -- self.btnSkin:addRedPoint(-65, -5, 0.6) + -- else + -- self.btnSkin:removeRedPoint() + -- end + -- if DataManager.FullMoonData:hasHeroRedPoint() then + -- self.btnHero:addRedPoint(-65, -5, 0.6) + -- else + -- self.btnHero:removeRedPoint() + -- end +end + +function FullMoonUI:showTaskInfo() + self.taskPanel:setActive(true) + self.selectTask:setActive(true) + self.chooseHeroPanel:setActive(false) + self.selectChooseHero:setActive(false) + self.newHeroPanel:setActive(false) + self.selectNewHero:setActive(false) + self.skinPanel:setActive(false) + self.selectSkin:setActive(false) + self.bg_task:setActive(true) + self.bg_gift:setActive(false) + + if not self.compTask then + self.taskPanel:initPrefabHelper() + self.taskPanel:genAllChildren() + self.compTask = self.taskPanel:addLuaComponent(COMP_TASK) + end + + self.compTask:refresh() +end + +function FullMoonUI:showChooseHeroInfo() + self.taskPanel:setActive(false) + self.selectTask:setActive(false) + self.chooseHeroPanel:setActive(true) + self.selectChooseHero:setActive(true) + self.newHeroPanel:setActive(false) + self.selectNewHero:setActive(false) + self.skinPanel:setActive(false) + self.selectSkin:setActive(false) + self.bg_task:setActive(false) + self.bg_gift:setActive(true) + + if not self.chooseHeroComp then + self.chooseHeroPanel:initPrefabHelper() + self.chooseHeroPanel:genAllChildren() + self.chooseHeroComp = self.chooseHeroPanel:addLuaComponent(COMP_CHOOSE_HERO) + end + + self.chooseHeroComp:refresh() +end + +function FullMoonUI:showNewHeroInfo() + self.taskPanel:setActive(false) + self.selectTask:setActive(false) + self.chooseHeroPanel:setActive(false) + self.selectChooseHero:setActive(false) + self.newHeroPanel:setActive(true) + self.selectNewHero:setActive(true) + self.skinPanel:setActive(false) + self.selectSkin:setActive(false) + self.bg_task:setActive(false) + self.bg_gift:setActive(true) + + if not self.newHeroComp then + self.newHeroPanel:initPrefabHelper() + self.newHeroPanel:genAllChildren() + self.newHeroComp = self.newHeroPanel:addLuaComponent(COMP_NEW_HERO) + end + + self.newHeroComp:refresh() +end + +function FullMoonUI:showSkinInfo() + self.taskPanel:setActive(false) + self.selectTask:setActive(false) + self.chooseHeroPanel:setActive(false) + self.selectChooseHero:setActive(false) + self.newHeroPanel:setActive(false) + self.selectNewHero:setActive(false) + self.skinPanel:setActive(true) + self.selectSkin:setActive(true) + self.bg_task:setActive(false) + self.bg_gift:setActive(false) + + if not self.compSkin then + self.skinPanel:initPrefabHelper() + self.skinPanel:genAllChildren() + self.compSkin = self.skinPanel:addLuaComponent(COMP_SKIN) + end + + self.compSkin:refresh() +end + +return FullMoonUI \ No newline at end of file diff --git a/lua/app/ui/activity/full_moon/full_moon_ui.lua.meta b/lua/app/ui/activity/full_moon/full_moon_ui.lua.meta new file mode 100644 index 00000000..60ed16b1 --- /dev/null +++ b/lua/app/ui/activity/full_moon/full_moon_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 89c9eb8cb84d89441b6f18941c24b880 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/common/cell/reward_cell.lua b/lua/app/ui/common/cell/reward_cell.lua index b5566f7f..105173e9 100644 --- a/lua/app/ui/common/cell/reward_cell.lua +++ b/lua/app/ui/common/cell/reward_cell.lua @@ -4,6 +4,7 @@ local EFFECT_LIGHT = "assets/prefabs/effects/ui/vfx_ui_arena_gift_b02.prefab" function RewardCell:init() local uiMap = self:getUIMap() + self.content = uiMap["reward_cell.content"] self.icon = uiMap["reward_cell.item_bg.icon"] self.frameBg = uiMap["reward_cell.item_bg"] self.mask = uiMap["reward_cell.item_bg.mask"] @@ -23,6 +24,10 @@ function RewardCell:init() self.skinQlt = uiMap["reward_cell.skin.img_qlt"] -- 特效 self.rootEffect = uiMap["reward_cell.root_effect"] + -- 选中框 + self.select = uiMap["reward_cell.content.item_bg.select"] + -- 自选 + self.choose = uiMap["reward_cell.choose"] self:hideFrameAnimation() self.baseObject:addClickListener(function() @@ -50,6 +55,12 @@ function RewardCell:refresh(reward) self:showFirstPass(false) end +-- 展示自选 +function RewardCell:refreshByChoose() + self.choose:setVisible(true) + self.content:setVisible(false) +end + function RewardCell:refreshByConfig(reward, mask, check) self:showMask(mask, check) if reward.type == GConst.REWARD_TYPE.ITEM then @@ -79,7 +90,10 @@ function RewardCell:refreshItemById(itemId, count, mask, check) end function RewardCell:_refreshItem(info, count) + self.choose:setVisible(false) + self.select:setVisible(false) self.lock:setVisible(false) + self.content:setVisible(true) self.numTx:setVisible(true) self.frameBg:setSprite(GConst.ATLAS_PATH.ICON_ITEM, GConst.FRAME_QLT[info.qlt]) if count and count > 0 then @@ -221,4 +235,9 @@ function RewardCell:showLight(show, ui) end end +-- 展示选中框 +function RewardCell:showSelect(show) + self.select:setActive(show == true) +end + return RewardCell \ No newline at end of file diff --git a/lua/app/ui/main_city/cell/side_bar_full_moon_cell.lua b/lua/app/ui/main_city/cell/side_bar_full_moon_cell.lua new file mode 100644 index 00000000..cc3448aa --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_full_moon_cell.lua @@ -0,0 +1,46 @@ +local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell" +local SideBarFullMoonCell = class("SideBarFullMoonCell", SideBarBaseCellComp) + +function SideBarFullMoonCell:getModuleKey() + return ModuleManager.MODULE_KEY.ACTIVITY +end + +function SideBarFullMoonCell:getIsOpen() + return DataManager.FullMoonData:isOpen() and DataManager.FullMoonData:isOpenTime() +end + +function SideBarFullMoonCell:getSpineName() + return "ui_main_btn_act_fullmoon" +end + +function SideBarFullMoonCell:onClick() + ModuleManager.FullMoonManager:showActMainUI() +end + +function SideBarFullMoonCell:getIsShowRedPoint() + return DataManager.FullMoonData:hasEntryRedPoint() +end + +function SideBarFullMoonCell:onRefresh() + self.timeBg:setVisible(true) + self:_refreshTime() +end + +function SideBarFullMoonCell:updateTime() + if self:getIsOpen() then + self:_refreshTime() + else + self:closeBtn() + end +end + +function SideBarFullMoonCell:_refreshTime() + local remainTime = DataManager.FullMoonData:getEndRemainTime() + if remainTime >= 0 then + self.timeTx:setText(GFunc.getTimeStr(remainTime)) + else + self.timeTx:setText("00:00:00") + end +end + +return SideBarFullMoonCell \ No newline at end of file diff --git a/lua/app/ui/main_city/cell/side_bar_full_moon_cell.lua.meta b/lua/app/ui/main_city/cell/side_bar_full_moon_cell.lua.meta new file mode 100644 index 00000000..939749f3 --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_full_moon_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4ba87a7695be4af42842b7637db142ae +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 46a09eb5..a2dae0ef 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -1111,6 +1111,13 @@ function MainCityUI:checkMainPop() return end + -- 圆月活动 + local showType = DataManager.FullMoonData:getNeedShowActPanel() + if showType then + ModuleManager.FullMoonManager:showActMainUI(showType) + return + end + -- 金猪满了后下次进主城要弹出来 if DataManager.GoldPigData:getPopFlag() and not DataManager.TutorialData:getIsInTutorial() then DataManager.GoldPigData:markPop() diff --git a/lua/app/ui/shop/cell/pop_reward_cell.lua b/lua/app/ui/shop/cell/pop_reward_cell.lua index 2ff51dfc..b3d1fced 100644 --- a/lua/app/ui/shop/cell/pop_reward_cell.lua +++ b/lua/app/ui/shop/cell/pop_reward_cell.lua @@ -3,6 +3,8 @@ local PopRewardCell = class("PopRewardCell", BaseCell) function PopRewardCell:init() local uiMap = self.baseObject:genAllChildren() self.bg = uiMap["pop_reward_cell.bg"] + self.choose = uiMap["pop_reward_cell.choose"] + self.imgChoose = uiMap["pop_reward_cell.img_choose"] if not self.itemCell then self.itemCell = CellManager:addCellComp(uiMap["pop_reward_cell.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL) end @@ -10,9 +12,18 @@ function PopRewardCell:init() self.popHeroCell = CellManager:addCellComp(uiMap["pop_reward_cell.pop_hero_cell"], GConst.TYPEOF_LUA_CLASS.POP_HERO_CELL) end self.descTx = uiMap["pop_reward_cell.desc_text"] + self:addClickListener(function() + if self.clickCallback then + self.clickCallback() + end + end) end +-- 显示道具 function PopRewardCell:refresh(id, num, showBg) + self.choose:setActive(false) + self.imgChoose:setActive(false) + self:setClickListener(nil) local cfgInfo = ConfigManager:getConfig("item")[id] if cfgInfo then self.bg:setVisible(showBg) @@ -44,7 +55,23 @@ function PopRewardCell:refresh(id, num, showBg) end end -function PopRewardCell:addClickListener(callback) +-- 显示可选 +function PopRewardCell:refreshChoose(clickFunc) + self.imgChoose:setActive(true) + self:setClickListener(clickFunc) +end + +-- 只显示可选 +function PopRewardCell:refreshOnlyChoose(clickFunc) + self.choose:setActive(true) + self.imgChoose:setActive(false) + self.itemCell:getBaseObject():setActive(false) + self.popHeroCell:getBaseObject():setActive(false) + self.descTx:setText(I18N:getGlobalText(I18N.GlobalConst.REWARD_DESC)) + self:setClickListener(clickFunc) +end + +function PopRewardCell:setClickListener(callback) self.clickCallback = callback end diff --git a/lua/app/ui/tips/choose_reward_tips.lua b/lua/app/ui/tips/choose_reward_tips.lua new file mode 100644 index 00000000..0229091a --- /dev/null +++ b/lua/app/ui/tips/choose_reward_tips.lua @@ -0,0 +1,69 @@ +local ChooseRewardTips = class("ChooseRewardTips", BaseUI) + +function ChooseRewardTips:ctor(params) + self.strTitle = params.title + self.strDesc = params.desc + self.chooseRewards = params.rewards + self.chooseCallback = params.callback +end + +function ChooseRewardTips:onPressBackspace() + self:closeUI() +end + +function ChooseRewardTips:getPrefabPath() + return "assets/prefabs/ui/tips/choose_reward_tips.prefab" +end + +function ChooseRewardTips:isFullScreen() + return false +end + +function ChooseRewardTips:onClose() + if self.chooseCallback and self.selectIndex then + self.chooseCallback(self.selectIndex) + end +end + +function ChooseRewardTips:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + + self.txDesc = uiMap["choose_reward_tips.content.tx_desc"] + self.txTitle = uiMap["choose_reward_tips.content.tx_title"] + self.scrollRectComp = uiMap["choose_reward_tips.content.scroll_rect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.btnClose = uiMap["choose_reward_tips.content.btn_close"] + self.rewardCell = uiMap["choose_reward_tips.content.reward_cell"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) + + self.selectIndex = nil + self.txTitle:setText(self.strTitle or I18N:getGlobalText(I18N.GlobalConst.HERO_CARD_TIPS_DESC)) + self.txDesc:setText(self.strDesc or I18N:getGlobalText(I18N.GlobalConst.HERO_CARD_TIPS_DESC)) + self.rewardCell:refreshByChoose() + self:initScrollRect() + + self.btnClose:addClickListener(function() + self:closeUI() + end) +end + +function ChooseRewardTips:initScrollRect() + self.scrollRectComp:addInitCallback(function() + return GConst.TYPEOF_LUA_CLASS.REWARD_CELL + end) + self.scrollRectComp:addRefreshCallback(function(index, cell) + cell:refreshByConfig(self.chooseRewards[index]) + cell:showSelect(index == self.selectIndex) + cell:addClickListener(function() + self:onSelectReward(index) + end) + end) + self.scrollRectComp:clearCells() + self.scrollRectComp:refillCells(#self.chooseRewards) +end + +function ChooseRewardTips:onSelectReward(index) + self.selectIndex = index + self.rewardCell:refreshByConfig(self.chooseRewards[self.selectIndex]) + self.scrollRectComp:updateAllCell() +end + +return ChooseRewardTips \ No newline at end of file diff --git a/lua/app/ui/tips/choose_reward_tips.lua.meta b/lua/app/ui/tips/choose_reward_tips.lua.meta new file mode 100644 index 00000000..b60c152d --- /dev/null +++ b/lua/app/ui/tips/choose_reward_tips.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5bb2d9a852b0b394abd828365adc09d3 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/userdata/activity/full_moon.meta b/lua/app/userdata/activity/full_moon.meta new file mode 100644 index 00000000..b2749106 --- /dev/null +++ b/lua/app/userdata/activity/full_moon.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aaa5662ae70c08140b8b3f2dde2fb87c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/userdata/activity/full_moon/full_moon_data.lua b/lua/app/userdata/activity/full_moon/full_moon_data.lua new file mode 100644 index 00000000..c0184067 --- /dev/null +++ b/lua/app/userdata/activity/full_moon/full_moon_data.lua @@ -0,0 +1,584 @@ +local FullMoonData = class("FullMoonData", BaseData) + +function FullMoonData:ctor() + self.data.isDirty = false +end + +function FullMoonData:clear() + DataManager:unregisterCrossDayFunc("FullMoonData") +end + +-- 设置活动数据 +function FullMoonData:setActStatus(data) + data = data or GConst.EMPTY_TABLE + + self.startTime = GFunc.formatTimeStep(data.start_at) + self.endTime = GFunc.formatTimeStep(data.end_at) + + if EDITOR_MODE then + Logger.logHighlight("圆月活动开启时间：") + Logger.printTable(data) + end +end + +-- 获取活动数据成功 +function FullMoonData:onGetActData(data) + data = data or GConst.EMPTY_TABLE + + self.taskFinished = data.finished or 0-- 任务奖励总计 + self.taskStatus = data.tasks or GConst.EMPTY_TABLE + self.taskProgReward = data.claimed or GConst.EMPTY_TABLE + -- self.curHeroGiftId = data.custom_gift_id + self.curHeroGiftChoose = data.custom_gift_choose + -- self.curNewHeroGiftId = data.hero_gift_id + self.chapterSkinClaimed = data.chapter_skin_claimed or GConst.EMPTY_TABLE + + if self:isOpenTime() then + -- 注册任务进度监听 + for id, data in ipairs(ConfigManager:getConfig("activity_full_moon_quest")) do + ModuleManager.TaskManager:registerTask("FullMoonData", data.type, function(count) + self:addTaskProgress(data.type, count) + end) + end + end + + if EDITOR_MODE then + Logger.logHighlight("圆月活动数据：") + Logger.printTable(data) + end + -- 跨天 + DataManager:registerCrossDayFunc("FullMoonData", function() + if not self:isOpen() then + return + end + if not self:isOpenTime() then + return + end + + ModuleManager.FullMoonManager:reqActData() + end) + + self.isInitedData = true + self:setDirty() +end + +function FullMoonData:setDirty() + self.data.isDirty = not self.data.isDirty +end + +function FullMoonData:isOpen() + if GFunc.isShenhe() then + return false + end + if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACTIVITY, true) then + return false + end + return true +end + +-- 是否在活动配置时间内 +function FullMoonData:isOpenTime() + if self.startTime == nil or self.startTime <= 0 then + return false + end + if self.endTime == nil or self.endTime <= 0 then + return false + end + return Time:getServerTime() >= self.startTime and Time:getServerTime() <= self.endTime +end + +-- 获取活动开启剩余时间（秒） +function FullMoonData:getStartRemainTime() + if self.startTime == nil or self.startTime <= 0 then + return 0 + end + return self.startTime - Time:getServerTime() +end + +-- 获取活动结束剩余时间（秒） +function FullMoonData:getEndRemainTime() + if self.endTime == nil or self.endTime <= 0 then + return 0 + end + return self.endTime - Time:getServerTime() +end + +-- 获取需要展示的活动界面 +function FullMoonData:getNeedShowActPanel() + if not self:isOpen() then + return nil + end + if not self:isOpenTime() then + return nil + end + if not self.isInitedData then + return nil + end + if self.isWatchedActPanel then + return nil + end + + if not self:isAllBoughtSkinGifts() then + return GConst.FullMoonConst.PANEL_TYPE.SKIN + end + + if not self:isAllBoughtNewHeroGifts() then + return GConst.FullMoonConst.PANEL_TYPE.NEW_HERO + end + + if not self:isAllBoughtChooseHeroGifts() then + return GConst.FullMoonConst.PANEL_TYPE.CHOOSE_HERO + end + + if not self:isTaskAllRewardReceived() then + return GConst.FullMoonConst.PANEL_TYPE.TASK + end + + return nil +end + +-- 展示活动界面 +function FullMoonData:showActPanel() + self.isWatchedActPanel = true +end + +-- 是否有入口红点 +function FullMoonData:hasEntryRedPoint() + return self:hasTaskRedPoint() +end + +-- 任务-------------------------------------------------------------------------------------------------- + +-- 是否奖励全领完 +function FullMoonData:isTaskAllRewardReceived() + for index, id in ipairs(self:getTaskListSort()) do + if not self:isReceivedTaskReward(id) then + return false + end + end + + return true +end + +-- 是否有任务红点 +function FullMoonData:hasTaskRedPoint() + for index, id in ipairs(table.keys(ConfigManager:getConfig("activity_full_moon_quest"))) do + if self:canGetTaskReward(id) and not self:isReceivedTaskReward(id) then + return true + end + end + + for index, id in ipairs(table.keys(ConfigManager:getConfig("activity_full_moon_reward"))) do + if self:isReachTaskProgressReward(id) and not self:isReceivedTaskProgressReward(id) then + return true + end + end + + return false +end + +-- 获取任务完成个数 +function FullMoonData:getTaskFinishNum() + return self.taskFinished +end + +-- 获取任务完成总目标个数 +function FullMoonData:getTaskTotalNum() + local max + for id, value in pairs(ConfigManager:getConfig("activity_full_moon_reward")) do + if max == nil or max < value.quest then + max = value.quest + end + end + + return max +end + +-- 获取下标对应的任务进度奖励id +function FullMoonData:getTaskProgressRewardIdByIndex(index) + for id, value in pairs(ConfigManager:getConfig("activity_full_moon_reward")) do + if index == 1 then + return id + end + index = index - 1 + end +end + +-- 获取任务进度奖励总个数 +function FullMoonData:getTaskProgressRewardTotalNum() + return table.nums(ConfigManager:getConfig("activity_full_moon_reward")) +end + +-- 获取任务进度奖励 +function FullMoonData:getTaskProgressReward(id) + return ConfigManager:getConfig("activity_full_moon_reward")[id].reward +end + +-- 获取任务进度目标 +function FullMoonData:getTaskProgressTarget(id) + return ConfigManager:getConfig("activity_full_moon_reward")[id].quest +end + +-- 任务进度奖励是否满足领取条件 +function FullMoonData:isReachTaskProgressReward(id) + return self:getTaskFinishNum() >= self:getTaskProgressTarget(id) +end + +-- 任务进度奖励是否已领取 +function FullMoonData:isReceivedTaskProgressReward(id) + return self.taskProgReward[id] +end + +-- 获取当前定位的任务进度奖励index +function FullMoonData:getCurTaskProgressRewardIndex() + local index = 0 + + for id, data in pairs(ConfigManager:getConfig("activity_full_moon_reward")) do + index = index + 1 + if self:isReachTaskProgressReward(id) and not self:isReceivedTaskProgressReward(id) then + return index + end + end + + index = 0 + local curStage = self:getTaskProgressRewardId() + for id, data in pairs(ConfigManager:getConfig("activity_full_moon_reward")) do + index = index + 1 + if curStage == id then + return index + end + end + + return nil +end + +-- 获取任务奖励阶段id +function FullMoonData:getTaskProgressRewardId() + local finish = self:getTaskFinishNum() + local curId + for id, data in pairs(ConfigManager:getConfig("activity_full_moon_reward")) do + if finish >= data.quest then + curId = id + else + break + end + finish = finish - data.quest + end + + return curId +end + +-- 获取今日任务列表 +function FullMoonData:getTaskListSort() + local ids = {} + + for id, data in pairs(self.taskStatus) do + local sort = id + 10000000 + if self:canGetTaskReward(id) and not self:isReceivedTaskReward(id) then + sort = sort - 100000 + end + if self:isReceivedTaskReward(id) then + sort = sort + 100000 + end + table.insert(ids, {id = id, sort = sort}) + end + table.sort(ids, function (a, b) + return a.sort < b.sort + end) + + -- Logger.logHighlight("任务列表排序:") + -- Logger.printTable(ids) + return ids +end + +-- 获取任务类型 +function FullMoonData:getTaskType(id) + return ConfigManager:getConfig("activity_full_moon_quest")[id].type +end + +-- 获取任务目标 +function FullMoonData:getTaskTarget(id) + return ConfigManager:getConfig("activity_full_moon_quest")[id].number +end + +-- 获取任务奖励 +function FullMoonData:getTaskReward(id) + return ConfigManager:getConfig("activity_full_moon_quest")[id].reward +end + +-- 获取任务进度 +function FullMoonData:getTaskProgress(id) + if self:getTaskType(id) == GConst.TaskConst.TASK_TYPE.X_PLAYER_LV_REACH then + -- 玩家等级实时处理 + return DataManager.PlayerData:getLv() + end + return self.taskStatus[id] and self.taskStatus[id].progress or 0 +end + +-- 任务是否完成 +function FullMoonData:canGetTaskReward(id) + return self:getTaskProgress(id) >= self:getTaskTarget(id) +end + +-- 任务奖励是否已领取 +function FullMoonData:isReceivedTaskReward(id) + if self.taskStatus[id] == nil then + return false + end + + return self.taskStatus[id].claimed +end + +-- 添加任务进度 +function FullMoonData:addTaskProgress(taskType, count) + -- Logger.logHighlight("任务进度改变："..tostring(taskType)..","..tostring(count)) + if not self:isOpen() then + return + end + if not self:isOpenTime() then + return + end + + for id, data in pairs(self.taskStatus) do + local tt = self:getTaskType(id) + if tt == taskType then + if self.taskStatus[id] == nil then + self.taskStatus[id] = {} + self.taskStatus[id].progress = 0 + end + self.taskStatus[id].progress = self.taskStatus[id].progress + count + end + end + + self:setDirty() +end + +-- 领取任务奖励成功 +function FullMoonData:onReceivedTaskReward(id, finished) + self.taskFinished = finished + if self.taskStatus[id] then + self.taskStatus[id].claimed = true + end + self:setDirty() +end + +-- 领取任务进度奖励成功 +function FullMoonData:onReceivedTaskProgressReward(id) + self.taskProgReward[id] = true + self:setDirty() +end + +-- 英雄自选连购礼包-------------------------------------------------------------------------------------------------- + +-- 所有自选英雄礼包都被购买 +function FullMoonData:isAllBoughtChooseHeroGifts() + for index, id in ipairs(self:getChooseHeroGiftIds()) do + if not self:isGiftBought(id) then + return false + end + end + return true +end + +-- 获取英雄自选礼包ids +function FullMoonData:getChooseHeroGiftIds() + if self.chooseHeroIds == nil then + self.chooseHeroIds = table.keys(DataManager.ShopData:getGiftsByType(PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_HERO_GIFT)) + table.sort(self.chooseHeroIds) + end + + return self.chooseHeroIds +end + +-- 当前所处的英雄礼包 +function FullMoonData:getCurChooseHeroGiftId() + for index, id in pairs(self:getChooseHeroGiftIds()) do + if not self:isGiftBought(id) then + return id + end + end + + return self:getChooseHeroGiftIds()[#self:getChooseHeroGiftIds()] +end + +-- 获取当前组礼包ids +function FullMoonData:getCurStepChooseHeroGiftIds() + local ids = self:getChooseHeroGiftIds() + local curId = self:getCurChooseHeroGiftId() + local result = {} + local step = 1 + + local idx = 0 + for index, value in ipairs(GConst.FullMoonConst.HERO_GIFT_SHOW_STEP) do + result[index] = {} + for i = 1, value do + idx = idx + 1 + if curId == ids[idx] then + step = index + end + if ids[idx] then + table.insert(result[index], ids[idx]) + end + end + end + + return result[step] +end + +-- 当前自选英雄的下标 +function FullMoonData:getChooseHeroIndex() + return self.curHeroGiftChoose > 0 and self.curHeroGiftChoose or nil +end + +-- 获取固定奖励 +function FullMoonData:getFixedRewards(id) + return DataManager.ShopData:getActGiftConfig()[id].reward +end + +-- 获取自选奖励 +function FullMoonData:getChooseRewards(id, isAll) + + local rewards = {} + + if not isAll then + for index, reward in ipairs(DataManager.ShopData:getActGiftConfig()[id].choose_reward) do + local info = ConfigManager:getConfig("item")[reward.id] + if info.type == GConst.ItemConst.ITEM_TYPE.HERO_FRAGMENT then + if DataManager.HeroData:getHeroIsActive(info.parameter) then + table.insert(rewards, reward) + end + end + end + else + rewards = DataManager.ShopData:getActGiftConfig()[id].choose_reward + end + + return rewards +end + +-- 获取可选择的自选奖励下标对应的全部自选奖励下标 +function FullMoonData:getChooseRewardsIndexByCanChooseIndex(index) + local selectReward = self:getChooseRewards(self:getCurChooseHeroGiftId())[index] + local result = {} + for idx, reward in ipairs(self:getChooseRewards(self:getCurChooseHeroGiftId(), true)) do + if reward == selectReward then + return idx + end + end + + Logger.logError("未找到"..index) + return result +end + +-- 自选成功 +function FullMoonData:onChooseHeroSuccess(index) + self.curHeroGiftChoose = index + self:setDirty() +end + +-- 新英雄连购礼包-------------------------------------------------------------------------------------------------- + +-- 所有新英雄礼包都被购买 +function FullMoonData:isAllBoughtNewHeroGifts() + for index, id in ipairs(self:getNewHeroGiftIds()) do + if not self:isGiftBought(id) then + return false + end + end + return true +end + +-- 获取新英雄礼包ids +function FullMoonData:getNewHeroGiftIds() + if self.newHeroIds == nil then + self.newHeroIds = table.keys(DataManager.ShopData:getGiftsByType(PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_NEW_HERO_GIFT)) + table.sort(self.newHeroIds) + end + + return self.newHeroIds +end + +-- 当前所处的新英雄礼包 +function FullMoonData:getCurNewHeroGiftId() + for index, id in pairs(self:getNewHeroGiftIds()) do + if DataManager.ShopData:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, id) == 0 then + return id + end + end + + return self:getNewHeroGiftIds()[#self:getNewHeroGiftIds()] +end + +-- 获取当前组礼包ids +function FullMoonData:getCurStepNewHeroGiftIds() + local ids = self:getNewHeroGiftIds() + local curId = self:getCurNewHeroGiftId() + local result = {} + local step = 1 + + local idx = 0 + for index, value in ipairs(GConst.FullMoonConst.HERO_GIFT_SHOW_STEP) do + result[index] = {} + for i = 1, value do + idx = idx + 1 + if curId == ids[idx] then + step = index + end + if ids[idx] then + table.insert(result[index], ids[idx]) + end + end + end + + return result[step] +end + +-- 皮肤礼包-------------------------------------------------------------------------------------------------- + +-- 所有皮肤礼包都被购买 +function FullMoonData:isAllBoughtSkinGifts() + for index, id in ipairs(table.keys(DataManager.ShopData:getGiftsByType(PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_SKIN_GIFT))) do + if not self:isGiftBought(id) then + return false + end + end + return true +end + +-- 皮肤礼包剩余购买次数 +function FullMoonData:getSkinGiftRemainBuyNum(id) + return DataManager.ShopData:getGiftRemainBuyNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, id) +end + +-- 获取皮肤挑战首通奖励 +function FullMoonData:getSkinFirstChallengeReward(id) + return ConfigManager:getConfig("chapter_new_skin_fight")[id].reward[1] +end + +-- 皮肤挑战首通奖励是否已领取 +function FullMoonData:isReceivedSkinFirstChallengeReward(id) + return self.chapterSkinClaimed[id] +end + +-- 设置当前皮肤挑战关卡id +function FullMoonData:setCurSkinChallengeId(id) + self.curSkinChallengeId = id +end + +-- 获取当前皮肤挑战关卡id +function FullMoonData:getCurSkinChallengeId() + return self.curSkinChallengeId +end + +-- 皮肤挑战奖励领取成功 +function FullMoonData:onReceivedSkinChallengeReward(id) + self.chapterSkinClaimed[id] = true + self:setDirty() +end + +-- 礼包是否已购买 +function FullMoonData:isGiftBought(id) + return DataManager.ShopData:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, id) > 0 +end + +return FullMoonData \ No newline at end of file diff --git a/lua/app/userdata/activity/full_moon/full_moon_data.lua.meta b/lua/app/userdata/activity/full_moon/full_moon_data.lua.meta new file mode 100644 index 00000000..d4be7b7f --- /dev/null +++ b/lua/app/userdata/activity/full_moon/full_moon_data.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 26e9c0c4a4691ed41a638980ce937de9 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/userdata/bag/item_data.lua b/lua/app/userdata/bag/item_data.lua index 241bc7dc..157e52b8 100644 --- a/lua/app/userdata/bag/item_data.lua +++ b/lua/app/userdata/bag/item_data.lua @@ -164,6 +164,10 @@ function ItemData:addItem(data, itemGetType) else BIReport:postVitGet(data.count, itemGetType) end + elseif data.id == GConst.ItemConst.ITEM_ID_RUNES then + if data.count > 0 then + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_RUNES_GETED_MATERIALS, data.count) + end else if data.count < 0 then BIReport:postItemUse(data.count, data.id, itemGetType) diff --git a/lua/app/userdata/player/player_data.lua b/lua/app/userdata/player/player_data.lua index a050f21b..b0a1a707 100644 --- a/lua/app/userdata/player/player_data.lua +++ b/lua/app/userdata/player/player_data.lua @@ -202,6 +202,7 @@ function PlayerData:addPayment(rechargeId) self.data.payAmount = self.data.payAmount + cfg.price self.data.payCount = self.data.payCount + 1 self.pay_counts[rechargeId] = (self.pay_counts[rechargeId] or 0) + 1 + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_BUY_ANYONE) end function PlayerData:getPayCount() diff --git a/lua/app/userdata/skin/skin_data.lua b/lua/app/userdata/skin/skin_data.lua index bd08a7ae..a6f2e45f 100644 --- a/lua/app/userdata/skin/skin_data.lua +++ b/lua/app/userdata/skin/skin_data.lua @@ -92,12 +92,20 @@ end -- 获取皮肤id所对应英雄id function SkinData:getHeroIdBySkinId(skinId) + if skinId == nil then + return nil + end + local cfg = self:getSkinCfg(skinId) return cfg and cfg.hero_id end -- 获取皮肤id所对应道具id function SkinData:getItemIdBySkinId(skinId) + if skinId == nil then + return nil + end + local cfg = self:getSkinCfg(skinId) return cfg and cfg.item_id end From 33526b2d2f72ac236d8eff1a7088aa88de35e968 Mon Sep 17 00:00:00 2001 From: Fang Date: Fri, 15 Sep 2023 19:21:15 +0800 Subject: [PATCH 33/35] review --- lua/app/ui/common/cell/reward_cell.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/ui/common/cell/reward_cell.lua b/lua/app/ui/common/cell/reward_cell.lua index 105173e9..fd0bdd63 100644 --- a/lua/app/ui/common/cell/reward_cell.lua +++ b/lua/app/ui/common/cell/reward_cell.lua @@ -91,7 +91,7 @@ end function RewardCell:_refreshItem(info, count) self.choose:setVisible(false) - self.select:setVisible(false) + self.select:setActive(false) self.lock:setVisible(false) self.content:setVisible(true) self.numTx:setVisible(true) From 4c27243520b87e3e3bb9b90f7fd02a74b289bb57 Mon Sep 17 00:00:00 2001 From: Fang Date: Fri, 15 Sep 2023 20:11:50 +0800 Subject: [PATCH 34/35] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/activity/full_moon/full_moon_manager.lua | 11 ++++++++++- .../controller/battle_controller_full_moon_skin.lua | 6 +----- lua/app/module/task/task_manager.lua | 5 +++++ lua/app/ui/activity/full_moon/full_moon_ui.lua | 5 +++++ .../userdata/activity/full_moon/full_moon_data.lua | 10 +++++++++- 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/lua/app/module/activity/full_moon/full_moon_manager.lua b/lua/app/module/activity/full_moon/full_moon_manager.lua index 9c298343..ce42bcb1 100644 --- a/lua/app/module/activity/full_moon/full_moon_manager.lua +++ b/lua/app/module/activity/full_moon/full_moon_manager.lua @@ -28,10 +28,19 @@ function FullMoonManager:reqActData() if not DataManager.FullMoonData:isOpen() then return end + if not DataManager.FullMoonData:isOpenTime() then + return + end + if self.isReqActData then + return + end + + self.isReqActData = true self:sendMessage(ProtoMsgType.FromMsgEnum.FullMoonInfoReq, {}, {}, self.rspActData, nil) end function FullMoonManager:rspActData(result) + self.isReqActData = false if result.err_code == GConst.ERROR_STR.SUCCESS then DataManager.FullMoonData:onGetActData(result.full_moon) end @@ -84,7 +93,7 @@ end -- 请求皮肤关卡挑战奖励 function FullMoonManager:reqChapterSkinClaim(id, combatReport) - if DataManager.FullMoonData:isReceivedSkinFirstChallengeReward(id) then + if not combatReport.victory or DataManager.FullMoonData:isReceivedSkinFirstChallengeReward(id) then ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.FULL_MOON_SKIN, {}, combatReport or {}, nil, nil, true) return end diff --git a/lua/app/module/battle/controller/battle_controller_full_moon_skin.lua b/lua/app/module/battle/controller/battle_controller_full_moon_skin.lua index 946e67a3..ba960300 100644 --- a/lua/app/module/battle/controller/battle_controller_full_moon_skin.lua +++ b/lua/app/module/battle/controller/battle_controller_full_moon_skin.lua @@ -22,19 +22,15 @@ function BattleControllerFullMoonSkin:controllBattleEnd() local atkReport = {} local teamEntity = self.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 self.victory then - ModuleManager.FullMoonManager:reqChapterSkinClaim(self.chapterId, self.combatReport, totalDamage) - end + ModuleManager.FullMoonManager:reqChapterSkinClaim(self.chapterId, self.combatReport) end function BattleControllerFullMoonSkin:postWaveOver(atkDead, isQuit) diff --git a/lua/app/module/task/task_manager.lua b/lua/app/module/task/task_manager.lua index 662e5666..e04a106a 100644 --- a/lua/app/module/task/task_manager.lua +++ b/lua/app/module/task/task_manager.lua @@ -63,6 +63,11 @@ function TaskManager:onResetDailyTask(result) DataManager.DailyTaskData:setInReset(false) if result.err_code == GConst.ERROR_STR.SUCCESS then DataManager.DailyTaskData:init(result.info) + + -- 检查圆月活动任务更新 + if self:getIsInReset() then + ModuleManager.FullMoonManager:reqActData() + end end end diff --git a/lua/app/ui/activity/full_moon/full_moon_ui.lua b/lua/app/ui/activity/full_moon/full_moon_ui.lua index 8e4cdbf0..fc8144f1 100644 --- a/lua/app/ui/activity/full_moon/full_moon_ui.lua +++ b/lua/app/ui/activity/full_moon/full_moon_ui.lua @@ -107,6 +107,11 @@ function FullMoonUI:onRefresh() self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.FullMoonData:getEndRemainTime())) self.actCountdownSid = self.txCountdown:scheduleGlobal(function() self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.FullMoonData:getEndRemainTime())) + + -- 检查更新数据 + if self:getIsInReset() and self.panelType == GConst.FullMoonConst.PANEL_TYPE.TASK then + ModuleManager.FullMoonManager:reqActData() + end end, 1) if self.panelType == GConst.FullMoonConst.PANEL_TYPE.TASK then diff --git a/lua/app/userdata/activity/full_moon/full_moon_data.lua b/lua/app/userdata/activity/full_moon/full_moon_data.lua index c0184067..dc636ed2 100644 --- a/lua/app/userdata/activity/full_moon/full_moon_data.lua +++ b/lua/app/userdata/activity/full_moon/full_moon_data.lua @@ -55,7 +55,7 @@ function FullMoonData:onGetActData(data) return end - ModuleManager.FullMoonManager:reqActData() + self:setInReset(true) end) self.isInitedData = true @@ -142,6 +142,14 @@ function FullMoonData:showActPanel() self.isWatchedActPanel = true end +function FullMoonData:setInReset(isInReset) + self.isInReset = isInReset +end + +function FullMoonData:getIsInReset() + return self.isInReset +end + -- 是否有入口红点 function FullMoonData:hasEntryRedPoint() return self:hasTaskRedPoint() From b36fde93c3a84e5d1b73d587ccfa07e760fd49d8 Mon Sep 17 00:00:00 2001 From: Fang Date: Fri, 15 Sep 2023 20:53:50 +0800 Subject: [PATCH 35/35] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/full_moon/full_moon_manager.lua | 1 + lua/app/module/task/task_manager.lua | 5 ----- lua/app/ui/activity/full_moon/full_moon_ui.lua | 16 +++++++++++----- .../activity/full_moon/full_moon_data.lua | 15 +++++++++++++-- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/lua/app/module/activity/full_moon/full_moon_manager.lua b/lua/app/module/activity/full_moon/full_moon_manager.lua index ce42bcb1..8a32c606 100644 --- a/lua/app/module/activity/full_moon/full_moon_manager.lua +++ b/lua/app/module/activity/full_moon/full_moon_manager.lua @@ -41,6 +41,7 @@ end function FullMoonManager:rspActData(result) self.isReqActData = false + DataManager.FullMoonData:setInReset(false) if result.err_code == GConst.ERROR_STR.SUCCESS then DataManager.FullMoonData:onGetActData(result.full_moon) end diff --git a/lua/app/module/task/task_manager.lua b/lua/app/module/task/task_manager.lua index e04a106a..662e5666 100644 --- a/lua/app/module/task/task_manager.lua +++ b/lua/app/module/task/task_manager.lua @@ -63,11 +63,6 @@ function TaskManager:onResetDailyTask(result) DataManager.DailyTaskData:setInReset(false) if result.err_code == GConst.ERROR_STR.SUCCESS then DataManager.DailyTaskData:init(result.info) - - -- 检查圆月活动任务更新 - if self:getIsInReset() then - ModuleManager.FullMoonManager:reqActData() - end end end diff --git a/lua/app/ui/activity/full_moon/full_moon_ui.lua b/lua/app/ui/activity/full_moon/full_moon_ui.lua index fc8144f1..853fa3b7 100644 --- a/lua/app/ui/activity/full_moon/full_moon_ui.lua +++ b/lua/app/ui/activity/full_moon/full_moon_ui.lua @@ -16,6 +16,12 @@ function FullMoonUI:onPressBackspace() self:closeUI() end +function FullMoonUI:onClose() + if self.actCountdownSid then + self.txCountdown:unscheduleGlobal(self.actCountdownSid) + end +end + function FullMoonUI:ctor(param) if param then self.panelType = param @@ -92,6 +98,11 @@ function FullMoonUI:onLoadRootComplete() self:closeUI() end) self:bind(DataManager.FullMoonData, "isDirty", function() + -- 检查更新数据 + if DataManager.FullMoonData:getIsInReset() and self.panelType == GConst.FullMoonConst.PANEL_TYPE.TASK then + ModuleManager.FullMoonManager:reqActData() + end + self:onRefresh() end) self:bind(DataManager.ShopData, "isDirty", function() @@ -107,11 +118,6 @@ function FullMoonUI:onRefresh() self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.FullMoonData:getEndRemainTime())) self.actCountdownSid = self.txCountdown:scheduleGlobal(function() self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.FullMoonData:getEndRemainTime())) - - -- 检查更新数据 - if self:getIsInReset() and self.panelType == GConst.FullMoonConst.PANEL_TYPE.TASK then - ModuleManager.FullMoonManager:reqActData() - end end, 1) if self.panelType == GConst.FullMoonConst.PANEL_TYPE.TASK then diff --git a/lua/app/userdata/activity/full_moon/full_moon_data.lua b/lua/app/userdata/activity/full_moon/full_moon_data.lua index dc636ed2..fd102023 100644 --- a/lua/app/userdata/activity/full_moon/full_moon_data.lua +++ b/lua/app/userdata/activity/full_moon/full_moon_data.lua @@ -2,6 +2,12 @@ local FullMoonData = class("FullMoonData", BaseData) function FullMoonData:ctor() self.data.isDirty = false + + self.taskFinished = 0 + self.curHeroGiftChoose = nil + self.taskStatus = GConst.EMPTY_TABLE + self.taskProgReward = GConst.EMPTY_TABLE + self.chapterSkinClaimed = GConst.EMPTY_TABLE end function FullMoonData:clear() @@ -28,9 +34,7 @@ function FullMoonData:onGetActData(data) self.taskFinished = data.finished or 0-- 任务奖励总计 self.taskStatus = data.tasks or GConst.EMPTY_TABLE self.taskProgReward = data.claimed or GConst.EMPTY_TABLE - -- self.curHeroGiftId = data.custom_gift_id self.curHeroGiftChoose = data.custom_gift_choose - -- self.curNewHeroGiftId = data.hero_gift_id self.chapterSkinClaimed = data.chapter_skin_claimed or GConst.EMPTY_TABLE if self:isOpenTime() then @@ -56,6 +60,7 @@ function FullMoonData:onGetActData(data) end self:setInReset(true) + self:setDirty() end) self.isInitedData = true @@ -320,6 +325,7 @@ function FullMoonData:getTaskProgress(id) -- 玩家等级实时处理 return DataManager.PlayerData:getLv() end + return self.taskStatus[id] and self.taskStatus[id].progress or 0 end @@ -347,6 +353,11 @@ function FullMoonData:addTaskProgress(taskType, count) return end + -- 检查圆月活动任务更新 + if self:getIsInReset() then + ModuleManager.FullMoonManager:reqActData() + end + for id, data in pairs(self.taskStatus) do local tt = self:getTaskType(id) if tt == taskType then