From e0db8bcfdaf182dc1f8f141c64123971fe2e0a77 Mon Sep 17 00:00:00 2001 From: Fang Date: Fri, 4 Aug 2023 10:48:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=8F=E6=97=A5=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 | 4 + lua/app/common/event_manager.lua | 1 + lua/app/common/local_data.lua | 18 + lua/app/common/module_manager.lua | 1 + lua/app/common/pay_manager.lua | 3 + lua/app/common/time.lua | 7 + lua/app/config/avatar.lua | 22 +- lua/app/config/skin_skill.lua.meta | 2 +- .../strings/cn/activity_bounty_task.lua.meta | 2 +- lua/app/config/strings/cn/avatar.lua | 17 +- .../strings/de/activity_bounty_task.lua.meta | 2 +- lua/app/config/strings/de/avatar.lua | 17 +- .../strings/en/activity_bounty_task.lua.meta | 2 +- lua/app/config/strings/en/avatar.lua | 17 +- .../strings/es/activity_bounty_task.lua.meta | 2 +- lua/app/config/strings/es/avatar.lua | 17 +- .../strings/fr/activity_bounty_task.lua.meta | 2 +- lua/app/config/strings/fr/avatar.lua | 17 +- .../strings/id/activity_bounty_task.lua.meta | 2 +- lua/app/config/strings/id/avatar.lua | 17 +- .../strings/ja/activity_bounty_task.lua.meta | 2 +- lua/app/config/strings/ja/avatar.lua | 17 +- .../strings/ko/activity_bounty_task.lua.meta | 2 +- lua/app/config/strings/ko/avatar.lua | 17 +- .../strings/pt/activity_bounty_task.lua.meta | 2 +- lua/app/config/strings/pt/avatar.lua | 17 +- lua/app/config/strings/ru/avatar.lua | 17 +- .../strings/th/activity_bounty_task.lua.meta | 2 +- lua/app/config/strings/th/avatar.lua | 17 +- .../strings/vi/activity_bounty_task.lua.meta | 2 +- lua/app/config/strings/vi/avatar.lua | 17 +- .../strings/zh/activity_bounty_task.lua.meta | 2 +- lua/app/config/strings/zh/avatar.lua | 17 +- lua/app/global/global_const.lua | 4 + lua/app/module/activity/activity_const.lua | 36 ++ .../module/activity/activity_const.lua.meta | 10 + lua/app/module/activity/activity_manager.lua | 97 ++++ lua/app/module/arena/arena_manager.lua | 1 + lua/app/module/maincity/maincity_const.lua | 1 + lua/app/module/skin/skin_manager.lua | 4 +- lua/app/module/task/task_const.lua | 1 + lua/app/module/task/task_manager.lua | 5 + .../ui/activity/activity_bounty_buy_ui.lua | 112 +++++ .../activity/activity_bounty_buy_ui.lua.meta | 10 + lua/app/ui/activity/activity_bounty_comp.lua | 103 ++++ .../ui/activity/activity_bounty_comp.lua.meta | 10 + lua/app/ui/activity/activity_hero_comp.lua | 52 ++ .../ui/activity/activity_hero_comp.lua.meta | 10 + lua/app/ui/activity/activity_skin_comp.lua | 112 +++++ .../ui/activity/activity_skin_comp.lua.meta | 10 + lua/app/ui/activity/activity_task_comp.lua | 35 ++ .../ui/activity/activity_task_comp.lua.meta | 10 + lua/app/ui/activity/activity_ui.lua | 241 +++++++++ lua/app/ui/activity/activity_ui.lua.meta | 10 + lua/app/ui/activity/cell.meta | 8 + .../ui/activity/cell/activity_bounty_cell.lua | 60 +++ .../cell/activity_bounty_cell.lua.meta | 10 + .../ui/activity/cell/activity_task_cell.lua | 64 +++ .../activity/cell/activity_task_cell.lua.meta | 10 + lua/app/ui/common/cell/reward_cell.lua | 42 +- .../main_city/cell/side_bar_activity_cell.lua | 24 + .../cell/side_bar_activity_cell.lua.meta | 10 + lua/app/ui/shop/cell/pop_reward_cell.lua | 8 +- lua/app/userdata/activity/activity_data.lua | 475 +++++++++++++++++- lua/app/userdata/equip/equip_entity.lua | 5 + lua/app/userdata/hero/hero_entity.lua | 3 +- lua/app/userdata/shop/shop_data.lua | 9 + lua/app/userdata/skin/skin_data.lua | 7 +- 68 files changed, 1860 insertions(+), 52 deletions(-) create mode 100644 lua/app/module/activity/activity_const.lua create mode 100644 lua/app/module/activity/activity_const.lua.meta create mode 100644 lua/app/ui/activity/activity_bounty_buy_ui.lua create mode 100644 lua/app/ui/activity/activity_bounty_buy_ui.lua.meta create mode 100644 lua/app/ui/activity/activity_bounty_comp.lua create mode 100644 lua/app/ui/activity/activity_bounty_comp.lua.meta create mode 100644 lua/app/ui/activity/activity_hero_comp.lua create mode 100644 lua/app/ui/activity/activity_hero_comp.lua.meta create mode 100644 lua/app/ui/activity/activity_skin_comp.lua create mode 100644 lua/app/ui/activity/activity_skin_comp.lua.meta create mode 100644 lua/app/ui/activity/activity_task_comp.lua create mode 100644 lua/app/ui/activity/activity_task_comp.lua.meta create mode 100644 lua/app/ui/activity/activity_ui.lua create mode 100644 lua/app/ui/activity/activity_ui.lua.meta create mode 100644 lua/app/ui/activity/cell.meta create mode 100644 lua/app/ui/activity/cell/activity_bounty_cell.lua create mode 100644 lua/app/ui/activity/cell/activity_bounty_cell.lua.meta create mode 100644 lua/app/ui/activity/cell/activity_task_cell.lua create mode 100644 lua/app/ui/activity/cell/activity_task_cell.lua.meta create mode 100644 lua/app/ui/main_city/cell/side_bar_activity_cell.lua create mode 100644 lua/app/ui/main_city/cell/side_bar_activity_cell.lua.meta diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index 8e3de99c..2c6b8ec2 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -121,6 +121,8 @@ BIReport.ITEM_GET_TYPE = { ARENA_CHALLENGE = "ArenaChallenge", ARENA_SETTLEMENT = "ArenaSettlement", ARENA_GIFT = "ArenaGift", + ACTIVITY_BOUNTY_REWARD = "ActivityBountyReward", + ACTIVITY_BOUNTY_LEVEL = "ActivityBountyLevel", COLLECTION_HERO_REWARD = "CollectionHeroReward", DUNGEON_WEAPON_CHALLENGE = "DungeonWeaponChallenge", DUNGEON_WEAPON_END = "DungeonWeaponEnd", @@ -136,6 +138,7 @@ BIReport.ITEM_GET_TYPE = { EQUIP_UPGRADE = "EquipUpgrade", ARMOR_UPGRADE = "ArmorUpgrade", OFFLINE_RECOVERY = "OfflineRecovery", + ACT_SUMMER = "ActSummer", } BIReport.ADS_CLICK_TYPE = { @@ -203,6 +206,7 @@ BIReport.GIFT_TYPE = { ARMOR_FUND = "ArmorFund", WEAPON_GIFT = "WeaponGift", ARMOR_GIFT = "ArmorGift", + ACT_SUMMER = "ActSummer", } BIReport.COIN_TYPE = { diff --git a/lua/app/common/event_manager.lua b/lua/app/common/event_manager.lua index 9c257c9a..65fee41a 100644 --- a/lua/app/common/event_manager.lua +++ b/lua/app/common/event_manager.lua @@ -59,6 +59,7 @@ EventManager.CUSTOM_EVENT = { -- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN", -- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER" DUNGEON_ARMOR_TO_TARGET_ID = "DUNGEON_ARMOR_TO_TARGET_ID", + ACTIVITY_SUMMER_END = "ACTIVITY_SUMMER_END", } -- 此方法不能直接在外部调用，请使用例如BaseUI，BaseModule等封装好的接口 diff --git a/lua/app/common/local_data.lua b/lua/app/common/local_data.lua index 20b88380..47e7f3ce 100644 --- a/lua/app/common/local_data.lua +++ b/lua/app/common/local_data.lua @@ -38,6 +38,8 @@ local LOCAL_DATA_KEY = { ARENA_TODAY_BATTLE_COUNT = "ARENA_TODAY_BATTLE_COUNT", TRIAL_HERO = "TRIAL_HERO", BATTLE_SNAPSHOT = "BATTLE_SNAPSHOT", + ACTIVITY_SUMMER_TODAY_SKIN = "ACTIVITY_SUMMER_TODAY_SKIN", + ACTIVITY_SUMMER_TODAY_HERO = "ACTIVITY_SUMMER_TODAY_HERO", } LocalData.KEYS = LOCAL_DATA_KEY @@ -447,4 +449,20 @@ function LocalData:getBattleSnapshot() return json.decode(dealedSnapshot) end +function LocalData:getTodayActSummerWatchedSkin() + return self:getInt(LOCAL_DATA_KEY.ACTIVITY_SUMMER_TODAY_SKIN .. Time:getBeginningOfServerToday(), 0) == 1 +end + +function LocalData:recordTodayActSummerWatchedSkin() + self:setInt(LOCAL_DATA_KEY.ACTIVITY_SUMMER_TODAY_SKIN .. Time:getBeginningOfServerToday(), 1) +end + +function LocalData:getTodayActSummerWatchedHero() + return self:getInt(LOCAL_DATA_KEY.ACTIVITY_SUMMER_TODAY_HERO .. Time:getBeginningOfServerToday(), 0) == 1 +end + +function LocalData:recordTodayActSummerWatchedHero() + self:setInt(LOCAL_DATA_KEY.ACTIVITY_SUMMER_TODAY_HERO .. Time:getBeginningOfServerToday(), 1) +end + return LocalData \ No newline at end of file diff --git a/lua/app/common/module_manager.lua b/lua/app/common/module_manager.lua index 778dfb7a..377b610d 100644 --- a/lua/app/common/module_manager.lua +++ b/lua/app/common/module_manager.lua @@ -80,6 +80,7 @@ ModuleManager.MODULE_KEY = { STORE_BOX_3_OPEN = "store_box_3_open", BOUNTY_OPEN = "bounty_open", IDLE_DROP = "idle_drop", + ACTIVITY = "activity_open", MALL = "mall", -- 商城 MALL_DAILY = "mall_daily", -- 每日商城 DAILY_CHALLENGE = "daily_challenge", -- 每日挑战 diff --git a/lua/app/common/pay_manager.lua b/lua/app/common/pay_manager.lua index 5fc9f996..76617cdb 100644 --- a/lua/app/common/pay_manager.lua +++ b/lua/app/common/pay_manager.lua @@ -22,6 +22,7 @@ PayManager.PURCHARSE_ACT_TYPE = { ARMOR_FUND = 10, WEAPON_GIFT = 11, ARMOR_GIFT = 12, + ACT_SUMMER = 13, } PayManager.PURCHARSE_TYPE_CONFIG = { @@ -46,6 +47,7 @@ PayManager.BI_ITEM_GET_TYPE = { [PayManager.PURCHARSE_ACT_TYPE.ARMOR_FUND] = BIReport.ITEM_GET_TYPE.ARMOR_FUND, [PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = BIReport.ITEM_GET_TYPE.WEAPON_GIFT, [PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = BIReport.ITEM_GET_TYPE.ARMOR_GIFT, + [PayManager.PURCHARSE_ACT_TYPE.ACT_SUMMER] = BIReport.ITEM_GET_TYPE.ACT_SUMMER, }, [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.ITEM_GET_TYPE.GOLD_PIG, [PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.ITEM_GET_TYPE.MALL_TREASURE, @@ -67,6 +69,7 @@ PayManager.BI_GIFT_TYPE = { [PayManager.PURCHARSE_ACT_TYPE.ARMOR_FUND] = BIReport.GIFT_TYPE.ARMOR_FUND, [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_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/time.lua b/lua/app/common/time.lua index bf0b8bf6..dc3c4bc2 100644 --- a/lua/app/common/time.lua +++ b/lua/app/common/time.lua @@ -308,6 +308,13 @@ function Time:getWeekByTimeStamp(time) return weekTab[now.wday] end +-- 获取今天距目标日期的天数 +function Time:getDistanceDays(time) + local nowNum = self:getBeginningOfOneDay(self:getServerTime()) + local targetNum = self:getBeginningOfOneDay(time) + return (nowNum - targetNum)/24/60/60 +end + -- 转换服务器时间字符串(ISO 8601)的对应的时间戳,例如2022-09-10T18:10:00.000Z function Time:convertServerTimeStringToTimestamp(str) local dateTime = CS.System.DateTime.Parse(str) diff --git a/lua/app/config/avatar.lua b/lua/app/config/avatar.lua index 6d3d1fd9..f1ed4beb 100644 --- a/lua/app/config/avatar.lua +++ b/lua/app/config/avatar.lua @@ -111,6 +111,26 @@ local avatar = { ["iconId"]="26", ["hero"]=54002 }, + [14003]={ + ["iconId"]="31", + ["hero"]=14003 + }, + [24003]={ + ["iconId"]="27", + ["hero"]=24003 + }, + [34003]={ + ["iconId"]="28", + ["hero"]=34003 + }, + [44003]={ + ["iconId"]="29", + ["hero"]=44003 + }, + [54003]={ + ["iconId"]="30", + ["hero"]=54003 + }, [1400201]={ ["iconId"]="skin_3", ["item"]=1400201 @@ -129,6 +149,6 @@ local avatar = { } } local config = { -data=avatar,count=31 +data=avatar,count=36 } return config \ No newline at end of file diff --git a/lua/app/config/skin_skill.lua.meta b/lua/app/config/skin_skill.lua.meta index d8c717bb..34753fb3 100644 --- a/lua/app/config/skin_skill.lua.meta +++ b/lua/app/config/skin_skill.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5a5148a7b16b1fc41b4cf4d3032434f7 +guid: 893b1162479b05246acae9d3a7c2dc8d ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/config/strings/cn/activity_bounty_task.lua.meta b/lua/app/config/strings/cn/activity_bounty_task.lua.meta index d6317999..e0fad10f 100644 --- a/lua/app/config/strings/cn/activity_bounty_task.lua.meta +++ b/lua/app/config/strings/cn/activity_bounty_task.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1127c4a778e20e548bab5b6d9197438f +guid: ecf9832219c651a42a6da2144d6b4b0e ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/config/strings/cn/avatar.lua b/lua/app/config/strings/cn/avatar.lua index 9bbaf16e..631a5656 100644 --- a/lua/app/config/strings/cn/avatar.lua +++ b/lua/app/config/strings/cn/avatar.lua @@ -80,6 +80,21 @@ local avatar = { [25001]={ ["desc"]="激活闪烁法师后获得。" }, + [14003]={ + ["desc"]="激活恶魔侍者后获得。" + }, + [24003]={ + ["desc"]="激活阿飞后获得。" + }, + [34003]={ + ["desc"]="激活忍者菲尔后获得。" + }, + [44003]={ + ["desc"]="激活月之法师后获得。" + }, + [54003]={ + ["desc"]="激活堕落骑士后获得。" + }, [1400201]={ ["desc"]="激活潘达沙滩王者皮肤获得。" }, @@ -94,6 +109,6 @@ local avatar = { } } local config = { -data=avatar,count=31 +data=avatar,count=36 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/activity_bounty_task.lua.meta b/lua/app/config/strings/de/activity_bounty_task.lua.meta index 03c57cc2..1b2ff09e 100644 --- a/lua/app/config/strings/de/activity_bounty_task.lua.meta +++ b/lua/app/config/strings/de/activity_bounty_task.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 918bec283e903ac40b3c53b3f01b7e6e +guid: 0f83d9ac19d0ece40a8322b3a3076967 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/config/strings/de/avatar.lua b/lua/app/config/strings/de/avatar.lua index d47f7486..9e50f952 100644 --- a/lua/app/config/strings/de/avatar.lua +++ b/lua/app/config/strings/de/avatar.lua @@ -79,6 +79,21 @@ local avatar = { }, [25001]={ + }, + [14003]={ + + }, + [24003]={ + + }, + [34003]={ + + }, + [44003]={ + + }, + [54003]={ + }, [1400201]={ @@ -94,6 +109,6 @@ local avatar = { } } local config = { -data=avatar,count=31 +data=avatar,count=36 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/activity_bounty_task.lua.meta b/lua/app/config/strings/en/activity_bounty_task.lua.meta index c6573bf2..2f7c5cb2 100644 --- a/lua/app/config/strings/en/activity_bounty_task.lua.meta +++ b/lua/app/config/strings/en/activity_bounty_task.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 37583a684486ff14f81e7f764ee1dfe7 +guid: da6eafcb15352aa48ad1a28bb73f5875 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/config/strings/en/avatar.lua b/lua/app/config/strings/en/avatar.lua index b2798ba4..a009284d 100644 --- a/lua/app/config/strings/en/avatar.lua +++ b/lua/app/config/strings/en/avatar.lua @@ -79,6 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="Obtained after activating Twinkling Mage." + }, + [14003]={ + + }, + [24003]={ + + }, + [34003]={ + + }, + [44003]={ + + }, + [54003]={ + }, [1400201]={ @@ -94,6 +109,6 @@ local avatar = { } } local config = { -data=avatar,count=31 +data=avatar,count=36 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/activity_bounty_task.lua.meta b/lua/app/config/strings/es/activity_bounty_task.lua.meta index 8385698c..86d8b5c3 100644 --- a/lua/app/config/strings/es/activity_bounty_task.lua.meta +++ b/lua/app/config/strings/es/activity_bounty_task.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d227df9391e785e408121f4ff642cfb5 +guid: aba4b90f0689e0d49ac6fbecf9f457e6 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/config/strings/es/avatar.lua b/lua/app/config/strings/es/avatar.lua index 05111ab2..5b63b140 100644 --- a/lua/app/config/strings/es/avatar.lua +++ b/lua/app/config/strings/es/avatar.lua @@ -79,6 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="Se obtiene tras activar Mago Brillante." + }, + [14003]={ + + }, + [24003]={ + + }, + [34003]={ + + }, + [44003]={ + + }, + [54003]={ + }, [1400201]={ @@ -94,6 +109,6 @@ local avatar = { } } local config = { -data=avatar,count=31 +data=avatar,count=36 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/activity_bounty_task.lua.meta b/lua/app/config/strings/fr/activity_bounty_task.lua.meta index 8bd2efeb..da4f693e 100644 --- a/lua/app/config/strings/fr/activity_bounty_task.lua.meta +++ b/lua/app/config/strings/fr/activity_bounty_task.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 519cb5672fc300e46a858a224241830b +guid: 5d2e06c6a89d5ba4f9f56288581b30fb ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/config/strings/fr/avatar.lua b/lua/app/config/strings/fr/avatar.lua index d47f7486..9e50f952 100644 --- a/lua/app/config/strings/fr/avatar.lua +++ b/lua/app/config/strings/fr/avatar.lua @@ -79,6 +79,21 @@ local avatar = { }, [25001]={ + }, + [14003]={ + + }, + [24003]={ + + }, + [34003]={ + + }, + [44003]={ + + }, + [54003]={ + }, [1400201]={ @@ -94,6 +109,6 @@ local avatar = { } } local config = { -data=avatar,count=31 +data=avatar,count=36 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/activity_bounty_task.lua.meta b/lua/app/config/strings/id/activity_bounty_task.lua.meta index 80e8e741..02bd603a 100644 --- a/lua/app/config/strings/id/activity_bounty_task.lua.meta +++ b/lua/app/config/strings/id/activity_bounty_task.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1218053606fbff34db28d72a590c208a +guid: 256cb63107484c14388a13d5f80f47c1 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/config/strings/id/avatar.lua b/lua/app/config/strings/id/avatar.lua index 903e4765..8d158c04 100644 --- a/lua/app/config/strings/id/avatar.lua +++ b/lua/app/config/strings/id/avatar.lua @@ -79,6 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="Dapat setelah lolos Blink Mage" + }, + [14003]={ + + }, + [24003]={ + + }, + [34003]={ + + }, + [44003]={ + + }, + [54003]={ + }, [1400201]={ @@ -94,6 +109,6 @@ local avatar = { } } local config = { -data=avatar,count=31 +data=avatar,count=36 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/activity_bounty_task.lua.meta b/lua/app/config/strings/ja/activity_bounty_task.lua.meta index d7d81c62..398e9caf 100644 --- a/lua/app/config/strings/ja/activity_bounty_task.lua.meta +++ b/lua/app/config/strings/ja/activity_bounty_task.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 10498da83e85fdf4dbb6c8206ca0d693 +guid: 3d8991f3c62a35d46a4f56b0fd0bebac ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/config/strings/ja/avatar.lua b/lua/app/config/strings/ja/avatar.lua index 64b7d33f..f9b5e9f8 100644 --- a/lua/app/config/strings/ja/avatar.lua +++ b/lua/app/config/strings/ja/avatar.lua @@ -79,6 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="トゥインクリングメイジをアクティブ化後獲得できる。" + }, + [14003]={ + + }, + [24003]={ + + }, + [34003]={ + + }, + [44003]={ + + }, + [54003]={ + }, [1400201]={ @@ -94,6 +109,6 @@ local avatar = { } } local config = { -data=avatar,count=31 +data=avatar,count=36 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/activity_bounty_task.lua.meta b/lua/app/config/strings/ko/activity_bounty_task.lua.meta index 91a672c7..4376f740 100644 --- a/lua/app/config/strings/ko/activity_bounty_task.lua.meta +++ b/lua/app/config/strings/ko/activity_bounty_task.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 14212bd9d0535924eb424e56b3d89aae +guid: dc9c852361917104da8be013c7b344c1 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/config/strings/ko/avatar.lua b/lua/app/config/strings/ko/avatar.lua index a446213f..51fdbf85 100644 --- a/lua/app/config/strings/ko/avatar.lua +++ b/lua/app/config/strings/ko/avatar.lua @@ -79,6 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="반짝이는 마법사을(를) 활성화한 후, 획득할 수 있습니다." + }, + [14003]={ + + }, + [24003]={ + + }, + [34003]={ + + }, + [44003]={ + + }, + [54003]={ + }, [1400201]={ @@ -94,6 +109,6 @@ local avatar = { } } local config = { -data=avatar,count=31 +data=avatar,count=36 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/activity_bounty_task.lua.meta b/lua/app/config/strings/pt/activity_bounty_task.lua.meta index 2bea6fd1..cfef9d10 100644 --- a/lua/app/config/strings/pt/activity_bounty_task.lua.meta +++ b/lua/app/config/strings/pt/activity_bounty_task.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a5b8d45ff88b5cc4b97a7220f6d9dd7b +guid: 888023c46b5a83e4ca8623eb8b44146f ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/config/strings/pt/avatar.lua b/lua/app/config/strings/pt/avatar.lua index 50e0e493..acae82d6 100644 --- a/lua/app/config/strings/pt/avatar.lua +++ b/lua/app/config/strings/pt/avatar.lua @@ -79,6 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="Ativar Mago do Brilho para obter." + }, + [14003]={ + + }, + [24003]={ + + }, + [34003]={ + + }, + [44003]={ + + }, + [54003]={ + }, [1400201]={ @@ -94,6 +109,6 @@ local avatar = { } } local config = { -data=avatar,count=31 +data=avatar,count=36 } 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 d47f7486..9e50f952 100644 --- a/lua/app/config/strings/ru/avatar.lua +++ b/lua/app/config/strings/ru/avatar.lua @@ -79,6 +79,21 @@ local avatar = { }, [25001]={ + }, + [14003]={ + + }, + [24003]={ + + }, + [34003]={ + + }, + [44003]={ + + }, + [54003]={ + }, [1400201]={ @@ -94,6 +109,6 @@ local avatar = { } } local config = { -data=avatar,count=31 +data=avatar,count=36 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/activity_bounty_task.lua.meta b/lua/app/config/strings/th/activity_bounty_task.lua.meta index 31dc1a2e..29052759 100644 --- a/lua/app/config/strings/th/activity_bounty_task.lua.meta +++ b/lua/app/config/strings/th/activity_bounty_task.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fa0d75a897385e244a94199562ff8a10 +guid: 5b35ae430e54fbe44b652cbfca604e87 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/config/strings/th/avatar.lua b/lua/app/config/strings/th/avatar.lua index d912b039..ea033ea1 100644 --- a/lua/app/config/strings/th/avatar.lua +++ b/lua/app/config/strings/th/avatar.lua @@ -79,6 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="หลังจากการเปิดใช้งานนักเวทแวบวับจะได้รับ" + }, + [14003]={ + + }, + [24003]={ + + }, + [34003]={ + + }, + [44003]={ + + }, + [54003]={ + }, [1400201]={ @@ -94,6 +109,6 @@ local avatar = { } } local config = { -data=avatar,count=31 +data=avatar,count=36 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/activity_bounty_task.lua.meta b/lua/app/config/strings/vi/activity_bounty_task.lua.meta index 1e694b9c..575b9f9e 100644 --- a/lua/app/config/strings/vi/activity_bounty_task.lua.meta +++ b/lua/app/config/strings/vi/activity_bounty_task.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f49db969f35f5744cbb754a485aafaf6 +guid: 3b9824b549f61574e81a5ef2be629f48 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/config/strings/vi/avatar.lua b/lua/app/config/strings/vi/avatar.lua index fe46c89d..f1266a58 100644 --- a/lua/app/config/strings/vi/avatar.lua +++ b/lua/app/config/strings/vi/avatar.lua @@ -79,6 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="Kích hoạt Pháp Sư Blink nhận được." + }, + [14003]={ + + }, + [24003]={ + + }, + [34003]={ + + }, + [44003]={ + + }, + [54003]={ + }, [1400201]={ @@ -94,6 +109,6 @@ local avatar = { } } local config = { -data=avatar,count=31 +data=avatar,count=36 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/activity_bounty_task.lua.meta b/lua/app/config/strings/zh/activity_bounty_task.lua.meta index 4b129f9d..1e471606 100644 --- a/lua/app/config/strings/zh/activity_bounty_task.lua.meta +++ b/lua/app/config/strings/zh/activity_bounty_task.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2f94a212b1547cc49a9ca8a0c0a11388 +guid: cae075fa2ab34d4468845c6964b80002 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/config/strings/zh/avatar.lua b/lua/app/config/strings/zh/avatar.lua index 3c4f60f8..d7576d51 100644 --- a/lua/app/config/strings/zh/avatar.lua +++ b/lua/app/config/strings/zh/avatar.lua @@ -79,6 +79,21 @@ local avatar = { }, [25001]={ ["desc"]="啟動閃爍法師後獲得。" + }, + [14003]={ + + }, + [24003]={ + + }, + [34003]={ + + }, + [44003]={ + + }, + [54003]={ + }, [1400201]={ @@ -94,6 +109,6 @@ local avatar = { } } local config = { -data=avatar,count=31 +data=avatar,count=36 } 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 77e83df2..94a882d0 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -19,6 +19,7 @@ local CONST_PATHS = { MailConst = "app/module/mail/mail_const", GameSettingConst = "app/module/game_setting/game_setting_const", CollectionConst = "app/module/collection/collection_const", + ActivityConst = "app/module/activity/activity_const", } if EDITOR_MODE then @@ -217,6 +218,8 @@ GConst.ATLAS_PATH = { MODULE = "assets/arts/atlas/ui/module.asset", UI_MAIL = "assets/arts/atlas/ui/mail.asset", UI_DUGEON_ARMOR = "assets/arts/atlas/ui/dungeon_armor.asset", + ACT_SUMMER = "assets/arts/atlas/ui/act_summer.asset", + TASK = "assets/arts/atlas/ui/task.asset", } GConst.TOUCH_EVENT = { @@ -295,6 +298,7 @@ GConst.MESSAGE_BOX_TYPE = { GConst.MESSAGE_BOX_SHOW_TODAY = { BOUNTY_BUY_LEVEL = 1, HOT_SELL_BUY = 2, + ACTIVITY_BUY_LEVEL = 2, } GConst.QUALITY_TYPE = diff --git a/lua/app/module/activity/activity_const.lua b/lua/app/module/activity/activity_const.lua new file mode 100644 index 00000000..6b12d6f8 --- /dev/null +++ b/lua/app/module/activity/activity_const.lua @@ -0,0 +1,36 @@ +local ActivityConst = {} + +-- 活动类型 +ActivityConst.ACT_TYPE = { +} + +-- 活动id +ActivityConst.ACT = { + SUMMER = 106, +} + +-- 战令档位 +ActivityConst.BOUNTY_GRADE_TYPE = { + FREE = 0, + PAY1 = 1, + PAY2 = 2, +} + +-- 界面 +ActivityConst.PANEL_TYPE = { + TASK = 1, + BOUNTY = 2, + SKIN = 3, + HERO = 4 +} + +-- 战令礼包id +ActivityConst.BOUNTY_GIFT_ID_1 = 130002 +ActivityConst.BOUNTY_GIFT_ID_2 = 130102 +-- 皮肤礼包id +ActivityConst.SKIN_GIFT_ID_1 = 130302 +ActivityConst.SKIN_GIFT_ID_2 = 130202 +-- 英雄礼包id +ActivityConst.HERO_GIFT_ID_1 = 130402 + +return ActivityConst \ No newline at end of file diff --git a/lua/app/module/activity/activity_const.lua.meta b/lua/app/module/activity/activity_const.lua.meta new file mode 100644 index 00000000..7176c954 --- /dev/null +++ b/lua/app/module/activity/activity_const.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 0b055c01cb49c774ea9d7417586df034 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/activity/activity_manager.lua b/lua/app/module/activity/activity_manager.lua index 9e85fbdd..7577970f 100644 --- a/lua/app/module/activity/activity_manager.lua +++ b/lua/app/module/activity/activity_manager.lua @@ -14,4 +14,101 @@ function ActivityManager:onBoughtGoldPigFinish(result) end end +-- 夏日活动分界线----------------------------------------------------------------------------------------------------- + +function ActivityManager:showActivityUI() + UIManager:showUI("app/ui/activity/activity_ui") +end + +-- 购买夏日活动战令 +function ActivityManager:buySummerBounty(giftId) + PayManager:purchasePackage(giftId, PayManager.PURCHARSE_TYPE.ACT_GIFT) +end + +-- 初始化夏日活动计时器 +function ActivityManager:initSummerTimer() + self:unscheduleGlobal(self.summerSid) + + if DataManager.ActivityData:isInActiveTime() then + Logger.logHighlight("夏日活动结束倒计时："..DataManager.ActivityData:getEndRemainTime()) + self.summerSid = self:performWithDelayGlobal(function() + -- 夏日活动结束 + Logger.logHighlight("夏日活动结束") + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.ACTIVITY_SUMMER_END) + end, DataManager.ActivityData:getEndRemainTime()) + elseif DataManager.ActivityData:getStartRemainTime() > 0 then + Logger.logHighlight("夏日活动开始倒计时："..DataManager.ActivityData:getStartRemainTime()) + self.summerSid = self:performWithDelayGlobal(function() + -- 夏日活动结束 + Logger.logHighlight("夏日活动开始") + self:reqSummerData() + end, DataManager.ActivityData:getStartRemainTime()) + end +end + +-- 请求夏日活动数据 +function ActivityManager:reqSummerData() + self:sendMessage(ProtoMsgType.FromMsgEnum.SummerDataReq, {}, {}, self.rspSummerData, nil) +end + +function ActivityManager:rspSummerData(result) + DataManager.ActivityData:onGetActData(result.summer) +end + +-- 请求夏日活动任务奖励 +function ActivityManager:reqSummerTaskReward(id) + self:sendMessage(ProtoMsgType.FromMsgEnum.SummerTaskClaimReq, {id = id, stage = DataManager.ActivityData:getTaskStage(id)}, {}, self.rspSummerTaskReward, nil) +end + +function ActivityManager:rspSummerTaskReward(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.ActivityData:onReceivedTaskReward(result.reqData.id, result.stage, result.level, result.exp) + end +end + +-- 请求夏日活动战令奖励，id为0就是领取档位全部可领奖励 +function ActivityManager:reqSummerBountyReward(id, grade) + self:sendMessage(ProtoMsgType.FromMsgEnum.SummerBountyClaimReq, {id = id, grade = grade}, {}, self.rspSummerBountyReward, BIReport.ITEM_GET_TYPE.ACTIVITY_BOUNTY_REWARD) +end + +function ActivityManager:rspSummerBountyReward(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.ActivityData:onReceivedBountyReward(result.success_id_grade) + + GFunc.showRewardBox(result.rewards) + end +end + +-- 购买战令等级 +function ActivityManager:reqBuyBountyLevel() + local cost = DataManager.ActivityData:getBuyBountyLevelCost() + local costId = GFunc.getRewardId(cost) + local costNum = GFunc.getRewardNum(cost) + if not GFunc.checkCost(costId, costNum, true) then + return + end + local params ={ + titleTx = I18N:getGlobalText(I18N.GlobalConst.BOUNTY_BUY_LEVEL_TITLE), + content = I18N:getGlobalText(I18N.GlobalConst.BOUNTY_BUY_LEVEL_COUNTENT), + boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, + showToday = GConst.MESSAGE_BOX_SHOW_TODAY.ACTIVITY_BUY_LEVEL, + costId = costId, + costNum = costNum, + okFunc = function() + local id = DataManager.ActivityData:getBountyCfg()[DataManager.ActivityData:getBountyLevel() + 1].id + Logger.logHighlight("购买战令等级:"..id) + self:sendMessage(ProtoMsgType.FromMsgEnum.SummerBountyClaimByDiamondReq, {id = id}, {}, self.rspBuyBountyLevel, BIReport.ITEM_GET_TYPE.ACTIVITY_BOUNTY_LEVEL) + end, + } + GFunc.showMessageBox(params) +end + +function ActivityManager:rspBuyBountyLevel(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.ActivityData:onBoughtBountyLevel() + end +end + +-- 夏日活动分界线----------------------------------------------------------------------------------------------------- + return ActivityManager \ No newline at end of file diff --git a/lua/app/module/arena/arena_manager.lua b/lua/app/module/arena/arena_manager.lua index 852bf676..be47c7c2 100644 --- a/lua/app/module/arena/arena_manager.lua +++ b/lua/app/module/arena/arena_manager.lua @@ -130,6 +130,7 @@ function ArenaManager:rspSettlement(result) self:checkSeasonChange() ModuleManager.TaskManager:addFightTaskProgress(reqData.task_stat) + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_ARENA_CHALLENGE) --bi上报 local winRate = result.total_win_count / (result.total_win_count + result.total_lose_count) diff --git a/lua/app/module/maincity/maincity_const.lua b/lua/app/module/maincity/maincity_const.lua index 3799130d..714e3bb4 100644 --- a/lua/app/module/maincity/maincity_const.lua +++ b/lua/app/module/maincity/maincity_const.lua @@ -31,6 +31,7 @@ MainCityConst.LEFT_SIDE_BARS = { "app/ui/main_city/cell/side_bar_idle_cell", "app/ui/main_city/cell/side_bar_growth_fund_cell", "app/ui/main_city/cell/side_bar_seven_days_cell", + "app/ui/main_city/cell/side_bar_activity_cell", -- gm放最后一个 "app/ui/main_city/cell/side_bar_gm_cell" } diff --git a/lua/app/module/skin/skin_manager.lua b/lua/app/module/skin/skin_manager.lua index cb12ce70..7ab8a5f2 100644 --- a/lua/app/module/skin/skin_manager.lua +++ b/lua/app/module/skin/skin_manager.lua @@ -2,8 +2,6 @@ local SkinManager = class("SkinManager", BaseModule) function SkinManager:init() self:addEventListener(EventManager.CUSTOM_EVENT.GETED_REWARD_SUCCESS, function(rewards) - Logger.logHighlight("奖励获取") - Logger.printTable(rewards) self:checkUnlockSkin(rewards) end) end @@ -15,7 +13,7 @@ function SkinManager:checkUnlockSkin(checkData) end for index, reward in ipairs(checkData) do - if reward.type == GConst.REWARD_TYPE.ITEM and reward.item.type == GConst.ItemConst.ITEM_TYPE.SKIN then + if reward.type == GConst.REWARD_TYPE.ITEM and ConfigManager:getConfig("item")[reward.item.id].type == GConst.ItemConst.ITEM_TYPE.SKIN then DataManager.SkinData:onUnlockSkin(reward.item.id) end end diff --git a/lua/app/module/task/task_const.lua b/lua/app/module/task/task_const.lua index 250e0537..c3a7c27a 100644 --- a/lua/app/module/task/task_const.lua +++ b/lua/app/module/task/task_const.lua @@ -30,6 +30,7 @@ TaskConst.TASK_TYPE = { X_NEW_HERO_GOT = 27, -- 拥有X个英雄 X_OPEN_SHOP_BOX_LEVEL_1 = 28, -- 商城里的1级抽卡宝箱 X_OPEN_SHOP_BOX_LEVEL_2 = 29, -- 商城里的2级抽卡宝箱 + X_ARENA_CHALLENGE = 30, -- 竞技场挑战 } 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 9621afcd..38f6b677 100644 --- a/lua/app/module/task/task_manager.lua +++ b/lua/app/module/task/task_manager.lua @@ -270,6 +270,10 @@ function TaskManager:xOpenShopBoxLevel3(count) self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX, count) end +function TaskManager:xArenaChallenge() + self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_ARENA_CHALLENGE, 1) +end + ---- 没有特殊说明，方法均返回任务增量 TaskManager.TYPE_DEAL_FUNC = { [GConst.TaskConst.TASK_TYPE.X_WATCH_AD] = TaskManager.xWatchAd, @@ -299,6 +303,7 @@ TaskManager.TYPE_DEAL_FUNC = { [GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_1] = TaskManager.xOpenShopBoxLevel1, [GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_2] = TaskManager.xOpenShopBoxLevel2, [GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_3] = TaskManager.xOpenShopBoxLevel3, + [GConst.TaskConst.TASK_TYPE.X_ARENA_CHALLENGE] = TaskManager.xArenaChallenge, } function TaskManager:taskGoto(taskType) diff --git a/lua/app/ui/activity/activity_bounty_buy_ui.lua b/lua/app/ui/activity/activity_bounty_buy_ui.lua new file mode 100644 index 00000000..954b2902 --- /dev/null +++ b/lua/app/ui/activity/activity_bounty_buy_ui.lua @@ -0,0 +1,112 @@ +local ActivityUI = class("ActivityUI", BaseUI) +local SPINE_BANNER = { + [GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1] = "ui_act_summer_buy_1", + [GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2] = "ui_act_summer_buy_2", +} +local PANEL_BG = { + [GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1] = "assets/arts/textures/background/shop/shop_bg_11.png", + [GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2] = "assets/arts/textures/background/shop/shop_bg_pig.png", +} +local TITLE_BG = { + [GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1] = "common_title_10", + [GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2] = "common_title_12", +} +local OFF_BG = { + [GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1] = "shop_bg_18", + [GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2] = "shop_bg_9", +} +local LINE_BG = { + [GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1] = "act_summer_board_6", + [GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2] = "act_summer_board_5", +} +local SPINE_POS_Y = { + [GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1] = 285, + [GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2] = 340, +} + +function ActivityUI:isFullScreen() + return false +end + +function ActivityUI:getPrefabPath() + return "assets/prefabs/ui/activity/activity_bounty_buy_ui.prefab" +end + +function ActivityUI:onPressBackspace() + self:closeUI() +end + +function ActivityUI:ctor(parmas) + self.payType = parmas + if self.payType == GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1 then + self.giftId = GConst.ActivityConst.BOUNTY_GIFT_ID_1 + elseif self.payType == GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2 then + self.giftId = GConst.ActivityConst.BOUNTY_GIFT_ID_2 + end +end + +function ActivityUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + self.bg = uiMap["activity_bounty_buy_ui.bg"] + self.spineBanner = uiMap["activity_bounty_buy_ui.bg.spine_banner"] + self.imgTitle = uiMap["activity_bounty_buy_ui.bg.img_title"] + self.txTitle = uiMap["activity_bounty_buy_ui.bg.img_title.tx_title"] + self.imgOff = uiMap["activity_bounty_buy_ui.bg.img_off"] + self.txOff = uiMap["activity_bounty_buy_ui.bg.img_off.tx_off"] + self.txDesc = uiMap["activity_bounty_buy_ui.bg.tx_desc"] + self.line = uiMap["activity_bounty_buy_ui.bg.line"] + self.scrollrectComp = uiMap["activity_bounty_buy_ui.bg.scroll_rect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.btnBuy = uiMap["activity_bounty_buy_ui.bg.btn_buy"] + self.txBuy = uiMap["activity_bounty_buy_ui.bg.btn_buy.tx_buy"] + self.btnClose = uiMap["activity_bounty_buy_ui.bg.close_btn"] + + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.REWARD_PREVIEW_DESC)) + self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_11)) + + self.btnBuy:addClickListener(function() + ModuleManager.ActivityManager:buySummerBounty(self.giftId) + end) + self.btnClose:addClickListener(function() + self:closeUI() + end) + self:addEventListener(EventManager.CUSTOM_EVENT.ACTIVITY_SUMMER_END, function() + self:closeUI() + end) + self:bind(DataManager.ShopData, "isDirty", function() + self:closeUI() + end) +end + +function ActivityUI:onRefresh() + self.spineBanner:getSkeletonGraphic().enabled = false + self.spineBanner:loadAssetAsync(SPINE_BANNER[self.payType], function() + self.spineBanner:getSkeletonGraphic().enabled = true + self.spineBanner:playAnim("idle", true, true, true) + end, false) + self.spineBanner:setAnchoredPositionY(SPINE_POS_Y[self.payType]) + + self.bg:setTexture(PANEL_BG[self.payType]) + self.imgTitle:setSprite(GConst.ATLAS_PATH.COMMON, TITLE_BG[self.payType]) + self.imgOff:setSprite(GConst.ATLAS_PATH.SHOP, OFF_BG[self.payType]) + self.line:setSprite(GConst.ATLAS_PATH.ACT_SUMMER, LINE_BG[self.payType]) + local gift = DataManager.ShopData:getActGiftConfig()[self.giftId] + if gift.value then + self.imgOff:setActive(true) + self.txOff:setText(gift.value .. "%") + else + self.imgOff:setActive(false) + end + self.txBuy:setText(GFunc.getFormatPrice(gift.recharge_id)) + + local totalRewards = DataManager.ActivityData:getBountyGradeAllRewardSort(self.payType) + self.scrollrectComp:addInitCallback(function() + return GConst.TYPEOF_LUA_CLASS.REWARD_CELL + end) + self.scrollrectComp:addRefreshCallback(function(index, cell) + cell:refreshByConfig(totalRewards[index]) + end) + self.scrollrectComp:clearCells() + self.scrollrectComp:refillCells(#totalRewards) +end + +return ActivityUI \ No newline at end of file diff --git a/lua/app/ui/activity/activity_bounty_buy_ui.lua.meta b/lua/app/ui/activity/activity_bounty_buy_ui.lua.meta new file mode 100644 index 00000000..cb3dd1a7 --- /dev/null +++ b/lua/app/ui/activity/activity_bounty_buy_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2433585b4982fc8439f9ea349d187da2 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/activity_bounty_comp.lua b/lua/app/ui/activity/activity_bounty_comp.lua new file mode 100644 index 00000000..d74b4ad3 --- /dev/null +++ b/lua/app/ui/activity/activity_bounty_comp.lua @@ -0,0 +1,103 @@ +local ActivityBountyComp = class("ActivityBountyComp", LuaComponent) + +function ActivityBountyComp:init() + local uiMap = self:getUIMap() + self.txScore = uiMap["bounty_panel.bounty.tx_score"] + self.imgProg = uiMap["bounty_panel.bounty.prog.img_prog"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) + self.txProg = uiMap["bounty_panel.bounty.prog.tx_prog"] + self.txLv = uiMap["bounty_panel.bounty.tx_lv"] + self.txLvNum = uiMap["bounty_panel.bounty.tx_lv_num"] + self.txFree = uiMap["bounty_panel.title.free.tx_free"] + -- 档位1 + self.txBuyed1 = uiMap["bounty_panel.title.buy1.tx_buyed"] + self.btnBuy1 = uiMap["bounty_panel.title.buy1.btn_buy"] + self.txBuy1 = uiMap["bounty_panel.title.buy1.btn_buy.tx_buy"] + -- 档位2 + self.txBuyed2 = uiMap["bounty_panel.title.buy2.tx_buyed"] + self.btnBuy2 = uiMap["bounty_panel.title.buy2.btn_buy"] + self.txBuy2 = uiMap["bounty_panel.title.buy2.btn_buy.tx_buy"] + + self.scrollrectComp = uiMap["bounty_panel.list_bounty"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.progLevel = uiMap["bounty_panel.list_bounty.viewport.content.prog"] + self.imgProgLevel = uiMap["bounty_panel.list_bounty.viewport.content.prog.img_prog"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) + self.maskLevel = uiMap["bounty_panel.list_bounty.viewport.content.mask_img"] + self.lineLevel = uiMap["bounty_panel.list_bounty.viewport.content.line"] + self.btnBuyLevel = uiMap["bounty_panel.list_bounty.viewport.content.line.btn_buy_level"] + self.txBuyLevelNum = uiMap["bounty_panel.list_bounty.viewport.content.line.btn_buy_level.tx_num"] + self.imgBuyLevelIcon = uiMap["bounty_panel.list_bounty.viewport.content.line.btn_buy_level.icon"] + + self.txFree:setText(I18N:getGlobalText(I18N.GlobalConst.STR_FREE)) + self.txBuyed1:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20)) + self.txBuyed2:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20)) + self.bountyList = DataManager.ActivityData:getBountyCfg() + self.scrollrectComp:addInitCallback(function() + self.maskLevel:getTransform():SetAsLastSibling() + self.lineLevel:getTransform():SetAsLastSibling() + return "app/ui/activity/cell/activity_bounty_cell" + end) + self.scrollrectComp:addRefreshCallback(function(index, cell) + cell:refresh(index, self.bountyList[index]) + end) + self.scrollrectComp:clearCells() + self.scrollrectComp:refillCells(#self.bountyList) + + self.btnBuy1:addClickListener(function() + UIManager:showUI("app/ui/activity/activity_bounty_buy_ui", GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1) + end) + self.btnBuy2:addClickListener(function() + UIManager:showUI("app/ui/activity/activity_bounty_buy_ui", GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2) + end) + self.btnBuyLevel:addClickListener(function() + ModuleManager.ActivityManager:reqBuyBountyLevel() + end) +end + +function ActivityBountyComp:refresh() + self.btnBuyLevel:setActive(DataManager.ActivityData:canBuyBountyLevel()) + -- 战令积分显示 + local total = DataManager.ActivityData:getBountyUpgradeScore() + local cur = DataManager.ActivityData:getBountyLevelScore() + self.imgProg.value = cur / total + self.txScore:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_1)) + self.txProg:setText(cur .. "/" .. total) + self.txLv:setText("LV") + self.txLvNum:setText(DataManager.ActivityData:getBountyLevel()) + + -- 档位展示 + local curGrade = DataManager.ActivityData:getBountyGrade() + self.btnBuy1:setActive(curGrade < GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1) + self.btnBuy2:setActive(curGrade < GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2) + + local gift1 = DataManager.ActivityData:getBountyGradeGiftCfg(GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1) + local gift2 = DataManager.ActivityData:getBountyGradeGiftCfg(GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2) + self.txBuy1:setText(GFunc.getFormatPrice(gift1.recharge_id)) + self.txBuy2:setText(GFunc.getFormatPrice(gift2.recharge_id)) + self.txBuyLevelNum:setText(GFunc.getRewardNum(DataManager.ActivityData:getBuyBountyLevelCost())) + GFunc.centerImgAndTx(self.imgBuyLevelIcon, self.txBuyLevelNum, 5) + + -- 等级列表 + self.scrollrectComp:updateAllCell() + + local maxLevel = DataManager.ActivityData:getBountyMaxLevel() + local curLevel = DataManager.ActivityData:getBountyLevel() + local topRecoveryOffset = self.scrollrectComp:getTopRecoveryOffset() + local downRecoveryOffset = self.scrollrectComp:getDownRecoveryOffset() + local cellHeight = self.scrollrectComp:getCellHeight() + if curLevel >= maxLevel then + self.lineLevel:setVisible(false) + else + self.lineLevel:setVisible(true) + self.lineLevel:setAnchoredPositionY(-topRecoveryOffset - curLevel * cellHeight) + end + self.progLevel:setAnchoredPositionY((topRecoveryOffset + downRecoveryOffset) / 2 - cellHeight / 2 - 10) + self.progLevel:setSizeDeltaY(cellHeight * (maxLevel - 1)) + local percent = (curLevel - 1) / (maxLevel - 1) + if percent < 0 then + percent = 0 + end + self.imgProgLevel.value = percent + self.maskLevel:setAnchoredPositionY(-topRecoveryOffset - curLevel * cellHeight) + self.maskLevel:setSizeDeltaY(cellHeight * maxLevel + GConst.UI_SCREEN_HEIGHT) +end + +return ActivityBountyComp \ No newline at end of file diff --git a/lua/app/ui/activity/activity_bounty_comp.lua.meta b/lua/app/ui/activity/activity_bounty_comp.lua.meta new file mode 100644 index 00000000..52cb2e04 --- /dev/null +++ b/lua/app/ui/activity/activity_bounty_comp.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6be3caa8b2628cc4eb4bd042b7600484 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/activity_hero_comp.lua b/lua/app/ui/activity/activity_hero_comp.lua new file mode 100644 index 00000000..4383b2da --- /dev/null +++ b/lua/app/ui/activity/activity_hero_comp.lua @@ -0,0 +1,52 @@ +local ActivityHeroComp = class("ActivityHeroComp", LuaComponent) + +function ActivityHeroComp:init() + local uiMap = self:getUIMap() + self.spineBanner = uiMap["hero_panel.spine_banner"] + self.txTitle = uiMap["hero_panel.tx_title"] + self.popRewardCell1 = uiMap["hero_panel.rewards.pop_reward_cell_1"] + self.popRewardCell2 = uiMap["hero_panel.rewards.pop_reward_cell_2"] + self.popRewardCell3 = uiMap["hero_panel.rewards.pop_reward_cell_3"] + self.txTime = uiMap["hero_panel.tx_time"] + self.btnBuy = uiMap["hero_panel.btn_buy"] + self.txBuy = uiMap["hero_panel.btn_buy.tx_buy"] + self.rewardCells = {} + for i = 1, 3 do + table.insert(self.rewardCells, uiMap["hero_panel.rewards.pop_reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.POP_REWARD_CELL)) + end + + self.btnBuy:addClickListener(function() + PayManager:purchasePackage(GConst.ActivityConst.HERO_GIFT_ID_1, PayManager.PURCHARSE_TYPE.ACT_GIFT) + end) + LocalData:recordTodayActSummerWatchedHero() +end + +function ActivityHeroComp:refresh() + self.spineBanner:playAnimComplete("born", false, true, function() + self.spineBanner:playAnim("idle", true, true) + end) + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_8)) + + local gift = DataManager.ShopData:getActGiftConfig()[GConst.ActivityConst.HERO_GIFT_ID_1] + self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, tostring(gift.limit))) + self.txBuy:setText(GFunc.getFormatPrice(gift.recharge_id)) + 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 + if DataManager.ShopData:getGiftRemainBuyNum(GConst.ActivityConst.HERO_GIFT_ID_1) > 0 then + self.btnBuy:setTouchEnable(true) + self.btnBuy:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_green_2") + self.txBuy:setText(GFunc.getFormatPrice(gift.recharge_id)) + else + self.btnBuy:setTouchEnable(false) + self.btnBuy:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_2") + self.txBuy:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20)) + end +end + +return ActivityHeroComp \ No newline at end of file diff --git a/lua/app/ui/activity/activity_hero_comp.lua.meta b/lua/app/ui/activity/activity_hero_comp.lua.meta new file mode 100644 index 00000000..b71feaba --- /dev/null +++ b/lua/app/ui/activity/activity_hero_comp.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: acb5324ea144d4e40841f09925c09155 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/activity_skin_comp.lua b/lua/app/ui/activity/activity_skin_comp.lua new file mode 100644 index 00000000..fd364c7c --- /dev/null +++ b/lua/app/ui/activity/activity_skin_comp.lua @@ -0,0 +1,112 @@ +local ActivitySkinComp = class("ActivitySkinComp", LuaComponent) + +function ActivitySkinComp: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.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.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.btnBuy1:addClickListener(function() + PayManager:purchasePackage(GConst.ActivityConst.SKIN_GIFT_ID_1, PayManager.PURCHARSE_TYPE.ACT_GIFT) + end) + self.btnBuy2:addClickListener(function() + PayManager:purchasePackage(GConst.ActivityConst.SKIN_GIFT_ID_2, PayManager.PURCHARSE_TYPE.ACT_GIFT) + end) + LocalData:recordTodayActSummerWatchedSkin() +end + +function ActivitySkinComp:refresh() + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_5)) + + -- 礼包1 + local gift1 = DataManager.ShopData:getActGiftConfig()[GConst.ActivityConst.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.ACT_DESC_6)) + 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.ActivityConst.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 + local gift2 = DataManager.ShopData:getActGiftConfig()[GConst.ActivityConst.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.ACT_DESC_7)) + 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.ActivityConst.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 ActivitySkinComp \ No newline at end of file diff --git a/lua/app/ui/activity/activity_skin_comp.lua.meta b/lua/app/ui/activity/activity_skin_comp.lua.meta new file mode 100644 index 00000000..bc2c473c --- /dev/null +++ b/lua/app/ui/activity/activity_skin_comp.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: efbdbb326ef93fc488aa2aa486acd5aa +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/activity_task_comp.lua b/lua/app/ui/activity/activity_task_comp.lua new file mode 100644 index 00000000..e14b20ab --- /dev/null +++ b/lua/app/ui/activity/activity_task_comp.lua @@ -0,0 +1,35 @@ +local ActivityTaskComp = class("ActivityTaskComp", LuaComponent) + +function ActivityTaskComp:init() + local uiMap = self:getUIMap() + self.txScore = uiMap["task_panel.bounty.tx_score"] + self.imgProg = uiMap["task_panel.bounty.prog.img_prog"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) + self.txProg = uiMap["task_panel.bounty.prog.tx_prog"] + self.txLv = uiMap["task_panel.bounty.tx_lv"] + self.txLvNum = uiMap["task_panel.bounty.tx_lv_num"] + self.scrollrectComp = uiMap["task_panel.list_task"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) +end + +function ActivityTaskComp:refresh() + -- 战令积分显示 + local total = DataManager.ActivityData:getBountyUpgradeScore() + local cur = DataManager.ActivityData:getBountyLevelScore() + self.imgProg.value = cur / total + self.txScore:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_1)) + self.txProg:setText(cur .. "/" .. total) + self.txLv:setText("LV") + self.txLvNum:setText(DataManager.ActivityData:getBountyLevel()) + + -- 任务列表 + local tasks = DataManager.ActivityData:getTaskListSort() + self.scrollrectComp:addInitCallback(function() + return "app/ui/activity/cell/activity_task_cell" + end) + self.scrollrectComp:addRefreshCallback(function(index, cell) + cell:refresh(tasks[index]) + end) + self.scrollrectComp:clearCells() + self.scrollrectComp:refillCells(#tasks) +end + +return ActivityTaskComp \ No newline at end of file diff --git a/lua/app/ui/activity/activity_task_comp.lua.meta b/lua/app/ui/activity/activity_task_comp.lua.meta new file mode 100644 index 00000000..295594d2 --- /dev/null +++ b/lua/app/ui/activity/activity_task_comp.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3f79f106fd5bfec40abd342921663365 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/activity_ui.lua b/lua/app/ui/activity/activity_ui.lua new file mode 100644 index 00000000..428d246f --- /dev/null +++ b/lua/app/ui/activity/activity_ui.lua @@ -0,0 +1,241 @@ +local ActivityUI = class("ActivityUI", BaseUI) +local COMP_TASK = "app/ui/activity/activity_task_comp" +local COMP_BOUNTY = "app/ui/activity/activity_bounty_comp" +local COMP_SKIN = "app/ui/activity/activity_skin_comp" +local COMP_HERO = "app/ui/activity/activity_hero_comp" + +function ActivityUI:isFullScreen() + return false +end + +function ActivityUI:getPrefabPath() + return "assets/prefabs/ui/activity/activity_ui.prefab" +end + +function ActivityUI:onPressBackspace() + self:closeUI() +end + +function ActivityUI:ctor() + self.panelType = GConst.ActivityConst.PANEL_TYPE.TASK -- 默认进入任务页签 + + if self.panelType == nil and DataManager.ActivityData:hasTaskRedPoint() then + self.panelType = GConst.ActivityConst.PANEL_TYPE.TASK + elseif self.panelType == nil and DataManager.ActivityData:hasBountyRedPoint() then + self.panelType = GConst.ActivityConst.PANEL_TYPE.BOUNTY + elseif self.panelType == nil and DataManager.ActivityData:hasSkinRedPoint() then + self.panelType = GConst.ActivityConst.PANEL_TYPE.SKIN + elseif self.panelType == nil and DataManager.ActivityData:hasHeroRedPoint() then + self.panelType = GConst.ActivityConst.PANEL_TYPE.HERO + end +end + +function ActivityUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + -- 标题 + self.imgTitle = uiMap["activity_ui.img_title"] + self.txTitle = uiMap["activity_ui.img_title.tx_title"] + -- 子界面 + self.taskPanel = uiMap["activity_ui.task_panel"] + self.bountyPanel = uiMap["activity_ui.bounty_panel"] + self.skinPanel = uiMap["activity_ui.skin_panel"] + self.heroPanel = uiMap["activity_ui.hero_panel"] + -- 任务标签 + self.btnTask = uiMap["activity_ui.common.btns.btn_task"] + self.txTask1 = uiMap["activity_ui.common.btns.btn_task.tx_btn"] + self.txTask2 = uiMap["activity_ui.common.btns.btn_task.select.tx_select"] + self.selectTask = uiMap["activity_ui.common.btns.btn_task.select"] + -- 战令标签 + self.btnBounty = uiMap["activity_ui.common.btns.btn_bounty"] + self.txBounty1 = uiMap["activity_ui.common.btns.btn_bounty.tx_btn"] + self.txBounty2 = uiMap["activity_ui.common.btns.btn_bounty.select.tx_select"] + self.selectBounty = uiMap["activity_ui.common.btns.btn_bounty.select"] + -- 皮肤标签 + self.btnSkin = uiMap["activity_ui.common.btns.btn_skin"] + self.txSkin1 = uiMap["activity_ui.common.btns.btn_skin.tx_btn"] + self.txSkin2 = uiMap["activity_ui.common.btns.btn_skin.select.tx_select"] + self.selectSkin = uiMap["activity_ui.common.btns.btn_skin.select"] + -- 英雄标签 + self.btnHero = uiMap["activity_ui.common.btns.btn_hero"] + self.txHero1 = uiMap["activity_ui.common.btns.btn_hero.tx_btn"] + self.txHero2 = uiMap["activity_ui.common.btns.btn_hero.select.tx_select"] + self.selectHero = uiMap["activity_ui.common.btns.btn_hero.select"] + -- 通用 + self.btnClose = uiMap["activity_ui.common.btn_close"] + self.btnHelp = uiMap["activity_ui.countdown.btn_help"] + self.txCountdown = uiMap["activity_ui.countdown.content.tx_countdown"] + + self.txTask1:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_NAME)) + self.txTask2:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_NAME)) + self.txBounty1:setText(I18N:getGlobalText(I18N.GlobalConst.REWARD_DESC)) + self.txBounty2:setText(I18N:getGlobalText(I18N.GlobalConst.REWARD_DESC)) + self.txSkin1:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_3)) + self.txSkin2:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_3)) + self.txHero1:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_4)) + self.txHero2:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_4)) + + self.btnTask:addClickListener(function() + self.panelType = GConst.ActivityConst.PANEL_TYPE.TASK + self:onRefresh() + end) + self.btnBounty:addClickListener(function() + self.panelType = GConst.ActivityConst.PANEL_TYPE.BOUNTY + self:onRefresh() + end) + self.btnSkin:addClickListener(function() + self.panelType = GConst.ActivityConst.PANEL_TYPE.SKIN + self:onRefresh() + end) + self.btnHero:addClickListener(function() + self.panelType = GConst.ActivityConst.PANEL_TYPE.HERO + self:onRefresh() + end) + self.btnClose:addClickListener(function() + self:closeUI() + end) + self.btnHelp:addClickListener(function() + local params = { + type = GConst.TipsConst.HELP_TIPS_TYPE.ARENA, + title = I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_11), + desc = I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_10), + } + ModuleManager.TipsManager:showHelpTips(params) + end) + self:addEventListener(EventManager.CUSTOM_EVENT.ACTIVITY_SUMMER_END, function() + self:closeUI() + end) + self:bind(DataManager.ActivityData, "isDirty", function() + self:onRefresh() + end) +end + +function ActivityUI:onRefresh() + self.txTitle:setText(DataManager.ActivityData:getActTitle()) + self.imgTitle:setSprite(DataManager.ActivityData:getActTitleBg()) + + -- 倒计时 + if self.actCountdownSid then + self.txCountdown:unscheduleGlobal(self.actCountdownSid) + end + self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.ActivityData:getEndRemainTime())) + self.actCountdownSid = self.txCountdown:scheduleGlobal(function() + self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.ActivityData:getEndRemainTime())) + end, 1) + + if self.panelType == GConst.ActivityConst.PANEL_TYPE.TASK then + self:showTaskInfo() + elseif self.panelType == GConst.ActivityConst.PANEL_TYPE.BOUNTY then + self:showBountyInfo() + elseif self.panelType == GConst.ActivityConst.PANEL_TYPE.SKIN then + self:showSkinInfo() + elseif self.panelType == GConst.ActivityConst.PANEL_TYPE.HERO then + self:showHeroInfo() + end + self:refreshRedPoint() +end + +-- 刷新标签红点 +function ActivityUI:refreshRedPoint() + if DataManager.ActivityData:hasTaskRedPoint() then + self.btnTask:addRedPoint(-55, 0, 0.6) + else + self.btnTask:removeRedPoint() + end + if DataManager.ActivityData:hasBountyRedPoint() then + self.btnBounty:addRedPoint(-55, 0, 0.6) + else + self.btnBounty:removeRedPoint() + end + if DataManager.ActivityData:hasSkinRedPoint() then + self.btnSkin:addRedPoint(-55, 0, 0.6) + else + self.btnSkin:removeRedPoint() + end + if DataManager.ActivityData:hasHeroRedPoint() then + self.btnHero:addRedPoint(-55, 0, 0.6) + else + self.btnHero:removeRedPoint() + end +end + +function ActivityUI:showTaskInfo() + self.taskPanel:setActive(true) + self.selectTask:setActive(true) + self.bountyPanel:setActive(false) + self.selectBounty:setActive(false) + self.skinPanel:setActive(false) + self.selectSkin:setActive(false) + self.heroPanel:setActive(false) + self.selectHero:setActive(false) + self.btnHelp:setActive(true) + + if not self.compTask then + self.taskPanel:initPrefabHelper() + self.taskPanel:genAllChildren() + self.compTask = self.taskPanel:addLuaComponent(COMP_TASK) + end + + self.compTask:refresh() +end + +function ActivityUI:showBountyInfo() + self.taskPanel:setActive(false) + self.selectTask:setActive(false) + self.bountyPanel:setActive(true) + self.selectBounty:setActive(true) + self.skinPanel:setActive(false) + self.selectSkin:setActive(false) + self.heroPanel:setActive(false) + self.selectHero:setActive(false) + self.btnHelp:setActive(true) + + if not self.compBounty then + self.bountyPanel:initPrefabHelper() + self.bountyPanel:genAllChildren() + self.compBounty = self.bountyPanel:addLuaComponent(COMP_BOUNTY) + end + + self.compBounty:refresh() +end + +function ActivityUI:showSkinInfo() + self.taskPanel:setActive(false) + self.selectTask:setActive(false) + self.bountyPanel:setActive(false) + self.selectBounty:setActive(false) + self.skinPanel:setActive(true) + self.selectSkin:setActive(true) + self.heroPanel:setActive(false) + self.selectHero:setActive(false) + self.btnHelp: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 + +function ActivityUI:showHeroInfo() + self.taskPanel:setActive(false) + self.selectTask:setActive(false) + self.bountyPanel:setActive(false) + self.selectBounty:setActive(false) + self.skinPanel:setActive(false) + self.selectSkin:setActive(false) + self.heroPanel:setActive(true) + self.selectHero:setActive(true) + self.btnHelp:setActive(false) + + if not self.compHero then + self.heroPanel:initPrefabHelper() + self.heroPanel:genAllChildren() + self.compHero = self.heroPanel:addLuaComponent(COMP_HERO) + end + + self.compHero:refresh() +end + +return ActivityUI \ No newline at end of file diff --git a/lua/app/ui/activity/activity_ui.lua.meta b/lua/app/ui/activity/activity_ui.lua.meta new file mode 100644 index 00000000..cf54edd7 --- /dev/null +++ b/lua/app/ui/activity/activity_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 0c526726984e51544a3c4431f87407a6 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/cell.meta b/lua/app/ui/activity/cell.meta new file mode 100644 index 00000000..297eeb68 --- /dev/null +++ b/lua/app/ui/activity/cell.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c4d674ecc75bed47a3147c849d209d8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/ui/activity/cell/activity_bounty_cell.lua b/lua/app/ui/activity/cell/activity_bounty_cell.lua new file mode 100644 index 00000000..e0ed389a --- /dev/null +++ b/lua/app/ui/activity/cell/activity_bounty_cell.lua @@ -0,0 +1,60 @@ +local ActivityBountyCell = class("ActivityBountyCell", BaseCell) + +function ActivityBountyCell:init() + local uiMap = self:getUIMap() + self.txLevel = uiMap["activity_bounty_cell.level.tx_level"] + self.rewardCell1 = uiMap["activity_bounty_cell.reward_cell_1"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) + self.rewardCell2 = uiMap["activity_bounty_cell.reward_cell_2"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) + self.rewardCell3 = uiMap["activity_bounty_cell.reward_cell_3"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) +end + +function ActivityBountyCell:refresh(level, data) + self.gradeData = data + self.txLevel:setText(level) + + local isGet + local curGrade = DataManager.ActivityData:getBountyGrade() + + isGet = DataManager.ActivityData:isReceivedBountyReward(level, GConst.ActivityConst.BOUNTY_GRADE_TYPE.FREE) + self.rewardCell1:refreshByConfig(DataManager.ActivityData:getBountyGradeReward(level, GConst.ActivityConst.BOUNTY_GRADE_TYPE.FREE), isGet, isGet) + self.rewardCell1:showLock(curGrade < GConst.ActivityConst.BOUNTY_GRADE_TYPE.FREE) + if DataManager.ActivityData:canGetBountyReward(level, GConst.ActivityConst.BOUNTY_GRADE_TYPE.FREE) then + self.rewardCell1.baseObject:addRedPoint(50, 50, 0.6) + self.rewardCell1:addClickListener(function() + self:onClickReward(GConst.ActivityConst.BOUNTY_GRADE_TYPE.FREE) + end) + else + self.rewardCell1.baseObject:removeRedPoint() + end + + isGet = DataManager.ActivityData:isReceivedBountyReward(level, GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1) + self.rewardCell2:refreshByConfig(DataManager.ActivityData:getBountyGradeReward(level, GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1), isGet, isGet) + self.rewardCell2:showLock(curGrade < GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1) + if DataManager.ActivityData:canGetBountyReward(level, GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1) then + self.rewardCell2.baseObject:addRedPoint(50, 50, 0.6) + self.rewardCell2:addClickListener(function() + self:onClickReward(GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1) + end) + else + self.rewardCell2.baseObject:removeRedPoint() + end + + isGet = DataManager.ActivityData:isReceivedBountyReward(level, GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2) + self.rewardCell3:refreshByConfig(DataManager.ActivityData:getBountyGradeReward(level, GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2), isGet, isGet) + self.rewardCell3:showLock(curGrade < GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2) + if DataManager.ActivityData:canGetBountyReward(level, GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2) then + self.rewardCell3.baseObject:addRedPoint(50, 50, 0.6) + self.rewardCell3:addClickListener(function() + self:onClickReward(GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2) + end) + else + self.rewardCell3.baseObject:removeRedPoint() + end +end + +-- 领取奖励 +function ActivityBountyCell:onClickReward(grade) + ModuleManager.ActivityManager:reqSummerBountyReward(self.gradeData.id, grade) +end + +return ActivityBountyCell \ No newline at end of file diff --git a/lua/app/ui/activity/cell/activity_bounty_cell.lua.meta b/lua/app/ui/activity/cell/activity_bounty_cell.lua.meta new file mode 100644 index 00000000..fc6f684b --- /dev/null +++ b/lua/app/ui/activity/cell/activity_bounty_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 306878aa195006a4786dbeeea3b520d9 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/cell/activity_task_cell.lua b/lua/app/ui/activity/cell/activity_task_cell.lua new file mode 100644 index 00000000..271fdf6d --- /dev/null +++ b/lua/app/ui/activity/cell/activity_task_cell.lua @@ -0,0 +1,64 @@ +local ActivityTaskCell = class("ActivityTaskCell", BaseCell) +local TASK_BG = { + {GConst.ATLAS_PATH.TASK, "task_bg_2"}, + {GConst.ATLAS_PATH.ACT_SUMMER, "act_summer_bg_2"}, +} +local TASK_ICON_BG = { + {GConst.ATLAS_PATH.TASK, "task_bg_4"}, + {GConst.ATLAS_PATH.ACT_SUMMER, "act_summer_board_1"}, +} + +function ActivityTaskCell:init() + local uiMap = self:getUIMap() + self.imgTaskBg = uiMap["activity_task_cell.img_task_bg"] + self.imgTask = uiMap["activity_task_cell.img_task_bg.img_task"] + self.txDesc = uiMap["activity_task_cell.tx_desc"] + self.imgProg = uiMap["activity_task_cell.prog.img_prog"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) + self.txProg = uiMap["activity_task_cell.prog.tx_prog"] + self.txRewardName = uiMap["activity_task_cell.tx_reward_name"] + self.txNum = uiMap["activity_task_cell.tx_num"] + self.finish = uiMap["activity_task_cell.finish"] + self.txFinish = uiMap["activity_task_cell.finish.bg.tx_finish"] + + self:addClickListener(function() + if DataManager.ActivityData:canGetTaskReward(self.taskId) and not DataManager.ActivityData:isReceivedTaskReward(self.taskId) then + ModuleManager.ActivityManager:reqSummerTaskReward(self.taskId) + end + end) +end + +function ActivityTaskCell:refresh(id) + self.taskId = id + local total = DataManager.ActivityData:getTaskTarget(self.taskId) + local cur = DataManager.ActivityData:getTaskProgress(self.taskId) + self.imgTask:setSprite(GConst.ATLAS_PATH.ICON_TASK, DataManager.ActivityData:getTaskIcon(self.taskId)) + self.txDesc:setText(DataManager.ActivityData:getTaskDesc(self.taskId)) + self.imgProg.value = cur / total + self.txProg:setText(cur .. "/" .. total) + self.txRewardName:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_16)) + self.txNum:setText(DataManager.ActivityData:getTaskRewardNum(self.taskId)) + self.txFinish:setText(I18N:getGlobalText(I18N.GlobalConst.STR_COMPLETED)) + + self.finish:setActive(false) + self.baseObject:removeRedPoint() + if DataManager.ActivityData:canGetTaskReward(self.taskId) then + -- 已完成 + if DataManager.ActivityData:isReceivedTaskReward(self.taskId) then + -- 已领取 + self.baseObject:setSprite(TASK_BG[1][1], TASK_BG[1][2]) + self.imgTaskBg:setSprite(TASK_ICON_BG[1][1], TASK_ICON_BG[1][2]) + self.finish:setActive(true) + else + -- 未领取 + self.baseObject:setSprite(TASK_BG[2][1], TASK_BG[2][2]) + self.imgTaskBg:setSprite(TASK_ICON_BG[2][1], TASK_ICON_BG[2][2]) + self.baseObject:addRedPoint(260, 70, 0.8) + end + else + --未完成 + self.baseObject:setSprite(TASK_BG[1][1], TASK_BG[1][2]) + self.imgTaskBg:setSprite(TASK_ICON_BG[1][1], TASK_ICON_BG[1][2]) + end +end + +return ActivityTaskCell \ No newline at end of file diff --git a/lua/app/ui/activity/cell/activity_task_cell.lua.meta b/lua/app/ui/activity/cell/activity_task_cell.lua.meta new file mode 100644 index 00000000..13f8a673 --- /dev/null +++ b/lua/app/ui/activity/cell/activity_task_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 95f71fc79d8d6ce4485129fac274d448 +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 e76e59db..c2aaac5c 100644 --- a/lua/app/ui/common/cell/reward_cell.lua +++ b/lua/app/ui/common/cell/reward_cell.lua @@ -12,6 +12,7 @@ function RewardCell:init() self.sImg = uiMap["reward_cell.item_bg.s"] self.matchImg = uiMap["reward_cell.item_bg.match_img"] self.frameAni = uiMap["reward_cell.frame_ani"] + self.lock = uiMap["reward_cell.lock"] -- 首通 self.firstPass = uiMap["reward_cell.first"] self.firstPassTx = uiMap["reward_cell.first.tx_first"] @@ -36,9 +37,9 @@ function RewardCell:refresh(reward) if info == nil then return end - self:_refreshItem(info, reward.item.count) self.rewardId = reward.item.id self.rewardType = reward.type + self:_refreshItem(info, reward.item.count) else self.rewardId = nil end @@ -52,9 +53,9 @@ function RewardCell:refreshByConfig(reward, mask, check) if info == nil then return end - self:_refreshItem(info, reward.num) self.rewardId = reward.id self.rewardType = reward.type + self:_refreshItem(info, reward.num) else self.rewardId = nil end @@ -74,6 +75,7 @@ function RewardCell:refreshItemById(itemId, count, mask, check) end function RewardCell:_refreshItem(info, count) + self.lock:setVisible(false) self.numTx:setVisible(true) self.frameBg:setSprite(GConst.ATLAS_PATH.ICON_ITEM, GConst.FRAME_QLT[info.qlt]) if count and count > 0 then @@ -86,6 +88,9 @@ function RewardCell:_refreshItem(info, count) self.numTx:setText(GConst.EMPTY_STRING) end if info.type == GConst.ItemConst.ITEM_TYPE.HERO_FRAGMENT then + -- 英雄碎片道具 + self.skin:setVisible(false) + self.fragment:setVisible(true) local heroInfo = ConfigManager:getConfig("hero")[info.parameter] if heroInfo then self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO, heroInfo.icon) @@ -97,14 +102,31 @@ function RewardCell:_refreshItem(info, count) self.sImg:setVisible(false) self.matchImg:setVisible(false) end - self.fragment:setVisible(true) + elseif info.type == GConst.ItemConst.ITEM_TYPE.SKIN then + -- 皮肤道具 + self.skin:setVisible(true) + self.matchImg:setVisible(false) + self.fragment:setVisible(false) + local skinInfo = ConfigManager:getConfig("skin")[info.parameter] + if skinInfo then + self.skin:setVisible(true) + self.sImg:setVisible(skinInfo.qlt >= 4) + self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO, skinInfo.icon) + self.skin:setSprite(GConst.ATLAS_PATH.ICON_HERO, "frame_dec_" .. skinInfo.qlt) + self.skinQlt:setSprite(GConst.ATLAS_PATH.HERO, "hero_skin_" .. skinInfo.qlt) + self.frameBg:setSprite(GConst.ATLAS_PATH.ICON_ITEM, GConst.FRAME_QLT[skinInfo.qlt]) + else + self.icon:setSprite(GConst.ATLAS_PATH.COMMON, "common_alpha") + self.sImg:setVisible(false) + end else + -- 其他 self.icon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon) self.fragment:setVisible(false) self.sImg:setVisible(false) self.matchImg:setVisible(false) + self.skin:setVisible(false) end - self:showSkin(info.type == GConst.ItemConst.ITEM_TYPE.SKIN) end function RewardCell:setNumTx(str) @@ -175,15 +197,9 @@ function RewardCell:showFirstPass(show) end end --- 展示皮肤标记 -function RewardCell:showSkin(show) - self.skin:setVisible(show == true) - if show then - local qlt = ConfigManager:getConfig("item")[self.rewardId] - self.skin:setSprite(GConst.ATLAS_PATH.ICON_HERO, "frame_dec_" .. qlt) - self.skinQlt:setSprite(GConst.ATLAS_PATH.HERO, "hero_skin_" .. qlt) - self.sImg:setVisible(qlt >= 4) - end +-- 展示锁定标记 +function RewardCell:showLock(show) + self.lock:setVisible(show == true) end return RewardCell \ No newline at end of file diff --git a/lua/app/ui/main_city/cell/side_bar_activity_cell.lua b/lua/app/ui/main_city/cell/side_bar_activity_cell.lua new file mode 100644 index 00000000..e3f58628 --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_activity_cell.lua @@ -0,0 +1,24 @@ +local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell" +local SideBarActivityCell = class("SideBarActivityCell", SideBarBaseCellComp) + +function SideBarActivityCell:getModuleKey() + return ModuleManager.MODULE_KEY.ACTIVITY +end + +function SideBarActivityCell:getIsOpen() + return DataManager.ActivityData:isOpen() +end + +function SideBarActivityCell:getSpineName() + return "ui_main_btn_act_summer" +end + +function SideBarActivityCell:onClick() + ModuleManager.ActivityManager:showActivityUI() +end + +function SideBarActivityCell:getIsShowRedPoint() + return DataManager.ActivityData:hasEntryRedPoint() +end + +return SideBarActivityCell \ No newline at end of file diff --git a/lua/app/ui/main_city/cell/side_bar_activity_cell.lua.meta b/lua/app/ui/main_city/cell/side_bar_activity_cell.lua.meta new file mode 100644 index 00000000..04e4b7bd --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_activity_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 17647bcfe606b834e9aca8d6c64249aa +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/shop/cell/pop_reward_cell.lua b/lua/app/ui/shop/cell/pop_reward_cell.lua index 6e474622..2ff51dfc 100644 --- a/lua/app/ui/shop/cell/pop_reward_cell.lua +++ b/lua/app/ui/shop/cell/pop_reward_cell.lua @@ -17,8 +17,8 @@ function PopRewardCell:refresh(id, num, showBg) if cfgInfo then self.bg:setVisible(showBg) if cfgInfo.type == GConst.ItemConst.ITEM_TYPE.HERO_FRAGMENT then -- 英雄展示 - self.itemCell:getBaseObject():setVisible(false) - self.popHeroCell:setVisible(true) + self.itemCell:getBaseObject():setActive(false) + self.popHeroCell:getBaseObject():setActive(true) local heroEntity = DataManager.HeroData:getHeroById(id) if heroEntity then @@ -31,8 +31,8 @@ function PopRewardCell:refresh(id, num, showBg) end) self.descTx:setText(ModuleManager.HeroManager:getHeroName(id)) else -- 通用道具 - self.itemCell:getBaseObject():setVisible(true) - self.popHeroCell:setVisible(false) + self.itemCell:getBaseObject():setActive(true) + self.popHeroCell:getBaseObject():setActive(false) self.itemCell:refreshByCfg(id, 0) self.itemCell:setNum("") diff --git a/lua/app/userdata/activity/activity_data.lua b/lua/app/userdata/activity/activity_data.lua index 12aeaef6..53df124e 100644 --- a/lua/app/userdata/activity/activity_data.lua +++ b/lua/app/userdata/activity/activity_data.lua @@ -1,6 +1,479 @@ local ActivityData = class("ActivityData", BaseData) -function ActivityData:init(data) +-- 活动id，目前只有这一个活动 +local ACT_ID = 106 +local ACT_DAYS = 7 + +function ActivityData:ctor() + self.data.isDirty = false +end + +function ActivityData:init() + self.actData = {} + + ModuleManager.ActivityManager:reqSummerData() +end + +function ActivityData:setDirty() + self.data.isDirty = not self.data.isDirty +end + +function ActivityData:isOpen() + if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACTIVITY, true) then + return false + end + if #self:getActiveIdList() <= 0 then + return false + end + return true +end + +-- 获取活动时间配置 +function ActivityData:getActCfg() + return ConfigManager:getConfig("activity")[ACT_ID] +end + +-- 获取活动战令配置 +function ActivityData:getBountyCfg() + if self.bountyCfg == nil then + self.bountyCfg = {} + for id, data in pairs(ConfigManager:getConfig("activity_bounty_level")) do + if data.act_id == ACT_ID then + data.id = id + table.insert(self.bountyCfg, data) + end + end + table.sort(self.bountyCfg, function (a, b) + return a.id < b.id + end) + end + + return self.bountyCfg +end + +-- 获取当前开启的活动id列表 +function ActivityData:getActiveIdList() + local result = {} + for id, data in pairs(ConfigManager:getConfig("activity")) do + if self:isInActiveTime() then + table.insert(result, id) + end + end + return result +end + +-- 是否在活动时间内 +function ActivityData:isInActiveTime() + if self.actData.activated_at == nil then + return false + end + + local startTime = Time:getBeginningOfOneDay(self.actData.activated_at // 1000) + local endTime = startTime + ACT_DAYS * 24 * 60 * 60 + return Time:getServerTime() >= startTime and Time:getServerTime() <= endTime +end + +-- 获取活动开启剩余时间（秒） +function ActivityData:getStartRemainTime() + local startTime = Time:getCertainTimeByStr(self:getActCfg().start_time) + return startTime - Time:getServerTime() +end + +-- 获取活动结束剩余时间（秒） +function ActivityData:getEndRemainTime() + local startTime = Time:getBeginningOfOneDay(self.actData.activated_at // 1000) + local endTime = startTime + ACT_DAYS * 24 * 60 * 60 + return math.floor(endTime) - Time:getServerTime() +end + +-- 当前为活动第几天 +function ActivityData:getActDay() + if self.actData == nil then + return 0 + end + + local days = Time:getDistanceDays(self.actData.activated_at // 1000) + if days < 0 then + days = -days + end + return days + 1 +end + +-- 获取活动标题 +function ActivityData:getActTitle() + return I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_2) +end + +-- 获取活动标题背景 +function ActivityData:getActTitleBg() + return GConst.ATLAS_PATH.ACT_SUMMER, "act_summer_title_1" +end + +-- 是否有入口红点 +function ActivityData:hasEntryRedPoint() + return self:hasTaskRedPoint() or self:hasBountyRedPoint() or self:hasSkinRedPoint() or self:hasHeroRedPoint() +end + +-- 获取活动数据成功 +function ActivityData:onGetActData(data) + self.actData = data + + -- 注册任务进度监听 + if self:isInActiveTime() then + for id, data in ipairs(ConfigManager:getConfig("activity_bounty_task")) do + ModuleManager.TaskManager:registerTask("ActivityData", data.type, function(count) + self:addTaskProgress(data.type, count) + end) + end + end + + if EDITOR_MODE then + Logger.logHighlight("夏日活动：".. self:getActDay()) + Logger.printTable(data) + end + + ModuleManager.ActivityManager:initSummerTimer() + + self:setDirty() +end + +-- 任务-------------------------------------------------------------------------------------------------- + +-- 获取今日任务列表 +function ActivityData:getTaskListSort() + local canGet = {} + local unfinish = {} + local result = {} + + for index, id in ipairs(table.keys(ConfigManager:getConfig("activity_bounty_task"))) do + if self:canGetTaskReward(id) then + -- 已完成 + if self:isReceivedTaskReward(id) then + -- 已领取 + table.insert(result, id) + else + -- 未领取 + table.insert(canGet, id) + end + else + --未完成 + table.insert(unfinish, id) + end + end + + unfinish = table.addArray(canGet, unfinish) + result = table.addArray(unfinish, result) + + return result +end + +-- 获取任务目标 +function ActivityData:getTaskTarget(id) + return ConfigManager:getConfig("activity_bounty_task")[id].number[self:getTaskStage(id)] +end + +-- 获取任务奖励 +function ActivityData:getTaskRewardNum(id) + return ConfigManager:getConfig("activity_bounty_task")[id].reward[self:getTaskStage(id)] +end + +-- 获取任务icon +function ActivityData:getTaskIcon(id) + return ConfigManager:getConfig("activity_bounty_task")[id].icon +end + +-- 获取任务描述 +function ActivityData:getTaskDesc(id) + local cfg = I18N:getConfig("activity_bounty_task") + if cfg == nil then + return GConst.EMPTY_STRING + end + return cfg[id].desc +end + +-- 获取任务类型 +function ActivityData:getTaskType(id) + return ConfigManager:getConfig("activity_bounty_task")[id].type +end + +-- 获取任务总阶段数 +function ActivityData:getTaskTotalStageNum(id) + local cfg = ConfigManager:getConfig("activity_bounty_task")[id] + if #cfg.number ~= #cfg.reward then + Logger.logError("活动任务阶段和奖励数量不一致，让策划检查配置！") + end + + return #cfg.number +end + +-- 获取任务所处阶段 +function ActivityData:getTaskStage(id) + local stage = 1 + local maxStage = self:getTaskTotalStageNum(id) + stage = self:getTaskClaimedStage(id) + 1 + if stage > maxStage then + stage = maxStage + end + return stage +end + +-- 获取任务进度 +function ActivityData:getTaskProgress(id) + local taskType = self:getTaskType(id) + if self.actData and self.actData.task_info and self.actData.task_info.summer_task and self.actData.task_info.summer_task[taskType] then + return self.actData.task_info.summer_task[taskType] + end + return 0 +end + +-- 获取任务已领取的最大阶段 +function ActivityData:getTaskClaimedStage(id) + local taskType = self:getTaskType(id) + if self.actData and self.actData.task_info and self.actData.task_info.claimed_stage and self.actData.task_info.claimed_stage[taskType] then + return self.actData.task_info.claimed_stage[taskType] + end + return 0 +end + +-- 任务是否完成 +function ActivityData:canGetTaskReward(id) + return self:getTaskProgress(id) >= self:getTaskTarget(id) +end + +-- 任务奖励是否已领取 +function ActivityData:isReceivedTaskReward(id) + return self:getTaskClaimedStage(id) >= self:getTaskStage(id) +end + +-- 是否有任务红点 +function ActivityData:hasTaskRedPoint() + for index, id in ipairs(table.keys(ConfigManager:getConfig("activity_bounty_task"))) do + if self:canGetTaskReward(id) and not self:isReceivedTaskReward(id) then + return true + end + end + return false +end + +-- 添加任务进度 +function ActivityData:addTaskProgress(taskType, count) + if self.actData.task_info.summer_task[taskType] == nil then + self.actData.task_info.summer_task[taskType] = 0 + end + self.actData.task_info.summer_task[taskType] = self.actData.task_info.summer_task[taskType] + count + + self:setDirty() +end + +-- 领取任务奖励成功 +function ActivityData:onReceivedTaskReward(id, getMaxStage, level, exp) + local taskType = self:getTaskType(id) + self.actData.task_info.claimed_stage[taskType] = getMaxStage + self.actData.level = level + self.actData.exp = exp + self:setDirty() +end + +-- 战令-------------------------------------------------------------------------------------------------- + +-- 获取战令档位，0免费档，1、2付费档 +function ActivityData:getBountyGrade() + if DataManager.ShopData:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ActivityConst.BOUNTY_GIFT_ID_2) > 0 then + return GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2 + end + if DataManager.ShopData:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ActivityConst.BOUNTY_GIFT_ID_1) > 0 then + return GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1 + end + + return GConst.ActivityConst.BOUNTY_GRADE_TYPE.FREE +end + +-- 获取战令档位礼包配置 +function ActivityData:getBountyGradeGiftCfg(gradeType) + if gradeType == GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1 then + return DataManager.ShopData:getActGiftConfig()[GConst.ActivityConst.BOUNTY_GIFT_ID_1] + elseif gradeType == GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2 then + return DataManager.ShopData:getActGiftConfig()[GConst.ActivityConst.BOUNTY_GIFT_ID_2] + end +end + +-- 战令最大等级 +function ActivityData:getBountyMaxLevel() + return #self:getBountyCfg() +end + +-- 获取战令等级 +function ActivityData:getBountyLevel() + if self.actData == nil or self.actData.level == nil then + return 0 + end + return self.actData.level +end + +-- 获取当前等级战令积分 +function ActivityData:getBountyLevelScore() + if self.actData == nil or self.actData.exp == nil then + return 0 + end + return self.actData.exp +end + +-- 获取当前升级所需总积分 +function ActivityData:getBountyUpgradeScore() + return self:getBountyCfg()[self:getBountyLevel()].exp +end + +-- 是否满足购买战令等级的条件 +function ActivityData:canBuyBountyLevel() + return self:getActDay() >= GFunc.getConstIntValue("activity_bounty_day") +end + +-- 购买战令等级的消耗 +function ActivityData:getBuyBountyLevelCost() + return GFunc.getConstReward("activity_bounty_cost") +end + +-- 是否有战令红点 +function ActivityData:hasBountyRedPoint() + local curLevel = self:getBountyLevel() + local lv = 0 + for idx, data in ipairs(self:getBountyCfg()) do + lv = lv + 1 + if lv > curLevel then + break + end + + if self:canGetBountyReward(lv, GConst.ActivityConst.BOUNTY_GRADE_TYPE.FREE) then + return true + end + if self:canGetBountyReward(lv, GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1) then + return true + end + if self:canGetBountyReward(lv, GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2) then + return true + end + end + + return false +end + +-- 获取战令档位所有奖励，排序 +function ActivityData:getBountyGradeAllRewardSort(grade) + local rewards = {} + for idx, data in ipairs(self:getBountyCfg()) do + if grade == GConst.ActivityConst.BOUNTY_GRADE_TYPE.FREE then + table.insert(rewards, data.reward) + elseif grade == GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1 then + table.insert(rewards, data.reward_pro) + elseif grade == GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2 then + table.insert(rewards, data.reward_pro_max) + end + end + rewards = GFunc.mergeRewards(rewards) + table.sort(rewards, function(a, b) + return a.id > b.id + end) + + return rewards +end + +-- 获取战令档位奖励 +function ActivityData:getBountyGradeReward(level, grade) + local cfg = self:getBountyCfg()[level] + local result + if cfg ~= nil then + if grade == GConst.ActivityConst.BOUNTY_GRADE_TYPE.FREE then + result = cfg.reward + elseif grade == GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1 then + result = cfg.reward_pro + elseif grade == GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2 then + result = cfg.reward_pro_max + end + end + return result +end + +-- 战令奖励是否满足领取条件 +function ActivityData:isReachBountyReward(level, grade) + local curLevel = self:getBountyLevel() + local curGrade = self:getBountyGrade() + if curLevel >= level then + return grade <= curGrade + else + return false + end +end + +-- 战令奖励可领取 +function ActivityData:canGetBountyReward(level, grade) + return self:isReachBountyReward(level, grade) and not self:isReceivedBountyReward(level, grade) +end + +-- 战令奖励是否已领取 +function ActivityData:isReceivedBountyReward(level, grade) + local id = self:getBountyCfg()[level].id + if self.actData == nil or self.actData.collected == nil or self.actData.collected[id] == nil then + return false + end + + if grade == GConst.ActivityConst.BOUNTY_GRADE_TYPE.FREE then + return self.actData.collected[id].normal + elseif grade == GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1 then + return self.actData.collected[id].superior + elseif grade == GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2 then + return self.actData.collected[id].superior_max + end +end + +-- 战令档位购买成功 +function ActivityData:onBuyBountyGrade(giftId) + local grade + if giftId == GConst.ActivityConst.BOUNTY_GIFT_ID_1 then-- 解锁1档 + grade = GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1 + elseif giftId == GConst.ActivityConst.BOUNTY_GIFT_ID_2 then-- 解锁2档 + grade = GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2 + end + + ModuleManager.ActivityManager:reqSummerBountyReward(0, grade)-- 请求档位全部奖励 + + self:setDirty() +end + +-- 战令奖励领取成功 +function ActivityData:onReceivedBountyReward(successMap) + for id, grade in pairs(successMap) do + if self.actData.collected[id] == nil then + self.actData.collected[id] = {} + end + + if grade == GConst.ActivityConst.BOUNTY_GRADE_TYPE.FREE then + self.actData.collected[id].normal = true + elseif grade == GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY1 then + self.actData.collected[id].superior = true + elseif grade == GConst.ActivityConst.BOUNTY_GRADE_TYPE.PAY2 then + self.actData.collected[id].superior_max = true + end + end + + self:setDirty() +end + +-- 解锁战令等级成功 +function ActivityData:onBoughtBountyLevel() + self.actData.level = self.actData.level + 1 + self:setDirty() +end + +-- 礼包-------------------------------------------------------------------------------------------------- + +-- 皮肤礼包是否有红点 +function ActivityData:hasSkinRedPoint() + return not LocalData:getTodayActSummerWatchedSkin() +end + +-- 英雄礼包是否有红点 +function ActivityData:hasHeroRedPoint() + return not LocalData:getTodayActSummerWatchedHero() end return ActivityData \ No newline at end of file diff --git a/lua/app/userdata/equip/equip_entity.lua b/lua/app/userdata/equip/equip_entity.lua index 4078b9b9..75ccbc7f 100644 --- a/lua/app/userdata/equip/equip_entity.lua +++ b/lua/app/userdata/equip/equip_entity.lua @@ -279,6 +279,11 @@ end -- 部位是否可升级 function EquipEntity:canLevelUp() + -- 判断英雄解锁 + if not self:getHeroEntity():isUnlock() then + return false + end + --判断材料 if not self:isEnoughMaterial() then return false diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index 8b95144b..6f46a9bf 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -433,8 +433,7 @@ function HeroEntity:getHurtNum() end function HeroEntity:getName() - local skinName = DataManager.SkinData:getName(self:getSkinId()) - return skinName or ModuleManager.HeroManager:getHeroName(self:getCfgId()) + return ModuleManager.HeroManager:getHeroName(self:getCfgId()) end function HeroEntity:getDesc() diff --git a/lua/app/userdata/shop/shop_data.lua b/lua/app/userdata/shop/shop_data.lua index 816fef43..da8f5b80 100644 --- a/lua/app/userdata/shop/shop_data.lua +++ b/lua/app/userdata/shop/shop_data.lua @@ -83,6 +83,13 @@ function ShopData:getGiftBoughtNum(actType, actId) return 0 end +-- 获取通用礼包剩余可购买次数 +function ShopData:getGiftRemainBuyNum(actId) + local bought = self:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, actId) + + return self:getActGiftConfig()[actId].limit - bought +end + -- 礼包购买成功更新 function ShopData:updateGiftInfo(gift) local giftType = gift.act_type @@ -107,6 +114,8 @@ function ShopData:updateGiftInfo(gift) DataManager.ArenaData:onBoughtGift(giftId) elseif cfg[giftId].type == PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT or cfg[giftId].type == PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT then self:onGiftBuySuccess(cfg[giftId].type) + elseif cfg[giftId].type == PayManager.PURCHARSE_ACT_TYPE.ACT_SUMMER then + DataManager.ActivityData:onBuyBountyGrade(giftId) end end end diff --git a/lua/app/userdata/skin/skin_data.lua b/lua/app/userdata/skin/skin_data.lua index 89ab302e..b44204da 100644 --- a/lua/app/userdata/skin/skin_data.lua +++ b/lua/app/userdata/skin/skin_data.lua @@ -125,7 +125,7 @@ end -- 获取模型id function SkinData:getModelId(skinId) local cfg = self:getSkinCfg(skinId) - return cfg and cfg.model_id or "p0001"-- 未配置模型id的处理 + return cfg and cfg.model_id end -- 获取皮肤来源 @@ -287,8 +287,11 @@ end -- 解锁皮肤 function SkinData:onUnlockSkin(itemId) local skinId = self:getSkinIdByItemId(itemId) + if skinId == nil then + return + end local heroId = self:getHeroIdBySkinId(skinId) - if skinId or heroId then + if heroId == nil then return end From ba449382a9aecc6f0d34ee5618d1d7d63517dd44 Mon Sep 17 00:00:00 2001 From: Fang Date: Fri, 11 Aug 2023 14:26:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=BB=86=E8=8A=82=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/activity/activity_manager.lua | 6 ++++-- lua/app/ui/activity/activity_bounty_comp.lua | 2 +- lua/app/ui/activity/activity_task_comp.lua | 2 +- lua/app/ui/activity/activity_ui.lua | 12 ++++++------ lua/app/userdata/activity/activity_data.lua | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/lua/app/module/activity/activity_manager.lua b/lua/app/module/activity/activity_manager.lua index 7577970f..159a7b54 100644 --- a/lua/app/module/activity/activity_manager.lua +++ b/lua/app/module/activity/activity_manager.lua @@ -52,7 +52,9 @@ function ActivityManager:reqSummerData() end function ActivityManager:rspSummerData(result) - DataManager.ActivityData:onGetActData(result.summer) + if result.summer then + DataManager.ActivityData:onGetActData(result.summer) + end end -- 请求夏日活动任务奖励 @@ -96,7 +98,7 @@ function ActivityManager:reqBuyBountyLevel() costNum = costNum, okFunc = function() local id = DataManager.ActivityData:getBountyCfg()[DataManager.ActivityData:getBountyLevel() + 1].id - Logger.logHighlight("购买战令等级:"..id) + -- Logger.logHighlight("购买战令等级:"..id) self:sendMessage(ProtoMsgType.FromMsgEnum.SummerBountyClaimByDiamondReq, {id = id}, {}, self.rspBuyBountyLevel, BIReport.ITEM_GET_TYPE.ACTIVITY_BOUNTY_LEVEL) end, } diff --git a/lua/app/ui/activity/activity_bounty_comp.lua b/lua/app/ui/activity/activity_bounty_comp.lua index d74b4ad3..111fd735 100644 --- a/lua/app/ui/activity/activity_bounty_comp.lua +++ b/lua/app/ui/activity/activity_bounty_comp.lua @@ -60,7 +60,7 @@ function ActivityBountyComp:refresh() self.imgProg.value = cur / total self.txScore:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_1)) self.txProg:setText(cur .. "/" .. total) - self.txLv:setText("LV") + self.txLv:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_12)) self.txLvNum:setText(DataManager.ActivityData:getBountyLevel()) -- 档位展示 diff --git a/lua/app/ui/activity/activity_task_comp.lua b/lua/app/ui/activity/activity_task_comp.lua index e14b20ab..ec347aa5 100644 --- a/lua/app/ui/activity/activity_task_comp.lua +++ b/lua/app/ui/activity/activity_task_comp.lua @@ -17,7 +17,7 @@ function ActivityTaskComp:refresh() self.imgProg.value = cur / total self.txScore:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_1)) self.txProg:setText(cur .. "/" .. total) - self.txLv:setText("LV") + self.txLv:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_DESC_12)) self.txLvNum:setText(DataManager.ActivityData:getBountyLevel()) -- 任务列表 diff --git a/lua/app/ui/activity/activity_ui.lua b/lua/app/ui/activity/activity_ui.lua index 428d246f..db1cc198 100644 --- a/lua/app/ui/activity/activity_ui.lua +++ b/lua/app/ui/activity/activity_ui.lua @@ -17,16 +17,16 @@ function ActivityUI:onPressBackspace() end function ActivityUI:ctor() - self.panelType = GConst.ActivityConst.PANEL_TYPE.TASK -- 默认进入任务页签 - - if self.panelType == nil and DataManager.ActivityData:hasTaskRedPoint() then + if DataManager.ActivityData:hasTaskRedPoint() then self.panelType = GConst.ActivityConst.PANEL_TYPE.TASK - elseif self.panelType == nil and DataManager.ActivityData:hasBountyRedPoint() then + elseif DataManager.ActivityData:hasBountyRedPoint() then self.panelType = GConst.ActivityConst.PANEL_TYPE.BOUNTY - elseif self.panelType == nil and DataManager.ActivityData:hasSkinRedPoint() then + elseif DataManager.ActivityData:hasSkinRedPoint() then self.panelType = GConst.ActivityConst.PANEL_TYPE.SKIN - elseif self.panelType == nil and DataManager.ActivityData:hasHeroRedPoint() then + elseif DataManager.ActivityData:hasHeroRedPoint() then self.panelType = GConst.ActivityConst.PANEL_TYPE.HERO + else + self.panelType = GConst.ActivityConst.PANEL_TYPE.TASK -- 默认进入任务页签 end end diff --git a/lua/app/userdata/activity/activity_data.lua b/lua/app/userdata/activity/activity_data.lua index 53df124e..f45b2850 100644 --- a/lua/app/userdata/activity/activity_data.lua +++ b/lua/app/userdata/activity/activity_data.lua @@ -305,7 +305,7 @@ end -- 获取战令等级 function ActivityData:getBountyLevel() if self.actData == nil or self.actData.level == nil then - return 0 + return 1 end return self.actData.level end From a749cbfa94be32f8b7bbc2cafc676b04b6c78f65 Mon Sep 17 00:00:00 2001 From: Fang Date: Fri, 11 Aug 2023 14:27:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AF=BC=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/chapter_board_daily_challenge.lua | 2795 ++++++++++++++++- lua/app/config/chapter_daily_challenge.lua | 689 +++- .../localization_global_const.lua | 1 + lua/app/config/monster_daily_challenge.lua | 831 ++++- lua/app/config/skin.lua | 2 +- lua/app/config/strings/cn/global.lua | 1 + 6 files changed, 4315 insertions(+), 4 deletions(-) diff --git a/lua/app/config/chapter_board_daily_challenge.lua b/lua/app/config/chapter_board_daily_challenge.lua index 7305b572..e0d1f3be 100644 --- a/lua/app/config/chapter_board_daily_challenge.lua +++ b/lua/app/config/chapter_board_daily_challenge.lua @@ -5598,9 +5598,2802 @@ local chapter_board_daily_challenge = { 0 } } + }, + [29]={ + ["board_daily_challenge"]={ + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 36, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 36, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 36, + 0 + }, + { + 0, + 5 + }, + { + 14, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [30]={ + ["board_daily_challenge"]={ + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 36, + 0 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 14, + 0 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 36, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 36, + 0 + } + } + }, + [31]={ + ["board_daily_challenge"]={ + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 36, + 0 + }, + { + 0, + 4 + }, + { + 36, + 0 + }, + { + 36, + 0 + }, + { + 0, + 2 + }, + { + 14, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [32]={ + ["board_daily_challenge"]={ + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 36, + 0 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 36, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 36, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 36, + 0 + }, + { + 14, + 0 + }, + { + 36, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [33]={ + ["board_daily_challenge"]={ + { + 37, + 0 + }, + { + 0, + 3 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 0, + 5 + }, + { + 37, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 7, + 0 + }, + { + 14, + 0 + }, + { + 7, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 21, + 4 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 21, + 4 + }, + { + 21, + 4 + }, + { + 3, + 0 + }, + { + 21, + 4 + }, + { + 21, + 4 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + } + } + }, + [34]={ + ["board_daily_challenge"]={ + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 4 + }, + { + 5, + 2 + }, + { + 5, + 3 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 3, + 0 + }, + { + 21, + 5 + }, + { + 5, + 4 + }, + { + 37, + 0 + }, + { + 5, + 3 + }, + { + 21, + 5 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 5, + 4 + }, + { + 14, + 0 + }, + { + 5, + 3 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 5, + 4 + }, + { + 5, + 5 + }, + { + 5, + 3 + }, + { + 0, + 0 + }, + { + 3, + 0 + } + } + }, + [35]={ + ["board_daily_challenge"]={ + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 5 + }, + { + 37, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 37, + 0 + }, + { + 3, + 0 + }, + { + 5, + 5 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 21, + 5 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 2 + }, + { + 37, + 0 + }, + { + 5, + 4 + }, + { + 21, + 5 + }, + { + 5, + 3 + }, + { + 21, + 4 + }, + { + 14, + 0 + }, + { + 5, + 2 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 3, + 0 + } + } + }, + [36]={ + ["board_daily_challenge"]={ + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 37, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 37, + 0 + }, + { + 14, + 0 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 1 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 1 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 5, + 1 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 3, + 0 + }, + { + 21, + 2 + }, + { + 21, + 2 + }, + { + 21, + 2 + }, + { + 21, + 2 + }, + { + 21, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + } + }, + [37]={ + ["board_daily_challenge"]={ + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 14, + 0 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 5 + }, + { + 0, + 5 + } + }, + ["grid_edge"]={ + { + ["pos"]=12, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=22, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=32, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=42, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=43, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=54, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=54, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=65, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=65, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=76, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=15, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=25, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=35, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=35, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=46, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=46, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=57, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=57, + ["type"]=3, + ["direction"]=2 + } + } + }, + [38]={ + ["board_daily_challenge"]={ + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 2 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 0 + }, + { + 0, + 2 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 14, + 0 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 37, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 2 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 37, + 0 + }, + { + 0, + 2 + }, + { + 0, + 0 + }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 0, + 0 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + } + }, + ["grid_edge"]={ + { + ["pos"]=12, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=14, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=23, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=25, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=32, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=34, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=36, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=41, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=41, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=41, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=41, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=43, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=45, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=52, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=54, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=61, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=61, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=61, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=61, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=72, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=74, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=76, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=47, + ["type"]=3, + ["direction"]=1 + }, + { + ["pos"]=47, + ["type"]=3, + ["direction"]=2 + }, + { + ["pos"]=47, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=47, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=63, + ["type"]=1, + ["direction"]=1 + }, + { + ["pos"]=65, + ["type"]=1, + ["direction"]=1 + } + } + }, + [39]={ + ["board_daily_challenge"]={ + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 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 + }, + { + 37, + 0 + }, + { + 5, + 3 + }, + { + 14, + 0 + }, + { + 5, + 3 + }, + { + 37, + 0 + }, + { + 5, + 3 + } + }, + ["grid_edge"]={ + { + ["pos"]=42, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=43, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=44, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=45, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=46, + ["type"]=2, + ["direction"]=1 + } + } + }, + [40]={ + ["board_daily_challenge"]={ + { + 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 + }, + { + 14, + 0 + }, + { + 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"]=3 + }, + { + ["pos"]=21, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=41, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=61, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=62, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=23, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=23, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=33, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=53, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=53, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=24, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=34, + ["type"]=2, + ["direction"]=3 + }, + { + ["pos"]=34, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=44, + ["type"]=3, + ["direction"]=3 + }, + { + ["pos"]=44, + ["type"]=3, + ["direction"]=4 + }, + { + ["pos"]=44, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=64, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=35, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=35, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=55, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=55, + ["type"]=2, + ["direction"]=2 + }, + { + ["pos"]=26, + ["type"]=2, + ["direction"]=1 + }, + { + ["pos"]=26, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=46, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=66, + ["type"]=2, + ["direction"]=4 + }, + { + ["pos"]=66, + ["type"]=2, + ["direction"]=2 + } + } } } local config = { -data=chapter_board_daily_challenge,count=28 +data=chapter_board_daily_challenge,count=40 } return config \ No newline at end of file diff --git a/lua/app/config/chapter_daily_challenge.lua b/lua/app/config/chapter_daily_challenge.lua index 62f228b6..8fecac2b 100644 --- a/lua/app/config/chapter_daily_challenge.lua +++ b/lua/app/config/chapter_daily_challenge.lua @@ -1601,9 +1601,696 @@ local chapter_daily_challenge = { 13 } } + }, + [8]={ + ["scene"]="bg_27", + ["block_icon"]="battle_hinder_27", + ["chess_board"]="chessboard_1", + ["chapter_board_daily_challenge"]={ + 29, + 30, + 31, + 32 + }, + ["monster"]={ + 14102, + 14202, + 14302, + 14402, + 14502, + 14602, + 14702, + 14802, + 14902, + 15002, + 15102, + 15202, + 15302, + 15402, + 15502, + 15602, + 15702, + 15802, + 15902, + 16002 + }, + ["wave_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=12, + ["id_for_nothing"]="Vwo=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + ["begin_buff_id"]={ + { + 1, + 8 + }, + { + 1, + 9 + }, + { + 1, + 10 + }, + { + 1, + 11 + }, + { + 1, + 12 + }, + { + 1, + 13 + }, + { + 2, + 8 + }, + { + 2, + 9 + }, + { + 2, + 10 + }, + { + 2, + 11 + }, + { + 2, + 12 + }, + { + 2, + 13 + }, + { + 3, + 8 + }, + { + 3, + 9 + }, + { + 3, + 10 + }, + { + 3, + 11 + }, + { + 3, + 12 + }, + { + 3, + 13 + }, + { + 4, + 8 + }, + { + 4, + 9 + }, + { + 4, + 10 + }, + { + 4, + 11 + }, + { + 4, + 12 + }, + { + 4, + 13 + }, + { + 5, + 8 + }, + { + 5, + 9 + }, + { + 5, + 10 + }, + { + 5, + 11 + }, + { + 5, + 12 + }, + { + 5, + 13 + }, + { + 6, + 8 + }, + { + 6, + 9 + }, + { + 6, + 10 + }, + { + 6, + 12 + }, + { + 6, + 13 + }, + { + 7, + 8 + }, + { + 7, + 9 + }, + { + 7, + 10 + }, + { + 7, + 12 + }, + { + 7, + 13 + } + } + }, + [9]={ + ["scene"]="bg_30", + ["block_icon"]="battle_hinder_29", + ["chess_board"]="chessboard_3", + ["chapter_board_daily_challenge"]={ + 33, + 34, + 35, + 36 + }, + ["monster"]={ + 16102, + 16202, + 16302, + 16402, + 16502, + 16602, + 16702, + 16802, + 16902, + 17002, + 17102, + 17202, + 17302, + 17402, + 17502, + 17602, + 17702, + 17802, + 17902, + 18002 + }, + ["wave_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=12, + ["id_for_nothing"]="Vwo=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + ["begin_buff_id"]={ + { + 1, + 8 + }, + { + 1, + 9 + }, + { + 1, + 10 + }, + { + 1, + 11 + }, + { + 1, + 12 + }, + { + 1, + 13 + }, + { + 2, + 8 + }, + { + 2, + 9 + }, + { + 2, + 10 + }, + { + 2, + 11 + }, + { + 2, + 12 + }, + { + 2, + 13 + }, + { + 3, + 8 + }, + { + 3, + 9 + }, + { + 3, + 10 + }, + { + 3, + 11 + }, + { + 3, + 12 + }, + { + 3, + 13 + }, + { + 4, + 8 + }, + { + 4, + 9 + }, + { + 4, + 10 + }, + { + 4, + 11 + }, + { + 4, + 12 + }, + { + 4, + 13 + }, + { + 5, + 8 + }, + { + 5, + 9 + }, + { + 5, + 10 + }, + { + 5, + 11 + }, + { + 5, + 12 + }, + { + 5, + 13 + }, + { + 6, + 8 + }, + { + 6, + 9 + }, + { + 6, + 10 + }, + { + 6, + 12 + }, + { + 6, + 13 + }, + { + 7, + 8 + }, + { + 7, + 9 + }, + { + 7, + 10 + }, + { + 7, + 12 + }, + { + 7, + 13 + } + } + }, + [10]={ + ["scene"]="bg_35", + ["block_icon"]="battle_hinder_35", + ["chess_board"]="chessboard_2", + ["chapter_board_daily_challenge"]={ + 37, + 38, + 39, + 40 + }, + ["monster"]={ + 18102, + 18202, + 18302, + 18402, + 18502, + 18602, + 18702, + 18802, + 18902, + 19002, + 19102, + 19202, + 19302, + 19402, + 19502, + 19602, + 19702, + 19802, + 19902, + 20002 + }, + ["wave_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=12, + ["id_for_nothing"]="Vwo=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + ["begin_buff_id"]={ + { + 1, + 8 + }, + { + 1, + 9 + }, + { + 1, + 10 + }, + { + 1, + 11 + }, + { + 1, + 12 + }, + { + 1, + 13 + }, + { + 2, + 8 + }, + { + 2, + 9 + }, + { + 2, + 10 + }, + { + 2, + 11 + }, + { + 2, + 12 + }, + { + 2, + 13 + }, + { + 3, + 8 + }, + { + 3, + 9 + }, + { + 3, + 10 + }, + { + 3, + 11 + }, + { + 3, + 12 + }, + { + 3, + 13 + }, + { + 4, + 8 + }, + { + 4, + 9 + }, + { + 4, + 10 + }, + { + 4, + 11 + }, + { + 4, + 12 + }, + { + 4, + 13 + }, + { + 5, + 8 + }, + { + 5, + 9 + }, + { + 5, + 10 + }, + { + 5, + 11 + }, + { + 5, + 12 + }, + { + 5, + 13 + }, + { + 6, + 8 + }, + { + 6, + 9 + }, + { + 6, + 10 + }, + { + 6, + 12 + }, + { + 6, + 13 + }, + { + 7, + 8 + }, + { + 7, + 9 + }, + { + 7, + 10 + }, + { + 7, + 12 + }, + { + 7, + 13 + } + } } } local config = { -data=chapter_daily_challenge,count=7 +data=chapter_daily_challenge,count=10 } 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 c59b8c1d..e1ab8b51 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -445,6 +445,7 @@ local LocalizationGlobalConst = ACT_DESC_9 = "ACT_DESC_9", ACT_DESC_10 = "ACT_DESC_10", ACT_DESC_11 = "ACT_DESC_11", + ACT_DESC_12 = "ACT_DESC_12", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/monster_daily_challenge.lua b/lua/app/config/monster_daily_challenge.lua index 25560983..df227b5d 100644 --- a/lua/app/config/monster_daily_challenge.lua +++ b/lua/app/config/monster_daily_challenge.lua @@ -1869,9 +1869,838 @@ local monster_daily_challenge = { 10013 }, ["monster_exp"]=22000 + }, + [14102]={ + ["monster_base"]=10058, + ["hp"]=21820000, + ["atk"]=610000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20169, + 20170, + 20171 + }, + ["monster_exp"]=11000 + }, + [14202]={ + ["monster_base"]=10051, + ["hp"]=30000000, + ["atk"]=660000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20148, + 20149, + 20150 + }, + ["monster_exp"]=11000 + }, + [14302]={ + ["monster_base"]=10055, + ["hp"]=32730000, + ["atk"]=710000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20160, + 20161, + 20162 + }, + ["monster_exp"]=17000 + }, + [14402]={ + ["monster_base"]=10057, + ["hp"]=40910000, + ["atk"]=760000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20166, + 20167, + 20168 + }, + ["monster_exp"]=19000 + }, + [14502]={ + ["monster_base"]=20031, + ["is_boss"]=1, + ["hp"]=62730000, + ["atk"]=910000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30091, + 30092, + 30093 + }, + ["skill"]={ + 10058, + 10059 + }, + ["passive_skill"]={ + 10008, + 10011, + 10013 + }, + ["monster_exp"]=18000 + }, + [14602]={ + ["monster_base"]=10051, + ["hp"]=40910000, + ["atk"]=760000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20148, + 20149, + 20150 + }, + ["monster_exp"]=9000 + }, + [14702]={ + ["monster_base"]=10027, + ["hp"]=46360000, + ["atk"]=810000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20076, + 20077, + 20078 + }, + ["monster_exp"]=10000 + }, + [14802]={ + ["monster_base"]=10052, + ["hp"]=54550000, + ["atk"]=810000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20151, + 20152, + 20153 + }, + ["monster_exp"]=11000 + }, + [14902]={ + ["monster_base"]=10061, + ["hp"]=60000000, + ["atk"]=850000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20178, + 20179, + 20180 + }, + ["monster_exp"]=12000 + }, + [15002]={ + ["monster_base"]=20034, + ["is_boss"]=1, + ["hp"]=114550000, + ["atk"]=980000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30097, + 30098, + 30099 + }, + ["skill"]={ + 10074, + 10075 + }, + ["passive_skill"]={ + 10013, + 10012 + }, + ["monster_exp"]=12000 + }, + [15102]={ + ["monster_base"]=10030, + ["hp"]=62730000, + ["atk"]=850000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20085, + 20086, + 20087 + }, + ["monster_exp"]=16000 + }, + [15202]={ + ["monster_base"]=10029, + ["hp"]=76360000, + ["atk"]=910000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20082, + 20083, + 20084 + }, + ["monster_exp"]=18000 + }, + [15302]={ + ["monster_base"]=10033, + ["hp"]=84550000, + ["atk"]=950000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20094, + 20095, + 20096 + }, + ["monster_exp"]=21000 + }, + [15402]={ + ["monster_base"]=10054, + ["hp"]=95450000, + ["atk"]=1000000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20157, + 20158, + 20159 + }, + ["monster_exp"]=22000 + }, + [15502]={ + ["monster_base"]=20010, + ["is_boss"]=1, + ["hp"]=141820000, + ["atk"]=1070000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30028, + 30029, + 30030 + }, + ["skill"]={ + 10041, + 10066 + }, + ["passive_skill"]={ + 10008, + 10009, + 10013 + }, + ["monster_exp"]=24000 + }, + [15602]={ + ["monster_base"]=10027, + ["hp"]=109090000, + ["atk"]=1060000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20076, + 20077, + 20078 + }, + ["monster_exp"]=15000 + }, + [15702]={ + ["monster_base"]=10047, + ["hp"]=120000000, + ["atk"]=1100000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20136, + 20137, + 20138 + }, + ["monster_exp"]=16000 + }, + [15802]={ + ["monster_base"]=10057, + ["hp"]=136360000, + ["atk"]=1150000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20166, + 20167, + 20168 + }, + ["monster_exp"]=17000 + }, + [15902]={ + ["monster_base"]=10060, + ["hp"]=147270000, + ["atk"]=1190000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20175, + 20176, + 20177 + }, + ["monster_exp"]=17000 + }, + [16002]={ + ["monster_base"]=20035, + ["is_boss"]=2, + ["hp"]=245450000, + ["atk"]=1640000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30100, + 30101, + 30102, + 30113 + }, + ["skill"]={ + 10076 + }, + ["passive_skill"]={ + 10011, + 10009 + }, + ["monster_exp"]=22000 + }, + [16102]={ + ["monster_base"]=10063, + ["hp"]=21820000, + ["atk"]=610000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20184, + 20185, + 20186 + }, + ["monster_exp"]=11000 + }, + [16202]={ + ["monster_base"]=10062, + ["hp"]=30000000, + ["atk"]=660000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=11000 + }, + [16302]={ + ["monster_base"]=10022, + ["hp"]=32730000, + ["atk"]=710000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20061, + 20062, + 20063 + }, + ["monster_exp"]=17000 + }, + [16402]={ + ["monster_base"]=10065, + ["hp"]=40910000, + ["atk"]=760000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20187, + 20188, + 20189 + }, + ["monster_exp"]=19000 + }, + [16502]={ + ["monster_base"]=20037, + ["is_boss"]=1, + ["hp"]=62730000, + ["atk"]=910000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30106, + 30107, + 30108 + }, + ["skill"]={ + 10079 + }, + ["passive_skill"]={ + 10013, + 10009, + 10084 + }, + ["monster_exp"]=18000 + }, + [16602]={ + ["monster_base"]=10026, + ["hp"]=40910000, + ["atk"]=760000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20073, + 20074, + 20075 + }, + ["monster_exp"]=9000 + }, + [16702]={ + ["monster_base"]=10063, + ["hp"]=46360000, + ["atk"]=810000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20184, + 20185, + 20186 + }, + ["monster_exp"]=10000 + }, + [16802]={ + ["monster_base"]=10062, + ["hp"]=54550000, + ["atk"]=810000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=11000 + }, + [16902]={ + ["monster_base"]=10065, + ["hp"]=60000000, + ["atk"]=850000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20187, + 20188, + 20189 + }, + ["monster_exp"]=12000 + }, + [17002]={ + ["monster_base"]=20036, + ["is_boss"]=1, + ["hp"]=114550000, + ["atk"]=980000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30103, + 30104, + 30105 + }, + ["skill"]={ + 10077, + 10078 + }, + ["passive_skill"]={ + 10011 + }, + ["monster_exp"]=12000 + }, + [17102]={ + ["monster_base"]=10063, + ["hp"]=62730000, + ["atk"]=850000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20184, + 20185, + 20186 + }, + ["monster_exp"]=16000 + }, + [17202]={ + ["monster_base"]=10064, + ["hp"]=76360000, + ["atk"]=910000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20190, + 20191, + 20192 + }, + ["monster_exp"]=18000 + }, + [17302]={ + ["monster_base"]=10062, + ["hp"]=84550000, + ["atk"]=950000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=21000 + }, + [17402]={ + ["monster_base"]=10026, + ["hp"]=95450000, + ["atk"]=1000000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20073, + 20074, + 20075 + }, + ["monster_exp"]=22000 + }, + [17502]={ + ["monster_base"]=20021, + ["is_boss"]=1, + ["hp"]=141820000, + ["atk"]=1070000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30061, + 30062, + 30063 + }, + ["skill"]={ + 10034 + }, + ["passive_skill"]={ + 10011, + 10008 + }, + ["monster_exp"]=24000 + }, + [17602]={ + ["monster_base"]=10062, + ["hp"]=109090000, + ["atk"]=1060000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=15000 + }, + [17702]={ + ["monster_base"]=10063, + ["hp"]=120000000, + ["atk"]=1100000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20184, + 20185, + 20186 + }, + ["monster_exp"]=16000 + }, + [17802]={ + ["monster_base"]=10026, + ["hp"]=136360000, + ["atk"]=1150000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20073, + 20074, + 20075 + }, + ["monster_exp"]=17000 + }, + [17902]={ + ["monster_base"]=10065, + ["hp"]=147270000, + ["atk"]=1190000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20187, + 20188, + 20189 + }, + ["monster_exp"]=17000 + }, + [18002]={ + ["monster_base"]=20038, + ["is_boss"]=2, + ["hp"]=245450000, + ["atk"]=1640000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30109, + 30110, + 30111, + 30112 + }, + ["skill"]={ + 10080, + 10081 + }, + ["passive_skill"]={ + 10083, + 10009, + 10011 + }, + ["monster_exp"]=22000 + }, + [18102]={ + ["monster_base"]=10062, + ["hp"]=21820000, + ["atk"]=610000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=11000 + }, + [18202]={ + ["monster_base"]=10069, + ["hp"]=30000000, + ["atk"]=660000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20196, + 20197, + 20198 + }, + ["monster_exp"]=11000 + }, + [18302]={ + ["monster_base"]=10072, + ["hp"]=32730000, + ["atk"]=710000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20205, + 20206, + 20207 + }, + ["monster_exp"]=17000 + }, + [18402]={ + ["monster_base"]=10070, + ["hp"]=40910000, + ["atk"]=760000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20199, + 20200, + 20201 + }, + ["monster_exp"]=19000 + }, + [18502]={ + ["monster_base"]=20045, + ["is_boss"]=1, + ["hp"]=62730000, + ["atk"]=910000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30150, + 30151, + 30152 + }, + ["skill"]={ + 10133, + 10134 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=18000 + }, + [18602]={ + ["monster_base"]=10063, + ["hp"]=40910000, + ["atk"]=760000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20184, + 20185, + 20186 + }, + ["monster_exp"]=9000 + }, + [18702]={ + ["monster_base"]=10077, + ["hp"]=46360000, + ["atk"]=810000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20220, + 20221, + 20222 + }, + ["monster_exp"]=10000 + }, + [18802]={ + ["monster_base"]=10068, + ["hp"]=54550000, + ["atk"]=810000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20193, + 20194, + 20195 + }, + ["monster_exp"]=11000 + }, + [18902]={ + ["monster_base"]=10069, + ["hp"]=60000000, + ["atk"]=850000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20196, + 20197, + 20198 + }, + ["monster_exp"]=12000 + }, + [19002]={ + ["monster_base"]=20044, + ["is_boss"]=1, + ["hp"]=114550000, + ["atk"]=980000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30147, + 30148, + 30149 + }, + ["skill"]={ + 10130, + 10131 + }, + ["passive_skill"]={ + 10132, + 10013, + 10011 + }, + ["monster_exp"]=12000 + }, + [19102]={ + ["monster_base"]=10072, + ["hp"]=62730000, + ["atk"]=850000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20205, + 20206, + 20207 + }, + ["monster_exp"]=16000 + }, + [19202]={ + ["monster_base"]=10069, + ["hp"]=76360000, + ["atk"]=910000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20196, + 20197, + 20198 + }, + ["monster_exp"]=18000 + }, + [19302]={ + ["monster_base"]=10072, + ["hp"]=84550000, + ["atk"]=950000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20205, + 20206, + 20207 + }, + ["monster_exp"]=21000 + }, + [19402]={ + ["monster_base"]=10063, + ["hp"]=95450000, + ["atk"]=1000000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20184, + 20185, + 20186 + }, + ["monster_exp"]=22000 + }, + [19502]={ + ["monster_base"]=20046, + ["is_boss"]=1, + ["hp"]=141820000, + ["atk"]=1070000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30153, + 30154, + 30155 + }, + ["skill"]={ + 10135, + 10136 + }, + ["passive_skill"]={ + 10012 + }, + ["monster_exp"]=24000 + }, + [19602]={ + ["monster_base"]=10077, + ["hp"]=109090000, + ["atk"]=1060000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20220, + 20221, + 20222 + }, + ["monster_exp"]=15000 + }, + [19702]={ + ["monster_base"]=10074, + ["hp"]=120000000, + ["atk"]=1100000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20211, + 20212, + 20213 + }, + ["monster_exp"]=16000 + }, + [19802]={ + ["monster_base"]=10064, + ["hp"]=136360000, + ["atk"]=1150000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20190, + 20191, + 20192 + }, + ["monster_exp"]=17000 + }, + [19902]={ + ["monster_base"]=10062, + ["hp"]=147270000, + ["atk"]=1190000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20181, + 20182, + 20183 + }, + ["monster_exp"]=17000 + }, + [20002]={ + ["monster_base"]=20047, + ["is_boss"]=2, + ["hp"]=245450000, + ["atk"]=1640000, + ["atk_times"]=4, + ["hurt_skill"]={ + 30156, + 30157, + 30158 + }, + ["skill"]={ + 10137, + 10138 + }, + ["passive_skill"]={ + 10013, + 10010 + }, + ["monster_exp"]=22000 } } local config = { -data=monster_daily_challenge,count=140 +data=monster_daily_challenge,count=200 } return config \ No newline at end of file diff --git a/lua/app/config/skin.lua b/lua/app/config/skin.lua index 78d00aee..c892312b 100644 --- a/lua/app/config/skin.lua +++ b/lua/app/config/skin.lua @@ -122,7 +122,7 @@ local skin = { ["hero_id"]=34001 }, [3400101]={ - ["model_id"]="p0016", + ["model_id"]="p0033", ["qlt"]=4, ["bonus"]={ { diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index c2018347..3c7b6f95 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -445,6 +445,7 @@ local localization_global = ["ACT_DESC_9"] = "S", ["ACT_DESC_10"] = "完成活动任务获得奖励积分，积分达到一定数量可提升奖励等级领取奖励。付费可解锁更多奖励哦！", ["ACT_DESC_11"] = "解锁后提升奖励等级，可额外获得以下奖励：", + ["ACT_DESC_12"] = "LV", } return localization_global \ No newline at end of file From 84796cd4a81e7282d6598b84e99a2359a347210c Mon Sep 17 00:00:00 2001 From: Fang Date: Fri, 11 Aug 2023 15:08:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E9=80=BB=E8=BE=91=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/data_manager.lua | 3 +- lua/app/config/chapter.lua | 22 +- .../config/chapter_board_daily_challenge.lua | 8 +- lua/app/config/grid_edge_type.lua | 6 +- lua/app/config/monster_chapter.lua | 1406 ++++++++--------- lua/app/config/strings/zh/skill_rogue.lua | 8 +- lua/app/module/activity/activity_manager.lua | 10 +- lua/app/module/shop/shop_manager.lua | 4 + lua/app/ui/activity/activity_gift_hero_ui.lua | 6 + .../activity/activity_gift_hero_ui.lua.meta | 10 + lua/app/ui/activity/activity_gift_skin_ui.lua | 6 + .../activity/activity_gift_skin_ui.lua.meta | 10 + lua/app/ui/activity/activity_ui.lua | 6 +- .../main_city/cell/side_bar_activity_cell.lua | 22 + lua/app/ui/main_city/main_city_ui.lua | 13 + lua/app/userdata/activity/activity_data.lua | 15 +- 16 files changed, 824 insertions(+), 731 deletions(-) create mode 100644 lua/app/ui/activity/activity_gift_hero_ui.lua create mode 100644 lua/app/ui/activity/activity_gift_hero_ui.lua.meta create mode 100644 lua/app/ui/activity/activity_gift_skin_ui.lua create mode 100644 lua/app/ui/activity/activity_gift_skin_ui.lua.meta diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index fd8812d3..832c455f 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -150,7 +150,6 @@ function DataManager:initWithServerData(data) self.CollectionData:init(data.collection) self.TutorialData:init(data.guide) self.MailData:init(data.mail_info) - self.ActivityData:init() self.GoldPigData:init(data.pig, true) self.BountyData:init(data.bounty) self.ArenaBountyData:init(data.arena_bounty) @@ -166,6 +165,8 @@ function DataManager:initWithServerData(data) self.ShopData:initGrowUpGift(data.act_grow_up_gift2) -- 成长礼包 self.ShopData:initLevelUpGift(data.act_level_up_gift) -- 助力/金币礼包 self.ShopData:initIntroductGift(data.act_introductory_gift) -- 入门礼包 + -- 活动要在礼包后初始化 + self.ActivityData:init() -- 商店礼包都初始化完了后检查一下每日红点 self.ShopData:checkShopDiscountRedPoint() self.ShopData:checkLoginPopInfo() -- 需要写在shopdata所有初始化之后 diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 48f261a9..4b5c2d26 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -7379,7 +7379,7 @@ local chapter = { }, ["daily_challenge_difficulty"]={ 41710, - 53745 + 52198 } }, [36]={ @@ -7597,8 +7597,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 37410, - 63294 + 41904, + 53805 } }, [37]={ @@ -7816,8 +7816,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 38984, - 66067 + 43347, + 55615 } }, [38]={ @@ -8035,8 +8035,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 41000, - 69592 + 44750, + 57395 } }, [39]={ @@ -8254,8 +8254,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 42574, - 72471 + 46208, + 59200 } }, [40]={ @@ -8472,8 +8472,8 @@ local chapter = { } }, ["daily_challenge_difficulty"]={ - 46207, - 78535 + 49049, + 62756 } } } diff --git a/lua/app/config/chapter_board_daily_challenge.lua b/lua/app/config/chapter_board_daily_challenge.lua index e0d1f3be..fd644423 100644 --- a/lua/app/config/chapter_board_daily_challenge.lua +++ b/lua/app/config/chapter_board_daily_challenge.lua @@ -8263,22 +8263,22 @@ local chapter_board_daily_challenge = { { ["pos"]=11, ["type"]=2, - ["direction"]=3 + ["direction"]=4 }, { ["pos"]=21, ["type"]=2, - ["direction"]=3 + ["direction"]=4 }, { ["pos"]=41, ["type"]=2, - ["direction"]=3 + ["direction"]=4 }, { ["pos"]=61, ["type"]=2, - ["direction"]=3 + ["direction"]=4 }, { ["pos"]=62, diff --git a/lua/app/config/grid_edge_type.lua b/lua/app/config/grid_edge_type.lua index a0e4780b..691b2651 100644 --- a/lua/app/config/grid_edge_type.lua +++ b/lua/app/config/grid_edge_type.lua @@ -1,15 +1,15 @@ local grid_edge_type = { [1]={ - ["icon"]="battle_obstacle_stick_3", + ["icon"]="battle_obstacle_coral_1", ["break_sfx"]="sfx_piece_za_b01" }, [2]={ - ["icon"]="battle_obstacle_stick_2", + ["icon"]="battle_obstacle_coral_2", ["next_type"]=1, ["break_sfx"]="sfx_piece_za_b01" }, [3]={ - ["icon"]="battle_obstacle_stick_1", + ["icon"]="battle_obstacle_coral_3", ["next_type"]=2, ["break_sfx"]="sfx_piece_za_b01" } diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index fc6dd769..6c78a720 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -2497,7 +2497,7 @@ local monster_chapter = { }, [19101]={ ["monster_base"]=10020, - ["hp"]=54410000, + ["hp"]=48700000, ["atk"]=1740000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2509,7 +2509,7 @@ local monster_chapter = { }, [19201]={ ["monster_base"]=10038, - ["hp"]=75610000, + ["hp"]=68500000, ["atk"]=1850000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2521,7 +2521,7 @@ local monster_chapter = { }, [19301]={ ["monster_base"]=10021, - ["hp"]=85370000, + ["hp"]=77100000, ["atk"]=1950000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2533,7 +2533,7 @@ local monster_chapter = { }, [19401]={ ["monster_base"]=10040, - ["hp"]=113550000, + ["hp"]=102800000, ["atk"]=2020000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2546,7 +2546,7 @@ local monster_chapter = { [19501]={ ["monster_base"]=20017, ["is_boss"]=1, - ["hp"]=157640000, + ["hp"]=142300000, ["atk"]=2320000, ["atk_times"]=4, ["hurt_skill"]={ @@ -2561,7 +2561,7 @@ local monster_chapter = { }, [19601]={ ["monster_base"]=10022, - ["hp"]=107690000, + ["hp"]=97000000, ["atk"]=2140000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2573,7 +2573,7 @@ local monster_chapter = { }, [19701]={ ["monster_base"]=10004, - ["hp"]=119690000, + ["hp"]=108200000, ["atk"]=2420000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2585,7 +2585,7 @@ local monster_chapter = { }, [19801]={ ["monster_base"]=10023, - ["hp"]=138380000, + ["hp"]=125400000, ["atk"]=2250000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2597,7 +2597,7 @@ local monster_chapter = { }, [19901]={ ["monster_base"]=10007, - ["hp"]=157640000, + ["hp"]=142300000, ["atk"]=2520000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2610,7 +2610,7 @@ local monster_chapter = { [20001]={ ["monster_base"]=20007, ["is_boss"]=1, - ["hp"]=297140000, + ["hp"]=295800000, ["atk"]=2810000, ["atk_times"]=4, ["hurt_skill"]={ @@ -2628,7 +2628,7 @@ local monster_chapter = { }, [20101]={ ["monster_base"]=10048, - ["hp"]=171590000, + ["hp"]=170700000, ["atk"]=2630000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2640,7 +2640,7 @@ local monster_chapter = { }, [20201]={ ["monster_base"]=10023, - ["hp"]=194460000, + ["hp"]=193500000, ["atk"]=2690000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2652,7 +2652,7 @@ local monster_chapter = { }, [20301]={ ["monster_base"]=10006, - ["hp"]=206180000, + ["hp"]=205100000, ["atk"]=2810000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2664,7 +2664,7 @@ local monster_chapter = { }, [20401]={ ["monster_base"]=10047, - ["hp"]=223480000, + ["hp"]=221800000, ["atk"]=2920000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2677,7 +2677,7 @@ local monster_chapter = { [20501]={ ["monster_base"]=20015, ["is_boss"]=1, - ["hp"]=404830000, + ["hp"]=403300000, ["atk"]=2920000, ["atk_times"]=4, ["hurt_skill"]={ @@ -2695,7 +2695,7 @@ local monster_chapter = { }, [20601]={ ["monster_base"]=10021, - ["hp"]=268120000, + ["hp"]=267300000, ["atk"]=3020000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2707,7 +2707,7 @@ local monster_chapter = { }, [20701]={ ["monster_base"]=10006, - ["hp"]=285980000, + ["hp"]=284200000, ["atk"]=3090000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2719,7 +2719,7 @@ local monster_chapter = { }, [20801]={ ["monster_base"]=10048, - ["hp"]=313880000, + ["hp"]=312600000, ["atk"]=3200000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2731,7 +2731,7 @@ local monster_chapter = { }, [20901]={ ["monster_base"]=10023, - ["hp"]=342890000, + ["hp"]=341100000, ["atk"]=3310000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2744,7 +2744,7 @@ local monster_chapter = { [21001]={ ["monster_base"]=30014, ["is_boss"]=2, - ["hp"]=541820000, + ["hp"]=539600000, ["atk"]=4510000, ["atk_times"]=4, ["hurt_skill"]={ @@ -2760,7 +2760,7 @@ local monster_chapter = { }, [21101]={ ["monster_base"]=10024, - ["hp"]=57200000, + ["hp"]=51400000, ["atk"]=1840000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2772,7 +2772,7 @@ local monster_chapter = { }, [21201]={ ["monster_base"]=10006, - ["hp"]=79240000, + ["hp"]=72300000, ["atk"]=1960000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2784,7 +2784,7 @@ local monster_chapter = { }, [21301]={ ["monster_base"]=10007, - ["hp"]=89560000, + ["hp"]=81400000, ["atk"]=2060000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2796,7 +2796,7 @@ local monster_chapter = { }, [21401]={ ["monster_base"]=10023, - ["hp"]=118850000, + ["hp"]=108500000, ["atk"]=2140000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2809,7 +2809,7 @@ local monster_chapter = { [21501]={ ["monster_base"]=20015, ["is_boss"]=1, - ["hp"]=165170000, + ["hp"]=150200000, ["atk"]=2450000, ["atk_times"]=4, ["hurt_skill"]={ @@ -2827,7 +2827,7 @@ local monster_chapter = { }, [21601]={ ["monster_base"]=10048, - ["hp"]=112720000, + ["hp"]=102400000, ["atk"]=2260000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2839,7 +2839,7 @@ local monster_chapter = { }, [21701]={ ["monster_base"]=10025, - ["hp"]=125270000, + ["hp"]=114200000, ["atk"]=2560000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2851,7 +2851,7 @@ local monster_chapter = { }, [21801]={ ["monster_base"]=10004, - ["hp"]=144800000, + ["hp"]=132400000, ["atk"]=2380000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2863,7 +2863,7 @@ local monster_chapter = { }, [21901]={ ["monster_base"]=10022, - ["hp"]=165170000, + ["hp"]=150200000, ["atk"]=2660000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2876,7 +2876,7 @@ local monster_chapter = { [22001]={ ["monster_base"]=20005, ["is_boss"]=1, - ["hp"]=311090000, + ["hp"]=312100000, ["atk"]=2970000, ["atk_times"]=4, ["hurt_skill"]={ @@ -2894,7 +2894,7 @@ local monster_chapter = { }, [22101]={ ["monster_base"]=10047, - ["hp"]=179680000, + ["hp"]=180200000, ["atk"]=2780000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2906,7 +2906,7 @@ local monster_chapter = { }, [22201]={ ["monster_base"]=10026, - ["hp"]=203670000, + ["hp"]=204200000, ["atk"]=2840000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2918,7 +2918,7 @@ local monster_chapter = { }, [22301]={ ["monster_base"]=10006, - ["hp"]=215950000, + ["hp"]=216400000, ["atk"]=2970000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2930,7 +2930,7 @@ local monster_chapter = { }, [22401]={ ["monster_base"]=10040, - ["hp"]=234080000, + ["hp"]=234100000, ["atk"]=3090000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2943,7 +2943,7 @@ local monster_chapter = { [22501]={ ["monster_base"]=20017, ["is_boss"]=1, - ["hp"]=423800000, + ["hp"]=425600000, ["atk"]=3090000, ["atk_times"]=4, ["hurt_skill"]={ @@ -2958,7 +2958,7 @@ local monster_chapter = { }, [22601]={ ["monster_base"]=10020, - ["hp"]=280670000, + ["hp"]=282100000, ["atk"]=3190000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2970,7 +2970,7 @@ local monster_chapter = { }, [22701]={ ["monster_base"]=10010, - ["hp"]=299370000, + ["hp"]=299900000, ["atk"]=3270000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2982,7 +2982,7 @@ local monster_chapter = { }, [22801]={ ["monster_base"]=10038, - ["hp"]=328380000, + ["hp"]=329900000, ["atk"]=3380000, ["atk_times"]=3, ["hurt_skill"]={ @@ -2994,7 +2994,7 @@ local monster_chapter = { }, [22901]={ ["monster_base"]=10027, - ["hp"]=358790000, + ["hp"]=359900000, ["atk"]=3500000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3007,7 +3007,7 @@ local monster_chapter = { [23001]={ ["monster_base"]=20008, ["is_boss"]=2, - ["hp"]=566930000, + ["hp"]=569400000, ["atk"]=4760000, ["atk_times"]=4, ["hurt_skill"]={ @@ -3025,7 +3025,7 @@ local monster_chapter = { }, [23101]={ ["monster_base"]=10005, - ["hp"]=62220000, + ["hp"]=53100000, ["atk"]=1910000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3037,7 +3037,7 @@ local monster_chapter = { }, [23201]={ ["monster_base"]=10022, - ["hp"]=86210000, + ["hp"]=74700000, ["atk"]=2030000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3049,7 +3049,7 @@ local monster_chapter = { }, [23301]={ ["monster_base"]=10005, - ["hp"]=97370000, + ["hp"]=84100000, ["atk"]=2130000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3061,7 +3061,7 @@ local monster_chapter = { }, [23401]={ ["monster_base"]=10026, - ["hp"]=129180000, + ["hp"]=112100000, ["atk"]=2220000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3074,7 +3074,7 @@ local monster_chapter = { [23501]={ ["monster_base"]=20014, ["is_boss"]=1, - ["hp"]=179400000, + ["hp"]=155200000, ["atk"]=2540000, ["atk_times"]=4, ["hurt_skill"]={ @@ -3092,7 +3092,7 @@ local monster_chapter = { }, [23601]={ ["monster_base"]=10022, - ["hp"]=122480000, + ["hp"]=105800000, ["atk"]=2340000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3104,7 +3104,7 @@ local monster_chapter = { }, [23701]={ ["monster_base"]=10026, - ["hp"]=135870000, + ["hp"]=118000000, ["atk"]=2650000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3116,7 +3116,7 @@ local monster_chapter = { }, [23801]={ ["monster_base"]=10032, - ["hp"]=157080000, + ["hp"]=136800000, ["atk"]=2460000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3128,7 +3128,7 @@ local monster_chapter = { }, [23901]={ ["monster_base"]=10044, - ["hp"]=179400000, + ["hp"]=155200000, ["atk"]=2750000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3141,7 +3141,7 @@ local monster_chapter = { [24001]={ ["monster_base"]=20015, ["is_boss"]=1, - ["hp"]=337590000, + ["hp"]=322400000, ["atk"]=3070000, ["atk_times"]=4, ["hurt_skill"]={ @@ -3159,7 +3159,7 @@ local monster_chapter = { }, [24101]={ ["monster_base"]=10001, - ["hp"]=195020000, + ["hp"]=186200000, ["atk"]=2880000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3171,7 +3171,7 @@ local monster_chapter = { }, [24201]={ ["monster_base"]=10022, - ["hp"]=220970000, + ["hp"]=211000000, ["atk"]=2940000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3183,7 +3183,7 @@ local monster_chapter = { }, [24301]={ ["monster_base"]=10044, - ["hp"]=234360000, + ["hp"]=223600000, ["atk"]=3070000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3195,7 +3195,7 @@ local monster_chapter = { }, [24401]={ ["monster_base"]=10019, - ["hp"]=253890000, + ["hp"]=241900000, ["atk"]=3200000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3208,7 +3208,7 @@ local monster_chapter = { [24501]={ ["monster_base"]=20001, ["is_boss"]=1, - ["hp"]=459790000, + ["hp"]=439700000, ["atk"]=3200000, ["atk_times"]=4, ["hurt_skill"]={ @@ -3223,7 +3223,7 @@ local monster_chapter = { }, [24601]={ ["monster_base"]=10013, - ["hp"]=304670000, + ["hp"]=291400000, ["atk"]=3300000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3235,7 +3235,7 @@ local monster_chapter = { }, [24701]={ ["monster_base"]=10005, - ["hp"]=324760000, + ["hp"]=309800000, ["atk"]=3380000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3247,7 +3247,7 @@ local monster_chapter = { }, [24801]={ ["monster_base"]=10026, - ["hp"]=356280000, + ["hp"]=340800000, ["atk"]=3500000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3259,7 +3259,7 @@ local monster_chapter = { }, [24901]={ ["monster_base"]=10032, - ["hp"]=389210000, + ["hp"]=371800000, ["atk"]=3620000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3272,7 +3272,7 @@ local monster_chapter = { [25001]={ ["monster_base"]=20006, ["is_boss"]=2, - ["hp"]=614920000, + ["hp"]=588200000, ["atk"]=4920000, ["atk_times"]=4, ["hurt_skill"]={ @@ -3290,7 +3290,7 @@ local monster_chapter = { }, [25101]={ ["monster_base"]=10044, - ["hp"]=63890000, + ["hp"]=54800000, ["atk"]=1980000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3302,7 +3302,7 @@ local monster_chapter = { }, [25201]={ ["monster_base"]=10013, - ["hp"]=88720000, + ["hp"]=77100000, ["atk"]=2100000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3314,7 +3314,7 @@ local monster_chapter = { }, [25301]={ ["monster_base"]=10001, - ["hp"]=100160000, + ["hp"]=86800000, ["atk"]=2200000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3326,7 +3326,7 @@ local monster_chapter = { }, [25401]={ ["monster_base"]=10026, - ["hp"]=132800000, + ["hp"]=115700000, ["atk"]=2300000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3339,7 +3339,7 @@ local monster_chapter = { [25501]={ ["monster_base"]=20015, ["is_boss"]=1, - ["hp"]=184420000, + ["hp"]=160200000, ["atk"]=2630000, ["atk_times"]=4, ["hurt_skill"]={ @@ -3357,7 +3357,7 @@ local monster_chapter = { }, [25601]={ ["monster_base"]=10022, - ["hp"]=125830000, + ["hp"]=109200000, ["atk"]=2420000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3369,7 +3369,7 @@ local monster_chapter = { }, [25701]={ ["monster_base"]=10044, - ["hp"]=139500000, + ["hp"]=121800000, ["atk"]=2740000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3381,7 +3381,7 @@ local monster_chapter = { }, [25801]={ ["monster_base"]=10032, - ["hp"]=161540000, + ["hp"]=141200000, ["atk"]=2540000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3393,7 +3393,7 @@ local monster_chapter = { }, [25901]={ ["monster_base"]=10019, - ["hp"]=184420000, + ["hp"]=160200000, ["atk"]=2840000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3406,7 +3406,7 @@ local monster_chapter = { [26001]={ ["monster_base"]=20008, ["is_boss"]=1, - ["hp"]=346800000, + ["hp"]=332700000, ["atk"]=3170000, ["atk_times"]=4, ["hurt_skill"]={ @@ -3424,7 +3424,7 @@ local monster_chapter = { }, [26101]={ ["monster_base"]=10026, - ["hp"]=200320000, + ["hp"]=192200000, ["atk"]=2980000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3436,7 +3436,7 @@ local monster_chapter = { }, [26201]={ ["monster_base"]=10001, - ["hp"]=227110000, + ["hp"]=217800000, ["atk"]=3040000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3448,7 +3448,7 @@ local monster_chapter = { }, [26301]={ ["monster_base"]=10044, - ["hp"]=240780000, + ["hp"]=230800000, ["atk"]=3170000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3460,7 +3460,7 @@ local monster_chapter = { }, [26401]={ ["monster_base"]=10013, - ["hp"]=260870000, + ["hp"]=249700000, ["atk"]=3310000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3473,7 +3473,7 @@ local monster_chapter = { [26501]={ ["monster_base"]=20002, ["is_boss"]=1, - ["hp"]=472070000, + ["hp"]=453800000, ["atk"]=3310000, ["atk_times"]=4, ["hurt_skill"]={ @@ -3488,7 +3488,7 @@ local monster_chapter = { }, [26601]={ ["monster_base"]=10001, - ["hp"]=313040000, + ["hp"]=300700000, ["atk"]=3410000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3500,7 +3500,7 @@ local monster_chapter = { }, [26701]={ ["monster_base"]=10032, - ["hp"]=333680000, + ["hp"]=319700000, ["atk"]=3490000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3512,7 +3512,7 @@ local monster_chapter = { }, [26801]={ ["monster_base"]=10022, - ["hp"]=366050000, + ["hp"]=351700000, ["atk"]=3620000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3524,7 +3524,7 @@ local monster_chapter = { }, [26901]={ ["monster_base"]=10005, - ["hp"]=399810000, + ["hp"]=383700000, ["atk"]=3740000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3537,7 +3537,7 @@ local monster_chapter = { [27001]={ ["monster_base"]=20021, ["is_boss"]=2, - ["hp"]=631380000, + ["hp"]=607000000, ["atk"]=5080000, ["atk_times"]=4, ["hurt_skill"]={ @@ -3556,7 +3556,7 @@ local monster_chapter = { }, [27101]={ ["monster_base"]=10022, - ["hp"]=67070000, + ["hp"]=57800000, ["atk"]=2090000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3568,7 +3568,7 @@ local monster_chapter = { }, [27201]={ ["monster_base"]=10044, - ["hp"]=93010000, + ["hp"]=81300000, ["atk"]=2220000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3580,7 +3580,7 @@ local monster_chapter = { }, [27301]={ ["monster_base"]=10032, - ["hp"]=104880000, + ["hp"]=91500000, ["atk"]=2320000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3592,7 +3592,7 @@ local monster_chapter = { }, [27401]={ ["monster_base"]=10019, - ["hp"]=139100000, + ["hp"]=121900000, ["atk"]=2430000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3605,7 +3605,7 @@ local monster_chapter = { [27501]={ ["monster_base"]=20008, ["is_boss"]=1, - ["hp"]=192920000, + ["hp"]=168800000, ["atk"]=2780000, ["atk_times"]=4, ["hurt_skill"]={ @@ -3623,7 +3623,7 @@ local monster_chapter = { }, [27601]={ ["monster_base"]=10005, - ["hp"]=131650000, + ["hp"]=115100000, ["atk"]=2550000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3635,7 +3635,7 @@ local monster_chapter = { }, [27701]={ ["monster_base"]=10022, - ["hp"]=146000000, + ["hp"]=128300000, ["atk"]=2890000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3647,7 +3647,7 @@ local monster_chapter = { }, [27801]={ ["monster_base"]=10005, - ["hp"]=169190000, + ["hp"]=148800000, ["atk"]=2680000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3659,7 +3659,7 @@ local monster_chapter = { }, [27901]={ ["monster_base"]=10026, - ["hp"]=192920000, + ["hp"]=168800000, ["atk"]=3000000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3672,7 +3672,7 @@ local monster_chapter = { [28001]={ ["monster_base"]=20014, ["is_boss"]=1, - ["hp"]=362940000, + ["hp"]=350500000, ["atk"]=3340000, ["atk_times"]=4, ["hurt_skill"]={ @@ -3690,7 +3690,7 @@ local monster_chapter = { }, [28101]={ ["monster_base"]=10013, - ["hp"]=209760000, + ["hp"]=202500000, ["atk"]=3140000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3702,7 +3702,7 @@ local monster_chapter = { }, [28201]={ ["monster_base"]=10005, - ["hp"]=237640000, + ["hp"]=229500000, ["atk"]=3210000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3714,7 +3714,7 @@ local monster_chapter = { }, [28301]={ ["monster_base"]=10026, - ["hp"]=251990000, + ["hp"]=243100000, ["atk"]=3340000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3726,7 +3726,7 @@ local monster_chapter = { }, [28401]={ ["monster_base"]=10032, - ["hp"]=272960000, + ["hp"]=263100000, ["atk"]=3490000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3739,7 +3739,7 @@ local monster_chapter = { [28501]={ ["monster_base"]=20006, ["is_boss"]=1, - ["hp"]=494040000, + ["hp"]=478000000, ["atk"]=3490000, ["atk_times"]=4, ["hurt_skill"]={ @@ -3757,7 +3757,7 @@ local monster_chapter = { }, [28601]={ ["monster_base"]=10013, - ["hp"]=327610000, + ["hp"]=316800000, ["atk"]=3600000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3769,7 +3769,7 @@ local monster_chapter = { }, [28701]={ ["monster_base"]=10005, - ["hp"]=349140000, + ["hp"]=336800000, ["atk"]=3680000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3781,7 +3781,7 @@ local monster_chapter = { }, [28801]={ ["monster_base"]=10026, - ["hp"]=383090000, + ["hp"]=370500000, ["atk"]=3820000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3793,7 +3793,7 @@ local monster_chapter = { }, [28901]={ ["monster_base"]=10001, - ["hp"]=418420000, + ["hp"]=404200000, ["atk"]=3940000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3806,7 +3806,7 @@ local monster_chapter = { [29001]={ ["monster_base"]=30010, ["is_boss"]=2, - ["hp"]=660740000, + ["hp"]=639400000, ["atk"]=5360000, ["atk_times"]=4, ["hurt_skill"]={ @@ -3822,7 +3822,7 @@ local monster_chapter = { }, [29101]={ ["monster_base"]=10013, - ["hp"]=70100000, + ["hp"]=59700000, ["atk"]=2160000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3834,7 +3834,7 @@ local monster_chapter = { }, [29201]={ ["monster_base"]=10005, - ["hp"]=97150000, + ["hp"]=83900000, ["atk"]=2300000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3846,7 +3846,7 @@ local monster_chapter = { }, [29301]={ ["monster_base"]=10026, - ["hp"]=109300000, + ["hp"]=94500000, ["atk"]=2400000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3858,7 +3858,7 @@ local monster_chapter = { }, [29401]={ ["monster_base"]=10032, - ["hp"]=145180000, + ["hp"]=125800000, ["atk"]=2510000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3871,7 +3871,7 @@ local monster_chapter = { [29501]={ ["monster_base"]=20006, ["is_boss"]=1, - ["hp"]=201200000, + ["hp"]=174200000, ["atk"]=2870000, ["atk_times"]=4, ["hurt_skill"]={ @@ -3889,7 +3889,7 @@ local monster_chapter = { }, [29601]={ ["monster_base"]=10001, - ["hp"]=137450000, + ["hp"]=118800000, ["atk"]=2640000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3901,7 +3901,7 @@ local monster_chapter = { }, [29701]={ ["monster_base"]=10032, - ["hp"]=152350000, + ["hp"]=132400000, ["atk"]=2990000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3913,7 +3913,7 @@ local monster_chapter = { }, [29801]={ ["monster_base"]=10022, - ["hp"]=176360000, + ["hp"]=153600000, ["atk"]=2770000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3925,7 +3925,7 @@ local monster_chapter = { }, [29901]={ ["monster_base"]=10005, - ["hp"]=201200000, + ["hp"]=174200000, ["atk"]=3100000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3938,7 +3938,7 @@ local monster_chapter = { [30001]={ ["monster_base"]=20021, ["is_boss"]=1, - ["hp"]=378400000, + ["hp"]=361700000, ["atk"]=3450000, ["atk_times"]=4, ["hurt_skill"]={ @@ -3957,7 +3957,7 @@ local monster_chapter = { }, [30101]={ ["monster_base"]=10022, - ["hp"]=218590000, + ["hp"]=209000000, ["atk"]=3240000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3969,7 +3969,7 @@ local monster_chapter = { }, [30201]={ ["monster_base"]=10004, - ["hp"]=247850000, + ["hp"]=236900000, ["atk"]=3320000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3981,7 +3981,7 @@ local monster_chapter = { }, [30301]={ ["monster_base"]=10023, - ["hp"]=262750000, + ["hp"]=250900000, ["atk"]=3450000, ["atk_times"]=3, ["hurt_skill"]={ @@ -3993,7 +3993,7 @@ local monster_chapter = { }, [30401]={ ["monster_base"]=10007, - ["hp"]=284560000, + ["hp"]=271500000, ["atk"]=3610000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4006,7 +4006,7 @@ local monster_chapter = { [30501]={ ["monster_base"]=20007, ["is_boss"]=1, - ["hp"]=515020000, + ["hp"]=493300000, ["atk"]=3610000, ["atk_times"]=4, ["hurt_skill"]={ @@ -4024,7 +4024,7 @@ local monster_chapter = { }, [30601]={ ["monster_base"]=10019, - ["hp"]=341410000, + ["hp"]=326900000, ["atk"]=3720000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4036,7 +4036,7 @@ local monster_chapter = { }, [30701]={ ["monster_base"]=10023, - ["hp"]=364040000, + ["hp"]=347600000, ["atk"]=3800000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4048,7 +4048,7 @@ local monster_chapter = { }, [30801]={ ["monster_base"]=10005, - ["hp"]=399370000, + ["hp"]=382300000, ["atk"]=3950000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4060,7 +4060,7 @@ local monster_chapter = { }, [30901]={ ["monster_base"]=10033, - ["hp"]=436080000, + ["hp"]=417100000, ["atk"]=4070000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4073,7 +4073,7 @@ local monster_chapter = { [31001]={ ["monster_base"]=20016, ["is_boss"]=2, - ["hp"]=688620000, + ["hp"]=659800000, ["atk"]=5530000, ["atk_times"]=4, ["hurt_skill"]={ @@ -4092,7 +4092,7 @@ local monster_chapter = { }, [31101]={ ["monster_base"]=10026, - ["hp"]=73440000, + ["hp"]=62700000, ["atk"]=2270000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4104,7 +4104,7 @@ local monster_chapter = { }, [31201]={ ["monster_base"]=10001, - ["hp"]=101830000, + ["hp"]=88100000, ["atk"]=2420000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4116,7 +4116,7 @@ local monster_chapter = { }, [31301]={ ["monster_base"]=10044, - ["hp"]=114660000, + ["hp"]=99200000, ["atk"]=2520000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4128,7 +4128,7 @@ local monster_chapter = { }, [31401]={ ["monster_base"]=10013, - ["hp"]=152060000, + ["hp"]=132000000, ["atk"]=2640000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4141,7 +4141,7 @@ local monster_chapter = { [31501]={ ["monster_base"]=20002, ["is_boss"]=1, - ["hp"]=210760000, + ["hp"]=182800000, ["atk"]=3020000, ["atk_times"]=4, ["hurt_skill"]={ @@ -4156,7 +4156,7 @@ local monster_chapter = { }, [31601]={ ["monster_base"]=10048, - ["hp"]=144140000, + ["hp"]=124700000, ["atk"]=2770000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4168,7 +4168,7 @@ local monster_chapter = { }, [31701]={ ["monster_base"]=10006, - ["hp"]=159710000, + ["hp"]=138900000, ["atk"]=3140000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4180,7 +4180,7 @@ local monster_chapter = { }, [31801]={ ["monster_base"]=10012, - ["hp"]=184820000, + ["hp"]=161200000, ["atk"]=2910000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4192,7 +4192,7 @@ local monster_chapter = { }, [31901]={ ["monster_base"]=10004, - ["hp"]=210760000, + ["hp"]=182800000, ["atk"]=3260000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4205,7 +4205,7 @@ local monster_chapter = { [32001]={ ["monster_base"]=20004, ["is_boss"]=1, - ["hp"]=396120000, + ["hp"]=379500000, ["atk"]=3620000, ["atk_times"]=4, ["hurt_skill"]={ @@ -4220,7 +4220,7 @@ local monster_chapter = { }, [32101]={ ["monster_base"]=10024, - ["hp"]=229050000, + ["hp"]=219300000, ["atk"]=3400000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4232,7 +4232,7 @@ local monster_chapter = { }, [32201]={ ["monster_base"]=10044, - ["hp"]=259620000, + ["hp"]=248600000, ["atk"]=3490000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4244,7 +4244,7 @@ local monster_chapter = { }, [32301]={ ["monster_base"]=10016, - ["hp"]=275180000, + ["hp"]=263200000, ["atk"]=3620000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4256,7 +4256,7 @@ local monster_chapter = { }, [32401]={ ["monster_base"]=10019, - ["hp"]=298120000, + ["hp"]=284900000, ["atk"]=3790000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4269,7 +4269,7 @@ local monster_chapter = { [32501]={ ["monster_base"]=20008, ["is_boss"]=1, - ["hp"]=539180000, + ["hp"]=517500000, ["atk"]=3790000, ["atk_times"]=4, ["hurt_skill"]={ @@ -4287,7 +4287,7 @@ local monster_chapter = { }, [32601]={ ["monster_base"]=10004, - ["hp"]=357630000, + ["hp"]=343000000, ["atk"]=3910000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4299,7 +4299,7 @@ local monster_chapter = { }, [32701]={ ["monster_base"]=10006, - ["hp"]=381110000, + ["hp"]=364700000, ["atk"]=3990000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4311,7 +4311,7 @@ local monster_chapter = { }, [32801]={ ["monster_base"]=10048, - ["hp"]=418240000, + ["hp"]=401100000, ["atk"]=4150000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4323,7 +4323,7 @@ local monster_chapter = { }, [32901]={ ["monster_base"]=10037, - ["hp"]=456730000, + ["hp"]=437600000, ["atk"]=4280000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4336,7 +4336,7 @@ local monster_chapter = { [33001]={ ["monster_base"]=30020, ["is_boss"]=2, - ["hp"]=720990000, + ["hp"]=692200000, ["atk"]=5810000, ["atk_times"]=4, ["hurt_skill"]={ @@ -4352,7 +4352,7 @@ local monster_chapter = { }, [33101]={ ["monster_base"]=10049, - ["hp"]=75620000, + ["hp"]=65300000, ["atk"]=2370000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4364,7 +4364,7 @@ local monster_chapter = { }, [33201]={ ["monster_base"]=10005, - ["hp"]=104830000, + ["hp"]=91700000, ["atk"]=2520000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4376,7 +4376,7 @@ local monster_chapter = { }, [33301]={ ["monster_base"]=10024, - ["hp"]=117940000, + ["hp"]=103300000, ["atk"]=2630000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4388,7 +4388,7 @@ local monster_chapter = { }, [33401]={ ["monster_base"]=10012, - ["hp"]=156430000, + ["hp"]=137400000, ["atk"]=2750000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4401,7 +4401,7 @@ local monster_chapter = { [33501]={ ["monster_base"]=20006, ["is_boss"]=1, - ["hp"]=216760000, + ["hp"]=190300000, ["atk"]=3150000, ["atk_times"]=4, ["hurt_skill"]={ @@ -4419,7 +4419,7 @@ local monster_chapter = { }, [33601]={ ["monster_base"]=10048, - ["hp"]=148240000, + ["hp"]=129800000, ["atk"]=2890000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4431,7 +4431,7 @@ local monster_chapter = { }, [33701]={ ["monster_base"]=10049, - ["hp"]=164350000, + ["hp"]=144600000, ["atk"]=3270000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4443,7 +4443,7 @@ local monster_chapter = { }, [33801]={ ["monster_base"]=10004, - ["hp"]=190010000, + ["hp"]=167800000, ["atk"]=3030000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4455,7 +4455,7 @@ local monster_chapter = { }, [33901]={ ["monster_base"]=10006, - ["hp"]=216760000, + ["hp"]=190300000, ["atk"]=3400000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4468,7 +4468,7 @@ local monster_chapter = { [34001]={ ["monster_base"]=20007, ["is_boss"]=1, - ["hp"]=407040000, + ["hp"]=395000000, ["atk"]=3770000, ["atk_times"]=4, ["hurt_skill"]={ @@ -4486,7 +4486,7 @@ local monster_chapter = { }, [34101]={ ["monster_base"]=10020, - ["hp"]=235600000, + ["hp"]=228300000, ["atk"]=3540000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4498,7 +4498,7 @@ local monster_chapter = { }, [34201]={ ["monster_base"]=10024, - ["hp"]=266990000, + ["hp"]=258800000, ["atk"]=3640000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4510,7 +4510,7 @@ local monster_chapter = { }, [34301]={ ["monster_base"]=10012, - ["hp"]=282830000, + ["hp"]=274000000, ["atk"]=3770000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4522,7 +4522,7 @@ local monster_chapter = { }, [34401]={ ["monster_base"]=10016, - ["hp"]=306580000, + ["hp"]=296500000, ["atk"]=3950000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4535,7 +4535,7 @@ local monster_chapter = { [34501]={ ["monster_base"]=20002, ["is_boss"]=1, - ["hp"]=554190000, + ["hp"]=538600000, ["atk"]=3950000, ["atk_times"]=4, ["hurt_skill"]={ @@ -4550,7 +4550,7 @@ local monster_chapter = { }, [34601]={ ["monster_base"]=10004, - ["hp"]=367730000, + ["hp"]=357000000, ["atk"]=4070000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4562,7 +4562,7 @@ local monster_chapter = { }, [34701]={ ["monster_base"]=10012, - ["hp"]=391760000, + ["hp"]=379600000, ["atk"]=4160000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4574,7 +4574,7 @@ local monster_chapter = { }, [34801]={ ["monster_base"]=10049, - ["hp"]=429980000, + ["hp"]=417500000, ["atk"]=4320000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4586,7 +4586,7 @@ local monster_chapter = { }, [34901]={ ["monster_base"]=10048, - ["hp"]=469560000, + ["hp"]=455500000, ["atk"]=4460000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4599,7 +4599,7 @@ local monster_chapter = { [35001]={ ["monster_base"]=20009, ["is_boss"]=2, - ["hp"]=740920000, + ["hp"]=720400000, ["atk"]=6050000, ["atk_times"]=4, ["hurt_skill"]={ @@ -4618,7 +4618,7 @@ local monster_chapter = { }, [35101]={ ["monster_base"]=10004, - ["hp"]=79650000, + ["hp"]=67600000, ["atk"]=2460000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4630,7 +4630,7 @@ local monster_chapter = { }, [35201]={ ["monster_base"]=10020, - ["hp"]=110160000, + ["hp"]=94900000, ["atk"]=2610000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4642,7 +4642,7 @@ local monster_chapter = { }, [35301]={ ["monster_base"]=10048, - ["hp"]=123930000, + ["hp"]=106900000, ["atk"]=2730000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4654,7 +4654,7 @@ local monster_chapter = { }, [35401]={ ["monster_base"]=10012, - ["hp"]=164430000, + ["hp"]=142100000, ["atk"]=2850000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4667,7 +4667,7 @@ local monster_chapter = { [35501]={ ["monster_base"]=20014, ["is_boss"]=1, - ["hp"]=227610000, + ["hp"]=196800000, ["atk"]=3260000, ["atk_times"]=4, ["hurt_skill"]={ @@ -4685,7 +4685,7 @@ local monster_chapter = { }, [35601]={ ["monster_base"]=10004, - ["hp"]=155790000, + ["hp"]=134300000, ["atk"]=2990000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4697,7 +4697,7 @@ local monster_chapter = { }, [35701]={ ["monster_base"]=10012, - ["hp"]=172800000, + ["hp"]=149600000, ["atk"]=3390000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4709,7 +4709,7 @@ local monster_chapter = { }, [35801]={ ["monster_base"]=10037, - ["hp"]=199530000, + ["hp"]=173600000, ["atk"]=3140000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4721,7 +4721,7 @@ local monster_chapter = { }, [35901]={ ["monster_base"]=10048, - ["hp"]=227610000, + ["hp"]=196800000, ["atk"]=3520000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4734,7 +4734,7 @@ local monster_chapter = { [36001]={ ["monster_base"]=20009, ["is_boss"]=1, - ["hp"]=427410000, + ["hp"]=408500000, ["atk"]=3900000, ["atk_times"]=4, ["hurt_skill"]={ @@ -4753,7 +4753,7 @@ local monster_chapter = { }, [36101]={ ["monster_base"]=10014, - ["hp"]=247590000, + ["hp"]=236100000, ["atk"]=3670000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4765,7 +4765,7 @@ local monster_chapter = { }, [36201]={ ["monster_base"]=10027, - ["hp"]=280530000, + ["hp"]=267700000, ["atk"]=3770000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4777,7 +4777,7 @@ local monster_chapter = { }, [36301]={ ["monster_base"]=10017, - ["hp"]=297000000, + ["hp"]=283400000, ["atk"]=3900000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4789,7 +4789,7 @@ local monster_chapter = { }, [36401]={ ["monster_base"]=10023, - ["hp"]=322110000, + ["hp"]=306600000, ["atk"]=4090000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4802,7 +4802,7 @@ local monster_chapter = { [36501]={ ["monster_base"]=20015, ["is_boss"]=1, - ["hp"]=582120000, + ["hp"]=557000000, ["atk"]=4090000, ["atk_times"]=4, ["hurt_skill"]={ @@ -4820,7 +4820,7 @@ local monster_chapter = { }, [36601]={ ["monster_base"]=10014, - ["hp"]=386370000, + ["hp"]=369200000, ["atk"]=4220000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4832,7 +4832,7 @@ local monster_chapter = { }, [36701]={ ["monster_base"]=10002, - ["hp"]=411480000, + ["hp"]=392600000, ["atk"]=4310000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4844,7 +4844,7 @@ local monster_chapter = { }, [36801]={ ["monster_base"]=10029, - ["hp"]=451710000, + ["hp"]=431800000, ["atk"]=4470000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4856,7 +4856,7 @@ local monster_chapter = { }, [36901]={ ["monster_base"]=10036, - ["hp"]=493290000, + ["hp"]=471100000, ["atk"]=4620000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4869,7 +4869,7 @@ local monster_chapter = { [37001]={ ["monster_base"]=30009, ["is_boss"]=2, - ["hp"]=778140000, + ["hp"]=745000000, ["atk"]=6260000, ["atk_times"]=4, ["hurt_skill"]={ @@ -4885,7 +4885,7 @@ local monster_chapter = { }, [37101]={ ["monster_base"]=10054, - ["hp"]=82890000, + ["hp"]=69500000, ["atk"]=2530000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4897,7 +4897,7 @@ local monster_chapter = { }, [37201]={ ["monster_base"]=10024, - ["hp"]=114480000, + ["hp"]=97500000, ["atk"]=2690000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4909,7 +4909,7 @@ local monster_chapter = { }, [37301]={ ["monster_base"]=10012, - ["hp"]=128790000, + ["hp"]=109900000, ["atk"]=2810000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4921,7 +4921,7 @@ local monster_chapter = { }, [37401]={ ["monster_base"]=10048, - ["hp"]=170910000, + ["hp"]=146000000, ["atk"]=2930000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4934,7 +4934,7 @@ local monster_chapter = { [37501]={ ["monster_base"]=20009, ["is_boss"]=1, - ["hp"]=236520000, + ["hp"]=202200000, ["atk"]=3350000, ["atk_times"]=4, ["hurt_skill"]={ @@ -4953,7 +4953,7 @@ local monster_chapter = { }, [37601]={ ["monster_base"]=10048, - ["hp"]=162000000, + ["hp"]=138000000, ["atk"]=3080000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4965,7 +4965,7 @@ local monster_chapter = { }, [37701]={ ["monster_base"]=10054, - ["hp"]=179550000, + ["hp"]=153700000, ["atk"]=3490000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4977,7 +4977,7 @@ local monster_chapter = { }, [37801]={ ["monster_base"]=10012, - ["hp"]=207360000, + ["hp"]=178400000, ["atk"]=3230000, ["atk_times"]=3, ["hurt_skill"]={ @@ -4989,7 +4989,7 @@ local monster_chapter = { }, [37901]={ ["monster_base"]=10024, - ["hp"]=236520000, + ["hp"]=202200000, ["atk"]=3620000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5002,7 +5002,7 @@ local monster_chapter = { [38001]={ ["monster_base"]=20006, ["is_boss"]=1, - ["hp"]=443880000, + ["hp"]=419700000, ["atk"]=4010000, ["atk_times"]=4, ["hurt_skill"]={ @@ -5020,7 +5020,7 @@ local monster_chapter = { }, [38101]={ ["monster_base"]=10020, - ["hp"]=257310000, + ["hp"]=242600000, ["atk"]=3770000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5032,7 +5032,7 @@ local monster_chapter = { }, [38201]={ ["monster_base"]=10053, - ["hp"]=291330000, + ["hp"]=275100000, ["atk"]=3880000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5044,7 +5044,7 @@ local monster_chapter = { }, [38301]={ ["monster_base"]=10006, - ["hp"]=308340000, + ["hp"]=291200000, ["atk"]=4010000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5056,7 +5056,7 @@ local monster_chapter = { }, [38401]={ ["monster_base"]=10004, - ["hp"]=334530000, + ["hp"]=315000000, ["atk"]=4210000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5069,7 +5069,7 @@ local monster_chapter = { [38501]={ ["monster_base"]=20004, ["is_boss"]=1, - ["hp"]=604530000, + ["hp"]=572300000, ["atk"]=4210000, ["atk_times"]=4, ["hurt_skill"]={ @@ -5084,7 +5084,7 @@ local monster_chapter = { }, [38601]={ ["monster_base"]=10053, - ["hp"]=401220000, + ["hp"]=379300000, ["atk"]=4340000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5096,7 +5096,7 @@ local monster_chapter = { }, [38701]={ ["monster_base"]=10049, - ["hp"]=427410000, + ["hp"]=403400000, ["atk"]=4430000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5108,7 +5108,7 @@ local monster_chapter = { }, [38801]={ ["monster_base"]=10020, - ["hp"]=468990000, + ["hp"]=443600000, ["atk"]=4600000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5120,7 +5120,7 @@ local monster_chapter = { }, [38901]={ ["monster_base"]=10054, - ["hp"]=512190000, + ["hp"]=484000000, ["atk"]=4750000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5133,7 +5133,7 @@ local monster_chapter = { [39001]={ ["monster_base"]=20010, ["is_boss"]=2, - ["hp"]=808110000, + ["hp"]=765400000, ["atk"]=6440000, ["atk_times"]=4, ["hurt_skill"]={ @@ -5154,7 +5154,7 @@ local monster_chapter = { }, [39101]={ ["monster_base"]=10052, - ["hp"]=85050000, + ["hp"]=71700000, ["atk"]=2610000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5166,7 +5166,7 @@ local monster_chapter = { }, [39201]={ ["monster_base"]=10050, - ["hp"]=117450000, + ["hp"]=100500000, ["atk"]=2780000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5178,7 +5178,7 @@ local monster_chapter = { }, [39301]={ ["monster_base"]=10010, - ["hp"]=132030000, + ["hp"]=113300000, ["atk"]=2900000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5190,7 +5190,7 @@ local monster_chapter = { }, [39401]={ ["monster_base"]=10053, - ["hp"]=175230000, + ["hp"]=150500000, ["atk"]=3020000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5203,7 +5203,7 @@ local monster_chapter = { [39501]={ ["monster_base"]=20005, ["is_boss"]=1, - ["hp"]=242460000, + ["hp"]=208500000, ["atk"]=3460000, ["atk_times"]=4, ["hurt_skill"]={ @@ -5221,7 +5221,7 @@ local monster_chapter = { }, [39601]={ ["monster_base"]=10040, - ["hp"]=166050000, + ["hp"]=142300000, ["atk"]=3180000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5233,7 +5233,7 @@ local monster_chapter = { }, [39701]={ ["monster_base"]=10052, - ["hp"]=184140000, + ["hp"]=158500000, ["atk"]=3600000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5245,7 +5245,7 @@ local monster_chapter = { }, [39801]={ ["monster_base"]=10054, - ["hp"]=212760000, + ["hp"]=183900000, ["atk"]=3330000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5257,7 +5257,7 @@ local monster_chapter = { }, [39901]={ ["monster_base"]=10038, - ["hp"]=242460000, + ["hp"]=208500000, ["atk"]=3740000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5270,7 +5270,7 @@ local monster_chapter = { [40001]={ ["monster_base"]=20015, ["is_boss"]=1, - ["hp"]=454950000, + ["hp"]=432600000, ["atk"]=4140000, ["atk_times"]=4, ["hurt_skill"]={ @@ -5288,7 +5288,7 @@ local monster_chapter = { }, [40101]={ ["monster_base"]=10009, - ["hp"]=263790000, + ["hp"]=250100000, ["atk"]=3890000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5300,7 +5300,7 @@ local monster_chapter = { }, [40201]={ ["monster_base"]=10054, - ["hp"]=298620000, + ["hp"]=283600000, ["atk"]=4000000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5312,7 +5312,7 @@ local monster_chapter = { }, [40301]={ ["monster_base"]=10052, - ["hp"]=316170000, + ["hp"]=300200000, ["atk"]=4140000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5324,7 +5324,7 @@ local monster_chapter = { }, [40401]={ ["monster_base"]=10050, - ["hp"]=342900000, + ["hp"]=324700000, ["atk"]=4340000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5337,7 +5337,7 @@ local monster_chapter = { [40501]={ ["monster_base"]=20008, ["is_boss"]=1, - ["hp"]=619650000, + ["hp"]=589900000, ["atk"]=4340000, ["atk_times"]=4, ["hurt_skill"]={ @@ -5355,7 +5355,7 @@ local monster_chapter = { }, [40601]={ ["monster_base"]=10038, - ["hp"]=411210000, + ["hp"]=391000000, ["atk"]=4480000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5367,7 +5367,7 @@ local monster_chapter = { }, [40701]={ ["monster_base"]=10053, - ["hp"]=438210000, + ["hp"]=415800000, ["atk"]=4570000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5379,7 +5379,7 @@ local monster_chapter = { }, [40801]={ ["monster_base"]=10050, - ["hp"]=480870000, + ["hp"]=457300000, ["atk"]=4750000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5391,7 +5391,7 @@ local monster_chapter = { }, [40901]={ ["monster_base"]=10040, - ["hp"]=525150000, + ["hp"]=498900000, ["atk"]=4900000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5404,7 +5404,7 @@ local monster_chapter = { [41001]={ ["monster_base"]=30015, ["is_boss"]=2, - ["hp"]=828360000, + ["hp"]=788900000, ["atk"]=6640000, ["atk_times"]=4, ["hurt_skill"]={ @@ -5420,7 +5420,7 @@ local monster_chapter = { }, [41101]={ ["monster_base"]=10043, - ["hp"]=87310000, + ["hp"]=73900000, ["atk"]=2690000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5432,7 +5432,7 @@ local monster_chapter = { }, [41201]={ ["monster_base"]=10054, - ["hp"]=120420000, + ["hp"]=103500000, ["atk"]=2870000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5444,7 +5444,7 @@ local monster_chapter = { }, [41301]={ ["monster_base"]=10038, - ["hp"]=135370000, + ["hp"]=116700000, ["atk"]=2990000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5456,7 +5456,7 @@ local monster_chapter = { }, [41401]={ ["monster_base"]=10053, - ["hp"]=179690000, + ["hp"]=155000000, ["atk"]=3110000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5469,7 +5469,7 @@ local monster_chapter = { [41501]={ ["monster_base"]=20010, ["is_boss"]=1, - ["hp"]=248580000, + ["hp"]=214800000, ["atk"]=3570000, ["atk_times"]=4, ["hurt_skill"]={ @@ -5490,7 +5490,7 @@ local monster_chapter = { }, [41601]={ ["monster_base"]=10038, - ["hp"]=170350000, + ["hp"]=146600000, ["atk"]=3280000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5502,7 +5502,7 @@ local monster_chapter = { }, [41701]={ ["monster_base"]=10053, - ["hp"]=188770000, + ["hp"]=163300000, ["atk"]=3710000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5514,7 +5514,7 @@ local monster_chapter = { }, [41801]={ ["monster_base"]=10006, - ["hp"]=218140000, + ["hp"]=189400000, ["atk"]=3430000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5526,7 +5526,7 @@ local monster_chapter = { }, [41901]={ ["monster_base"]=10004, - ["hp"]=248580000, + ["hp"]=214800000, ["atk"]=3860000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5539,7 +5539,7 @@ local monster_chapter = { [42001]={ ["monster_base"]=20004, ["is_boss"]=1, - ["hp"]=466180000, + ["hp"]=445500000, ["atk"]=4270000, ["atk_times"]=4, ["hurt_skill"]={ @@ -5554,7 +5554,7 @@ local monster_chapter = { }, [42101]={ ["monster_base"]=10052, - ["hp"]=270470000, + ["hp"]=257600000, ["atk"]=4010000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5566,7 +5566,7 @@ local monster_chapter = { }, [42201]={ ["monster_base"]=10050, - ["hp"]=305980000, + ["hp"]=292100000, ["atk"]=4120000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5578,7 +5578,7 @@ local monster_chapter = { }, [42301]={ ["monster_base"]=10010, - ["hp"]=324140000, + ["hp"]=309200000, ["atk"]=4270000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5590,7 +5590,7 @@ local monster_chapter = { }, [42401]={ ["monster_base"]=10039, - ["hp"]=351370000, + ["hp"]=334400000, ["atk"]=4470000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5603,7 +5603,7 @@ local monster_chapter = { [42501]={ ["monster_base"]=20005, ["is_boss"]=1, - ["hp"]=634930000, + ["hp"]=607500000, ["atk"]=4470000, ["atk_times"]=4, ["hurt_skill"]={ @@ -5621,7 +5621,7 @@ local monster_chapter = { }, [42601]={ ["monster_base"]=10040, - ["hp"]=421330000, + ["hp"]=402700000, ["atk"]=4620000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5633,7 +5633,7 @@ local monster_chapter = { }, [42701]={ ["monster_base"]=10010, - ["hp"]=449090000, + ["hp"]=428200000, ["atk"]=4710000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5645,7 +5645,7 @@ local monster_chapter = { }, [42801]={ ["monster_base"]=10040, - ["hp"]=492620000, + ["hp"]=471000000, ["atk"]=4900000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5657,7 +5657,7 @@ local monster_chapter = { }, [42901]={ ["monster_base"]=10009, - ["hp"]=538010000, + ["hp"]=513800000, ["atk"]=5050000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5670,7 +5670,7 @@ local monster_chapter = { [43001]={ ["monster_base"]=20024, ["is_boss"]=2, - ["hp"]=848790000, + ["hp"]=812400000, ["atk"]=6840000, ["atk_times"]=4, ["hurt_skill"]={ @@ -5689,7 +5689,7 @@ local monster_chapter = { }, [43101]={ ["monster_base"]=10009, - ["hp"]=91310000, + ["hp"]=76100000, ["atk"]=2770000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5701,7 +5701,7 @@ local monster_chapter = { }, [43201]={ ["monster_base"]=10054, - ["hp"]=125760000, + ["hp"]=106500000, ["atk"]=2960000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5713,7 +5713,7 @@ local monster_chapter = { }, [43301]={ ["monster_base"]=10052, - ["hp"]=141240000, + ["hp"]=120100000, ["atk"]=3080000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5725,7 +5725,7 @@ local monster_chapter = { }, [43401]={ ["monster_base"]=10050, - ["hp"]=187430000, + ["hp"]=159500000, ["atk"]=3200000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5738,7 +5738,7 @@ local monster_chapter = { [43501]={ ["monster_base"]=20008, ["is_boss"]=1, - ["hp"]=259260000, + ["hp"]=221100000, ["atk"]=3680000, ["atk_times"]=4, ["hurt_skill"]={ @@ -5756,7 +5756,7 @@ local monster_chapter = { }, [43601]={ ["monster_base"]=10044, - ["hp"]=177820000, + ["hp"]=150900000, ["atk"]=3380000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5768,7 +5768,7 @@ local monster_chapter = { }, [43701]={ ["monster_base"]=10054, - ["hp"]=197050000, + ["hp"]=168100000, ["atk"]=3820000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5780,7 +5780,7 @@ local monster_chapter = { }, [43801]={ ["monster_base"]=10014, - ["hp"]=227750000, + ["hp"]=194900000, ["atk"]=3530000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5792,7 +5792,7 @@ local monster_chapter = { }, [43901]={ ["monster_base"]=10018, - ["hp"]=259260000, + ["hp"]=221100000, ["atk"]=3980000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5805,7 +5805,7 @@ local monster_chapter = { [44001]={ ["monster_base"]=20014, ["is_boss"]=1, - ["hp"]=486210000, + ["hp"]=458400000, ["atk"]=4400000, ["atk_times"]=4, ["hurt_skill"]={ @@ -5823,7 +5823,7 @@ local monster_chapter = { }, [44101]={ ["monster_base"]=10009, - ["hp"]=282220000, + ["hp"]=265100000, ["atk"]=4130000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5835,7 +5835,7 @@ local monster_chapter = { }, [44201]={ ["monster_base"]=10010, - ["hp"]=319330000, + ["hp"]=300600000, ["atk"]=4240000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5847,7 +5847,7 @@ local monster_chapter = { }, [44301]={ ["monster_base"]=10053, - ["hp"]=338290000, + ["hp"]=318200000, ["atk"]=4400000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5859,7 +5859,7 @@ local monster_chapter = { }, [44401]={ ["monster_base"]=10039, - ["hp"]=366590000, + ["hp"]=344100000, ["atk"]=4600000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5872,7 +5872,7 @@ local monster_chapter = { [44501]={ ["monster_base"]=20012, ["is_boss"]=1, - ["hp"]=662430000, + ["hp"]=625100000, ["atk"]=4600000, ["atk_times"]=4, ["hurt_skill"]={ @@ -5887,7 +5887,7 @@ local monster_chapter = { }, [44601]={ ["monster_base"]=10052, - ["hp"]=439480000, + ["hp"]=414400000, ["atk"]=4760000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5899,7 +5899,7 @@ local monster_chapter = { }, [44701]={ ["monster_base"]=10043, - ["hp"]=468590000, + ["hp"]=440600000, ["atk"]=4850000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5911,7 +5911,7 @@ local monster_chapter = { }, [44801]={ ["monster_base"]=10054, - ["hp"]=513980000, + ["hp"]=484700000, ["atk"]=5050000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5923,7 +5923,7 @@ local monster_chapter = { }, [44901]={ ["monster_base"]=10050, - ["hp"]=561230000, + ["hp"]=528700000, ["atk"]=5200000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5936,7 +5936,7 @@ local monster_chapter = { [45001]={ ["monster_base"]=20019, ["is_boss"]=2, - ["hp"]=708290000, + ["hp"]=668720000, ["atk"]=6330000, ["atk_times"]=4, ["hurt_skill"]={ @@ -5956,7 +5956,7 @@ local monster_chapter = { [45091]={ ["monster_base"]=20010, ["is_boss"]=1, - ["hp"]=531220000, + ["hp"]=501540000, ["atk"]=5630000, ["atk_times"]=4, ["hurt_skill"]={ @@ -5977,7 +5977,7 @@ local monster_chapter = { }, [45101]={ ["monster_base"]=10046, - ["hp"]=92140000, + ["hp"]=78300000, ["atk"]=2850000, ["atk_times"]=3, ["hurt_skill"]={ @@ -5989,7 +5989,7 @@ local monster_chapter = { }, [45201]={ ["monster_base"]=10043, - ["hp"]=126720000, + ["hp"]=109500000, ["atk"]=3050000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6001,7 +6001,7 @@ local monster_chapter = { }, [45301]={ ["monster_base"]=10050, - ["hp"]=142300000, + ["hp"]=123500000, ["atk"]=3170000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6013,7 +6013,7 @@ local monster_chapter = { }, [45401]={ ["monster_base"]=10054, - ["hp"]=188760000, + ["hp"]=164000000, ["atk"]=3290000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6026,7 +6026,7 @@ local monster_chapter = { [45501]={ ["monster_base"]=20010, ["is_boss"]=1, - ["hp"]=261100000, + ["hp"]=227400000, ["atk"]=3790000, ["atk_times"]=4, ["hurt_skill"]={ @@ -6047,7 +6047,7 @@ local monster_chapter = { }, [45601]={ ["monster_base"]=10052, - ["hp"]=179260000, + ["hp"]=155200000, ["atk"]=3480000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6059,7 +6059,7 @@ local monster_chapter = { }, [45701]={ ["monster_base"]=10045, - ["hp"]=198530000, + ["hp"]=172900000, ["atk"]=3930000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6071,7 +6071,7 @@ local monster_chapter = { }, [45801]={ ["monster_base"]=10043, - ["hp"]=229420000, + ["hp"]=200400000, ["atk"]=3630000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6083,7 +6083,7 @@ local monster_chapter = { }, [45901]={ ["monster_base"]=10053, - ["hp"]=261100000, + ["hp"]=227400000, ["atk"]=4100000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6096,7 +6096,7 @@ local monster_chapter = { [46001]={ ["monster_base"]=20005, ["is_boss"]=1, - ["hp"]=489720000, + ["hp"]=471300000, ["atk"]=4530000, ["atk_times"]=4, ["hurt_skill"]={ @@ -6114,7 +6114,7 @@ local monster_chapter = { }, [46101]={ ["monster_base"]=10045, - ["hp"]=284330000, + ["hp"]=272600000, ["atk"]=4250000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6126,7 +6126,7 @@ local monster_chapter = { }, [46201]={ ["monster_base"]=10052, - ["hp"]=321550000, + ["hp"]=309100000, ["atk"]=4360000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6138,7 +6138,7 @@ local monster_chapter = { }, [46301]={ ["monster_base"]=10010, - ["hp"]=340820000, + ["hp"]=327200000, ["atk"]=4530000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6150,7 +6150,7 @@ local monster_chapter = { }, [46401]={ ["monster_base"]=10039, - ["hp"]=369340000, + ["hp"]=353800000, ["atk"]=4730000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6163,7 +6163,7 @@ local monster_chapter = { [46501]={ ["monster_base"]=20012, ["is_boss"]=1, - ["hp"]=667130000, + ["hp"]=642700000, ["atk"]=4730000, ["atk_times"]=4, ["hurt_skill"]={ @@ -6178,7 +6178,7 @@ local monster_chapter = { }, [46601]={ ["monster_base"]=10050, - ["hp"]=442730000, + ["hp"]=426100000, ["atk"]=4900000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6190,7 +6190,7 @@ local monster_chapter = { }, [46701]={ ["monster_base"]=10043, - ["hp"]=472030000, + ["hp"]=453000000, ["atk"]=4990000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6202,7 +6202,7 @@ local monster_chapter = { }, [46801]={ ["monster_base"]=10046, - ["hp"]=517700000, + ["hp"]=498400000, ["atk"]=5200000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6214,7 +6214,7 @@ local monster_chapter = { }, [46901]={ ["monster_base"]=10054, - ["hp"]=565220000, + ["hp"]=543600000, ["atk"]=5350000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6227,7 +6227,7 @@ local monster_chapter = { [47001]={ ["monster_base"]=20020, ["is_boss"]=2, - ["hp"]=713220000, + ["hp"]=687520000, ["atk"]=6510000, ["atk_times"]=4, ["hurt_skill"]={ @@ -6247,7 +6247,7 @@ local monster_chapter = { [47091]={ ["monster_base"]=20010, ["is_boss"]=1, - ["hp"]=534910000, + ["hp"]=515640000, ["atk"]=5790000, ["atk_times"]=4, ["hurt_skill"]={ @@ -6268,7 +6268,7 @@ local monster_chapter = { }, [47101]={ ["monster_base"]=10047, - ["hp"]=94250000, + ["hp"]=80700000, ["atk"]=2940000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6280,7 +6280,7 @@ local monster_chapter = { }, [47201]={ ["monster_base"]=10038, - ["hp"]=129620000, + ["hp"]=112900000, ["atk"]=3150000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6292,7 +6292,7 @@ local monster_chapter = { }, [47301]={ ["monster_base"]=10021, - ["hp"]=145730000, + ["hp"]=127300000, ["atk"]=3270000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6304,7 +6304,7 @@ local monster_chapter = { }, [47401]={ ["monster_base"]=10040, - ["hp"]=193250000, + ["hp"]=169000000, ["atk"]=3390000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6317,7 +6317,7 @@ local monster_chapter = { [47501]={ ["monster_base"]=20017, ["is_boss"]=1, - ["hp"]=267170000, + ["hp"]=234400000, ["atk"]=3910000, ["atk_times"]=4, ["hurt_skill"]={ @@ -6332,7 +6332,7 @@ local monster_chapter = { }, [47601]={ ["monster_base"]=10010, - ["hp"]=183480000, + ["hp"]=160000000, ["atk"]=3590000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6344,7 +6344,7 @@ local monster_chapter = { }, [47701]={ ["monster_base"]=10039, - ["hp"]=203020000, + ["hp"]=178200000, ["atk"]=4050000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6356,7 +6356,7 @@ local monster_chapter = { }, [47801]={ ["monster_base"]=10040, - ["hp"]=234700000, + ["hp"]=206500000, ["atk"]=3740000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6368,7 +6368,7 @@ local monster_chapter = { }, [47901]={ ["monster_base"]=10009, - ["hp"]=267170000, + ["hp"]=234400000, ["atk"]=4230000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6381,7 +6381,7 @@ local monster_chapter = { [48001]={ ["monster_base"]=20024, ["is_boss"]=1, - ["hp"]=500810000, + ["hp"]=485700000, ["atk"]=4670000, ["atk_times"]=4, ["hurt_skill"]={ @@ -6400,7 +6400,7 @@ local monster_chapter = { }, [48101]={ ["monster_base"]=10052, - ["hp"]=290930000, + ["hp"]=280900000, ["atk"]=4380000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6412,7 +6412,7 @@ local monster_chapter = { }, [48201]={ ["monster_base"]=10043, - ["hp"]=328940000, + ["hp"]=318500000, ["atk"]=4500000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6424,7 +6424,7 @@ local monster_chapter = { }, [48301]={ ["monster_base"]=10050, - ["hp"]=348740000, + ["hp"]=337200000, ["atk"]=4670000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6436,7 +6436,7 @@ local monster_chapter = { }, [48401]={ ["monster_base"]=10054, - ["hp"]=377780000, + ["hp"]=364600000, ["atk"]=4880000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6449,7 +6449,7 @@ local monster_chapter = { [48501]={ ["monster_base"]=20019, ["is_boss"]=1, - ["hp"]=682180000, + ["hp"]=662300000, ["atk"]=4880000, ["atk_times"]=4, ["hurt_skill"]={ @@ -6467,7 +6467,7 @@ local monster_chapter = { }, [48601]={ ["monster_base"]=10029, - ["hp"]=452760000, + ["hp"]=439100000, ["atk"]=5050000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6479,7 +6479,7 @@ local monster_chapter = { }, [48701]={ ["monster_base"]=10050, - ["hp"]=482860000, + ["hp"]=466800000, ["atk"]=5150000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6491,7 +6491,7 @@ local monster_chapter = { }, [48801]={ ["monster_base"]=10043, - ["hp"]=529580000, + ["hp"]=513600000, ["atk"]=5360000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6503,7 +6503,7 @@ local monster_chapter = { }, [48901]={ ["monster_base"]=10028, - ["hp"]=578160000, + ["hp"]=560200000, ["atk"]=5520000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6516,7 +6516,7 @@ local monster_chapter = { [49001]={ ["monster_base"]=20013, ["is_boss"]=2, - ["hp"]=911860000, + ["hp"]=885500000, ["atk"]=7460000, ["atk_times"]=4, ["hurt_skill"]={ @@ -6532,7 +6532,7 @@ local monster_chapter = { }, [49101]={ ["monster_base"]=10052, - ["hp"]=98400000, + ["hp"]=83100000, ["atk"]=3030000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6544,7 +6544,7 @@ local monster_chapter = { }, [49201]={ ["monster_base"]=10045, - ["hp"]=135460000, + ["hp"]=116200000, ["atk"]=3250000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6556,7 +6556,7 @@ local monster_chapter = { }, [49301]={ ["monster_base"]=10043, - ["hp"]=152160000, + ["hp"]=131000000, ["atk"]=3370000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6568,7 +6568,7 @@ local monster_chapter = { }, [49401]={ ["monster_base"]=10053, - ["hp"]=201750000, + ["hp"]=173900000, ["atk"]=3490000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6581,7 +6581,7 @@ local monster_chapter = { [49501]={ ["monster_base"]=20005, ["is_boss"]=1, - ["hp"]=279010000, + ["hp"]=241200000, ["atk"]=4030000, ["atk_times"]=4, ["hurt_skill"]={ @@ -6599,7 +6599,7 @@ local monster_chapter = { }, [49601]={ ["monster_base"]=10010, - ["hp"]=191570000, + ["hp"]=164700000, ["atk"]=3700000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6611,7 +6611,7 @@ local monster_chapter = { }, [49701]={ ["monster_base"]=10039, - ["hp"]=211930000, + ["hp"]=183400000, ["atk"]=4170000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6623,7 +6623,7 @@ local monster_chapter = { }, [49801]={ ["monster_base"]=10040, - ["hp"]=245080000, + ["hp"]=212500000, ["atk"]=3850000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6635,7 +6635,7 @@ local monster_chapter = { }, [49901]={ ["monster_base"]=10009, - ["hp"]=279010000, + ["hp"]=241200000, ["atk"]=4360000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6648,7 +6648,7 @@ local monster_chapter = { [50001]={ ["monster_base"]=20024, ["is_boss"]=1, - ["hp"]=522780000, + ["hp"]=499800000, ["atk"]=4810000, ["atk_times"]=4, ["hurt_skill"]={ @@ -6667,7 +6667,7 @@ local monster_chapter = { }, [50101]={ ["monster_base"]=10040, - ["hp"]=303800000, + ["hp"]=289100000, ["atk"]=4510000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6679,7 +6679,7 @@ local monster_chapter = { }, [50201]={ ["monster_base"]=10039, - ["hp"]=343480000, + ["hp"]=327700000, ["atk"]=4640000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6691,7 +6691,7 @@ local monster_chapter = { }, [50301]={ ["monster_base"]=10010, - ["hp"]=364100000, + ["hp"]=347000000, ["atk"]=4810000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6703,7 +6703,7 @@ local monster_chapter = { }, [50401]={ ["monster_base"]=10039, - ["hp"]=394370000, + ["hp"]=375200000, ["atk"]=5030000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6716,7 +6716,7 @@ local monster_chapter = { [50501]={ ["monster_base"]=20012, ["is_boss"]=1, - ["hp"]=712010000, + ["hp"]=681500000, ["atk"]=5030000, ["atk_times"]=4, ["hurt_skill"]={ @@ -6731,7 +6731,7 @@ local monster_chapter = { }, [50601]={ ["monster_base"]=10010, - ["hp"]=472670000, + ["hp"]=451800000, ["atk"]=5200000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6743,7 +6743,7 @@ local monster_chapter = { }, [50701]={ ["monster_base"]=10040, - ["hp"]=503990000, + ["hp"]=480300000, ["atk"]=5310000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6755,7 +6755,7 @@ local monster_chapter = { }, [50801]={ ["monster_base"]=10038, - ["hp"]=552800000, + ["hp"]=528500000, ["atk"]=5520000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6767,7 +6767,7 @@ local monster_chapter = { }, [50901]={ ["monster_base"]=10032, - ["hp"]=603430000, + ["hp"]=576400000, ["atk"]=5690000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6780,7 +6780,7 @@ local monster_chapter = { [51001]={ ["monster_base"]=20018, ["is_boss"]=2, - ["hp"]=951870000, + ["hp"]=911100000, ["atk"]=7680000, ["atk_times"]=4, ["hurt_skill"]={ @@ -6799,7 +6799,7 @@ local monster_chapter = { }, [51101]={ ["monster_base"]=10033, - ["hp"]=100490000, + ["hp"]=85500000, ["atk"]=3120000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6811,7 +6811,7 @@ local monster_chapter = { }, [51201]={ ["monster_base"]=10029, - ["hp"]=138070000, + ["hp"]=119600000, ["atk"]=3350000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6823,7 +6823,7 @@ local monster_chapter = { }, [51301]={ ["monster_base"]=10031, - ["hp"]=155030000, + ["hp"]=134800000, ["atk"]=3470000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6835,7 +6835,7 @@ local monster_chapter = { }, [51401]={ ["monster_base"]=10028, - ["hp"]=205670000, + ["hp"]=178900000, ["atk"]=3590000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6848,7 +6848,7 @@ local monster_chapter = { [51501]={ ["monster_base"]=20013, ["is_boss"]=1, - ["hp"]=284490000, + ["hp"]=248200000, ["atk"]=4150000, ["atk_times"]=4, ["hurt_skill"]={ @@ -6864,7 +6864,7 @@ local monster_chapter = { }, [51601]={ ["monster_base"]=10030, - ["hp"]=195230000, + ["hp"]=169500000, ["atk"]=3810000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6876,7 +6876,7 @@ local monster_chapter = { }, [51701]={ ["monster_base"]=10029, - ["hp"]=216110000, + ["hp"]=188700000, ["atk"]=4290000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6888,7 +6888,7 @@ local monster_chapter = { }, [51801]={ ["monster_base"]=10033, - ["hp"]=249780000, + ["hp"]=218600000, ["atk"]=3960000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6900,7 +6900,7 @@ local monster_chapter = { }, [51901]={ ["monster_base"]=10054, - ["hp"]=284490000, + ["hp"]=248200000, ["atk"]=4490000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6913,7 +6913,7 @@ local monster_chapter = { [52001]={ ["monster_base"]=20010, ["is_boss"]=1, - ["hp"]=532700000, + ["hp"]=514200000, ["atk"]=4950000, ["atk_times"]=4, ["hurt_skill"]={ @@ -6934,7 +6934,7 @@ local monster_chapter = { }, [52101]={ ["monster_base"]=10053, - ["hp"]=309550000, + ["hp"]=297400000, ["atk"]=4640000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6946,7 +6946,7 @@ local monster_chapter = { }, [52201]={ ["monster_base"]=10033, - ["hp"]=350000000, + ["hp"]=337100000, ["atk"]=4780000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6958,7 +6958,7 @@ local monster_chapter = { }, [52301]={ ["monster_base"]=10029, - ["hp"]=371140000, + ["hp"]=357000000, ["atk"]=4950000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6970,7 +6970,7 @@ local monster_chapter = { }, [52401]={ ["monster_base"]=10054, - ["hp"]=401940000, + ["hp"]=386000000, ["atk"]=5180000, ["atk_times"]=3, ["hurt_skill"]={ @@ -6983,7 +6983,7 @@ local monster_chapter = { [52501]={ ["monster_base"]=20020, ["is_boss"]=1, - ["hp"]=725580000, + ["hp"]=701100000, ["atk"]=5180000, ["atk_times"]=4, ["hurt_skill"]={ @@ -7001,7 +7001,7 @@ local monster_chapter = { }, [52601]={ ["monster_base"]=10053, - ["hp"]=481550000, + ["hp"]=464800000, ["atk"]=5350000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7013,7 +7013,7 @@ local monster_chapter = { }, [52701]={ ["monster_base"]=10028, - ["hp"]=513650000, + ["hp"]=494100000, ["atk"]=5470000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7025,7 +7025,7 @@ local monster_chapter = { }, [52801]={ ["monster_base"]=10046, - ["hp"]=563240000, + ["hp"]=543700000, ["atk"]=5680000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7037,7 +7037,7 @@ local monster_chapter = { }, [52901]={ ["monster_base"]=10058, - ["hp"]=614920000, + ["hp"]=593000000, ["atk"]=5860000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7050,7 +7050,7 @@ local monster_chapter = { [53001]={ ["monster_base"]=20032, ["is_boss"]=2, - ["hp"]=969880000, + ["hp"]=937200000, ["atk"]=7900000, ["atk_times"]=4, ["hurt_skill"]={ @@ -7072,7 +7072,7 @@ local monster_chapter = { }, [53101]={ ["monster_base"]=10057, - ["hp"]=102570000, + ["hp"]=87900000, ["atk"]=3210000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7084,7 +7084,7 @@ local monster_chapter = { }, [53201]={ ["monster_base"]=10046, - ["hp"]=140940000, + ["hp"]=122900000, ["atk"]=3450000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7096,7 +7096,7 @@ local monster_chapter = { }, [53301]={ ["monster_base"]=10052, - ["hp"]=158170000, + ["hp"]=138500000, ["atk"]=3570000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7108,7 +7108,7 @@ local monster_chapter = { }, [53401]={ ["monster_base"]=10029, - ["hp"]=209840000, + ["hp"]=183800000, ["atk"]=3690000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7121,7 +7121,7 @@ local monster_chapter = { [53501]={ ["monster_base"]=20008, ["is_boss"]=1, - ["hp"]=290230000, + ["hp"]=255000000, ["atk"]=4270000, ["atk_times"]=4, ["hurt_skill"]={ @@ -7139,7 +7139,7 @@ local monster_chapter = { }, [53601]={ ["monster_base"]=10058, - ["hp"]=199140000, + ["hp"]=174200000, ["atk"]=3920000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7151,7 +7151,7 @@ local monster_chapter = { }, [53701]={ ["monster_base"]=10033, - ["hp"]=220550000, + ["hp"]=193900000, ["atk"]=4410000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7163,7 +7163,7 @@ local monster_chapter = { }, [53801]={ ["monster_base"]=10044, - ["hp"]=255000000, + ["hp"]=224600000, ["atk"]=4070000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7175,7 +7175,7 @@ local monster_chapter = { }, [53901]={ ["monster_base"]=10053, - ["hp"]=290230000, + ["hp"]=255000000, ["atk"]=4620000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7188,7 +7188,7 @@ local monster_chapter = { [54001]={ ["monster_base"]=20011, ["is_boss"]=1, - ["hp"]=543400000, + ["hp"]=528300000, ["atk"]=5090000, ["atk_times"]=4, ["hurt_skill"]={ @@ -7203,7 +7203,7 @@ local monster_chapter = { }, [54101]={ ["monster_base"]=10029, - ["hp"]=315810000, + ["hp"]=305600000, ["atk"]=4770000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7215,7 +7215,7 @@ local monster_chapter = { }, [54201]={ ["monster_base"]=10058, - ["hp"]=357050000, + ["hp"]=346300000, ["atk"]=4920000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7227,7 +7227,7 @@ local monster_chapter = { }, [54301]={ ["monster_base"]=10052, - ["hp"]=378710000, + ["hp"]=366800000, ["atk"]=5090000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7239,7 +7239,7 @@ local monster_chapter = { }, [54401]={ ["monster_base"]=10054, - ["hp"]=410030000, + ["hp"]=396600000, ["atk"]=5330000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7252,7 +7252,7 @@ local monster_chapter = { [54501]={ ["monster_base"]=20005, ["is_boss"]=1, - ["hp"]=740200000, + ["hp"]=720300000, ["atk"]=5330000, ["atk_times"]=4, ["hurt_skill"]={ @@ -7270,7 +7270,7 @@ local monster_chapter = { }, [54601]={ ["monster_base"]=10053, - ["hp"]=491200000, + ["hp"]=477500000, ["atk"]=5500000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7282,7 +7282,7 @@ local monster_chapter = { }, [54701]={ ["monster_base"]=10028, - ["hp"]=524090000, + ["hp"]=507600000, ["atk"]=5630000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7294,7 +7294,7 @@ local monster_chapter = { }, [54801]={ ["monster_base"]=10046, - ["hp"]=574720000, + ["hp"]=558600000, ["atk"]=5840000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7306,7 +7306,7 @@ local monster_chapter = { }, [54901]={ ["monster_base"]=10057, - ["hp"]=627440000, + ["hp"]=609200000, ["atk"]=6030000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7319,7 +7319,7 @@ local monster_chapter = { [55001]={ ["monster_base"]=20032, ["is_boss"]=2, - ["hp"]=791560000, + ["hp"]=770240000, ["atk"]=7300000, ["atk_times"]=4, ["hurt_skill"]={ @@ -7343,7 +7343,7 @@ local monster_chapter = { [55101]={ ["monster_base"]=20030, ["is_boss"]=2, - ["hp"]=593670000, + ["hp"]=577680000, ["atk"]=6490000, ["atk_times"]=4, ["hurt_skill"]={ @@ -7362,7 +7362,7 @@ local monster_chapter = { }, [55201]={ ["monster_base"]=10056, - ["hp"]=106340000, + ["hp"]=90300000, ["atk"]=3300000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7374,7 +7374,7 @@ local monster_chapter = { }, [55301]={ ["monster_base"]=10009, - ["hp"]=145860000, + ["hp"]=126300000, ["atk"]=3550000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7386,7 +7386,7 @@ local monster_chapter = { }, [55401]={ ["monster_base"]=10010, - ["hp"]=163710000, + ["hp"]=142300000, ["atk"]=3670000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7398,7 +7398,7 @@ local monster_chapter = { }, [55501]={ ["monster_base"]=10039, - ["hp"]=217260000, + ["hp"]=188800000, ["atk"]=3790000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7411,7 +7411,7 @@ local monster_chapter = { [55601]={ ["monster_base"]=20012, ["is_boss"]=1, - ["hp"]=300390000, + ["hp"]=262000000, ["atk"]=4390000, ["atk_times"]=4, ["hurt_skill"]={ @@ -7426,7 +7426,7 @@ local monster_chapter = { }, [55701]={ ["monster_base"]=10009, - ["hp"]=206040000, + ["hp"]=179000000, ["atk"]=4030000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7438,7 +7438,7 @@ local monster_chapter = { }, [55801]={ ["monster_base"]=10055, - ["hp"]=228230000, + ["hp"]=199200000, ["atk"]=4530000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7450,7 +7450,7 @@ local monster_chapter = { }, [55901]={ ["monster_base"]=10046, - ["hp"]=263930000, + ["hp"]=230700000, ["atk"]=4180000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7462,7 +7462,7 @@ local monster_chapter = { }, [56001]={ ["monster_base"]=10057, - ["hp"]=300390000, + ["hp"]=262000000, ["atk"]=4750000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7475,7 +7475,7 @@ local monster_chapter = { [56101]={ ["monster_base"]=20030, ["is_boss"]=1, - ["hp"]=562280000, + ["hp"]=542700000, ["atk"]=5230000, ["atk_times"]=4, ["hurt_skill"]={ @@ -7494,7 +7494,7 @@ local monster_chapter = { }, [56201]={ ["monster_base"]=10058, - ["hp"]=326910000, + ["hp"]=313900000, ["atk"]=4900000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7506,7 +7506,7 @@ local monster_chapter = { }, [56301]={ ["monster_base"]=10051, - ["hp"]=369500000, + ["hp"]=355700000, ["atk"]=5060000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7518,7 +7518,7 @@ local monster_chapter = { }, [56401]={ ["monster_base"]=10053, - ["hp"]=391940000, + ["hp"]=376800000, ["atk"]=5230000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7530,7 +7530,7 @@ local monster_chapter = { }, [56501]={ ["monster_base"]=10055, - ["hp"]=424320000, + ["hp"]=407400000, ["atk"]=5480000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7543,7 +7543,7 @@ local monster_chapter = { [56601]={ ["monster_base"]=20029, ["is_boss"]=1, - ["hp"]=766020000, + ["hp"]=739900000, ["atk"]=5480000, ["atk_times"]=4, ["hurt_skill"]={ @@ -7561,7 +7561,7 @@ local monster_chapter = { }, [56701]={ ["monster_base"]=10058, - ["hp"]=508220000, + ["hp"]=490500000, ["atk"]=5650000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7573,7 +7573,7 @@ local monster_chapter = { }, [56801]={ ["monster_base"]=10051, - ["hp"]=542390000, + ["hp"]=521400000, ["atk"]=5790000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7585,7 +7585,7 @@ local monster_chapter = { }, [56901]={ ["monster_base"]=10055, - ["hp"]=594660000, + ["hp"]=573800000, ["atk"]=6000000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7597,7 +7597,7 @@ local monster_chapter = { }, [57001]={ ["monster_base"]=10057, - ["hp"]=649230000, + ["hp"]=625800000, ["atk"]=6200000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7610,7 +7610,7 @@ local monster_chapter = { [57101]={ ["monster_base"]=20031, ["is_boss"]=2, - ["hp"]=1023830000, + ["hp"]=988900000, ["atk"]=8340000, ["atk_times"]=4, ["hurt_skill"]={ @@ -7631,7 +7631,7 @@ local monster_chapter = { }, [57201]={ ["monster_base"]=10060, - ["hp"]=110420000, + ["hp"]=92900000, ["atk"]=3400000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7643,7 +7643,7 @@ local monster_chapter = { }, [57301]={ ["monster_base"]=10046, - ["hp"]=151470000, + ["hp"]=129900000, ["atk"]=3660000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7655,7 +7655,7 @@ local monster_chapter = { }, [57401]={ ["monster_base"]=10061, - ["hp"]=169830000, + ["hp"]=146400000, ["atk"]=3780000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7667,7 +7667,7 @@ local monster_chapter = { }, [57501]={ ["monster_base"]=10052, - ["hp"]=225420000, + ["hp"]=194200000, ["atk"]=3900000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7680,7 +7680,7 @@ local monster_chapter = { [57601]={ ["monster_base"]=20017, ["is_boss"]=1, - ["hp"]=311610000, + ["hp"]=269500000, ["atk"]=4520000, ["atk_times"]=4, ["hurt_skill"]={ @@ -7695,7 +7695,7 @@ local monster_chapter = { }, [57701]={ ["monster_base"]=10023, - ["hp"]=213690000, + ["hp"]=184200000, ["atk"]=4150000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7707,7 +7707,7 @@ local monster_chapter = { }, [57801]={ ["monster_base"]=10060, - ["hp"]=236900000, + ["hp"]=204900000, ["atk"]=4660000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7719,7 +7719,7 @@ local monster_chapter = { }, [57901]={ ["monster_base"]=10057, - ["hp"]=273870000, + ["hp"]=237300000, ["atk"]=4300000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7731,7 +7731,7 @@ local monster_chapter = { }, [58001]={ ["monster_base"]=10055, - ["hp"]=311610000, + ["hp"]=269500000, ["atk"]=4890000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7744,7 +7744,7 @@ local monster_chapter = { [58101]={ ["monster_base"]=20031, ["is_boss"]=1, - ["hp"]=583190000, + ["hp"]=558200000, ["atk"]=5380000, ["atk_times"]=4, ["hurt_skill"]={ @@ -7765,7 +7765,7 @@ local monster_chapter = { }, [58201]={ ["monster_base"]=10047, - ["hp"]=339150000, + ["hp"]=322900000, ["atk"]=5040000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7777,7 +7777,7 @@ local monster_chapter = { }, [58301]={ ["monster_base"]=10052, - ["hp"]=383270000, + ["hp"]=365900000, ["atk"]=5210000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7789,7 +7789,7 @@ local monster_chapter = { }, [58401]={ ["monster_base"]=10027, - ["hp"]=406730000, + ["hp"]=387600000, ["atk"]=5380000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7801,7 +7801,7 @@ local monster_chapter = { }, [58501]={ ["monster_base"]=10061, - ["hp"]=440130000, + ["hp"]=419100000, ["atk"]=5640000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7814,7 +7814,7 @@ local monster_chapter = { [58601]={ ["monster_base"]=20029, ["is_boss"]=1, - ["hp"]=794580000, + ["hp"]=761000000, ["atk"]=5640000, ["atk_times"]=4, ["hurt_skill"]={ @@ -7832,7 +7832,7 @@ local monster_chapter = { }, [58701]={ ["monster_base"]=10051, - ["hp"]=527090000, + ["hp"]=504500000, ["atk"]=5820000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7844,7 +7844,7 @@ local monster_chapter = { }, [58801]={ ["monster_base"]=10027, - ["hp"]=562530000, + ["hp"]=536300000, ["atk"]=5960000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7856,7 +7856,7 @@ local monster_chapter = { }, [58901]={ ["monster_base"]=10052, - ["hp"]=616850000, + ["hp"]=590200000, ["atk"]=6180000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7868,7 +7868,7 @@ local monster_chapter = { }, [59001]={ ["monster_base"]=10061, - ["hp"]=673460000, + ["hp"]=643700000, ["atk"]=6380000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7881,7 +7881,7 @@ local monster_chapter = { [59101]={ ["monster_base"]=20034, ["is_boss"]=2, - ["hp"]=1062080000, + ["hp"]=1017100000, ["atk"]=8580000, ["atk_times"]=4, ["hurt_skill"]={ @@ -7901,7 +7901,7 @@ local monster_chapter = { }, [59201]={ ["monster_base"]=10060, - ["hp"]=114160000, + ["hp"]=98100000, ["atk"]=3590000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7913,7 +7913,7 @@ local monster_chapter = { }, [59301]={ ["monster_base"]=10027, - ["hp"]=156490000, + ["hp"]=137100000, ["atk"]=3870000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7925,7 +7925,7 @@ local monster_chapter = { }, [59401]={ ["monster_base"]=10051, - ["hp"]=175390000, + ["hp"]=154600000, ["atk"]=3990000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7937,7 +7937,7 @@ local monster_chapter = { }, [59501]={ ["monster_base"]=10055, - ["hp"]=232850000, + ["hp"]=205000000, ["atk"]=4120000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7950,7 +7950,7 @@ local monster_chapter = { [59601]={ ["monster_base"]=20019, ["is_boss"]=1, - ["hp"]=321800000, + ["hp"]=284500000, ["atk"]=4780000, ["atk_times"]=4, ["hurt_skill"]={ @@ -7968,7 +7968,7 @@ local monster_chapter = { }, [59701]={ ["monster_base"]=10057, - ["hp"]=220750000, + ["hp"]=194500000, ["atk"]=4380000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7980,7 +7980,7 @@ local monster_chapter = { }, [59801]={ ["monster_base"]=10027, - ["hp"]=244690000, + ["hp"]=216300000, ["atk"]=4920000, ["atk_times"]=3, ["hurt_skill"]={ @@ -7992,7 +7992,7 @@ local monster_chapter = { }, [59901]={ ["monster_base"]=10052, - ["hp"]=283000000, + ["hp"]=250500000, ["atk"]=4540000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8004,7 +8004,7 @@ local monster_chapter = { }, [60001]={ ["monster_base"]=10061, - ["hp"]=321800000, + ["hp"]=284500000, ["atk"]=5170000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8017,7 +8017,7 @@ local monster_chapter = { [60101]={ ["monster_base"]=20034, ["is_boss"]=1, - ["hp"]=602280000, + ["hp"]=589200000, ["atk"]=5680000, ["atk_times"]=4, ["hurt_skill"]={ @@ -8037,7 +8037,7 @@ local monster_chapter = { }, [60201]={ ["monster_base"]=10047, - ["hp"]=350280000, + ["hp"]=340800000, ["atk"]=5320000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8049,7 +8049,7 @@ local monster_chapter = { }, [60301]={ ["monster_base"]=10023, - ["hp"]=395890000, + ["hp"]=386200000, ["atk"]=5500000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8061,7 +8061,7 @@ local monster_chapter = { }, [60401]={ ["monster_base"]=10046, - ["hp"]=420080000, + ["hp"]=409100000, ["atk"]=5680000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8073,7 +8073,7 @@ local monster_chapter = { }, [60501]={ ["monster_base"]=10052, - ["hp"]=454610000, + ["hp"]=442400000, ["atk"]=5960000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8086,7 +8086,7 @@ local monster_chapter = { [60601]={ ["monster_base"]=20010, ["is_boss"]=1, - ["hp"]=820510000, + ["hp"]=803200000, ["atk"]=5960000, ["atk_times"]=4, ["hurt_skill"]={ @@ -8107,7 +8107,7 @@ local monster_chapter = { }, [60701]={ ["monster_base"]=10027, - ["hp"]=544320000, + ["hp"]=532500000, ["atk"]=6150000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8119,7 +8119,7 @@ local monster_chapter = { }, [60801]={ ["monster_base"]=10047, - ["hp"]=580860000, + ["hp"]=566100000, ["atk"]=6300000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8131,7 +8131,7 @@ local monster_chapter = { }, [60901]={ ["monster_base"]=10057, - ["hp"]=637060000, + ["hp"]=623000000, ["atk"]=6530000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8143,7 +8143,7 @@ local monster_chapter = { }, [61001]={ ["monster_base"]=10060, - ["hp"]=695520000, + ["hp"]=679400000, ["atk"]=6740000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8156,7 +8156,7 @@ local monster_chapter = { [61101]={ ["monster_base"]=20035, ["is_boss"]=2, - ["hp"]=1096700000, + ["hp"]=1073500000, ["atk"]=9060000, ["atk_times"]=4, ["hurt_skill"]={ @@ -8176,7 +8176,7 @@ local monster_chapter = { }, [61201]={ ["monster_base"]=10062, - ["hp"]=119020000, + ["hp"]=103300000, ["atk"]=3780000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8188,7 +8188,7 @@ local monster_chapter = { }, [61301]={ ["monster_base"]=10049, - ["hp"]=163100000, + ["hp"]=144300000, ["atk"]=4080000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8200,7 +8200,7 @@ local monster_chapter = { }, [61401]={ ["monster_base"]=10042, - ["hp"]=182770000, + ["hp"]=162800000, ["atk"]=4200000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8212,7 +8212,7 @@ local monster_chapter = { }, [61501]={ ["monster_base"]=10026, - ["hp"]=242530000, + ["hp"]=215800000, ["atk"]=4340000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8225,7 +8225,7 @@ local monster_chapter = { [61601]={ ["monster_base"]=20006, ["is_boss"]=1, - ["hp"]=335150000, + ["hp"]=299500000, ["atk"]=5040000, ["atk_times"]=4, ["hurt_skill"]={ @@ -8243,7 +8243,7 @@ local monster_chapter = { }, [61701]={ ["monster_base"]=10064, - ["hp"]=229830000, + ["hp"]=204800000, ["atk"]=4610000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8255,7 +8255,7 @@ local monster_chapter = { }, [61801]={ ["monster_base"]=10042, - ["hp"]=254730000, + ["hp"]=227700000, ["atk"]=5180000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8267,7 +8267,7 @@ local monster_chapter = { }, [61901]={ ["monster_base"]=10019, - ["hp"]=294820000, + ["hp"]=263700000, ["atk"]=4780000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8279,7 +8279,7 @@ local monster_chapter = { }, [62001]={ ["monster_base"]=10062, - ["hp"]=335150000, + ["hp"]=299500000, ["atk"]=5450000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8292,7 +8292,7 @@ local monster_chapter = { [62101]={ ["monster_base"]=20021, ["is_boss"]=1, - ["hp"]=626980000, + ["hp"]=620200000, ["atk"]=5980000, ["atk_times"]=4, ["hurt_skill"]={ @@ -8311,7 +8311,7 @@ local monster_chapter = { }, [62201]={ ["monster_base"]=10013, - ["hp"]=364790000, + ["hp"]=358700000, ["atk"]=5600000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8323,7 +8323,7 @@ local monster_chapter = { }, [62301]={ ["monster_base"]=10026, - ["hp"]=412340000, + ["hp"]=406500000, ["atk"]=5790000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8335,7 +8335,7 @@ local monster_chapter = { }, [62401]={ ["monster_base"]=10062, - ["hp"]=437490000, + ["hp"]=430600000, ["atk"]=5980000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8347,7 +8347,7 @@ local monster_chapter = { }, [62501]={ ["monster_base"]=10044, - ["hp"]=473350000, + ["hp"]=465700000, ["atk"]=6280000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8360,7 +8360,7 @@ local monster_chapter = { [62601]={ ["monster_base"]=20016, ["is_boss"]=1, - ["hp"]=854320000, + ["hp"]=845400000, ["atk"]=6280000, ["atk_times"]=4, ["hurt_skill"]={ @@ -8379,7 +8379,7 @@ local monster_chapter = { }, [62701]={ ["monster_base"]=10062, - ["hp"]=566720000, + ["hp"]=560500000, ["atk"]=6480000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8391,7 +8391,7 @@ local monster_chapter = { }, [62801]={ ["monster_base"]=10019, - ["hp"]=604820000, + ["hp"]=595900000, ["atk"]=6640000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8403,7 +8403,7 @@ local monster_chapter = { }, [62901]={ ["monster_base"]=10064, - ["hp"]=663340000, + ["hp"]=655800000, ["atk"]=6880000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8415,7 +8415,7 @@ local monster_chapter = { }, [63001]={ ["monster_base"]=10013, - ["hp"]=724090000, + ["hp"]=715100000, ["atk"]=7100000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8428,7 +8428,7 @@ local monster_chapter = { [63101]={ ["monster_base"]=20036, ["is_boss"]=2, - ["hp"]=1141670000, + ["hp"]=1129900000, ["atk"]=9540000, ["atk_times"]=4, ["hurt_skill"]={ @@ -8447,7 +8447,7 @@ local monster_chapter = { }, [63201]={ ["monster_base"]=10063, - ["hp"]=122760000, + ["hp"]=109100000, ["atk"]=3990000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8459,7 +8459,7 @@ local monster_chapter = { }, [63301]={ ["monster_base"]=10064, - ["hp"]=168080000, + ["hp"]=152300000, ["atk"]=4310000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8471,7 +8471,7 @@ local monster_chapter = { }, [63401]={ ["monster_base"]=10062, - ["hp"]=188490000, + ["hp"]=171900000, ["atk"]=4440000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8483,7 +8483,7 @@ local monster_chapter = { }, [63501]={ ["monster_base"]=10026, - ["hp"]=250000000, + ["hp"]=227800000, ["atk"]=4590000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8496,7 +8496,7 @@ local monster_chapter = { [63601]={ ["monster_base"]=20021, ["is_boss"]=1, - ["hp"]=345610000, + ["hp"]=316200000, ["atk"]=5320000, ["atk_times"]=4, ["hurt_skill"]={ @@ -8515,7 +8515,7 @@ local monster_chapter = { }, [63701]={ ["monster_base"]=10064, - ["hp"]=237050000, + ["hp"]=216200000, ["atk"]=4870000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8527,7 +8527,7 @@ local monster_chapter = { }, [63801]={ ["monster_base"]=10062, - ["hp"]=262700000, + ["hp"]=240400000, ["atk"]=5470000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8539,7 +8539,7 @@ local monster_chapter = { }, [63901]={ ["monster_base"]=10022, - ["hp"]=304030000, + ["hp"]=278400000, ["atk"]=5050000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8551,7 +8551,7 @@ local monster_chapter = { }, [64001]={ ["monster_base"]=10063, - ["hp"]=345610000, + ["hp"]=316200000, ["atk"]=5760000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8564,7 +8564,7 @@ local monster_chapter = { [64101]={ ["monster_base"]=20036, ["is_boss"]=1, - ["hp"]=646160000, + ["hp"]=654600000, ["atk"]=6320000, ["atk_times"]=4, ["hurt_skill"]={ @@ -8583,7 +8583,7 @@ local monster_chapter = { }, [64201]={ ["monster_base"]=10019, - ["hp"]=375990000, + ["hp"]=378600000, ["atk"]=5920000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8595,7 +8595,7 @@ local monster_chapter = { }, [64301]={ ["monster_base"]=10026, - ["hp"]=425040000, + ["hp"]=429100000, ["atk"]=6120000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8607,7 +8607,7 @@ local monster_chapter = { }, [64401]={ ["monster_base"]=10062, - ["hp"]=450940000, + ["hp"]=454500000, ["atk"]=6320000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8619,7 +8619,7 @@ local monster_chapter = { }, [64501]={ ["monster_base"]=10063, - ["hp"]=487790000, + ["hp"]=491600000, ["atk"]=6630000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8632,7 +8632,7 @@ local monster_chapter = { [64601]={ ["monster_base"]=20006, ["is_boss"]=1, - ["hp"]=880460000, + ["hp"]=892300000, ["atk"]=6630000, ["atk_times"]=4, ["hurt_skill"]={ @@ -8650,7 +8650,7 @@ local monster_chapter = { }, [64701]={ ["monster_base"]=10013, - ["hp"]=584150000, + ["hp"]=591600000, ["atk"]=6840000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8662,7 +8662,7 @@ local monster_chapter = { }, [64801]={ ["monster_base"]=10062, - ["hp"]=623500000, + ["hp"]=629000000, ["atk"]=7010000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8674,7 +8674,7 @@ local monster_chapter = { }, [64901]={ ["monster_base"]=10064, - ["hp"]=683750000, + ["hp"]=692200000, ["atk"]=7270000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8686,7 +8686,7 @@ local monster_chapter = { }, [65001]={ ["monster_base"]=10063, - ["hp"]=746250000, + ["hp"]=754800000, ["atk"]=7500000, ["atk_times"]=3, ["hurt_skill"]={ @@ -8699,7 +8699,7 @@ local monster_chapter = { [65101]={ ["monster_base"]=20037, ["is_boss"]=2, - ["hp"]=1176530000, + ["hp"]=1192600000, ["atk"]=10070000, ["atk_times"]=4, ["hurt_skill"]={ @@ -8719,8 +8719,8 @@ local monster_chapter = { }, [65201]={ ["monster_base"]=10065, - ["hp"]=131470000, - ["atk"]=4310000, + ["hp"]=114900000, + ["atk"]=4200000, ["atk_times"]=3, ["hurt_skill"]={ 20187, @@ -8731,8 +8731,8 @@ local monster_chapter = { }, [65301]={ ["monster_base"]=10062, - ["hp"]=179780000, - ["atk"]=4650000, + ["hp"]=160300000, + ["atk"]=4540000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -8743,8 +8743,8 @@ local monster_chapter = { }, [65401]={ ["monster_base"]=10064, - ["hp"]=201690000, - ["atk"]=4790000, + ["hp"]=181000000, + ["atk"]=4680000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -8755,8 +8755,8 @@ local monster_chapter = { }, [65501]={ ["monster_base"]=10063, - ["hp"]=267430000, - ["atk"]=4960000, + ["hp"]=239800000, + ["atk"]=4840000, ["atk_times"]=3, ["hurt_skill"]={ 20184, @@ -8768,8 +8768,8 @@ local monster_chapter = { [65601]={ ["monster_base"]=20027, ["is_boss"]=1, - ["hp"]=369520000, - ["atk"]=5740000, + ["hp"]=332900000, + ["atk"]=5600000, ["atk_times"]=4, ["hurt_skill"]={ 30079, @@ -8783,8 +8783,8 @@ local monster_chapter = { }, [65701]={ ["monster_base"]=10026, - ["hp"]=253480000, - ["atk"]=5260000, + ["hp"]=227600000, + ["atk"]=5130000, ["atk_times"]=3, ["hurt_skill"]={ 20073, @@ -8795,8 +8795,8 @@ local monster_chapter = { }, [65801]={ ["monster_base"]=10063, - ["hp"]=280870000, - ["atk"]=5910000, + ["hp"]=253100000, + ["atk"]=5760000, ["atk_times"]=3, ["hurt_skill"]={ 20184, @@ -8807,8 +8807,8 @@ local monster_chapter = { }, [65901]={ ["monster_base"]=10062, - ["hp"]=325190000, - ["atk"]=5450000, + ["hp"]=293100000, + ["atk"]=5320000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -8819,8 +8819,8 @@ local monster_chapter = { }, [66001]={ ["monster_base"]=10065, - ["hp"]=369520000, - ["atk"]=6220000, + ["hp"]=332900000, + ["atk"]=6070000, ["atk_times"]=3, ["hurt_skill"]={ 20187, @@ -8832,8 +8832,8 @@ local monster_chapter = { [66101]={ ["monster_base"]=20036, ["is_boss"]=1, - ["hp"]=690980000, - ["atk"]=6820000, + ["hp"]=689000000, + ["atk"]=6660000, ["atk_times"]=4, ["hurt_skill"]={ 30103, @@ -8851,8 +8851,8 @@ local monster_chapter = { }, [66201]={ ["monster_base"]=10063, - ["hp"]=402140000, - ["atk"]=6390000, + ["hp"]=398500000, + ["atk"]=6240000, ["atk_times"]=3, ["hurt_skill"]={ 20184, @@ -8863,8 +8863,8 @@ local monster_chapter = { }, [66301]={ ["monster_base"]=10062, - ["hp"]=454430000, - ["atk"]=6610000, + ["hp"]=451700000, + ["atk"]=6450000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -8875,8 +8875,8 @@ local monster_chapter = { }, [66401]={ ["monster_base"]=10022, - ["hp"]=482310000, - ["atk"]=6820000, + ["hp"]=478400000, + ["atk"]=6660000, ["atk_times"]=3, ["hurt_skill"]={ 20061, @@ -8887,8 +8887,8 @@ local monster_chapter = { }, [66501]={ ["monster_base"]=10065, - ["hp"]=521660000, - ["atk"]=7160000, + ["hp"]=517500000, + ["atk"]=6980000, ["atk_times"]=3, ["hurt_skill"]={ 20187, @@ -8900,8 +8900,8 @@ local monster_chapter = { [66601]={ ["monster_base"]=20037, ["is_boss"]=1, - ["hp"]=941470000, - ["atk"]=7160000, + ["hp"]=939200000, + ["atk"]=6980000, ["atk_times"]=4, ["hurt_skill"]={ 30106, @@ -8920,8 +8920,8 @@ local monster_chapter = { }, [66701]={ ["monster_base"]=10062, - ["hp"]=624490000, - ["atk"]=7380000, + ["hp"]=622700000, + ["atk"]=7200000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -8932,8 +8932,8 @@ local monster_chapter = { }, [66801]={ ["monster_base"]=10063, - ["hp"]=666570000, - ["atk"]=7570000, + ["hp"]=662100000, + ["atk"]=7380000, ["atk_times"]=3, ["hurt_skill"]={ 20184, @@ -8944,8 +8944,8 @@ local monster_chapter = { }, [66901]={ ["monster_base"]=10026, - ["hp"]=731060000, - ["atk"]=7850000, + ["hp"]=728600000, + ["atk"]=7660000, ["atk_times"]=3, ["hurt_skill"]={ 20073, @@ -8956,8 +8956,8 @@ local monster_chapter = { }, [67001]={ ["monster_base"]=10065, - ["hp"]=797800000, - ["atk"]=8100000, + ["hp"]=794500000, + ["atk"]=7900000, ["atk_times"]=3, ["hurt_skill"]={ 20187, @@ -8969,8 +8969,8 @@ local monster_chapter = { [67101]={ ["monster_base"]=20038, ["is_boss"]=2, - ["hp"]=1257950000, - ["atk"]=10870000, + ["hp"]=1255300000, + ["atk"]=10600000, ["atk_times"]=4, ["hurt_skill"]={ 30109, @@ -8991,8 +8991,8 @@ local monster_chapter = { }, [67201]={ ["monster_base"]=10074, - ["hp"]=42410000, - ["atk"]=2000000, + ["hp"]=117800000, + ["atk"]=4310000, ["atk_times"]=3, ["hurt_skill"]={ 20211, @@ -9003,8 +9003,8 @@ local monster_chapter = { }, [67301]={ ["monster_base"]=10062, - ["hp"]=59150000, - ["atk"]=2110000, + ["hp"]=164300000, + ["atk"]=4660000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -9015,8 +9015,8 @@ local monster_chapter = { }, [67401]={ ["monster_base"]=10073, - ["hp"]=66960000, - ["atk"]=2190000, + ["hp"]=185600000, + ["atk"]=4800000, ["atk_times"]=3, ["hurt_skill"]={ 20208, @@ -9027,8 +9027,8 @@ local monster_chapter = { }, [67501]={ ["monster_base"]=10062, - ["hp"]=89000000, - ["atk"]=2300000, + ["hp"]=245800000, + ["atk"]=4970000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -9040,8 +9040,8 @@ local monster_chapter = { [67601]={ ["monster_base"]=20006, ["is_boss"]=1, - ["hp"]=123600000, - ["atk"]=2460000, + ["hp"]=341300000, + ["atk"]=5740000, ["atk_times"]=4, ["hurt_skill"]={ 30016, @@ -9058,8 +9058,8 @@ local monster_chapter = { }, [67701]={ ["monster_base"]=10075, - ["hp"]=84260000, - ["atk"]=2380000, + ["hp"]=233300000, + ["atk"]=5260000, ["atk_times"]=3, ["hurt_skill"]={ 20214, @@ -9070,8 +9070,8 @@ local monster_chapter = { }, [67801]={ ["monster_base"]=10064, - ["hp"]=94020000, - ["atk"]=2670000, + ["hp"]=259500000, + ["atk"]=5910000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -9082,8 +9082,8 @@ local monster_chapter = { }, [67901]={ ["monster_base"]=10063, - ["hp"]=108530000, - ["atk"]=2480000, + ["hp"]=300500000, + ["atk"]=5460000, ["atk_times"]=3, ["hurt_skill"]={ 20184, @@ -9094,8 +9094,8 @@ local monster_chapter = { }, [68001]={ ["monster_base"]=10069, - ["hp"]=123600000, - ["atk"]=2750000, + ["hp"]=341300000, + ["atk"]=6230000, ["atk_times"]=3, ["hurt_skill"]={ 20196, @@ -9107,8 +9107,8 @@ local monster_chapter = { [68101]={ ["monster_base"]=20021, ["is_boss"]=1, - ["hp"]=242450000, - ["atk"]=2800000, + ["hp"]=706200000, + ["atk"]=6830000, ["atk_times"]=4, ["hurt_skill"]={ 30061, @@ -9126,8 +9126,8 @@ local monster_chapter = { }, [68201]={ ["monster_base"]=10062, - ["hp"]=140060000, - ["atk"]=2720000, + ["hp"]=408500000, + ["atk"]=6400000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -9138,8 +9138,8 @@ local monster_chapter = { }, [68301]={ ["monster_base"]=10063, - ["hp"]=158470000, - ["atk"]=2800000, + ["hp"]=463000000, + ["atk"]=6620000, ["atk_times"]=3, ["hurt_skill"]={ 20184, @@ -9150,8 +9150,8 @@ local monster_chapter = { }, [68401]={ ["monster_base"]=10075, - ["hp"]=168240000, - ["atk"]=2910000, + ["hp"]=490400000, + ["atk"]=6830000, ["atk_times"]=3, ["hurt_skill"]={ 20214, @@ -9162,8 +9162,8 @@ local monster_chapter = { }, [68501]={ ["monster_base"]=10064, - ["hp"]=182190000, - ["atk"]=2990000, + ["hp"]=530500000, + ["atk"]=7160000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -9175,8 +9175,8 @@ local monster_chapter = { [68601]={ ["monster_base"]=20027, ["is_boss"]=1, - ["hp"]=353210000, - ["atk"]=3100000, + ["hp"]=962700000, + ["atk"]=7160000, ["atk_times"]=4, ["hurt_skill"]={ 30079, @@ -9190,8 +9190,8 @@ local monster_chapter = { }, [68701]={ ["monster_base"]=10074, - ["hp"]=243290000, - ["atk"]=3390000, + ["hp"]=638300000, + ["atk"]=7380000, ["atk_times"]=3, ["hurt_skill"]={ 20211, @@ -9202,8 +9202,8 @@ local monster_chapter = { }, [68801]={ ["monster_base"]=10071, - ["hp"]=259190000, - ["atk"]=3500000, + ["hp"]=678700000, + ["atk"]=7570000, ["atk_times"]=3, ["hurt_skill"]={ 20202, @@ -9214,8 +9214,8 @@ local monster_chapter = { }, [68901]={ ["monster_base"]=10069, - ["hp"]=284580000, - ["atk"]=3580000, + ["hp"]=746800000, + ["atk"]=7860000, ["atk_times"]=3, ["hurt_skill"]={ 20196, @@ -9226,8 +9226,8 @@ local monster_chapter = { }, [69001]={ ["monster_base"]=10063, - ["hp"]=310810000, - ["atk"]=3680000, + ["hp"]=814400000, + ["atk"]=8100000, ["atk_times"]=3, ["hurt_skill"]={ 20184, @@ -9239,8 +9239,8 @@ local monster_chapter = { [69101]={ ["monster_base"]=20046, ["is_boss"]=2, - ["hp"]=545450000, - ["atk"]=5340000, + ["hp"]=1286700000, + ["atk"]=10870000, ["atk_times"]=4, ["hurt_skill"]={ 30153, @@ -9258,8 +9258,8 @@ local monster_chapter = { }, [69201]={ ["monster_base"]=10075, - ["hp"]=42410000, - ["atk"]=2000000, + ["hp"]=121100000, + ["atk"]=4430000, ["atk_times"]=3, ["hurt_skill"]={ 20214, @@ -9270,8 +9270,8 @@ local monster_chapter = { }, [69301]={ ["monster_base"]=10062, - ["hp"]=59150000, - ["atk"]=2110000, + ["hp"]=168900000, + ["atk"]=4790000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -9282,8 +9282,8 @@ local monster_chapter = { }, [69401]={ ["monster_base"]=10074, - ["hp"]=66960000, - ["atk"]=2190000, + ["hp"]=190800000, + ["atk"]=4940000, ["atk_times"]=3, ["hurt_skill"]={ 20211, @@ -9294,8 +9294,8 @@ local monster_chapter = { }, [69501]={ ["monster_base"]=10064, - ["hp"]=89000000, - ["atk"]=2300000, + ["hp"]=252600000, + ["atk"]=5110000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -9307,8 +9307,8 @@ local monster_chapter = { [69601]={ ["monster_base"]=20037, ["is_boss"]=1, - ["hp"]=123600000, - ["atk"]=2460000, + ["hp"]=350800000, + ["atk"]=5900000, ["atk_times"]=4, ["hurt_skill"]={ 30106, @@ -9327,8 +9327,8 @@ local monster_chapter = { }, [69701]={ ["monster_base"]=10066, - ["hp"]=84260000, - ["atk"]=2380000, + ["hp"]=239800000, + ["atk"]=5410000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -9339,8 +9339,8 @@ local monster_chapter = { }, [69801]={ ["monster_base"]=10074, - ["hp"]=94020000, - ["atk"]=2670000, + ["hp"]=266700000, + ["atk"]=6080000, ["atk_times"]=3, ["hurt_skill"]={ 20211, @@ -9351,8 +9351,8 @@ local monster_chapter = { }, [69901]={ ["monster_base"]=10072, - ["hp"]=108530000, - ["atk"]=2480000, + ["hp"]=308800000, + ["atk"]=5610000, ["atk_times"]=3, ["hurt_skill"]={ 20205, @@ -9363,8 +9363,8 @@ local monster_chapter = { }, [70001]={ ["monster_base"]=10063, - ["hp"]=123600000, - ["atk"]=2750000, + ["hp"]=350800000, + ["atk"]=6410000, ["atk_times"]=3, ["hurt_skill"]={ 20184, @@ -9376,8 +9376,8 @@ local monster_chapter = { [70101]={ ["monster_base"]=20006, ["is_boss"]=1, - ["hp"]=242450000, - ["atk"]=2800000, + ["hp"]=725700000, + ["atk"]=7020000, ["atk_times"]=4, ["hurt_skill"]={ 30016, @@ -9394,8 +9394,8 @@ local monster_chapter = { }, [70201]={ ["monster_base"]=10063, - ["hp"]=140060000, - ["atk"]=2720000, + ["hp"]=419800000, + ["atk"]=6580000, ["atk_times"]=3, ["hurt_skill"]={ 20184, @@ -9406,8 +9406,8 @@ local monster_chapter = { }, [70301]={ ["monster_base"]=10071, - ["hp"]=158470000, - ["atk"]=2800000, + ["hp"]=475800000, + ["atk"]=6810000, ["atk_times"]=3, ["hurt_skill"]={ 20202, @@ -9418,8 +9418,8 @@ local monster_chapter = { }, [70401]={ ["monster_base"]=10074, - ["hp"]=168240000, - ["atk"]=2910000, + ["hp"]=504000000, + ["atk"]=7020000, ["atk_times"]=3, ["hurt_skill"]={ 20211, @@ -9430,8 +9430,8 @@ local monster_chapter = { }, [70501]={ ["monster_base"]=10062, - ["hp"]=182190000, - ["atk"]=2990000, + ["hp"]=545200000, + ["atk"]=7360000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -9443,8 +9443,8 @@ local monster_chapter = { [70601]={ ["monster_base"]=20036, ["is_boss"]=1, - ["hp"]=353210000, - ["atk"]=3100000, + ["hp"]=989300000, + ["atk"]=7360000, ["atk_times"]=4, ["hurt_skill"]={ 30103, @@ -9462,8 +9462,8 @@ local monster_chapter = { }, [70701]={ ["monster_base"]=10062, - ["hp"]=243290000, - ["atk"]=3390000, + ["hp"]=656000000, + ["atk"]=7590000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -9474,8 +9474,8 @@ local monster_chapter = { }, [70801]={ ["monster_base"]=10068, - ["hp"]=259190000, - ["atk"]=3500000, + ["hp"]=697500000, + ["atk"]=7780000, ["atk_times"]=3, ["hurt_skill"]={ 20193, @@ -9486,8 +9486,8 @@ local monster_chapter = { }, [70901]={ ["monster_base"]=10071, - ["hp"]=284580000, - ["atk"]=3580000, + ["hp"]=767500000, + ["atk"]=8080000, ["atk_times"]=3, ["hurt_skill"]={ 20202, @@ -9498,8 +9498,8 @@ local monster_chapter = { }, [71001]={ ["monster_base"]=10062, - ["hp"]=310810000, - ["atk"]=3680000, + ["hp"]=836900000, + ["atk"]=8330000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -9511,8 +9511,8 @@ local monster_chapter = { [71101]={ ["monster_base"]=20044, ["is_boss"]=2, - ["hp"]=545450000, - ["atk"]=5340000, + ["hp"]=1322200000, + ["atk"]=11170000, ["atk_times"]=4, ["hurt_skill"]={ 30147, @@ -9532,8 +9532,8 @@ local monster_chapter = { }, [71201]={ ["monster_base"]=10069, - ["hp"]=42410000, - ["atk"]=2000000, + ["hp"]=124400000, + ["atk"]=4550000, ["atk_times"]=3, ["hurt_skill"]={ 20196, @@ -9544,8 +9544,8 @@ local monster_chapter = { }, [71301]={ ["monster_base"]=10064, - ["hp"]=59150000, - ["atk"]=2110000, + ["hp"]=173400000, + ["atk"]=4920000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -9556,8 +9556,8 @@ local monster_chapter = { }, [71401]={ ["monster_base"]=10062, - ["hp"]=66960000, - ["atk"]=2190000, + ["hp"]=195900000, + ["atk"]=5080000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -9568,8 +9568,8 @@ local monster_chapter = { }, [71501]={ ["monster_base"]=10063, - ["hp"]=89000000, - ["atk"]=2300000, + ["hp"]=259300000, + ["atk"]=5250000, ["atk_times"]=3, ["hurt_skill"]={ 20184, @@ -9581,8 +9581,8 @@ local monster_chapter = { [71601]={ ["monster_base"]=20021, ["is_boss"]=1, - ["hp"]=123600000, - ["atk"]=2460000, + ["hp"]=360100000, + ["atk"]=6060000, ["atk_times"]=4, ["hurt_skill"]={ 30061, @@ -9600,8 +9600,8 @@ local monster_chapter = { }, [71701]={ ["monster_base"]=10062, - ["hp"]=84260000, - ["atk"]=2380000, + ["hp"]=246200000, + ["atk"]=5560000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -9612,8 +9612,8 @@ local monster_chapter = { }, [71801]={ ["monster_base"]=10069, - ["hp"]=94020000, - ["atk"]=2670000, + ["hp"]=273800000, + ["atk"]=6250000, ["atk_times"]=3, ["hurt_skill"]={ 20196, @@ -9624,8 +9624,8 @@ local monster_chapter = { }, [71901]={ ["monster_base"]=10064, - ["hp"]=108530000, - ["atk"]=2480000, + ["hp"]=317000000, + ["atk"]=5760000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -9636,8 +9636,8 @@ local monster_chapter = { }, [72001]={ ["monster_base"]=10074, - ["hp"]=123600000, - ["atk"]=2750000, + ["hp"]=360100000, + ["atk"]=6590000, ["atk_times"]=3, ["hurt_skill"]={ 20211, @@ -9649,8 +9649,8 @@ local monster_chapter = { [72101]={ ["monster_base"]=20027, ["is_boss"]=1, - ["hp"]=242450000, - ["atk"]=2800000, + ["hp"]=744900000, + ["atk"]=7210000, ["atk_times"]=4, ["hurt_skill"]={ 30079, @@ -9664,8 +9664,8 @@ local monster_chapter = { }, [72201]={ ["monster_base"]=10062, - ["hp"]=140060000, - ["atk"]=2720000, + ["hp"]=431000000, + ["atk"]=6760000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -9676,8 +9676,8 @@ local monster_chapter = { }, [72301]={ ["monster_base"]=10071, - ["hp"]=158470000, - ["atk"]=2800000, + ["hp"]=488400000, + ["atk"]=7000000, ["atk_times"]=3, ["hurt_skill"]={ 20202, @@ -9688,8 +9688,8 @@ local monster_chapter = { }, [72401]={ ["monster_base"]=10064, - ["hp"]=168240000, - ["atk"]=2910000, + ["hp"]=517400000, + ["atk"]=7210000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -9700,8 +9700,8 @@ local monster_chapter = { }, [72501]={ ["monster_base"]=10065, - ["hp"]=182190000, - ["atk"]=2990000, + ["hp"]=559700000, + ["atk"]=7560000, ["atk_times"]=3, ["hurt_skill"]={ 20187, @@ -9713,8 +9713,8 @@ local monster_chapter = { [72601]={ ["monster_base"]=20046, ["is_boss"]=1, - ["hp"]=353210000, - ["atk"]=3100000, + ["hp"]=1015500000, + ["atk"]=7560000, ["atk_times"]=4, ["hurt_skill"]={ 30153, @@ -9732,8 +9732,8 @@ local monster_chapter = { }, [72701]={ ["monster_base"]=10062, - ["hp"]=243290000, - ["atk"]=3390000, + ["hp"]=673400000, + ["atk"]=7800000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -9744,8 +9744,8 @@ local monster_chapter = { }, [72801]={ ["monster_base"]=10069, - ["hp"]=259190000, - ["atk"]=3500000, + ["hp"]=716000000, + ["atk"]=7990000, ["atk_times"]=3, ["hurt_skill"]={ 20196, @@ -9756,8 +9756,8 @@ local monster_chapter = { }, [72901]={ ["monster_base"]=10072, - ["hp"]=284580000, - ["atk"]=3580000, + ["hp"]=787900000, + ["atk"]=8300000, ["atk_times"]=3, ["hurt_skill"]={ 20205, @@ -9768,8 +9768,8 @@ local monster_chapter = { }, [73001]={ ["monster_base"]=10070, - ["hp"]=310810000, - ["atk"]=3680000, + ["hp"]=859100000, + ["atk"]=8560000, ["atk_times"]=3, ["hurt_skill"]={ 20199, @@ -9781,8 +9781,8 @@ local monster_chapter = { [73101]={ ["monster_base"]=20045, ["is_boss"]=2, - ["hp"]=545450000, - ["atk"]=5340000, + ["hp"]=1357200000, + ["atk"]=11470000, ["atk_times"]=4, ["hurt_skill"]={ 30150, @@ -9800,8 +9800,8 @@ local monster_chapter = { }, [73201]={ ["monster_base"]=10076, - ["hp"]=42410000, - ["atk"]=2000000, + ["hp"]=127700000, + ["atk"]=4670000, ["atk_times"]=3, ["hurt_skill"]={ 20217, @@ -9812,8 +9812,8 @@ local monster_chapter = { }, [73301]={ ["monster_base"]=10070, - ["hp"]=59150000, - ["atk"]=2110000, + ["hp"]=178000000, + ["atk"]=5050000, ["atk_times"]=3, ["hurt_skill"]={ 20199, @@ -9824,8 +9824,8 @@ local monster_chapter = { }, [73401]={ ["monster_base"]=10067, - ["hp"]=66960000, - ["atk"]=2190000, + ["hp"]=201100000, + ["atk"]=5220000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -9836,8 +9836,8 @@ local monster_chapter = { }, [73501]={ ["monster_base"]=10070, - ["hp"]=89000000, - ["atk"]=2300000, + ["hp"]=266100000, + ["atk"]=5390000, ["atk_times"]=3, ["hurt_skill"]={ 20199, @@ -9849,8 +9849,8 @@ local monster_chapter = { [73601]={ ["monster_base"]=20006, ["is_boss"]=1, - ["hp"]=123600000, - ["atk"]=2460000, + ["hp"]=369600000, + ["atk"]=6220000, ["atk_times"]=4, ["hurt_skill"]={ 30016, @@ -9867,8 +9867,8 @@ local monster_chapter = { }, [73701]={ ["monster_base"]=10062, - ["hp"]=84260000, - ["atk"]=2380000, + ["hp"]=252700000, + ["atk"]=5710000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -9879,8 +9879,8 @@ local monster_chapter = { }, [73801]={ ["monster_base"]=10073, - ["hp"]=94020000, - ["atk"]=2670000, + ["hp"]=281000000, + ["atk"]=6420000, ["atk_times"]=3, ["hurt_skill"]={ 20208, @@ -9891,8 +9891,8 @@ local monster_chapter = { }, [73901]={ ["monster_base"]=10077, - ["hp"]=108530000, - ["atk"]=2480000, + ["hp"]=325300000, + ["atk"]=5910000, ["atk_times"]=3, ["hurt_skill"]={ 20220, @@ -9903,8 +9903,8 @@ local monster_chapter = { }, [74001]={ ["monster_base"]=10073, - ["hp"]=123600000, - ["atk"]=2750000, + ["hp"]=369600000, + ["atk"]=6770000, ["atk_times"]=3, ["hurt_skill"]={ 20208, @@ -9916,8 +9916,8 @@ local monster_chapter = { [74101]={ ["monster_base"]=20038, ["is_boss"]=1, - ["hp"]=242450000, - ["atk"]=2800000, + ["hp"]=764400000, + ["atk"]=7400000, ["atk_times"]=4, ["hurt_skill"]={ 30109, @@ -9938,8 +9938,8 @@ local monster_chapter = { }, [74201]={ ["monster_base"]=10063, - ["hp"]=140060000, - ["atk"]=2720000, + ["hp"]=442300000, + ["atk"]=6940000, ["atk_times"]=3, ["hurt_skill"]={ 20184, @@ -9950,8 +9950,8 @@ local monster_chapter = { }, [74301]={ ["monster_base"]=10077, - ["hp"]=158470000, - ["atk"]=2800000, + ["hp"]=501200000, + ["atk"]=7190000, ["atk_times"]=3, ["hurt_skill"]={ 20220, @@ -9962,8 +9962,8 @@ local monster_chapter = { }, [74401]={ ["monster_base"]=10068, - ["hp"]=168240000, - ["atk"]=2910000, + ["hp"]=531000000, + ["atk"]=7400000, ["atk_times"]=3, ["hurt_skill"]={ 20193, @@ -9974,8 +9974,8 @@ local monster_chapter = { }, [74501]={ ["monster_base"]=10069, - ["hp"]=182190000, - ["atk"]=2990000, + ["hp"]=574400000, + ["atk"]=7760000, ["atk_times"]=3, ["hurt_skill"]={ 20196, @@ -9987,8 +9987,8 @@ local monster_chapter = { [74601]={ ["monster_base"]=20044, ["is_boss"]=1, - ["hp"]=353210000, - ["atk"]=3100000, + ["hp"]=1042100000, + ["atk"]=7760000, ["atk_times"]=4, ["hurt_skill"]={ 30147, @@ -10008,8 +10008,8 @@ local monster_chapter = { }, [74701]={ ["monster_base"]=10077, - ["hp"]=243290000, - ["atk"]=3390000, + ["hp"]=691100000, + ["atk"]=8010000, ["atk_times"]=3, ["hurt_skill"]={ 20220, @@ -10020,8 +10020,8 @@ local monster_chapter = { }, [74801]={ ["monster_base"]=10064, - ["hp"]=259190000, - ["atk"]=3500000, + ["hp"]=734800000, + ["atk"]=8200000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -10032,8 +10032,8 @@ local monster_chapter = { }, [74901]={ ["monster_base"]=10065, - ["hp"]=284580000, - ["atk"]=3580000, + ["hp"]=808600000, + ["atk"]=8520000, ["atk_times"]=3, ["hurt_skill"]={ 20187, @@ -10044,8 +10044,8 @@ local monster_chapter = { }, [75001]={ ["monster_base"]=10074, - ["hp"]=310810000, - ["atk"]=3680000, + ["hp"]=881600000, + ["atk"]=8790000, ["atk_times"]=3, ["hurt_skill"]={ 20211, @@ -10057,8 +10057,8 @@ local monster_chapter = { [75101]={ ["monster_base"]=20048, ["is_boss"]=2, - ["hp"]=545450000, - ["atk"]=5340000, + ["hp"]=1392700000, + ["atk"]=11770000, ["atk_times"]=4, ["hurt_skill"]={ 30159, @@ -10078,8 +10078,8 @@ local monster_chapter = { }, [75201]={ ["monster_base"]=10072, - ["hp"]=42410000, - ["atk"]=2000000, + ["hp"]=134200000, + ["atk"]=4910000, ["atk_times"]=3, ["hurt_skill"]={ 20205, @@ -10090,8 +10090,8 @@ local monster_chapter = { }, [75301]={ ["monster_base"]=10069, - ["hp"]=59150000, - ["atk"]=2110000, + ["hp"]=187100000, + ["atk"]=5310000, ["atk_times"]=3, ["hurt_skill"]={ 20196, @@ -10102,8 +10102,8 @@ local monster_chapter = { }, [75401]={ ["monster_base"]=10072, - ["hp"]=66960000, - ["atk"]=2190000, + ["hp"]=211300000, + ["atk"]=5490000, ["atk_times"]=3, ["hurt_skill"]={ 20205, @@ -10114,8 +10114,8 @@ local monster_chapter = { }, [75501]={ ["monster_base"]=10063, - ["hp"]=89000000, - ["atk"]=2300000, + ["hp"]=279600000, + ["atk"]=5670000, ["atk_times"]=3, ["hurt_skill"]={ 20184, @@ -10127,8 +10127,8 @@ local monster_chapter = { [75601]={ ["monster_base"]=20046, ["is_boss"]=1, - ["hp"]=123600000, - ["atk"]=2460000, + ["hp"]=388400000, + ["atk"]=6540000, ["atk_times"]=4, ["hurt_skill"]={ 30153, @@ -10146,8 +10146,8 @@ local monster_chapter = { }, [75701]={ ["monster_base"]=10076, - ["hp"]=84260000, - ["atk"]=2380000, + ["hp"]=265500000, + ["atk"]=6000000, ["atk_times"]=3, ["hurt_skill"]={ 20217, @@ -10158,8 +10158,8 @@ local monster_chapter = { }, [75801]={ ["monster_base"]=10071, - ["hp"]=94020000, - ["atk"]=2670000, + ["hp"]=295300000, + ["atk"]=6750000, ["atk_times"]=3, ["hurt_skill"]={ 20202, @@ -10170,8 +10170,8 @@ local monster_chapter = { }, [75901]={ ["monster_base"]=10064, - ["hp"]=108530000, - ["atk"]=2480000, + ["hp"]=341800000, + ["atk"]=6210000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -10182,8 +10182,8 @@ local monster_chapter = { }, [76001]={ ["monster_base"]=10075, - ["hp"]=123600000, - ["atk"]=2750000, + ["hp"]=388400000, + ["atk"]=7120000, ["atk_times"]=3, ["hurt_skill"]={ 20214, @@ -10195,8 +10195,8 @@ local monster_chapter = { [76101]={ ["monster_base"]=20027, ["is_boss"]=1, - ["hp"]=242450000, - ["atk"]=2800000, + ["hp"]=803100000, + ["atk"]=7780000, ["atk_times"]=4, ["hurt_skill"]={ 30079, @@ -10210,8 +10210,8 @@ local monster_chapter = { }, [76201]={ ["monster_base"]=10065, - ["hp"]=140060000, - ["atk"]=2720000, + ["hp"]=464700000, + ["atk"]=7300000, ["atk_times"]=3, ["hurt_skill"]={ 20187, @@ -10222,8 +10222,8 @@ local monster_chapter = { }, [76301]={ ["monster_base"]=10076, - ["hp"]=158470000, - ["atk"]=2800000, + ["hp"]=526600000, + ["atk"]=7560000, ["atk_times"]=3, ["hurt_skill"]={ 20217, @@ -10234,8 +10234,8 @@ local monster_chapter = { }, [76401]={ ["monster_base"]=10062, - ["hp"]=168240000, - ["atk"]=2910000, + ["hp"]=557900000, + ["atk"]=7780000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -10246,8 +10246,8 @@ local monster_chapter = { }, [76501]={ ["monster_base"]=10075, - ["hp"]=182190000, - ["atk"]=2990000, + ["hp"]=603500000, + ["atk"]=8160000, ["atk_times"]=3, ["hurt_skill"]={ 20214, @@ -10259,8 +10259,8 @@ local monster_chapter = { [76601]={ ["monster_base"]=20037, ["is_boss"]=1, - ["hp"]=353210000, - ["atk"]=3100000, + ["hp"]=1094900000, + ["atk"]=8160000, ["atk_times"]=4, ["hurt_skill"]={ 30106, @@ -10279,8 +10279,8 @@ local monster_chapter = { }, [76701]={ ["monster_base"]=10077, - ["hp"]=243290000, - ["atk"]=3390000, + ["hp"]=726100000, + ["atk"]=8420000, ["atk_times"]=3, ["hurt_skill"]={ 20220, @@ -10291,8 +10291,8 @@ local monster_chapter = { }, [76801]={ ["monster_base"]=10074, - ["hp"]=259190000, - ["atk"]=3500000, + ["hp"]=772000000, + ["atk"]=8620000, ["atk_times"]=3, ["hurt_skill"]={ 20211, @@ -10303,8 +10303,8 @@ local monster_chapter = { }, [76901]={ ["monster_base"]=10064, - ["hp"]=284580000, - ["atk"]=3580000, + ["hp"]=849600000, + ["atk"]=8960000, ["atk_times"]=3, ["hurt_skill"]={ 20190, @@ -10315,8 +10315,8 @@ local monster_chapter = { }, [77001]={ ["monster_base"]=10062, - ["hp"]=310810000, - ["atk"]=3680000, + ["hp"]=926300000, + ["atk"]=9240000, ["atk_times"]=3, ["hurt_skill"]={ 20181, @@ -10328,8 +10328,8 @@ local monster_chapter = { [77101]={ ["monster_base"]=20047, ["is_boss"]=2, - ["hp"]=545450000, - ["atk"]=5340000, + ["hp"]=1463200000, + ["atk"]=12370000, ["atk_times"]=4, ["hurt_skill"]={ 30156, diff --git a/lua/app/config/strings/zh/skill_rogue.lua b/lua/app/config/strings/zh/skill_rogue.lua index 153500c9..e8152acd 100644 --- a/lua/app/config/strings/zh/skill_rogue.lua +++ b/lua/app/config/strings/zh/skill_rogue.lua @@ -330,7 +330,7 @@ local skill_rogue = { ["desc"]="巨劍轟擊沿X方向可額外消除4格。" }, [2400102]={ - ["desc"]="Combo:巨劍轟擊對凍傷敵人傷害大幅增加，並有50%機率附帶暈眩效果，2回合。" + ["desc"]="Combo:巨劍轟擊對凍結敵人傷害大幅增加，並有50%機率附帶暈眩效果，2回合。" }, [2400103]={ ["desc"]="巨劍轟擊附帶暈眩效果的機率提高到70%。" @@ -507,13 +507,13 @@ local skill_rogue = { ["desc"]="元素連接隨機消除元素+2。" }, [4200105]={ - ["desc"]="Combo:元素連接對冰霜敵人有20%機率附帶凍傷效果，1回合。" + ["desc"]="Combo:元素連接對冰霜敵人有20%機率附帶凍結效果，1回合。" }, [4200106]={ ["desc"]="冰心攻擊提高15%。" }, [4200107]={ - ["desc"]="元素連接附帶凍傷效果機率提高到40%。" + ["desc"]="元素連接附帶凍結效果機率提高到40%。" }, [4300100]={ ["desc"]="解鎖霜凍冰晶：額外造成一次技能傷害，附帶冰霜效果，1回合。" @@ -585,7 +585,7 @@ local skill_rogue = { ["desc"]="寒冰妖姬攻擊提高15%。" }, [4400107]={ - ["desc"]="冰霜劍舞附帶凍傷效果機率提高到70%。" + ["desc"]="冰霜劍舞附帶凍結效果機率提高到70%。" }, [4400200]={ ["desc"]="解鎖法老詛咒：額外造成一次技能傷害，附帶詛咒效果，1回合。" diff --git a/lua/app/module/activity/activity_manager.lua b/lua/app/module/activity/activity_manager.lua index 159a7b54..0f254734 100644 --- a/lua/app/module/activity/activity_manager.lua +++ b/lua/app/module/activity/activity_manager.lua @@ -16,8 +16,14 @@ end -- 夏日活动分界线----------------------------------------------------------------------------------------------------- -function ActivityManager:showActivityUI() - UIManager:showUI("app/ui/activity/activity_ui") +function ActivityManager:showActivityUI(panelType) + if panelType == GConst.ActivityConst.PANEL_TYPE.SKIN then + UIManager:showUI("app/ui/activity/activity_gift_skin_ui", panelType) + elseif panelType == GConst.ActivityConst.PANEL_TYPE.HERO then + UIManager:showUI("app/ui/activity/activity_gift_hero_ui", panelType) + else + UIManager:showUI("app/ui/activity/activity_ui", panelType) + end end -- 购买夏日活动战令 diff --git a/lua/app/module/shop/shop_manager.lua b/lua/app/module/shop/shop_manager.lua index 397a9abc..68fdc522 100644 --- a/lua/app/module/shop/shop_manager.lua +++ b/lua/app/module/shop/shop_manager.lua @@ -53,6 +53,10 @@ function ShopManager:showGiftPopUI(actType, actId, onlySelf, showType) UIManager:showUI("app/ui/shop/first_recharge_pop_ui", {showType = showType}) elseif actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ShopConst.INTRODUCT_GIFT_ID then UIManager:showUI("app/ui/shop/introduct_pop_ui", {showType = showType}) + elseif actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and (actId == GConst.ActivityConst.SKIN_GIFT_ID_1 or actId == GConst.ActivityConst.SKIN_GIFT_ID_2) then + ModuleManager.ActivityManager:showActivityUI(GConst.ActivityConst.PANEL_TYPE.SKIN) + elseif actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ActivityConst.HERO_GIFT_ID_1 then + ModuleManager.ActivityManager:showActivityUI(GConst.ActivityConst.PANEL_TYPE.HERO) elseif actType == PayManager.PURCHARSE_TYPE.CHAPTER_GIFT then UIManager:showUI("app/ui/shop/gift_pop_chapter_ui", {type = actType, id = actId, onlySelf = onlySelf, showType = showType}) elseif actType == PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW then diff --git a/lua/app/ui/activity/activity_gift_hero_ui.lua b/lua/app/ui/activity/activity_gift_hero_ui.lua new file mode 100644 index 00000000..6c0e0821 --- /dev/null +++ b/lua/app/ui/activity/activity_gift_hero_ui.lua @@ -0,0 +1,6 @@ +local ActivityUI = require "app/ui/activity/activity_ui" +local ActivityGiftHeroUI = class("ActivityGiftHeroUI", ActivityUI) + +-- 活动英雄礼包，为了避免界面和activity_ui冲突 + +return ActivityGiftHeroUI \ No newline at end of file diff --git a/lua/app/ui/activity/activity_gift_hero_ui.lua.meta b/lua/app/ui/activity/activity_gift_hero_ui.lua.meta new file mode 100644 index 00000000..934f711a --- /dev/null +++ b/lua/app/ui/activity/activity_gift_hero_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 27dfb616c5928a6408dcd22f5318002c +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/activity_gift_skin_ui.lua b/lua/app/ui/activity/activity_gift_skin_ui.lua new file mode 100644 index 00000000..224a94dc --- /dev/null +++ b/lua/app/ui/activity/activity_gift_skin_ui.lua @@ -0,0 +1,6 @@ +local ActivityUI = require "app/ui/activity/activity_ui" +local ActivityGiftSkinUI = class("ActivityGiftSkinUI", ActivityUI) + +-- 活动皮肤礼包，为了避免界面和activity_ui冲突 + +return ActivityGiftSkinUI \ No newline at end of file diff --git a/lua/app/ui/activity/activity_gift_skin_ui.lua.meta b/lua/app/ui/activity/activity_gift_skin_ui.lua.meta new file mode 100644 index 00000000..f2293f80 --- /dev/null +++ b/lua/app/ui/activity/activity_gift_skin_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fbf4f90499938e74d96a805ca6c2a29b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/activity_ui.lua b/lua/app/ui/activity/activity_ui.lua index db1cc198..deab82d1 100644 --- a/lua/app/ui/activity/activity_ui.lua +++ b/lua/app/ui/activity/activity_ui.lua @@ -16,8 +16,10 @@ function ActivityUI:onPressBackspace() self:closeUI() end -function ActivityUI:ctor() - if DataManager.ActivityData:hasTaskRedPoint() then +function ActivityUI:ctor(param) + if param then + self.panelType = param + elseif DataManager.ActivityData:hasTaskRedPoint() then self.panelType = GConst.ActivityConst.PANEL_TYPE.TASK elseif DataManager.ActivityData:hasBountyRedPoint() then self.panelType = GConst.ActivityConst.PANEL_TYPE.BOUNTY diff --git a/lua/app/ui/main_city/cell/side_bar_activity_cell.lua b/lua/app/ui/main_city/cell/side_bar_activity_cell.lua index e3f58628..03e0f3cb 100644 --- a/lua/app/ui/main_city/cell/side_bar_activity_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_activity_cell.lua @@ -21,4 +21,26 @@ function SideBarActivityCell:getIsShowRedPoint() return DataManager.ActivityData:hasEntryRedPoint() end +function SideBarActivityCell:onRefresh() + self.timeBg:setVisible(true) + self:_refreshTime() +end + +function SideBarActivityCell:updateTime() + if self:getIsOpen() then + self:_refreshTime() + else + self:closeBtn() + end +end + +function SideBarActivityCell:_refreshTime() + local remainTime = DataManager.ActivityData:getEndRemainTime() + if remainTime >= 0 then + self.timeTx:setText(GFunc.getTimeStr(remainTime)) + else + self.timeTx:setText("00:00:00") + end +end + return SideBarActivityCell \ No newline at end of file diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 7e5da6f2..f6f4320d 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -1100,6 +1100,7 @@ function MainCityUI:checkGift() -- 章节礼包 local chapterPopUpGifts = DataManager.ShopData:getPopUpGiftByType(PayManager.PURCHARSE_TYPE.CHAPTER_GIFT) -- 通用礼包 + local summerGiftIds local beginnerGiftIds local levelUpGiftIds local firstRechargeIds @@ -1110,6 +1111,13 @@ function MainCityUI:checkGift() for _, actId in ipairs(actPopUpGifts) do local cfgInfo = DataManager.ShopData:getActGiftConfig()[actId] if cfgInfo then + -- 夏日活动礼包 + if cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.ACT_SUMMER then + if not summerGiftIds then + summerGiftIds = {} + end + table.insert(summerGiftIds, actId) + end -- 新手礼包 if cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT then if not beginnerGiftIds then @@ -1149,6 +1157,11 @@ function MainCityUI:checkGift() -- ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, firstRechargeIds[1]) -- return true -- end + -- 夏日礼包在最前 + if summerGiftIds and #summerGiftIds > 0 then + ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, summerGiftIds[1], showType) + return true + end -- 入门礼包 if introductGiftIds and #introductGiftIds > 0 then ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, introductGiftIds[1], showType) diff --git a/lua/app/userdata/activity/activity_data.lua b/lua/app/userdata/activity/activity_data.lua index f45b2850..667a4422 100644 --- a/lua/app/userdata/activity/activity_data.lua +++ b/lua/app/userdata/activity/activity_data.lua @@ -12,6 +12,7 @@ function ActivityData:init() self.actData = {} ModuleManager.ActivityManager:reqSummerData() + self:markGiftPop() end function ActivityData:setDirty() @@ -64,7 +65,7 @@ end -- 是否在活动时间内 function ActivityData:isInActiveTime() - if self.actData.activated_at == nil then + if self.actData.activated_at == nil or self.actData.activated_at <= 0 then return false end @@ -466,6 +467,18 @@ end -- 礼包-------------------------------------------------------------------------------------------------- +-- 标记礼包弹出状态 +function ActivityData:markGiftPop() + if DataManager.ShopData:getGiftRemainBuyNum(GConst.ActivityConst.SKIN_GIFT_ID_1) > 0 then + DataManager.ShopData:markPopUpGift(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ActivityConst.SKIN_GIFT_ID_1) + elseif DataManager.ShopData:getGiftRemainBuyNum(GConst.ActivityConst.SKIN_GIFT_ID_2) > 0 then + DataManager.ShopData:markPopUpGift(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ActivityConst.SKIN_GIFT_ID_2) + end + if DataManager.ShopData:getGiftRemainBuyNum(GConst.ActivityConst.HERO_GIFT_ID_1) > 0 then + DataManager.ShopData:markPopUpGift(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ActivityConst.HERO_GIFT_ID_1) + end +end + -- 皮肤礼包是否有红点 function ActivityData:hasSkinRedPoint() return not LocalData:getTodayActSummerWatchedSkin()