From 7cfdc4a2f1338f4d2dac98c5623dbc00c17bad6d Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 26 May 2023 18:47:31 +0800 Subject: [PATCH 01/31] =?UTF-8?q?=E5=A5=96=E5=8A=B1=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/bounty/cell/bounty_reward_cell.lua | 9 +++++++++ lua/app/ui/common/cell/reward_cell.lua | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/lua/app/ui/bounty/cell/bounty_reward_cell.lua b/lua/app/ui/bounty/cell/bounty_reward_cell.lua index 858902ec..5a449785 100644 --- a/lua/app/ui/bounty/cell/bounty_reward_cell.lua +++ b/lua/app/ui/bounty/cell/bounty_reward_cell.lua @@ -9,6 +9,8 @@ function BountyRewardCell:init() self.fragment = uiMap["bounty_reward_cell.fragment"] self.light = uiMap["bounty_reward_cell.light"] self.lock = uiMap["bounty_reward_cell.lock"] + self.matchImg = uiMap["bounty_reward_cell.match_img"] + self.sImg = uiMap["bounty_reward_cell.s"] self:hideLight() self.baseObject:addClickListener(function() @@ -52,14 +54,21 @@ function BountyRewardCell:_refreshItem(item) if heroInfo then self.icon:setLocalScale(0.86, 0.86, 0.86) self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO, heroInfo.icon) + self.matchImg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.HeroConst.MATCH_ICON_NAME[heroInfo.position]) + self.matchImg:setVisible(true) + self.sImg:setVisible(heroInfo.qlt >= 4) else self.icon:setSprite(GConst.ATLAS_PATH.COMMON, "common_alpha") + self.matchImg:setVisible(false) + self.sImg:setVisible(false) end self.fragment:setVisible(true) else self.icon:setLocalScale(1, 1, 1) self.icon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon) self.fragment:setVisible(false) + self.matchImg:setVisible(false) + self.sImg:setVisible(false) end end diff --git a/lua/app/ui/common/cell/reward_cell.lua b/lua/app/ui/common/cell/reward_cell.lua index f4d90475..83826aaf 100644 --- a/lua/app/ui/common/cell/reward_cell.lua +++ b/lua/app/ui/common/cell/reward_cell.lua @@ -10,6 +10,7 @@ function RewardCell:init() self.fragment = uiMap["reward_cell.item_bg.fragment"] self.leftUpIcon = uiMap["reward_cell.item_bg.left_up_icon"] 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:hideFrameAnimation() self.baseObject:addClickListener(function() @@ -80,9 +81,12 @@ function RewardCell:_refreshItem(info, count) self.icon:setLocalScale(0.86, 0.86, 0.86) self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO, heroInfo.icon) self.sImg:setVisible(heroInfo.qlt >= 4) + self.matchImg:setVisible(true) + self.matchImg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.HeroConst.MATCH_ICON_NAME[heroInfo.position]) else self.icon:setSprite(GConst.ATLAS_PATH.COMMON, "common_alpha") self.sImg:setVisible(false) + self.matchImg:setVisible(false) end self.fragment:setVisible(true) else @@ -90,6 +94,7 @@ function RewardCell:_refreshItem(info, count) self.icon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon) self.fragment:setVisible(false) self.sImg:setVisible(false) + self.matchImg:setVisible(false) end end From dc96cf269e193416b70f8a7fbf667fd5d2ed76ee Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 26 May 2023 19:25:41 +0800 Subject: [PATCH 02/31] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BE=A7=E6=A0=87?= =?UTF-8?q?=E6=A0=8F=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/main_city/main_city_ui.lua | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 5229aa6f..a5e20f6c 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -2,6 +2,10 @@ local UIPrefabObject = require "app/bf/unity/uiprefab_object" local MainCityUI = class("MainCityUI", BaseUI) +local SIDE_BAR_BORDER_OFFSET = 12 +local SIDE_BAR_INTERVAL = 14 +local SIDE_BAR_ARROW_INTERVAL = 20 + local BF_UI_HELPER = GConst.TYPEOF_UNITY_CLASS.BF_UI_HELPER local HERO_COMP = "app/ui/hero/hero_comp" local MAIN_COMP = "app/ui/main_city/component/main_comp" @@ -380,14 +384,14 @@ function MainCityUI:refreshLeftBtns() return end self.leftNode:setAnchoredPositionX(0) - local y = - 2 - self.sideBarHeight/2 + local y = -SIDE_BAR_BORDER_OFFSET - self.sideBarHeight/2 if isClose then -- 只显示一个 local first = self.leftBarList[1] first:setAnchoredPositionY(y) first:setVisible(true) first:setActive(true) first:refresh() - y = y - self.sideBarHeight - 2 + y = y - self.sideBarHeight - SIDE_BAR_INTERVAL for i = 2, #self.leftBarList do self.leftBarList[i]:setVisible(false) self.leftBarList[i]:setActive(true) @@ -399,12 +403,14 @@ function MainCityUI:refreshLeftBtns() v:setVisible(true) v:setActive(true) v:refresh() - y = y - self.sideBarHeight - 2 + y = y - self.sideBarHeight - SIDE_BAR_INTERVAL end end + local arrowHeight = self.leftArrowBtn:getRectHeight() + y = y + self.sideBarHeight/2 - SIDE_BAR_ARROW_INTERVAL - arrowHeight self.leftSideBar:setSizeDeltaY(-y) self.leftArrowImg:setLocalScale(1, isClose and -1 or 1, 1) - self.leftArrowBtn:setAnchoredPositionY(self.leftSideBar:fastGetAnchoredPositionY() + y + 20) + self.leftArrowBtn:setAnchoredPositionY(self.leftSideBar:fastGetAnchoredPositionY() + y + arrowHeight/2 + SIDE_BAR_BORDER_OFFSET) end function MainCityUI:openOrCloseRightSideBar() @@ -445,14 +451,14 @@ function MainCityUI:refreshRightBtns() return end self.rightNode:setAnchoredPositionX(0) - local y = -2 - self.sideBarHeight/2 + local y = -SIDE_BAR_BORDER_OFFSET - self.sideBarHeight/2 if isClose then -- 只显示一个 local first = self.rightBarList[1] first:setAnchoredPositionY(y) first:setVisible(true) first:setActive(true) first:refresh() - y = y - self.sideBarHeight - 2 + y = y - self.sideBarHeight - SIDE_BAR_INTERVAL for i = 2, #self.rightBarList do self.rightBarList[i]:setVisible(false) self.rightBarList[i]:setActive(true) @@ -464,12 +470,14 @@ function MainCityUI:refreshRightBtns() v:setVisible(true) v:setActive(true) v:refresh() - y = y - self.sideBarHeight - 2 + y = y - self.sideBarHeight - SIDE_BAR_INTERVAL end end + local arrowHeight = self.rightArrowBtn:getRectHeight() + y = y + self.sideBarHeight / 2 - SIDE_BAR_ARROW_INTERVAL - arrowHeight self.rightSideBar:setSizeDeltaY(-y) self.rightArrowImg:setLocalScale(1, isClose and -1 or 1, 1) - self.rightArrowBtn:setAnchoredPositionY(self.rightSideBar:fastGetAnchoredPositionY() + y + 20) + self.rightArrowBtn:setAnchoredPositionY(self.rightSideBar:fastGetAnchoredPositionY() + y + arrowHeight/2 + SIDE_BAR_BORDER_OFFSET) end function MainCityUI:clearSideBarList(sideBarList) From 905cf03f741b04ba68114ef940c28bfa566df086 Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 26 May 2023 19:44:55 +0800 Subject: [PATCH 03/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/chapter.lua | 2826 +++++++---------- lua/app/config/chapter_board.lua | 310 +- lua/app/config/const.lua | 11 +- lua/app/config/hero.lua | 44 +- .../localization_global_const.lua | 1 + lua/app/config/monster_base.lua | 338 +- lua/app/config/monster_chapter.lua | 6 +- lua/app/config/skill.lua | 144 +- lua/app/config/skill_rogue.lua | 51 +- lua/app/config/strings/cn/buff.lua | 2 +- lua/app/config/strings/cn/global.lua | 1 + lua/app/config/strings/cn/item.lua | 40 +- lua/app/config/strings/cn/monster_base.lua | 20 +- lua/app/config/strings/cn/skill.lua | 4 +- lua/app/config/strings/cn/skill_rogue.lua | 50 +- lua/app/config/strings/de/monster_base.lua | 20 +- lua/app/config/strings/en/monster_base.lua | 20 +- lua/app/config/strings/fr/monster_base.lua | 20 +- lua/app/config/strings/id/monster_base.lua | 20 +- lua/app/config/strings/ja/monster_base.lua | 20 +- lua/app/config/strings/ko/monster_base.lua | 20 +- lua/app/config/strings/pt/monster_base.lua | 20 +- lua/app/config/strings/ru/monster_base.lua | 20 +- lua/app/config/strings/th/monster_base.lua | 20 +- lua/app/config/strings/vi/monster_base.lua | 20 +- lua/app/config/strings/zh/monster_base.lua | 20 +- 26 files changed, 1980 insertions(+), 2088 deletions(-) diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index e1b15a17..9bd76357 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -97,22 +97,24 @@ local chapter = { ["id_for_nothing"]="VwpcA2Q=", ["num"]=3, ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } }, - ["idle_exp"]=10, - ["idle_gold"]=10, + ["idle_exp"]=5, + ["idle_gold"]=6, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=55 - }, - { - ["type"]=1, - ["id"]=5, - ["num"]=1, - ["weight"]=5 + ["weight"]=28 } }, ["daily_challenge_difficulty"]={ @@ -168,8 +170,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=6, - ["num_for_nothing"]="UA==" + ["num"]=8, + ["num_for_nothing"]="Xg==" }, { ["type"]=1, @@ -194,8 +196,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=6, - ["num_for_nothing"]="UA==" + ["num"]=8, + ["num_for_nothing"]="Xg==" }, { ["type"]=1, @@ -207,14 +209,6 @@ local chapter = { } }, ["finish_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -236,6 +230,14 @@ local chapter = { ["id_for_nothing"]="VApcA2Q=", ["num"]=5, ["num_for_nothing"]="Uw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_reward_2"]={ @@ -250,26 +252,20 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" } }, - ["idle_exp"]=11, - ["idle_gold"]=11, + ["idle_exp"]=6, + ["idle_gold"]=6, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=55 - }, - { - ["type"]=1, - ["id"]=5, - ["num"]=1, - ["weight"]=5 + ["weight"]=28 } }, ["daily_challenge_difficulty"]={ @@ -312,8 +308,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, @@ -338,8 +334,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, @@ -359,14 +355,6 @@ local chapter = { } }, ["finish_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -386,16 +374,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_reward_2"]={ @@ -404,40 +392,26 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" } }, - ["idle_exp"]=12, - ["idle_gold"]=12, + ["idle_exp"]=6, + ["idle_gold"]=7, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=55 - }, - { - ["type"]=1, - ["id"]=5, - ["num"]=1, - ["weight"]=5 + ["weight"]=28 } }, ["daily_challenge_difficulty"]={ @@ -480,22 +454,48 @@ local chapter = { 4901, 5001 }, + ["mystery_box"]={ + 1, + 3 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, ["wave_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -512,16 +512,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -533,21 +533,13 @@ local chapter = { } }, ["finish_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_num"]={ @@ -561,8 +553,26 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + } + }, + ["box_reward_2"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, @@ -573,72 +583,32 @@ local chapter = { ["num_for_nothing"]="VwhcAw==" } }, - ["box_reward_2"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=25, - ["num_for_nothing"]="VA0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" - } - }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=43001, - ["id_for_nothing"]="UgtcA2Q=", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", ["num"]=3, ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" } }, - ["idle_exp"]=13, - ["idle_gold"]=13, + ["idle_exp"]=7, + ["idle_gold"]=7, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=55 - }, - { - ["type"]=1, - ["id"]=5, - ["num"]=1, - ["weight"]=5 + ["weight"]=28 } }, ["daily_challenge_difficulty"]={ @@ -681,22 +651,48 @@ local chapter = { 6901, 7001 }, + ["mystery_box"]={ + 2, + 3 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, ["wave_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -713,16 +709,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -734,21 +730,13 @@ local chapter = { } }, ["finish_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=30, - ["num_for_nothing"]="VQg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=4000, - ["num_for_nothing"]="UghcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_num"]={ @@ -762,16 +750,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_reward_2"]={ @@ -780,66 +768,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=5, ["num_for_nothing"]="Uw==" - } - }, - ["box_reward_3"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, - ["idle_exp"]=14, - ["idle_gold"]=14, + ["box_reward_3"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["idle_exp"]=7, + ["idle_gold"]=8, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=55 + ["weight"]=28 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=5 + ["weight"]=2 } }, ["daily_challenge_difficulty"]={ @@ -882,22 +854,48 @@ local chapter = { 8901, 9001 }, + ["mystery_box"]={ + 1, + 4 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, ["wave_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -914,16 +912,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -935,21 +933,13 @@ local chapter = { } }, ["finish_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=600, + ["num_for_nothing"]="UAhc" } }, ["box_num"]={ @@ -963,84 +953,68 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" - } - }, - ["box_reward_3"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=23001, - ["id_for_nothing"]="VAtcA2Q=", + ["id"]=4, + ["id_for_nothing"]="Ug==", ["num"]=5, ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["box_reward_3"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=25000, - ["num_for_nothing"]="VA1cA2U=" + ["id"]=43001, + ["id_for_nothing"]="UgtcA2Q=", + ["num"]=5, + ["num_for_nothing"]="Uw==" } }, - ["idle_exp"]=15, - ["idle_gold"]=15, + ["idle_exp"]=8, + ["idle_gold"]=8, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=50 + ["weight"]=25 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=10 + ["weight"]=5 } }, ["daily_challenge_difficulty"]={ @@ -1083,20 +1057,38 @@ local chapter = { 10901, 11001 }, + ["mystery_box"]={ + 2, + 3 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, ["wave_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -1105,8 +1097,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -1123,8 +1115,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -1139,8 +1131,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -1155,18 +1147,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=600, + ["num_for_nothing"]="UAhc" } }, ["box_num"]={ @@ -1180,84 +1172,68 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=75, - ["num_for_nothing"]="UQ0=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=8000, - ["num_for_nothing"]="XghcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", ["num"]=5, ["num_for_nothing"]="Uw==" }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=12000, - ["num_for_nothing"]="VwpcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=16, - ["idle_gold"]=16, + ["idle_exp"]=8, + ["idle_gold"]=9, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=50 + ["weight"]=25 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=10 + ["weight"]=5 } }, ["daily_challenge_difficulty"]={ @@ -1300,20 +1276,38 @@ local chapter = { 12901, 13001 }, + ["mystery_box"]={ + 1, + 4 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, ["wave_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -1322,8 +1316,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -1340,8 +1334,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -1356,8 +1350,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -1372,18 +1366,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=600, + ["num_for_nothing"]="UAhc" } }, ["box_num"]={ @@ -1397,84 +1391,68 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=15000, - ["num_for_nothing"]="Vw1cA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=33001, - ["id_for_nothing"]="VQtcA2Q=", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=40000, - ["num_for_nothing"]="UghcA2U=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" } }, - ["idle_exp"]=17, - ["idle_gold"]=17, + ["idle_exp"]=9, + ["idle_gold"]=9, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=50 + ["weight"]=25 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=10 + ["weight"]=5 } }, ["daily_challenge_difficulty"]={ @@ -1517,20 +1495,38 @@ local chapter = { 14901, 15001 }, + ["mystery_box"]={ + 3, + 4 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, ["wave_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -1539,8 +1535,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -1557,8 +1553,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -1573,8 +1569,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -1589,18 +1585,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=600, + ["num_for_nothing"]="UAhc" } }, ["box_num"]={ @@ -1614,84 +1610,68 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=150, - ["num_for_nothing"]="Vw1c" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=15000, - ["num_for_nothing"]="Vw1cA2U=" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=50000, - ["num_for_nothing"]="UwhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=18, - ["idle_gold"]=18, + ["idle_exp"]=9, + ["idle_gold"]=10, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=50 + ["weight"]=25 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=10 + ["weight"]=5 } }, ["daily_challenge_difficulty"]={ @@ -1734,20 +1714,38 @@ local chapter = { 16901, 17001 }, + ["mystery_box"]={ + 2, + 3 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, ["wave_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -1756,8 +1754,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -1774,8 +1772,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -1790,8 +1788,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -1806,18 +1804,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=600, + ["num_for_nothing"]="UAhc" } }, ["box_num"]={ @@ -1831,84 +1829,68 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=14, + ["id_for_nothing"]="Vww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=19, - ["idle_gold"]=19, + ["idle_exp"]=10, + ["idle_gold"]=10, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=50 + ["weight"]=25 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=10 + ["weight"]=5 } }, ["daily_challenge_difficulty"]={ @@ -1983,14 +1965,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -1999,8 +1973,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -2017,8 +1991,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -2033,8 +2007,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -2049,18 +2023,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=700, + ["num_for_nothing"]="UQhc" } }, ["box_num"]={ @@ -2074,16 +2048,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -2092,66 +2066,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=20, - ["idle_gold"]=20, + ["idle_exp"]=10, + ["idle_gold"]=11, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=45 + ["weight"]=23 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=15 + ["weight"]=7 } }, ["daily_challenge_difficulty"]={ @@ -2226,14 +2184,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -2242,8 +2192,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -2260,8 +2210,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -2276,8 +2226,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -2292,18 +2242,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=700, + ["num_for_nothing"]="UQhc" } }, ["box_num"]={ @@ -2317,16 +2267,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -2335,66 +2285,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=21, - ["idle_gold"]=21, + ["idle_exp"]=12, + ["idle_gold"]=11, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=45 + ["weight"]=23 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=15 + ["weight"]=7 } }, ["daily_challenge_difficulty"]={ @@ -2469,14 +2403,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -2485,8 +2411,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -2503,8 +2429,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -2519,8 +2445,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -2535,18 +2461,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=700, + ["num_for_nothing"]="UQhc" } }, ["box_num"]={ @@ -2560,16 +2486,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -2578,66 +2504,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=22, - ["idle_gold"]=22, + ["idle_exp"]=12, + ["idle_gold"]=12, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=45 + ["weight"]=23 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=15 + ["weight"]=7 } }, ["daily_challenge_difficulty"]={ @@ -2712,14 +2622,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -2728,8 +2630,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -2746,8 +2648,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -2762,8 +2664,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -2778,18 +2680,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=700, + ["num_for_nothing"]="UQhc" } }, ["box_num"]={ @@ -2803,16 +2705,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -2821,66 +2723,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=23, - ["idle_gold"]=23, + ["idle_exp"]=14, + ["idle_gold"]=12, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=45 + ["weight"]=23 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=15 + ["weight"]=7 } }, ["daily_challenge_difficulty"]={ @@ -2955,14 +2841,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -2971,8 +2849,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -2989,8 +2867,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -3005,8 +2883,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -3021,18 +2899,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=700, + ["num_for_nothing"]="UQhc" } }, ["box_num"]={ @@ -3046,16 +2924,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -3064,66 +2942,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=24, - ["idle_gold"]=24, + ["idle_exp"]=14, + ["idle_gold"]=13, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=45 + ["weight"]=23 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=15 + ["weight"]=7 } }, ["daily_challenge_difficulty"]={ @@ -3198,14 +3060,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3214,8 +3068,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -3232,8 +3086,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -3248,8 +3102,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -3264,18 +3118,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=800, + ["num_for_nothing"]="Xghc" } }, ["box_num"]={ @@ -3289,16 +3143,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -3307,66 +3161,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=27, - ["idle_gold"]=26, + ["idle_exp"]=16, + ["idle_gold"]=13, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=40 + ["weight"]=20 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=20 + ["weight"]=10 } }, ["daily_challenge_difficulty"]={ @@ -3441,14 +3279,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3457,8 +3287,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -3475,8 +3305,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -3491,8 +3321,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -3507,18 +3337,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=800, + ["num_for_nothing"]="Xghc" } }, ["box_num"]={ @@ -3532,16 +3362,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -3550,66 +3380,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=30, - ["idle_gold"]=28, + ["idle_exp"]=16, + ["idle_gold"]=14, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=40 + ["weight"]=20 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=20 + ["weight"]=10 } }, ["daily_challenge_difficulty"]={ @@ -3684,14 +3498,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3700,8 +3506,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -3718,8 +3524,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -3734,8 +3540,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -3750,18 +3556,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=800, + ["num_for_nothing"]="Xghc" } }, ["box_num"]={ @@ -3775,16 +3581,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -3793,66 +3599,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=33, - ["idle_gold"]=30, + ["idle_exp"]=18, + ["idle_gold"]=14, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=40 + ["weight"]=20 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=20 + ["weight"]=10 } }, ["daily_challenge_difficulty"]={ @@ -3927,14 +3717,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3943,8 +3725,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -3961,8 +3743,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -3977,8 +3759,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -3993,18 +3775,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=800, + ["num_for_nothing"]="Xghc" } }, ["box_num"]={ @@ -4018,16 +3800,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -4036,66 +3818,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=36, - ["idle_gold"]=32, + ["idle_exp"]=18, + ["idle_gold"]=15, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=40 + ["weight"]=20 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=20 + ["weight"]=10 } }, ["daily_challenge_difficulty"]={ @@ -4170,14 +3936,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -4186,8 +3944,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -4204,8 +3962,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -4220,8 +3978,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -4236,18 +3994,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=800, + ["num_for_nothing"]="Xghc" } }, ["box_num"]={ @@ -4261,16 +4019,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -4279,66 +4037,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=14, + ["id_for_nothing"]="Vww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=39, - ["idle_gold"]=34, + ["idle_exp"]=20, + ["idle_gold"]=15, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=40 + ["weight"]=20 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=20 + ["weight"]=10 } }, ["daily_challenge_difficulty"]={ @@ -4390,10 +4132,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -4413,14 +4155,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -4429,8 +4163,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -4447,8 +4181,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -4463,8 +4197,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -4479,18 +4213,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=900, + ["num_for_nothing"]="Xwhc" } }, ["box_num"]={ @@ -4504,16 +4238,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -4522,66 +4256,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=42, - ["idle_gold"]=36, + ["idle_exp"]=20, + ["idle_gold"]=16, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=35 + ["weight"]=18 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=25 + ["weight"]=12 } }, ["daily_challenge_difficulty"]={ @@ -4633,10 +4351,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -4656,14 +4374,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -4672,8 +4382,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -4690,8 +4400,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -4706,8 +4416,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -4722,18 +4432,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=900, + ["num_for_nothing"]="Xwhc" } }, ["box_num"]={ @@ -4747,16 +4457,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -4765,66 +4475,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=45, - ["idle_gold"]=38, + ["idle_exp"]=22, + ["idle_gold"]=16, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=35 + ["weight"]=18 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=25 + ["weight"]=12 } }, ["daily_challenge_difficulty"]={ @@ -4876,10 +4570,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -4899,14 +4593,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -4915,8 +4601,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -4933,8 +4619,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -4949,8 +4635,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -4965,18 +4651,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=900, + ["num_for_nothing"]="Xwhc" } }, ["box_num"]={ @@ -4990,16 +4676,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -5008,66 +4694,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=48, - ["idle_gold"]=40, + ["idle_exp"]=22, + ["idle_gold"]=17, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=35 + ["weight"]=18 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=25 + ["weight"]=12 } }, ["daily_challenge_difficulty"]={ @@ -5119,10 +4789,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -5142,14 +4812,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -5158,8 +4820,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -5176,8 +4838,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -5192,8 +4854,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -5208,18 +4870,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=900, + ["num_for_nothing"]="Xwhc" } }, ["box_num"]={ @@ -5233,16 +4895,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -5251,66 +4913,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=51, - ["idle_gold"]=42, + ["idle_exp"]=24, + ["idle_gold"]=17, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=35 + ["weight"]=18 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=25 + ["weight"]=12 } }, ["daily_challenge_difficulty"]={ @@ -5362,10 +5008,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -5385,14 +5031,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -5401,8 +5039,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -5419,8 +5057,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -5435,8 +5073,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -5451,18 +5089,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=900, + ["num_for_nothing"]="Xwhc" } }, ["box_num"]={ @@ -5476,16 +5114,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -5494,66 +5132,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=54, - ["idle_gold"]=44, + ["idle_exp"]=24, + ["idle_gold"]=18, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=35 + ["weight"]=18 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=25 + ["weight"]=12 } }, ["daily_challenge_difficulty"]={ @@ -5605,10 +5227,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -5628,14 +5250,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -5644,8 +5258,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -5662,8 +5276,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -5678,8 +5292,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -5694,18 +5308,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_num"]={ @@ -5719,16 +5333,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -5737,66 +5351,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=57, - ["idle_gold"]=46, + ["idle_exp"]=26, + ["idle_gold"]=18, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=30 + ["weight"]=15 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=30 + ["weight"]=15 } }, ["daily_challenge_difficulty"]={ @@ -5848,10 +5446,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -5871,14 +5469,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -5887,8 +5477,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -5905,8 +5495,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -5921,8 +5511,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -5937,18 +5527,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_num"]={ @@ -5962,16 +5552,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -5980,66 +5570,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=60, - ["idle_gold"]=48, + ["idle_exp"]=26, + ["idle_gold"]=19, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=30 + ["weight"]=15 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=30 + ["weight"]=15 } }, ["daily_challenge_difficulty"]={ @@ -6091,10 +5665,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -6114,14 +5688,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -6130,8 +5696,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -6148,8 +5714,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -6164,8 +5730,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -6180,18 +5746,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_num"]={ @@ -6205,16 +5771,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -6223,66 +5789,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=63, - ["idle_gold"]=50, + ["idle_exp"]=28, + ["idle_gold"]=19, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=30 + ["weight"]=15 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=30 + ["weight"]=15 } }, ["daily_challenge_difficulty"]={ @@ -6334,10 +5884,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -6357,14 +5907,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -6373,8 +5915,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -6391,8 +5933,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -6407,8 +5949,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -6423,18 +5965,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_num"]={ @@ -6448,16 +5990,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -6466,66 +6008,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=66, - ["idle_gold"]=52, + ["idle_exp"]=28, + ["idle_gold"]=20, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=30 + ["weight"]=15 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=30 + ["weight"]=15 } }, ["daily_challenge_difficulty"]={ @@ -6576,10 +6102,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -6599,14 +6125,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -6615,8 +6133,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -6633,8 +6151,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -6649,8 +6167,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -6665,18 +6183,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_num"]={ @@ -6690,16 +6208,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -6708,66 +6226,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=14, + ["id_for_nothing"]="Vww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=69, - ["idle_gold"]=54, + ["idle_exp"]=30, + ["idle_gold"]=20, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=30 + ["weight"]=15 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=30 + ["weight"]=15 } }, ["daily_challenge_difficulty"]={ diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index 01561188..ca0dcc85 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -626,35 +626,7 @@ local chapter_board = { }, { 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 0, - 2 + 3 }, { 0, @@ -676,6 +648,34 @@ local chapter_board = { 1, 0 }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 2, 0 @@ -686,7 +686,7 @@ local chapter_board = { }, { 0, - 2 + 5 }, { 3, @@ -700,106 +700,106 @@ local chapter_board = { 1, 0 }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 14, 0 }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 14, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, { 1, 0 @@ -873,7 +873,7 @@ local chapter_board = { 0 }, { - 14, + 3, 0 }, { @@ -897,11 +897,11 @@ local chapter_board = { 0 }, { - 14, + 3, 0 }, { - 3, + 2, 0 }, { @@ -925,7 +925,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -933,7 +933,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -949,7 +949,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -957,7 +957,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -981,7 +981,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -1026,7 +1026,7 @@ local chapter_board = { }, { 0, - 1 + 5 }, { 0, @@ -1034,7 +1034,7 @@ local chapter_board = { }, { 0, - 1 + 5 }, { 1, @@ -1082,15 +1082,15 @@ local chapter_board = { }, { 0, - 1 + 5 }, { 2, - 0 + 3 }, { 0, - 1 + 5 }, { 2, @@ -1108,6 +1108,10 @@ local chapter_board = { 3, 0 }, + { + 2, + 0 + }, { 3, 0 @@ -1120,6 +1124,10 @@ local chapter_board = { 3, 0 }, + { + 2, + 0 + }, { 3, 0 @@ -1128,6 +1136,10 @@ local chapter_board = { 2, 0 }, + { + 3, + 0 + }, { 14, 0 @@ -1137,25 +1149,13 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { 3, 0 }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 14, - 0 - }, { 1, 0 @@ -1165,7 +1165,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -1173,7 +1173,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -1197,7 +1197,7 @@ local chapter_board = { 0 }, { - 14, + 2, 0 }, { diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index 4a3e0215..0368c592 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -105,13 +105,13 @@ local const = { ["value"]=57600 }, ["idle_exp_drop_time"]={ - ["value"]=1200 + ["value"]=600 }, ["idle_gold_drop_time"]={ - ["value"]=1200 + ["value"]=600 }, ["idle_item_drop_time"]={ - ["value"]=1200 + ["value"]=600 }, ["idle_drop_fast_times_1"]={ ["value"]=2 @@ -188,9 +188,12 @@ local const = { }, ["act_sevenday_time"]={ ["value"]=7 + }, + ["model_daily_challenge"]={ + ["value"]=8000 } } local config = { -data=const,count=40 +data=const,count=41 } return config \ No newline at end of file diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index 41d8d6a9..5cb6d0b6 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -53,7 +53,7 @@ local hero = { 5490000 }, ["model_id"]="p0005", - ["icon"]="5", + ["icon"]="1", ["item_id"]=12001, ["unlock_chapter"]=1 }, @@ -111,7 +111,7 @@ local hero = { 5490000 }, ["model_id"]="p0014", - ["icon"]="5", + ["icon"]="6", ["item_id"]=13001, ["unlock_chapter"]=3, ["is_show"]=1 @@ -170,7 +170,7 @@ local hero = { 5490000 }, ["model_id"]="p0009", - ["icon"]="5", + ["icon"]="11", ["item_id"]=13002, ["unlock_chapter"]=3, ["is_show"]=1 @@ -229,7 +229,7 @@ local hero = { 5490000 }, ["model_id"]="p0011", - ["icon"]="5", + ["icon"]="16", ["item_id"]=14001, ["unlock_chapter"]=3, ["is_show"]=1 @@ -346,7 +346,7 @@ local hero = { 5490000 }, ["model_id"]="p0010", - ["icon"]="5", + ["icon"]="12", ["item_id"]=23001, ["unlock_chapter"]=3, ["is_show"]=1 @@ -405,7 +405,7 @@ local hero = { 5490000 }, ["model_id"]="p0012", - ["icon"]="5", + ["icon"]="7", ["item_id"]=23002, ["unlock_chapter"]=3, ["is_show"]=1 @@ -464,7 +464,7 @@ local hero = { 5490000 }, ["model_id"]="p0007", - ["icon"]="7", + ["icon"]="17", ["item_id"]=24001, ["unlock_chapter"]=3, ["is_show"]=1 @@ -523,7 +523,7 @@ local hero = { 5490000 }, ["model_id"]="p0001", - ["icon"]="1", + ["icon"]="3", ["item_id"]=32001, ["unlock_chapter"]=1 }, @@ -581,7 +581,7 @@ local hero = { 5490000 }, ["model_id"]="p0006", - ["icon"]="6", + ["icon"]="8", ["item_id"]=33001, ["unlock_chapter"]=3, ["is_show"]=1 @@ -639,8 +639,8 @@ local hero = { 4920000, 5490000 }, - ["model_id"]="p0006", - ["icon"]="6", + ["model_id"]="p0020", + ["icon"]="13", ["item_id"]=33002, ["unlock_chapter"]=3, ["is_show"]=1 @@ -698,8 +698,8 @@ local hero = { 4920000, 5490000 }, - ["model_id"]="p0006", - ["icon"]="6", + ["model_id"]="p0016", + ["icon"]="18", ["item_id"]=34001, ["unlock_chapter"]=3, ["is_show"]=1 @@ -758,7 +758,7 @@ local hero = { 5490000 }, ["model_id"]="p0003", - ["icon"]="3", + ["icon"]="4", ["item_id"]=42001, ["unlock_chapter"]=1 }, @@ -815,8 +815,8 @@ local hero = { 4920000, 5490000 }, - ["model_id"]="p0003", - ["icon"]="3", + ["model_id"]="p0022", + ["icon"]="9", ["item_id"]=43001, ["unlock_chapter"]=3, ["is_show"]=1 @@ -875,7 +875,7 @@ local hero = { 5490000 }, ["model_id"]="p0003", - ["icon"]="3", + ["icon"]="14", ["item_id"]=43002, ["unlock_chapter"]=3, ["is_show"]=1 @@ -934,7 +934,7 @@ local hero = { 5490000 }, ["model_id"]="p0008", - ["icon"]="8", + ["icon"]="19", ["item_id"]=44001, ["unlock_chapter"]=3, ["is_show"]=1 @@ -993,7 +993,7 @@ local hero = { 5490000 }, ["model_id"]="p0004", - ["icon"]="4", + ["icon"]="5", ["item_id"]=52001, ["unlock_chapter"]=1 }, @@ -1051,7 +1051,7 @@ local hero = { 5490000 }, ["model_id"]="p0015", - ["icon"]="4", + ["icon"]="10", ["item_id"]=53001, ["unlock_chapter"]=3, ["is_show"]=1 @@ -1110,7 +1110,7 @@ local hero = { 5490000 }, ["model_id"]="p0004", - ["icon"]="4", + ["icon"]="15", ["item_id"]=53002, ["unlock_chapter"]=3, ["is_show"]=1 @@ -1169,7 +1169,7 @@ local hero = { 5490000 }, ["model_id"]="p0004", - ["icon"]="4", + ["icon"]="20", ["item_id"]=54001, ["unlock_chapter"]=3, ["is_show"]=1 diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 64a01e7b..30f40594 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -144,6 +144,7 @@ local LocalizationGlobalConst = DAY_X_UNLOCK = "DAY_X_UNLOCK", SEVEN_DAY_DESC_2 = "SEVEN_DAY_DESC_2", FUNC_UNLOCK = "FUNC_UNLOCK", + MAIN_BTN_3 = "MAIN_BTN_3", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/monster_base.lua b/lua/app/config/monster_base.lua index 11862c10..75649dc4 100644 --- a/lua/app/config/monster_base.lua +++ b/lua/app/config/monster_base.lua @@ -1,414 +1,546 @@ local monster_base = { [10001]={ ["model_id"]="m10001", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10002]={ ["model_id"]="m10002", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10003]={ ["model_id"]="m10003", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10004]={ ["model_id"]="m10004", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10005]={ ["model_id"]="m10005", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10006]={ ["model_id"]="m10006", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10007]={ ["model_id"]="m10007", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10008]={ ["model_id"]="m10008", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10009]={ ["model_id"]="m10009", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10010]={ ["model_id"]="m10010", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10012]={ ["model_id"]="m10012", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10013]={ ["model_id"]="m10013", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10014]={ ["model_id"]="m10014", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10015]={ ["model_id"]="m10015", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10016]={ ["model_id"]="m10016", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10017]={ ["model_id"]="m10017", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10018]={ ["model_id"]="m10018", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10019]={ ["model_id"]="m10019", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10020]={ ["model_id"]="m10020", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10021]={ ["model_id"]="m10021", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10022]={ ["model_id"]="m10022", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10023]={ ["model_id"]="m10023", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10024]={ ["model_id"]="m10024", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10025]={ ["model_id"]="m10025", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10026]={ ["model_id"]="m10026", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10027]={ ["model_id"]="m10027", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10028]={ ["model_id"]="m10028", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10029]={ ["model_id"]="m10029", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10030]={ ["model_id"]="m10030", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10031]={ ["model_id"]="m10031", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10032]={ ["model_id"]="m10032", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10033]={ ["model_id"]="m10033", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10034]={ ["model_id"]="m10034", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10035]={ ["model_id"]="m10035", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10036]={ ["model_id"]="m10036", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10037]={ ["model_id"]="m10037", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10038]={ ["model_id"]="m10038", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10039]={ ["model_id"]="m10039", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10040]={ ["model_id"]="m10040", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10041]={ ["model_id"]="m10041", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10042]={ ["model_id"]="m10042", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10043]={ ["model_id"]="m10043", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10044]={ ["model_id"]="m10044", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10045]={ ["model_id"]="m10045", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10046]={ ["model_id"]="m10046", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10047]={ ["model_id"]="m10047", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10048]={ ["model_id"]="m10048", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10049]={ ["model_id"]="m10049", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10050]={ ["model_id"]="m10050", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10051]={ ["model_id"]="m10051", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10052]={ ["model_id"]="m10052", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10053]={ ["model_id"]="m10053", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10054]={ ["model_id"]="m10054", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10055]={ ["model_id"]="m10055", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10056]={ ["model_id"]="m10056", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10057]={ ["model_id"]="m10057", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10058]={ ["model_id"]="m10058", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10059]={ ["model_id"]="m10059", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [20001]={ ["model_id"]="m20001", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20002]={ ["model_id"]="m20002", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20003]={ ["model_id"]="m20003", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20004]={ ["model_id"]="m20004", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20005]={ ["model_id"]="m20005", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20006]={ ["model_id"]="m20006", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20007]={ ["model_id"]="m20007", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20008]={ ["model_id"]="m20008", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20009]={ ["model_id"]="m20009", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20010]={ ["model_id"]="m20010", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20011]={ ["model_id"]="m20011", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20012]={ ["model_id"]="m20012", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20013]={ ["model_id"]="m20013", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20014]={ ["model_id"]="m20014", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20015]={ ["model_id"]="m20015", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20016]={ ["model_id"]="m20016", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20017]={ ["model_id"]="m20017", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20018]={ ["model_id"]="m20018", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20019]={ ["model_id"]="m20019", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20020]={ ["model_id"]="m20020", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20021]={ ["model_id"]="m20021", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20022]={ ["model_id"]="m20022", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20023]={ ["model_id"]="m20023", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20024]={ ["model_id"]="m20024", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20025]={ ["model_id"]="m20025", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20026]={ ["model_id"]="m20026", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20027]={ ["model_id"]="m20027", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20028]={ ["model_id"]="m20028", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20029]={ ["model_id"]="m20029", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20030]={ ["model_id"]="m20030", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20031]={ ["model_id"]="m20031", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20032]={ ["model_id"]="m20032", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [30001]={ ["model_id"]="p0001", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30002]={ ["model_id"]="p0002", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30003]={ ["model_id"]="p0003", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30004]={ ["model_id"]="p0004", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30005]={ ["model_id"]="p0005", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30006]={ ["model_id"]="p0006", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30007]={ ["model_id"]="p0007", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30008]={ ["model_id"]="p0008", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30009]={ ["model_id"]="p0009", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30010]={ ["model_id"]="p0010", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30011]={ ["model_id"]="p0011", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 + }, + [30012]={ + ["model_id"]="p0012", + ["body"]=2, + ["model_ui"]=1.0 }, [30014]={ ["model_id"]="p0014", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 + }, + [30015]={ + ["model_id"]="p0015", + ["body"]=2, + ["model_ui"]=1.0 + }, + [30016]={ + ["model_id"]="p0016", + ["body"]=2, + ["model_ui"]=1.0 + }, + [30017]={ + ["model_id"]="p0017", + ["body"]=2, + ["model_ui"]=1.0 + }, + [30020]={ + ["model_id"]="p0020", + ["body"]=2, + ["model_ui"]=1.0 + }, + [30022]={ + ["model_id"]="p0022", + ["body"]=2, + ["model_ui"]=1.0 } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index 6576957a..e2019c6c 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -1142,7 +1142,7 @@ local monster_chapter = { ["monster_exp"]=17000 }, [9001]={ - ["monster_base"]=30003, + ["monster_base"]=30022, ["is_boss"]=2, ["hp"]=108900000, ["atk"]=1070000, @@ -1909,7 +1909,7 @@ local monster_chapter = { ["monster_exp"]=17000 }, [15001]={ - ["monster_base"]=30006, + ["monster_base"]=30012, ["is_boss"]=2, ["hp"]=145500000, ["atk"]=1480000, @@ -5328,7 +5328,7 @@ local monster_chapter = { ["monster_exp"]=17000 }, [41001]={ - ["monster_base"]=30005, + ["monster_base"]=30015, ["is_boss"]=2, ["hp"]=195000000, ["atk"]=2000000, diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 145f604d..863abfc9 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -184,7 +184,7 @@ local skill = { ["range"]=2 } }, - ["battle_icon"]="5", + ["battle_icon"]="1", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -200,7 +200,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]=1200120, - ["name_act"]="attack04", + ["name_act"]="skill01", ["fx_self"]=300020, ["fx_target"]=2, ["fx_target_delay"]=900 @@ -366,7 +366,7 @@ local skill = { ["link"]=1, ["position"]=1, ["method"]=1, - ["battle_icon"]="5", + ["battle_icon"]="6", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -459,7 +459,7 @@ local skill = { ["link"]=1, ["position"]=1, ["method"]=1, - ["battle_icon"]="5", + ["battle_icon"]="6", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -525,7 +525,7 @@ local skill = { ["type"]="normal_attack_add", ["num"]=2, ["ratio"]=10000, - ["round"]=2 + ["round"]=3 } }, ["obj"]=1 @@ -662,7 +662,7 @@ local skill = { ["range"]=2 } }, - ["battle_icon"]="5", + ["battle_icon"]="11", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -774,7 +774,7 @@ local skill = { ["range"]=2 } }, - ["battle_icon"]="5", + ["battle_icon"]="11", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -951,7 +951,7 @@ local skill = { ["range"]=1 } }, - ["battle_icon"]="5", + ["battle_icon"]="16", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -1185,11 +1185,7 @@ local skill = { ["energy"]=10, ["link"]=1, ["position"]=2, - ["method"]=2, - ["skill_type"]=4, - ["boardrange"]={ - - }, + ["method"]=1, ["battle_icon"]="2", ["effect_type"]=1, ["trigger"]=1, @@ -1263,6 +1259,56 @@ local skill = { ["obj"]=1, ["skill_position"]=2 }, + [2200123]={ + ["energy"]=10, + ["link"]=1, + ["position"]=2, + ["method"]=2, + ["skill_type"]=4, + ["boardrange"]={ + { + ["type"]=1, + ["range"]=1 + }, + { + ["type"]=2, + ["range"]=1 + }, + { + ["type"]=3, + ["range"]=1 + }, + { + ["type"]=4, + ["range"]=1 + } + }, + ["battle_icon"]="2", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=40000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=200, + ["shake_type"]=5, + ["sound_hit"]=2200120, + ["name_act"]="skill01", + ["fx_self"]=300008, + ["fx_target"]=4, + ["fx_target_delay"]=1100, + ["bullet_time"]={ + 1100, + 3000, + 400 + } + }, [2300110]={ ["position"]=2, ["effect_type"]=1, @@ -1357,7 +1403,7 @@ local skill = { ["position"]=2, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="2", + ["battle_icon"]="12", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -1433,7 +1479,7 @@ local skill = { ["position"]=2, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="2", + ["battle_icon"]="12", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -1676,7 +1722,7 @@ local skill = { ["boardrange"]={ }, - ["battle_icon"]="2", + ["battle_icon"]="7", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -1897,7 +1943,7 @@ local skill = { ["boardrange"]={ }, - ["battle_icon"]="7", + ["battle_icon"]="17", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -2004,7 +2050,7 @@ local skill = { ["boardrange"]={ }, - ["battle_icon"]="7", + ["battle_icon"]="17", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -2043,7 +2089,7 @@ local skill = { ["boardrange"]={ }, - ["battle_icon"]="7", + ["battle_icon"]="17", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -2184,7 +2230,7 @@ local skill = { ["boardrange"]={ }, - ["battle_icon"]="1", + ["battle_icon"]="3", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -2372,7 +2418,7 @@ local skill = { ["boardrange"]={ }, - ["battle_icon"]="6", + ["battle_icon"]="8", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -2426,7 +2472,7 @@ local skill = { ["type"]="skill_hurt_add", ["num"]=1500, ["ratio"]=10000, - ["round"]=2 + ["round"]=3 } }, ["obj"]=1 @@ -2440,7 +2486,7 @@ local skill = { ["type"]="skill_hurt_add", ["num"]=1500, ["ratio"]=10000, - ["round"]=3 + ["round"]=4 } }, ["obj"]=1 @@ -2530,7 +2576,7 @@ local skill = { ["link"]=1, ["position"]=3, ["method"]=1, - ["battle_icon"]="6", + ["battle_icon"]="13", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -2583,7 +2629,7 @@ local skill = { ["link"]=1, ["position"]=3, ["method"]=1, - ["battle_icon"]="6", + ["battle_icon"]="13", ["buff_condition"]={ { { @@ -2646,7 +2692,7 @@ local skill = { ["link"]=1, ["position"]=3, ["method"]=1, - ["battle_icon"]="6", + ["battle_icon"]="13", ["buff_condition"]={ { { @@ -2789,7 +2835,7 @@ local skill = { ["link"]=1, ["position"]=3, ["method"]=2, - ["battle_icon"]="6", + ["battle_icon"]="18", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -2972,7 +3018,7 @@ local skill = { ["range"]=3 } }, - ["battle_icon"]="3", + ["battle_icon"]="4", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -3156,7 +3202,7 @@ local skill = { ["boardrange"]={ }, - ["battle_icon"]="8", + ["battle_icon"]="9", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -3347,7 +3393,7 @@ local skill = { ["boardrange"]={ }, - ["battle_icon"]="8", + ["battle_icon"]="14", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -3554,7 +3600,7 @@ local skill = { ["range"]=3 } }, - ["battle_icon"]="8", + ["battle_icon"]="19", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -3732,7 +3778,7 @@ local skill = { ["position"]=5, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="4", + ["battle_icon"]="5", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -3755,7 +3801,7 @@ local skill = { ["position"]=5, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="4", + ["battle_icon"]="5", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -3778,7 +3824,7 @@ local skill = { ["position"]=5, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="4", + ["battle_icon"]="5", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -3881,7 +3927,7 @@ local skill = { ["position"]=5, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="8", + ["battle_icon"]="10", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -4094,7 +4140,7 @@ local skill = { ["position"]=5, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="8", + ["battle_icon"]="13", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -4289,7 +4335,7 @@ local skill = { ["position"]=5, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="8", + ["battle_icon"]="20", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -4334,7 +4380,7 @@ local skill = { ["position"]=5, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="8", + ["battle_icon"]="20", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -4613,7 +4659,7 @@ local skill = { ["obj"]=1, ["skill_position"]=2, ["cd"]=2, - ["cd_start"]=1, + ["cd_start"]=0, ["sound_hit"]=3300120, ["name_act"]="skill01", ["fx_self"]=200011 @@ -4632,7 +4678,7 @@ local skill = { ["obj"]=2, ["skill_position"]=1, ["cd"]=2, - ["cd_start"]=2, + ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]=10082, @@ -4664,7 +4710,7 @@ local skill = { ["obj"]=2, ["skill_position"]=1, ["cd"]=3, - ["cd_start"]=2, + ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]=10082, @@ -4705,7 +4751,7 @@ local skill = { }, ["skill_position"]=1, ["cd"]=2, - ["cd_start"]=2, + ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]=10082, @@ -4737,7 +4783,7 @@ local skill = { ["obj"]=2, ["skill_position"]=1, ["cd"]=3, - ["cd_start"]=2, + ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]=10082, @@ -4769,7 +4815,7 @@ local skill = { ["obj"]=2, ["skill_position"]=1, ["cd"]=3, - ["cd_start"]=2, + ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]=10082, @@ -4801,7 +4847,7 @@ local skill = { ["obj"]=2, ["skill_position"]=2, ["cd"]=3, - ["cd_start"]=1, + ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]=4200120, @@ -4827,7 +4873,7 @@ local skill = { ["obj"]=1, ["skill_position"]=2, ["cd"]=3, - ["cd_start"]=1 + ["cd_start"]=0 }, [10023]={ ["skill_type"]=3, @@ -4848,7 +4894,7 @@ local skill = { ["obj"]=2, ["skill_position"]=1, ["cd"]=2, - ["cd_start"]=2, + ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]=10082, @@ -5351,7 +5397,7 @@ local skill = { }, ["obj"]=1, ["cd"]=3, - ["cd_start"]=2, + ["cd_start"]=0, ["sound_hit"]=3300120, ["name_act"]="skill01", ["fx_self"]=300025 @@ -11482,6 +11528,6 @@ local skill = { } } local config = { -data=skill,count=551 +data=skill,count=552 } return config \ No newline at end of file diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 554587de..03c8234e 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -737,6 +737,7 @@ local skill_rogue = { ["round"]=1 } }, + ["obj"]=3, ["icon"]="44" }, [1200104]={ @@ -782,7 +783,7 @@ local skill_rogue = { ["round"]=1 } }, - ["obj"]=1, + ["obj"]=3, ["icon"]="45" }, [1200106]={ @@ -821,7 +822,7 @@ local skill_rogue = { ["round"]=1 } }, - ["obj"]=1, + ["obj"]=3, ["icon"]="45" }, [1300100]={ @@ -913,7 +914,7 @@ local skill_rogue = { ["round"]=1 } }, - ["obj"]=8, + ["obj"]=3, ["icon"]="45" }, [1300106]={ @@ -935,7 +936,7 @@ local skill_rogue = { ["round"]=1 } }, - ["obj"]=8, + ["obj"]=3, ["icon"]="45" }, [1300107]={ @@ -1233,26 +1234,11 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, - ["type"]=2, - ["skill_position"]=2, - ["boardrange"]={ - { - ["type"]=1, - ["range"]=1 - }, - { - ["type"]=2, - ["range"]=1 - }, - { - ["type"]=3, - ["range"]=1 - }, - { - ["type"]=4, - ["range"]=1 - } + ["type"]=1, + ["parameter"]={ + 2200123 }, + ["skill_position"]=2, ["icon"]="34" }, [2200103]={ @@ -1307,6 +1293,7 @@ local skill_rogue = { ["icon"]="36" }, [2200106]={ + ["unlock"]=2200102, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -1752,7 +1739,7 @@ local skill_rogue = { ["round"]=1 } }, - ["obj"]=2, + ["obj"]=4, ["icon"]="51" }, [3200100]={ @@ -1890,12 +1877,12 @@ local skill_rogue = { ["effect"]={ { ["type"]="block", - ["num"]=1000, + ["num"]=5000, ["ratio"]=10000, ["round"]=2 } }, - ["obj"]=8, + ["obj"]=5, ["icon"]="33" }, [3300100]={ @@ -1975,7 +1962,7 @@ local skill_rogue = { ["round"]=1 } }, - ["obj"]=8, + ["obj"]=5, ["icon"]="47" }, [3300105]={ @@ -2011,7 +1998,7 @@ local skill_rogue = { ["round"]=1 } }, - ["obj"]=8, + ["obj"]=5, ["icon"]="47" }, [3300107]={ @@ -2031,7 +2018,7 @@ local skill_rogue = { ["round"]=1 } }, - ["obj"]=8, + ["obj"]=5, ["icon"]="48" }, [3300200]={ @@ -2056,7 +2043,7 @@ local skill_rogue = { ["round"]=1 } }, - ["obj"]=1, + ["obj"]=5, ["icon"]="38" }, [3300202]={ @@ -3197,6 +3184,7 @@ local skill_rogue = { ["round"]=1 } }, + ["obj"]=7, ["icon"]="44" }, [5400103]={ @@ -3213,6 +3201,7 @@ local skill_rogue = { ["round"]=1 } }, + ["obj"]=7, ["icon"]="42" }, [5400104]={ @@ -3257,6 +3246,7 @@ local skill_rogue = { ["round"]=1 } }, + ["obj"]=7, ["icon"]="58" }, [5400107]={ @@ -3273,6 +3263,7 @@ local skill_rogue = { ["round"]=1 } }, + ["obj"]=7, ["icon"]="66" } } diff --git a/lua/app/config/strings/cn/buff.lua b/lua/app/config/strings/cn/buff.lua index d36bcecf..cff0dd8f 100644 --- a/lua/app/config/strings/cn/buff.lua +++ b/lua/app/config/strings/cn/buff.lua @@ -60,7 +60,7 @@ local buff = { ["name"]="poison" }, [52]={ - ["desc"]="禁锢：本回合只可使用普攻。", + ["desc"]="禁锢：本回合只可使用普攻，且技能进度不会增长。", ["name"]="imprison" }, [53]={ diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index fec94f10..308306ae 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -144,6 +144,7 @@ local localization_global = ["DAY_X_UNLOCK"] = "第{0}天解锁", ["SEVEN_DAY_DESC_2"] = "已完成任务数:{0}/{1}", ["FUNC_UNLOCK"] = "解锁新功能", + ["MAIN_BTN_3"] = "商城", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index c958ee00..1c5c20a8 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -77,83 +77,83 @@ local item = { }, [12001]={ ["name"]="舞娘碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="舞娘碎片，凑齐可激活或升级。" }, [13001]={ ["name"]="克劳德碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="克劳德碎片，凑齐可激活或升级。" }, [13002]={ ["name"]="火旺碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="火旺碎片，凑齐可激活或升级。" }, [14001]={ ["name"]="亚历山大碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="亚历山大碎片，凑齐可激活或升级。" }, [22001]={ ["name"]="刀妹碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="刀妹碎片，凑齐可激活或升级。" }, [23001]={ ["name"]="野蛮人碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="野蛮人碎片，凑齐可激活或升级。" }, [23002]={ ["name"]="二丫碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="二丫碎片，凑齐可激活或升级。" }, [24001]={ ["name"]="巨剑魔童碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="巨剑魔童碎片，凑齐可激活或升级。" }, [32001]={ ["name"]="洋葱头碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="洋葱头碎片，凑齐可激活或升级。" }, [33001]={ ["name"]="小鹿碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="小鹿碎片，凑齐可激活或升级。" }, [33002]={ ["name"]="森林狼碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="森林狼碎片，凑齐可激活或升级。" }, [34001]={ ["name"]="木兰碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="木兰碎片，凑齐可激活或升级。" }, [42001]={ ["name"]="冰心碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="冰心碎片，凑齐可激活或升级。" }, [43001]={ ["name"]="冰女碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="冰女碎片，凑齐可激活或升级。" }, [43002]={ ["name"]="鸦姐碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="鸦姐碎片，凑齐可激活或升级。" }, [44001]={ ["name"]="寒冰妖姬碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="寒冰妖姬碎片，凑齐可激活或升级。" }, [52001]={ ["name"]="忍者伦碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="忍者伦碎片，凑齐可激活或升级。" }, [53001]={ ["name"]="魔女琪琪碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="魔女琪琪碎片，凑齐可激活或升级。" }, [53002]={ ["name"]="灵魂猎手碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="灵魂猎手碎片，凑齐可激活或升级。" }, [54001]={ ["name"]="蝴蝶碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="蝴蝶碎片，凑齐可激活或升级。" } } local config = { diff --git a/lua/app/config/strings/cn/monster_base.lua b/lua/app/config/strings/cn/monster_base.lua index 776c83f5..e6b7458c 100644 --- a/lua/app/config/strings/cn/monster_base.lua +++ b/lua/app/config/strings/cn/monster_base.lua @@ -302,11 +302,29 @@ local monster_base = { [30011]={ ["name"]="亚历山大" }, + [30012]={ + ["name"]="二丫" + }, [30014]={ ["name"]="克劳德" + }, + [30015]={ + ["name"]="魔女琪琪" + }, + [30016]={ + ["name"]="木兰" + }, + [30017]={ + ["name"]="雷神" + }, + [30020]={ + ["name"]="森林狼" + }, + [30022]={ + ["name"]="冰女" } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/skill.lua b/lua/app/config/strings/cn/skill.lua index 5e2d05f1..d16415e5 100644 --- a/lua/app/config/strings/cn/skill.lua +++ b/lua/app/config/strings/cn/skill.lua @@ -33,13 +33,13 @@ local skill = { ["desc"]="森林狼：使用后本次伤害提升，并造成多次技能伤害。" }, [3400120]={ - ["desc"]="流星追月：使用后本次伤害提升，并一次巨量技能伤害。" + ["desc"]="流星追月：使用后本次伤害提升，并造成一次巨量技能伤害。" }, [4200120]={ ["desc"]="元素链接：随机消除3个元素，并造成一次技能伤害。" }, [4300120]={ - ["desc"]="冰女：额外造成一次技能伤害，附加冰霜效果，1回合。" + ["desc"]="霜冻冰晶：额外造成一次技能伤害，附加冰霜效果，1回合。" }, [4300220]={ ["desc"]="鸦姐：额外造成一次技能伤害，附加腐败效果，1回合。" diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index 5f9fb26f..3bdc51a6 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -372,31 +372,31 @@ local skill_rogue = { ["desc"]="急速治疗链接超过5个元素，回血效果提升。" }, [3300200]={ - ["desc"]="解锁森林狼技能：使用后本次伤害提升，并造成多次技能伤害。" + ["desc"]="解锁狼袭瞬杀：使用后本次伤害提升，并造成多次技能伤害。" }, [3300201]={ - ["desc"]="森林狼技能有50%概率附加易伤效果，2回合。" + ["desc"]="狼袭瞬杀有50%概率附加易伤效果，2回合。" }, [3300202]={ - ["desc"]="森林狼技能使用时本次普攻伤害提升15%。" + ["desc"]="狼袭瞬杀使用时本次普攻伤害提升15%。" }, [3300203]={ - ["desc"]="森林狼技能伤害提升。" + ["desc"]="狼袭瞬杀伤害提升。" }, [3300204]={ - ["desc"]="森林狼技能对中毒敌人有50%概率附加中毒效果，2回合。" + ["desc"]="狼袭瞬杀对中毒敌人有50%概率附加中毒效果，2回合。" }, [3300205]={ - ["desc"]="森林狼技能附加的中毒效果，伤害提升。" + ["desc"]="狼袭瞬杀附加的中毒效果，伤害提升。" }, [3300206]={ - ["desc"]="森林狼技能攻击提升15%。" + ["desc"]="森林狼攻击提升15%。" }, [3300207]={ - ["desc"]="森林狼技能对中毒敌人有100%概率附加中毒效果，2回合。" + ["desc"]="狼袭瞬杀对中毒敌人有100%概率附加中毒效果，2回合。" }, [3400100]={ - ["desc"]="解锁流星追月：使用后本次伤害提升，并一次巨量技能伤害。" + ["desc"]="解锁流星追月：使用后本次伤害提升，并造成一次巨量技能伤害。" }, [3400101]={ ["desc"]="流星追月可附加易伤效果，2回合。" @@ -444,28 +444,28 @@ local skill_rogue = { ["desc"]="元素链接附加冻结效果概率提升到40%。" }, [4300100]={ - ["desc"]="解锁冰女技能：额外造成一次技能伤害，附加冰霜效果，1回合。" + ["desc"]="解锁霜冻冰晶：额外造成一次技能伤害，附加冰霜效果，1回合。" }, [4300101]={ - ["desc"]="冰女技能沿＋方向可额外消除4格。" + ["desc"]="霜冻冰晶沿＋方向可额外消除4格。" }, [4300102]={ - ["desc"]="冰女技能对灼烧敌人的伤害增加50%。" + ["desc"]="霜冻冰晶对灼烧敌人的伤害增加50%。" }, [4300103]={ - ["desc"]="冰女技能附加的冰霜效果，回合数+1。" + ["desc"]="霜冻冰晶附加的冰霜效果，回合数+1。" }, [4300104]={ - ["desc"]="冰女技能伤害提升。" + ["desc"]="霜冻冰晶伤害提升。" }, [4300105]={ - ["desc"]="冰女技能对冰霜敌人有50%概率附加冻结效果，1回合。" + ["desc"]="霜冻冰晶对冰霜敌人有50%概率附加冻结效果，1回合。" }, [4300106]={ - ["desc"]="冰女技能后为团队附加冰盾效果，2回合。" + ["desc"]="霜冻冰晶后为团队附加冰盾效果，2回合。" }, [4300107]={ - ["desc"]="冰女技能附加的冰盾，可反伤400%。" + ["desc"]="霜冻冰晶附加的冰盾，可反伤400%。" }, [4300300]={ ["desc"]="解锁鸦姐技能：额外造成一次技能伤害，附加腐败效果，1回合。" @@ -540,28 +540,28 @@ local skill_rogue = { ["desc"]="护盾术附加的护盾，反伤效果翻倍。" }, [5300100]={ - ["desc"]="解锁魔女琪琪技能：额外造成一次大量技能伤害。" + ["desc"]="解锁魔法扫帚：额外造成一次大量技能伤害。" }, [5300101]={ - ["desc"]="魔女琪琪技能可附加中毒效果，2回合。" + ["desc"]="魔法扫帚可附加中毒效果，2回合。" }, [5300102]={ - ["desc"]="魔女琪琪技能使用时本次普攻伤害提升15%。" + ["desc"]="魔法扫帚使用时本次普攻伤害提升15%。" }, [5300103]={ - ["desc"]="魔女琪琪技能可附加昏睡效果，2回合。" + ["desc"]="魔法扫帚可附加昏睡效果，2回合。" }, [5300104]={ - ["desc"]="魔女琪琪技能附加的中毒效果，伤害提升。" + ["desc"]="魔法扫帚附加的中毒效果，伤害提升。" }, [5300105]={ - ["desc"]="魔女琪琪技能使用后随机增加一种技能的能量2点。" + ["desc"]="魔法扫帚使用后随机增加一种技能的能量2点。" }, [5300106]={ - ["desc"]="魔女琪琪技能使用后随机增加一种技能的能量2点。" + ["desc"]="魔法扫帚使用后随机增加一种技能的能量2点。" }, [5300107]={ - ["desc"]="魔女琪琪技能有15%概率为团队附加不死效果，1回合。" + ["desc"]="魔法扫帚有15%概率为团队附加不死效果，1回合。" }, [5300200]={ ["desc"]="解锁灵魂猎手技能：额外造成一次大量技能伤害。" diff --git a/lua/app/config/strings/de/monster_base.lua b/lua/app/config/strings/de/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/de/monster_base.lua +++ b/lua/app/config/strings/de/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/monster_base.lua b/lua/app/config/strings/en/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/en/monster_base.lua +++ b/lua/app/config/strings/en/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/monster_base.lua b/lua/app/config/strings/fr/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/fr/monster_base.lua +++ b/lua/app/config/strings/fr/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/monster_base.lua b/lua/app/config/strings/id/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/id/monster_base.lua +++ b/lua/app/config/strings/id/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/monster_base.lua b/lua/app/config/strings/ja/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/ja/monster_base.lua +++ b/lua/app/config/strings/ja/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/monster_base.lua b/lua/app/config/strings/ko/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/ko/monster_base.lua +++ b/lua/app/config/strings/ko/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/monster_base.lua b/lua/app/config/strings/pt/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/pt/monster_base.lua +++ b/lua/app/config/strings/pt/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/monster_base.lua b/lua/app/config/strings/ru/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/ru/monster_base.lua +++ b/lua/app/config/strings/ru/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/monster_base.lua b/lua/app/config/strings/th/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/th/monster_base.lua +++ b/lua/app/config/strings/th/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/monster_base.lua b/lua/app/config/strings/vi/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/vi/monster_base.lua +++ b/lua/app/config/strings/vi/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/monster_base.lua b/lua/app/config/strings/zh/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/zh/monster_base.lua +++ b/lua/app/config/strings/zh/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file From c106607a651ac951daf4701d1951a03e2c4bf6f5 Mon Sep 17 00:00:00 2001 From: CloudJ Date: Fri, 26 May 2023 19:57:13 +0800 Subject: [PATCH 04/31] =?UTF-8?q?=E6=88=90=E9=95=BF=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/module_manager.lua | 3 +- lua/app/module/maincity/maincity_const.lua | 3 + lua/app/module/shop/shop_manager.lua | 16 +++- .../cell/side_bar_beginner_gift_cell.lua | 42 +++++++++++ .../cell/side_bar_beginner_gift_cell.lua.meta | 10 +++ .../cell/side_bar_grow_up_gift_1_cell.lua | 57 +++++++++++++++ .../side_bar_grow_up_gift_1_cell.lua.meta | 10 +++ .../cell/side_bar_grow_up_gift_2_cell.lua | 57 +++++++++++++++ .../side_bar_grow_up_gift_2_cell.lua.meta | 10 +++ lua/app/ui/shop/gift_pop_ui.lua | 41 ++++++++++- lua/app/ui/shop/shop_comp.lua | 3 - lua/app/ui/ui_manager.lua | 1 + lua/app/userdata/player/player_data.lua | 6 ++ lua/app/userdata/shop/shop_data.lua | 73 ++++++++++++++++--- 14 files changed, 309 insertions(+), 23 deletions(-) create mode 100644 lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua create mode 100644 lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua.meta create mode 100644 lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua create mode 100644 lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua.meta create mode 100644 lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua create mode 100644 lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua.meta diff --git a/lua/app/common/module_manager.lua b/lua/app/common/module_manager.lua index 290a7089..d485e039 100644 --- a/lua/app/common/module_manager.lua +++ b/lua/app/common/module_manager.lua @@ -60,7 +60,8 @@ ModuleManager.MODULE_KEY = { IDLE_DROP = "idle_drop", MALL = "mall", -- 商城 MALL_DAILY = "mall_daily", -- 每日商城 - FUND = "act_level_gift" -- 成长基金 + FUND = "act_level_gift", -- 成长基金 + ACT_GIFT_SHOW_OPEN = "act_gift_show_open", -- 弹窗礼包通用开启条件 } local _moduleMgrs = {} diff --git a/lua/app/module/maincity/maincity_const.lua b/lua/app/module/maincity/maincity_const.lua index 1ec1011a..d887e565 100644 --- a/lua/app/module/maincity/maincity_const.lua +++ b/lua/app/module/maincity/maincity_const.lua @@ -25,6 +25,9 @@ MainCityConst.LEFT_SIDE_BARS = { MainCityConst.RIGHT_SIDE_BARS = { "app/ui/main_city/cell/side_bar_gold_pig_cell", "app/ui/main_city/cell/side_bar_level_fund_cell", + "app/ui/main_city/cell/side_bar_beginner_gift_cell", + "app/ui/main_city/cell/side_bar_grow_up_gift_1_cell", + "app/ui/main_city/cell/side_bar_grow_up_gift_2_cell", } return MainCityConst \ No newline at end of file diff --git a/lua/app/module/shop/shop_manager.lua b/lua/app/module/shop/shop_manager.lua index 7f455710..5a6851e6 100644 --- a/lua/app/module/shop/shop_manager.lua +++ b/lua/app/module/shop/shop_manager.lua @@ -23,8 +23,14 @@ end -- 触发弹窗礼包 function ShopManager:triggerGiftPopUI(actType, actId) - UIManager:showUI("app/ui/shop/gift_pop_ui", {type = actType, id = actId}) - DataManager.ShopData:removePopUpGift(actType, actId) + if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACT_GIFT_SHOW_OPEN, true) then + UIManager:showUI("app/ui/shop/gift_pop_ui", {type = actType, id = actId}) + DataManager.ShopData:removePopUpGift(actType, actId) + end +end + +function ShopManager:showGiftPopUI(actType, actId) + UIManager:showUI("app/ui/shop/gift_pop_ui", {type = actType, id = actId, onlySelf = true}) end -- 触发金币弹窗礼包 @@ -172,8 +178,10 @@ end -- 推送成长礼包 function ShopManager:onTriggerGrowUpGift(result) DataManager.ShopData:onTriggerGrowUpGift(result.add_grow_up_gift) - -- 立即触发弹窗 - self:triggerGrowUpGiftPopUI(result.add_grow_up_gift.current_grow_up_id) + -- 有2种情况 1.处于英雄升级/解锁界面 立即触发弹窗 2.购买了成长礼包,此时仅标记,在奖励弹窗结束后再弹 + if UIManager:getTopUIObj() == UIManager.UI_PATH.HERO_DETAIL_UI then + self:triggerGrowUpGiftPopUI(result.add_grow_up_gift.current_grow_up_id) + end end return ShopManager \ No newline at end of file diff --git a/lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua b/lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua new file mode 100644 index 00000000..c1dd3bd1 --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua @@ -0,0 +1,42 @@ +local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell" +local SideBarBeginnerGiftCell = class("SideBarBeginnerGiftCell", SideBarBaseCellComp) + +function SideBarBeginnerGiftCell:getIsOpen() + return DataManager.ShopData:getBeginnerGiftShowSideBar() +end + +function SideBarBeginnerGiftCell:getIconRes() + return "main_btn_gift_1" -- TODOJ +end + +function SideBarBeginnerGiftCell:onClick() + ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.BEGINNER_GIFT_ID) +end + +function SideBarBeginnerGiftCell:getIsShowRedPoint() + return false +end + +function SideBarBeginnerGiftCell:onRefresh() + self.timeBg:setVisible(true) + self:_refreshTime() +end + +function SideBarBeginnerGiftCell:updateTime() + if self:getIsOpen() then + self:_refreshTime() + else + self:closeBtn() + end +end + +function SideBarBeginnerGiftCell:_refreshTime() + local remainTime = DataManager.ShopData:getBeginnerGiftSideBarRemainTime() + if remainTime >= 0 then + self.timeTx:setText(GFunc.getTimeStr(remainTime)) + else + self.timeTx:setText("00:00:00") + end +end + +return SideBarBeginnerGiftCell \ No newline at end of file diff --git a/lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua.meta b/lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua.meta new file mode 100644 index 00000000..9b4bba88 --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b43a4c18aa3ff764691d1792e98936e2 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua new file mode 100644 index 00000000..4e33bd44 --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua @@ -0,0 +1,57 @@ +local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell" +local SideBarGrowUpGift1Cell = class("SideBarGrowUpGift1Cell", SideBarBaseCellComp) + +function SideBarGrowUpGift1Cell:getIsOpen() + return #DataManager.ShopData:getValidGrowUpGifts() >= 1 +end + +function SideBarGrowUpGift1Cell:getIconRes() + return "main_btn_gift_2" -- TODOJ +end + +function SideBarGrowUpGift1Cell:onClick() + local gift = DataManager.ShopData:getValidGrowUpGifts()[1] + if gift then + ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, gift.current_grow_up_id) + end +end + +function SideBarGrowUpGift1Cell:getIsShowRedPoint() + return false +end + +function SideBarGrowUpGift1Cell:onRefresh() + self.timeBg:setVisible(true) + self:_refreshTime() +end + +function SideBarGrowUpGift1Cell:updateTime() + if self:getIsOpen() then + self:_refreshTime() + else + self:closeBtn() + end +end + +function SideBarGrowUpGift1Cell:_refreshTime() + local gift = DataManager.ShopData:getValidGrowUpGifts()[1] + if gift then + local cfgInfo = DataManager.ShopData:getActGrowUpGiftConfig()[gift.current_grow_up_id] + if cfgInfo then + local durationTime = (cfgInfo.limit_time or 0) * 3600 + local triggerTime = gift.trigger_at // 1000 + local remainTime = triggerTime + durationTime - Time:getServerTime() + if remainTime >= 0 then + self.timeTx:setText(GFunc.getTimeStr(remainTime)) + else + self.timeTx:setText("00:00:00") + end + else + self.timeTx:setText("00:00:00") + end + else + self.timeTx:setText("00:00:00") + end +end + +return SideBarGrowUpGift1Cell \ No newline at end of file diff --git a/lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua.meta b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua.meta new file mode 100644 index 00000000..9a0420f0 --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 297d71f3bc4702a40a96511df082c7ad +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua new file mode 100644 index 00000000..5e4dcd1a --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua @@ -0,0 +1,57 @@ +local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell" +local SideBarGrowUpGift2Cell = class("SideBarGrowUpGift2Cell", SideBarBaseCellComp) + +function SideBarGrowUpGift2Cell:getIsOpen() + return #DataManager.ShopData:getValidGrowUpGifts() >= 2 +end + +function SideBarGrowUpGift2Cell:getIconRes() + return "main_btn_gift_2" -- TODOJ +end + +function SideBarGrowUpGift2Cell:onClick() + local gift = DataManager.ShopData:getValidGrowUpGifts()[2] + if gift then + ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, gift.current_grow_up_id) + end +end + +function SideBarGrowUpGift2Cell:getIsShowRedPoint() + return false +end + +function SideBarGrowUpGift2Cell:onRefresh() + self.timeBg:setVisible(true) + self:_refreshTime() +end + +function SideBarGrowUpGift2Cell:updateTime() + if self:getIsOpen() then + self:_refreshTime() + else + self:closeBtn() + end +end + +function SideBarGrowUpGift2Cell:_refreshTime() + local gift = DataManager.ShopData:getValidGrowUpGifts()[2] + if gift then + local cfgInfo = DataManager.ShopData:getActGrowUpGiftConfig()[gift.current_grow_up_id] + if cfgInfo then + local durationTime = (cfgInfo.limit_time or 0) * 3600 + local triggerTime = gift.trigger_at // 1000 + local remainTime = triggerTime + durationTime - Time:getServerTime() + if remainTime >= 0 then + self.timeTx:setText(GFunc.getTimeStr(remainTime)) + else + self.timeTx:setText("00:00:00") + end + else + self.timeTx:setText("00:00:00") + end + else + self.timeTx:setText("00:00:00") + end +end + +return SideBarGrowUpGift2Cell \ No newline at end of file diff --git a/lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua.meta b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua.meta new file mode 100644 index 00000000..e302a8a4 --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2dded7533782f8247b5d11e2eedfdd21 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/shop/gift_pop_ui.lua b/lua/app/ui/shop/gift_pop_ui.lua index a3f02793..3026ef52 100644 --- a/lua/app/ui/shop/gift_pop_ui.lua +++ b/lua/app/ui/shop/gift_pop_ui.lua @@ -26,6 +26,7 @@ function GiftPopUI:ctor(params) self.actType = params.type self.actId = params.id + self.onlySelf = params.onlySelf -- 有此标记时 关闭直接关闭界面 self.buyCount = DataManager.ShopData:getGiftBoughtNum(self.actType, self.actId) -- 触发时该礼包的购买数量 end @@ -44,7 +45,11 @@ function GiftPopUI:onLoadRootComplete() self.uiMap = self.root:genAllChildren() self.uiMap["gift_pop_ui.close_btn"]:addClickListener(function() - self:checkNextPopGiftOrClose() + if self.onlySelf then + self:closeUI() + else + self:checkNextPopGiftOrClose() + end end) self.titleTx = self.uiMap["gift_pop_ui.bg.title"] @@ -147,8 +152,38 @@ function GiftPopUI:refresh(needCheck) end function GiftPopUI:updateTime() - -- TODOJ - self.timeNode:setVisible(false) + local hasTime = false + -- 部分礼包有倒计时 + if self.actType == PayManager.PURCHARSE_TYPE.ACT_GIFT then + local cfgInfo = DataManager.ShopData:getActGiftConfig()[self.actId] + if cfgInfo then + if cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE then -- 首充礼包 + hasTime = true + self.timeText:setText("TODOJ") -- TODOJ + elseif cfgInfo and cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT then -- 金币礼包 + hasTime = true + local remainTime = 0 + local triggerTime = DataManager.ShopData:getCoinGiftTriggerTime() + remainTime = triggerTime + (cfgInfo.limit_time or 0) * 3600 - Time:getServerTime() + if remainTime <= 0 then + remainTime = 0 + end + self.timeText:setText(GFunc.getTimeStr(remainTime)) + end + end + elseif self.actType == PayManager.PURCHARSE_TYPE.GROW_UP_GIFT then -- 成长礼包 + hasTime = true + local remainTime = 0 + local cfgInfo = DataManager.ShopData:getActGrowUpGiftConfig()[self.actId] + local gift = DataManager.ShopData:getGrowUpGiftByActId(self.actId) + local triggerTime = (gift and gift.trigger_at or 0) // 1000 + remainTime = triggerTime + (cfgInfo.limit_time or 0) * 3600 - Time:getServerTime() + if remainTime <= 0 then + remainTime = 0 + end + self.timeText:setText(GFunc.getTimeStr(remainTime)) + end + self.timeNode:setVisible(hasTime) end function GiftPopUI:onClickGift() diff --git a/lua/app/ui/shop/shop_comp.lua b/lua/app/ui/shop/shop_comp.lua index c96e151f..14eabb26 100644 --- a/lua/app/ui/shop/shop_comp.lua +++ b/lua/app/ui/shop/shop_comp.lua @@ -110,9 +110,6 @@ function ShopComp:initDiscountPage() self.coinSellCell = self.uiMap["shop_comp.discount.scrollrect.viewport.content.coin_sell_cell"]:addLuaComponent(PAGE_DISCOUNT_COIN_SELL_CELL) end -function ShopComp:updateMainList() -end - function ShopComp:refresh() if self.page == PAGE_DISCOUNT then self.mainNode:setAnchoredPositionX(GConst.NOT_VISIBLE_POS) diff --git a/lua/app/ui/ui_manager.lua b/lua/app/ui/ui_manager.lua index 34aa7839..221fef8d 100644 --- a/lua/app/ui/ui_manager.lua +++ b/lua/app/ui/ui_manager.lua @@ -22,6 +22,7 @@ UIManager.UI_PATH = { BATTLE_UI = "app/ui/battle/battle_ui", ROGUE_SKILL_UI = "app/ui/battle/battle_skill_select_ui", REWARD_BOX = "app/ui/tips/reward_box", + HERO_DETAIL_UI = "app/ui/hero/hero_detail_ui", } -- 动画类型 diff --git a/lua/app/userdata/player/player_data.lua b/lua/app/userdata/player/player_data.lua index cc7896f9..3f9f665c 100644 --- a/lua/app/userdata/player/player_data.lua +++ b/lua/app/userdata/player/player_data.lua @@ -24,6 +24,7 @@ function PlayerData:init(data) self:resetOnCrossDay() self:markDirty() end) + self.createTime = basicInfo.create_at or 0 -- 创角时间 end function PlayerData:resetOnCrossDay() @@ -135,4 +136,9 @@ function PlayerData:addPayment(rechargeId) self.data.payAmount = self.data.payAmount + cfg.price end +-- 获取创角时间 +function PlayerData:getCreateTime() + return self.createTime +end + return PlayerData \ No newline at end of file diff --git a/lua/app/userdata/shop/shop_data.lua b/lua/app/userdata/shop/shop_data.lua index 4083955c..36090e3c 100644 --- a/lua/app/userdata/shop/shop_data.lua +++ b/lua/app/userdata/shop/shop_data.lua @@ -393,7 +393,7 @@ end function ShopData:getActChapterStoreCanBuyActIds() local list = {} local curChapterId = DataManager.ChapterData:getMaxChapterId() - for id = curChapterId, 1, -1 do + for id = 1, curChapterId do if not self:getActChapterStoreHasBuy(id) then table.insert(list, self.actChapterStoreChapterId2IdMap[id]) end @@ -421,6 +421,22 @@ function ShopData:getBeginnerGiftHasBuy() end end +function ShopData:getBeginnerGiftSideBarDurationTime() + return 3 * 24 * 3600 -- 暂无配置表 TODOJ +end + +-- 未购买且在开服的3天内 +function ShopData:getBeginnerGiftShowSideBar() + return not self:getBeginnerGiftHasBuy() and self:getBeginnerGiftSideBarRemainTime() > 0 +end + +-- 展示在侧边栏的剩余时间 +function ShopData:getBeginnerGiftSideBarRemainTime() + local createTime = DataManager.PlayerData:getCreateTime() // 1000 + local durationTime = self:getBeginnerGiftSideBarDurationTime() + return createTime + durationTime - Time:getServerTime() +end + -- 新手礼包结束 ---------------------------------------------------------------------------------------------- -- 助力与金币礼包(act_gift) ********************************************************************************************** @@ -623,36 +639,69 @@ function ShopData:getGrowUpGifts() return self.growUpGifts end +-- 目前允许显示的最多2个礼包 +function ShopData:getMaxGrowUpGiftCount() + return 2 +end + +function ShopData:getGrowUpGiftByActId(actId) + local list = self:getGrowUpGifts() + for _, gift in ipairs(list) do + if gift.current_grow_up_id == actId then + return gift + end + end +end + -- 获取目前时间有效的成长礼包 function ShopData:getValidGrowUpGifts() local list = {} for index, gift in ipairs(self:getGrowUpGifts()) do local cfgInfo = self:getActGrowUpGiftConfig()[gift.current_grow_up_id] if cfgInfo then - local cd = (cfgInfo.cd or 0) * 3600 + local isValid = false local durationTime = (cfgInfo.limit_time or 0) * 3600 local triggerTime = gift.trigger_at // 1000 local maxDurationTime = triggerTime + durationTime - local maxEndTime = triggerTime + cd + local buyLimit = cfgInfo.limit or 0 + -- 是否在有效范围内 local isInDurationTime = Time:getServerTime() < maxDurationTime if isInDurationTime then - -- 从通用act里找到这个礼包的最后购买时间 如果有且在这个范围内 则这个礼包已经被购买了 - local hasBuy = false + -- 从通用act里找到这个礼包 如果有该礼包且购买次数未达到上限,则有效；如果没有该礼包也有效 local actGiftDetailData = self:getActGiftDetailData(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, gift.current_grow_up_id) + if actGiftDetailData then + local buyCount = actGiftDetailData.buy_count local latestBuyTime = actGiftDetailData.latest_buy_at // 1000 - if latestBuyTime > 0 and triggerTime < latestBuyTime and latestBuyTime < maxEndTime then - hasBuy = true - end - end - if not hasBuy then - table.insert(list, gift) + if buyLimit > 0 then + if buyCount < buyLimit then + isValid = true + end + else + isValid = true + end + else + isValid = true end end + if isValid then + table.insert(list, gift) + end end end - return list + -- 按照时间排序 + table.sort(list, function(a, b) + return a.trigger_at < b.trigger_at + end) + -- 上限2位 + local limitList = {} + for i = 1, self:getMaxGrowUpGiftCount() do + if list[i] then + table.insert(limitList, list[i]) + end + end + return limitList end -- 触发了成长礼包 From 2430e09f7e9ead0405cad23ab654f5debeba5823 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 26 May 2023 20:03:33 +0800 Subject: [PATCH 05/31] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/component/battle_unit_comp.lua | 9 +++------ lua/app/module/battle/controller/battle_controller.lua | 8 ++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index bbfb8998..0ef9b5aa 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -288,10 +288,7 @@ function BattleUnitComp:getKeyFrameTime(skill, blockIndex, animationName) time = self:getAnimationKeyFrameTime(animationName, blockIndex) end end - -- Logger.logHighlight(animationName .. " blockIndex " .. blockIndex) - -- Logger.printTable(blockList) - -- Logger.printTable(self.validEffectIdx) return time end @@ -962,9 +959,9 @@ function BattleUnitComp:updateSkillAttack(dt) end return else + self:checkPassiveEvent(PASSIVE_EVENT.ON_ACTIVE_SKILL_BEFORE, self) self.currActiveSkill:startUse() self:doNextSkillAttack() - self:checkPassiveEvent(PASSIVE_EVENT.ON_ACTIVE_SKILL_BEFORE, self) end else -- 继续普攻 self:doNextNormalAttack() @@ -1593,8 +1590,8 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, d if self.unitEntity:getIsDead() then self:changeState(UNIT_STATE.DEAD) if damageOrCureType == BattleConst.BUFF_NAME.BURN then - local target = self.battleController:getOtherSideMainUnit(self.side) - target:checkPassiveEvent(BattleConst.PASSIVE_EVENT.ON_DEAD_BY_BURN, target) + local team = self.battleController:getOtherSideTeam(self.side) + team:checkPassiveEvent(BattleConst.PASSIVE_EVENT.ON_DEAD_BY_BURN) end elseif damage < 0 then self:playHurt() diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 763dde64..746eebf8 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -365,6 +365,14 @@ function BattleController:getOtherSideMainUnit(side) end end +function BattleController:getOtherSideTeam(side) + if side == BattleConst.SIDE_ATK then + return self.defTeam + else + return self.atkTeam + end +end + function BattleController:onLoadComplete() self:battleStart() end From 35c56dda722d1110b45e77450a703e0ffd5d7b66 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 26 May 2023 21:22:00 +0800 Subject: [PATCH 06/31] =?UTF-8?q?=E5=B8=A6=E6=9C=89=E6=B5=81=E8=A1=80buff?= =?UTF-8?q?=E6=97=B6=E6=AD=BB=E4=BA=A1=E8=A7=A6=E5=8F=91=E7=9A=84=E8=A2=AB?= =?UTF-8?q?=E5=8A=A8=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 4 +++- lua/app/module/battle/component/battle_unit_comp.lua | 7 ++++++- lua/app/module/battle/helper/battle_buff_special.lua | 2 ++ lua/app/module/battle/helper/battle_passive.lua | 5 +++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 563b76b8..26449380 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -231,7 +231,8 @@ BattleConst.PASSIVE_EVENT = { ON_ACTIVE_SKILL_BEFORE = 7, -- 主动技能释放前 ON_DEAD_BY_BURN = 8, -- 有敌人死于灼烧伤害时触发 ON_DEAD_BY_SKILL = 9, -- 有敌人死于技能时触发 - ON_DEAD = 10, -- 死亡时 + ON_DEAD_WITH_BLEED = 10, -- 死亡时带有流血buff + ON_DEAD = 11, -- 死亡时 } local BUFF_NAME = { @@ -344,6 +345,7 @@ local ATTR_NAME = { COUNTER_ATTACK = "counterattack", SKILL_HURT = "skill_hurt", DEATH_SUMMON = "death_summon", + BLEED = "bleed", } BattleConst.ATTR_NAME = ATTR_NAME diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 0ef9b5aa..e1b678e2 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1588,11 +1588,16 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, d end else if self.unitEntity:getIsDead() then - self:changeState(UNIT_STATE.DEAD) if damageOrCureType == BattleConst.BUFF_NAME.BURN then local team = self.battleController:getOtherSideTeam(self.side) team:checkPassiveEvent(BattleConst.PASSIVE_EVENT.ON_DEAD_BY_BURN) end + if self.unitEntity:getAttrValue(BattleConst.ATTR_NAME.BLEED) > 0 then + local team = self.battleController:getOtherSideTeam(self.side) + team:checkPassiveEvent(BattleConst.PASSIVE_EVENT.ON_DEAD_WITH_BLEED) + end + + self:changeState(UNIT_STATE.DEAD) elseif damage < 0 then self:playHurt() end diff --git a/lua/app/module/battle/helper/battle_buff_special.lua b/lua/app/module/battle/helper/battle_buff_special.lua index 76db1ebb..29de6c1d 100644 --- a/lua/app/module/battle/helper/battle_buff_special.lua +++ b/lua/app/module/battle/helper/battle_buff_special.lua @@ -28,10 +28,12 @@ local function _skillFireTimesOff(buffSender, target, buff, buffEffect) end local function _bleedOn(buffSender, buff, target, buffEffect) + target.unitEntity:addAttr(buff:getName(), buff:getEffectNum(), false) return target.unitEntity:addAttr(BattleConst.ATTR_NAME.BE_SUCKED, 1000, false) -- 写死10% end local function _bleedOff(buffSender, target, buff, buffEffect) + target.unitEntity:addAttr(buff:getName(), -buff:getEffectNum(), false) target.unitEntity:addAttr(BattleConst.ATTR_NAME.BE_SUCKED, -1000, false) -- 写死10% return 1 end diff --git a/lua/app/module/battle/helper/battle_passive.lua b/lua/app/module/battle/helper/battle_passive.lua index 4d64f3cf..cca31052 100644 --- a/lua/app/module/battle/helper/battle_passive.lua +++ b/lua/app/module/battle/helper/battle_passive.lua @@ -61,6 +61,10 @@ local function _checkOnDeadBySkill(unitComp, skill, targetComp) return 1 end +local function _checkOnDeadWithBleed(unitComp, skill, targetComp) + return 1 +end + local function _checkOnDead(unitComp, skill, targetComp) return 1 end @@ -74,6 +78,7 @@ BattlePassive.checkTrigger = { [PASSIVE_EVENT.ON_ACTIVE_SKILL_BEFORE] = _checkOnActiveSkillBefore, [PASSIVE_EVENT.ON_DEAD_BY_BURN] = _checkOnDeadByBurn, [PASSIVE_EVENT.ON_DEAD_BY_SKILL] = _checkOnDeadBySkill, + [PASSIVE_EVENT.ON_DEAD_WITH_BLEED] = _checkOnDeadWithBleed, [PASSIVE_EVENT.ON_DEAD] = _checkOnDead, } From fdd5ad08f51bfdf10f4219afba625d1b920025dc Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 26 May 2023 21:36:08 +0800 Subject: [PATCH 07/31] =?UTF-8?q?=E5=8F=8D=E5=87=BBbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/component/battle_unit_comp.lua | 4 ++++ lua/app/module/battle/helper/battle_buff_handle.lua | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index e1b678e2..0655cf94 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1597,6 +1597,10 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, d team:checkPassiveEvent(BattleConst.PASSIVE_EVENT.ON_DEAD_WITH_BLEED) end + if self.actionOverCallback then -- 被反击时死亡 + self:onAttackOver() + end + self:changeState(UNIT_STATE.DEAD) elseif damage < 0 then self:playHurt() diff --git a/lua/app/module/battle/helper/battle_buff_handle.lua b/lua/app/module/battle/helper/battle_buff_handle.lua index 1803da19..29c7e144 100644 --- a/lua/app/module/battle/helper/battle_buff_handle.lua +++ b/lua/app/module/battle/helper/battle_buff_handle.lua @@ -161,11 +161,11 @@ BattleBuffHandle.removeShield = { target.unitEntity:addAttr(ATTR_NAME.SHIELD_REBOUND, -20000, false) target:removeShield(buffEffect) end, - [BUFF_NAME.SHIELD_REBOUND_400] = function(unitComp, buff, target, buffEffect) + [BUFF_NAME.SHIELD_REBOUND_400] = function(unitComp, target, buff, buffEffect) target.unitEntity:addAttr(ATTR_NAME.SHIELD_REBOUND, -40000, false) target:removeShield(buffEffect) end, - [BUFF_NAME.SHIELD_ICE_REBOUND_400] = function(unitComp, buff, target, buffEffect) + [BUFF_NAME.SHIELD_ICE_REBOUND_400] = function(unitComp, target, buff, buffEffect) target.unitEntity:addAttr(ATTR_NAME.SHIELD_REBOUND, -40000, false) target:removeShield(buffEffect) end, From 66c0f4810fdc03cde48ebb65d7f304b984cd9946 Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 26 May 2023 22:43:43 +0800 Subject: [PATCH 08/31] =?UTF-8?q?=E6=88=98=E4=BB=A4=E6=BB=91=E5=8A=A8?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/bounty/bounty_main_ui.lua | 74 +++++++++----------------- lua/app/ui/bounty/cell/bounty_cell.lua | 18 +------ 2 files changed, 26 insertions(+), 66 deletions(-) diff --git a/lua/app/ui/bounty/bounty_main_ui.lua b/lua/app/ui/bounty/bounty_main_ui.lua index 9d4e911c..6bfbfc11 100644 --- a/lua/app/ui/bounty/bounty_main_ui.lua +++ b/lua/app/ui/bounty/bounty_main_ui.lua @@ -24,7 +24,6 @@ function BountyMainUI:ctor() end function BountyMainUI:onClose() - self:clearAdaptScrollrect() if self.autoRotateTween then self.autoRotateTween:Kill() end @@ -122,6 +121,10 @@ function BountyMainUI:initRewards() ModuleManager.BountyManager:buyBountyLevel() end) + self.progressBg = self.uiMap["bounty_main_ui.mid_node.scrollrect.viewport.content.progress_bg"] + self.progressComp = self.uiMap["bounty_main_ui.mid_node.scrollrect.viewport.content.progress_bg.progress"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) + self.rewardsMaskBg = self.uiMap["bounty_main_ui.mid_node.scrollrect.viewport.content.mask_img"] + self.scrollrect = self.uiMap["bounty_main_ui.mid_node.scrollrect"] self.scrollrectViewport = self.uiMap["bounty_main_ui.mid_node.scrollrect.viewport"] self.rewardsContent = self.uiMap["bounty_main_ui.mid_node.scrollrect.viewport.content"] @@ -129,18 +132,12 @@ function BountyMainUI:initRewards() self.scrollrectComp:clearCells() self.scrollrectComp:setTotalCount(0) self.scrollrectComp:addInitCallback(function() + self.rewardsMaskBg:getTransform():SetAsLastSibling() + self.line:getTransform():SetAsLastSibling() + self.repeatRewardRoot:getTransform():SetAsLastSibling() return "app/ui/bounty/cell/bounty_cell" end) self.scrollrectComp:addRefreshCallback(function(index, cell) - -- TODO 有时候顺序还是不对 - if self.refreshIndex then - if index > self.refreshIndex then - cell:getBaseObject():getTransform():SetAsLastSibling() - elseif index < self.refreshIndex then - cell:getBaseObject():getTransform():SetAsFirstSibling() - end - end - self.refreshIndex = index local totalCount = self.scrollrectComp:getTotalCount() local isFinalCell = index == totalCount if not self.disablePreviewReward then @@ -157,29 +154,14 @@ function BountyMainUI:initRewards() end end end - cell:refresh(index, isFinalCell) - local lv = DataManager.BountyData:getLevel() - if index > lv - 1 or index < lv + 1 then - self.line:getTransform():SetAsLastSibling() - end - if not self.adjustRepeatRewardRoot then - self.adjustRepeatRewardRoot = true - local posY = -totalCount*self.cellHeight - self.repeatRewardRoot:setAnchoredPositionY(posY) - end - self.repeatRewardRoot:getTransform():SetAsLastSibling() + cell:refresh(index) end) self.cellHeight = self.uiMap["bounty_main_ui.mid_node.scrollrect.viewport.content.cell"]:getRectHeight() - local scrollBottom = 106 - local scrollTop = 464 - local height = self.root:getRectHeight() - height = height - scrollTop - scrollBottom + local height = self.scrollrect:getRectHeight() - self.scrollrectComp:getTopRecoveryOffset() - self.scrollrectComp:getDownRecoveryOffset() self.rewardCellNum = math.ceil(height/self.cellHeight) - self:adaptScrollrect() end function BountyMainUI:initRepeatReward() - self.adjustRepeatRewardRoot = false self.repeatRewardRoot = self.uiMap["bounty_main_ui.mid_node.scrollrect.viewport.content.repeat"] self.uiMap["bounty_main_ui.mid_node.scrollrect.viewport.content.repeat.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.REWARD_BOX_DESC)) self.uiMap["bounty_main_ui.mid_node.scrollrect.viewport.content.repeat.desc_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.BOUNTY_DESC_3)) @@ -202,26 +184,6 @@ function BountyMainUI:initRepeatReward() end) end -function BountyMainUI:adaptScrollrect() - if not self.rectDefaultSize then - self.rectDefaultSize = self.scrollrect:getSizeDelta() - end - if not self.viewDefaultSize then - self.viewDefaultSize = self.scrollrectViewport:getSizeDelta() - end - local addH = GFunc.calculateFitSizeY() - self.scrollrect:setSizeDelta(self.rectDefaultSize.x, self.rectDefaultSize.y + addH) - self.scrollrectViewport:setSizeDelta(self.viewDefaultSize.x, self.viewDefaultSize.y + addH) -end - -function BountyMainUI:clearAdaptScrollrect() - if not self.rectDefaultSize then - return - end - self.scrollrect:setSizeDelta(self.rectDefaultSize.x, self.rectDefaultSize.y) - self.scrollrectViewport:setSizeDelta(self.viewDefaultSize.x, self.viewDefaultSize.y) -end - function BountyMainUI:bindData() self:bind(DataManager.BountyData, "dirty", function() self:onRefresh() @@ -292,14 +254,28 @@ function BountyMainUI:refreshRewards() self.scrollrectComp:updateAllCell() self.disablePreviewReward = false end + local topRecoveryOffset = self.scrollrectComp:getTopRecoveryOffset() + local downRecoveryOffset = self.scrollrectComp:getDownRecoveryOffset() + local cellHeight = self.scrollrectComp:getCellHeight() if lv >= maxLv then self.line:setVisible(false) else self.line:setVisible(true) - local posY = -lv*self.cellHeight - self.line:setAnchoredPositionY(posY) + self.line:setAnchoredPositionY(-topRecoveryOffset - lv*cellHeight) end + self.progressBg:setAnchoredPositionY((topRecoveryOffset + downRecoveryOffset)/2 - cellHeight/2) + self.progressBg:setSizeDeltaY(cellHeight*(maxLv - 1)) + local percent = (lv - 1) / (maxLv - 1) + if percent < 0 then + percent = 0 + end + self.progressComp.value = percent + + self.rewardsMaskBg:setAnchoredPositionY(-topRecoveryOffset - lv*cellHeight) + self.rewardsMaskBg:setSizeDeltaY(cellHeight*maxLv + GConst.UI_SCREEN_HEIGHT) + + self.repeatRewardRoot:setAnchoredPositionY(downRecoveryOffset) if DataManager.BountyData:getIfCanClaimRepeatReward() then self.repeatRewardRoot:addRedPoint(74, 15) else diff --git a/lua/app/ui/bounty/cell/bounty_cell.lua b/lua/app/ui/bounty/cell/bounty_cell.lua index 94d4a437..7a3e4188 100644 --- a/lua/app/ui/bounty/cell/bounty_cell.lua +++ b/lua/app/ui/bounty/cell/bounty_cell.lua @@ -9,12 +9,9 @@ function BountyCell:init() self.bountyRewardCell1 = uiMap["cell.bg.bounty_reward_cell_1"]:addLuaComponent(BOUNTY_REWARD_CELL) uiMap["cell.bg.bounty_reward_cell_2"]:setAnchoredPositionX(GConst.UI_SCREEN_WIDTH/4) self.bountyRewardCell2 = uiMap["cell.bg.bounty_reward_cell_2"]:addLuaComponent(BOUNTY_REWARD_CELL) - self.maskImg = uiMap["cell.mask_img"] self.lvBg = uiMap["cell.bg.lv_bg"] self.lvTx = uiMap["cell.bg.lv_bg.lv_tx"] - self.progressBg = uiMap["cell.bg.progress_bg"] - self.progressComp = uiMap["cell.bg.progress_bg.progress"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) self.bountyRewardCell1:addClickListener(function() if self.idx == nil then return @@ -44,7 +41,7 @@ function BountyCell:init() end) end -function BountyCell:refresh(idx, isFinalCell) +function BountyCell:refresh(idx) self.idx = idx local bountyInfo = DataManager.BountyData:getSeasonInfoByLevel(idx) local lv = DataManager.BountyData:getLevel() @@ -56,13 +53,7 @@ function BountyCell:refresh(idx, isFinalCell) self.bountyRewardCell1:refresh(bountyInfo.reward, false, false, state) self.bountyRewardCell2:refresh(bountyInfo.reward_pro, true, not isBought, proState) if lv >= idx then - self.maskImg:setVisible(false) self.lvBg:setImageGray(false) - if lv == idx then - self.progressComp.value = 0 - else - self.progressComp.value = 1 - end if state then -- 已经领过了 self.bountyRewardCell1:hideLight() else @@ -75,16 +66,9 @@ function BountyCell:refresh(idx, isFinalCell) end else self.lvBg:setImageGray(true) - self.maskImg:setVisible(true) - self.progressComp.value = 0 self.bountyRewardCell1:hideLight() self.bountyRewardCell2:hideLight() end - if isFinalCell then - self.progressBg:setVisible(false) - else - self.progressBg:setVisible(true) - end end function BountyCell:setVisible(visible) From 6f084d2c9131502ec9ed01f3a1a9495382b52a72 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 29 May 2023 09:45:36 +0800 Subject: [PATCH 09/31] =?UTF-8?q?=E6=88=98=E6=96=97=E6=AD=BB=E4=BA=A1?= =?UTF-8?q?=E5=BB=B6=E8=BF=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/component/battle_unit_comp.lua | 2 +- lua/app/module/battle/controller/battle_controller.lua | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 0655cf94..dc5dd155 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1582,7 +1582,7 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, d end local hpPercent = self.unitEntity:getHpPercent() self.battleController:refreshHp(self.side, hp, hpPercent) - if not atker:getIsFinalBlock() then + if not atker:getIsFinalBlock() or not self.battleController:getIsLastInstruction() then if damage < 0 then self:playHurt() end diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 746eebf8..09004fe5 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -1234,6 +1234,14 @@ function BattleController:exeInstructions(callback) end end +function BattleController:getIsLastInstruction() + if not self.instructions or not self.instructions[1] then + return true + end + + return false +end + function BattleController:generateBoard(isFirst) local boardList, _, mysteryBoxIndexMap = self:getInitBoard() if self.curBoardIndex and self.curBoardIndex >= #boardList then From 6246a9cd9d939a5d620213712c3818edfe1e4bcf Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 29 May 2023 10:50:56 +0800 Subject: [PATCH 10/31] =?UTF-8?q?=E5=AD=98=E5=82=A8=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E6=8A=80=E8=83=BD=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../skill/battle_rogue_skill_handle.lua | 17 +++++++++-- .../skill/battle_board_skill_entity.lua | 29 +++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/lua/app/module/battle/skill/battle_rogue_skill_handle.lua b/lua/app/module/battle/skill/battle_rogue_skill_handle.lua index 99bd4bed..da9ae4ec 100644 --- a/lua/app/module/battle/skill/battle_rogue_skill_handle.lua +++ b/lua/app/module/battle/skill/battle_rogue_skill_handle.lua @@ -21,8 +21,19 @@ local _changeBaseSkill = function(skillId, skillInfo, battleData, battleControll if not battleData.atkTeam then return end - if battleData.atkTeam:getAllMembers()[elementType] then - battleData.atkTeam:getAllMembers()[elementType]:changeSkillId(skillId, newSkillId) + local unitEntity = battleData.atkTeam:getAllMembers()[elementType] + if unitEntity then + unitEntity:changeSkillId(skillId, newSkillId) + Logger.logHighlight("------------") + Logger.printTable(skillEntity:getSkillRoundAdd()) + Logger.printTable(skillEntity:getSkillEffecuNumAdd()) + for effectType, effect in pairs(skillEntity:getSkillRoundAdd()) do -- 技能回合数 + unitEntity:addSkillRound(newSkillId, effect) + end + + for effectType, effect in pairs(skillEntity:getSkillEffecuNumAdd()) do -- 技能效果 + unitEntity:addSkillParams(newSkillId, effect) + end end end end @@ -135,6 +146,7 @@ local _addSkillEffectParams = function(skillId, skillInfo, battleData, battleCon local skillEntity = battleData:getSkillEntityByElement(elementType) if skillEntity then local skillId = skillEntity:getSkillId() + skillEntity:addSkillEffecuNumAdd(effect) if not battleData.atkTeam then return end @@ -173,6 +185,7 @@ local _addSkillRound = function(skillId, skillInfo, battleData, battleController local skillEntity = battleData:getSkillEntityByElement(elementType) if skillEntity then local skillId = skillEntity:getSkillId() + skillEntity:addSkillRoundAdd(effect) if not battleData.atkTeam then return end diff --git a/lua/app/userdata/battle/skill/battle_board_skill_entity.lua b/lua/app/userdata/battle/skill/battle_board_skill_entity.lua index 8437fb21..465bda99 100644 --- a/lua/app/userdata/battle/skill/battle_board_skill_entity.lua +++ b/lua/app/userdata/battle/skill/battle_board_skill_entity.lua @@ -11,6 +11,8 @@ function BattleBoardSkillEntity:ctor(skillId) self.elementCountEffectEntities = {} -- 根据消除数量获得次数的技能效果 type = 13 self.linkCountMoreEffects = {} -- 链接超过x元素获得一次技能效果 type = 14 self.linkCountPowerEffects = {} -- 链接超过x元素获得倍数技能效果 type = 15 + self.skillEffectNumAdd = {} -- 技能效果参数增加 type = 7 用于技能替换时生效 + self.skillRoundAdd = {} -- 技能效果回合增加 type = 8 用于技能替换时生效 self.upSkillIdMap = {} self.getUpSkillKind = 0 @@ -446,4 +448,31 @@ function BattleBoardSkillEntity:getLinkCountPowerEffects() return self.linkCountPowerEffects end +function BattleBoardSkillEntity:addSkillEffecuNumAdd(effect) + local effectInfo = self.skillEffectNumAdd[effect.type] + if effectInfo then + effectInfo.num = effectInfo.num + effect.num + else + self.skillEffectNumAdd[effect.type] = effect + end +end + +function BattleBoardSkillEntity:getSkillEffecuNumAdd() + return self.skillEffectNumAdd +end + +function BattleBoardSkillEntity:addSkillRoundAdd(effect) + local effectInfo = self.skillRoundAdd[effect.type] + if effectInfo then + effectInfo.round = effectInfo.round + effect.round + else + self.skillRoundAdd[effect.type] = effect + end +end + +function BattleBoardSkillEntity:getSkillRoundAdd() + return self.skillRoundAdd +end + + return BattleBoardSkillEntity \ No newline at end of file From 5ab6aac2b65ddc1e3adb3904e58cdf6c9a2c4ac3 Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 29 May 2023 10:54:10 +0800 Subject: [PATCH 11/31] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D?= 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/data_manager.lua | 8 +- lua/app/common/pay_manager.lua | 6 +- lua/app/module/fund/fund_manager.lua | 24 ++-- lua/app/module/maincity/maincity_const.lua | 2 +- ...vel_fund_cell.lua => growth_fund_cell.lua} | 58 ++++----- .../growth_fund_cell.lua.meta} | 2 +- ...d_cell.lua => growth_fund_reward_cell.lua} | 18 +-- ....meta => growth_fund_reward_cell.lua.meta} | 2 +- .../{level_fund_ui.lua => growth_fund_ui.lua} | 118 +++++++++--------- .../growth_fund_ui.lua.meta} | 2 +- .../cell/side_bar_growth_fund_cell.lua | 24 ++++ .../cell/side_bar_growth_fund_cell.lua.meta} | 2 +- .../cell/side_bar_level_fund_cell.lua | 24 ---- lua/app/userdata/fund/fund_data.lua.meta | 10 -- .../{fund_data.lua => growth_fund_data.lua} | 114 ++++++++--------- .../userdata/fund/growth_fund_data.lua.meta | 10 ++ lua/app/userdata/shop/shop_data.lua | 4 +- 18 files changed, 216 insertions(+), 216 deletions(-) rename lua/app/ui/fund/cell/{level_fund_cell.lua => growth_fund_cell.lua} (51%) rename lua/app/ui/fund/{level_fund_ui.lua.meta => cell/growth_fund_cell.lua.meta} (86%) rename lua/app/ui/fund/cell/{level_fund_reward_cell.lua => growth_fund_reward_cell.lua} (82%) rename lua/app/ui/fund/cell/{level_fund_cell.lua.meta => growth_fund_reward_cell.lua.meta} (86%) rename lua/app/ui/fund/{level_fund_ui.lua => growth_fund_ui.lua} (52%) rename lua/app/ui/{main_city/cell/side_bar_level_fund_cell.lua.meta => fund/growth_fund_ui.lua.meta} (86%) create mode 100644 lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua rename lua/app/ui/{fund/cell/level_fund_reward_cell.lua.meta => main_city/cell/side_bar_growth_fund_cell.lua.meta} (86%) delete mode 100644 lua/app/ui/main_city/cell/side_bar_level_fund_cell.lua delete mode 100644 lua/app/userdata/fund/fund_data.lua.meta rename lua/app/userdata/fund/{fund_data.lua => growth_fund_data.lua} (68%) create mode 100644 lua/app/userdata/fund/growth_fund_data.lua.meta diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index 6c9295e5..b671dfc5 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -84,7 +84,7 @@ BIReport.ITEM_GET_TYPE = { PLAYER_LV_UP = "PlayerLvUp", GOLD_PIG = "GoldPig", BATTLE_SKILL_REFRESH = "BattleSkillRefresh", - LEVEL_FUND = "LevelFund", + GROWTH_FUND = "GrowthFund", GROW_UP_GIFT = "GrowUpGift", -- 成长礼包 SEVEN_DAY_TASK = "SevenDayTask", SEVEN_DAY_STEP_REWARD = "SevenDayStepReward", @@ -137,7 +137,7 @@ BIReport.GIFT_TYPE = { GOLD_PIG = "GoldPig", MALL_TREASURE = "MallTreasure", ACT_CHAPTER_STORE = "ActChapterStore", - LEVEL_FUND = "LevelFund", + GROWTH_FUND = "GrowthFund", GROW_UP_GIFT = "GrowUpGift", } diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index 2e08160a..4af4a7b9 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -20,7 +20,7 @@ function DataManager:init() self:initManager("TaskData", "app/userdata/task/task_data") self:initManager("DailyTaskData", "app/userdata/task/daily_task_data") self:initManager("IdleData", "app/userdata/idle/idle_data") - self:initManager("FundData", "app/userdata/fund/fund_data") + self:initManager("GrowthFundData", "app/userdata/fund/growth_fund_data") self:initManager("SevenDayData", "app/userdata/activity/seven_day/seven_day_data") self:initManager("ShopData", "app/userdata/shop/shop_data") self:initManager("SummonData", "app/userdata/summon/summon_data") @@ -92,7 +92,7 @@ function DataManager:clear() self.BountyData:clear() self.DailyTaskData:clear() self.IdleData:clear() - self.FundData:clear() + self.GrowthFundData:clear() self.SevenDayData:clear() self.ShopData:clear() self.SummonData:clear() @@ -133,10 +133,10 @@ function DataManager:initWithServerData(data) self.ShopData:initCommonDailyGoldGift(data.mall_idle and data.mall_idle.ad_count) -- 常驻金币礼包 self.ShopData:initGrowUpGift(data.act_grow_up_gift, data.now_ts) -- 成长礼包 self.ShopData:initLevelUpGift(data.act_level_up_gift) -- 助力/金币礼包 - self.SummonData:init(data.summon, true) + self.SummonData:init(data.summon, true) -- 成长基金要在ShopData和PlayerDataBagData还有之后初始化，依赖这些数据 if data.fund then - self.FundData:init(data.fund.funds) + self.GrowthFundData:init(data.fund.funds) end -- 任务数据最后初始化,依赖其他模块的数据 diff --git a/lua/app/common/pay_manager.lua b/lua/app/common/pay_manager.lua index 9fc449b8..ff78d38d 100644 --- a/lua/app/common/pay_manager.lua +++ b/lua/app/common/pay_manager.lua @@ -15,7 +15,7 @@ PayManager.PURCHARSE_ACT_TYPE = { COIN_GIFT = 2, BEGINNER_GIFT = 4, LEVEL_UP_GIFT = 5, - LEVEL_FUND = 6, + GROWTH_FUND = 6, BOUNTY = 7, } @@ -33,7 +33,7 @@ PayManager.BI_ITEM_GET_TYPE = { [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = BIReport.ITEM_GET_TYPE.COIN_GIFT, [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = BIReport.ITEM_GET_TYPE.BEGINNER_GIFT, [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = BIReport.ITEM_GET_TYPE.LEVEL_UP_GIFT, - [PayManager.PURCHARSE_ACT_TYPE.LEVEL_FUND] = BIReport.ITEM_GET_TYPE.LEVEL_FUND, + [PayManager.PURCHARSE_ACT_TYPE.GROWTH_FUND] = BIReport.ITEM_GET_TYPE.GROWTH_FUND, [PayManager.PURCHARSE_ACT_TYPE.BOUNTY] = BIReport.ITEM_GET_TYPE.BOUNTY, }, [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.ITEM_GET_TYPE.GOLD_PIG, @@ -48,7 +48,7 @@ PayManager.BI_GIFT_TYPE = { [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = BIReport.GIFT_TYPE.COIN_GIFT, [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = BIReport.GIFT_TYPE.BEGINNER_GIFT, [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = BIReport.GIFT_TYPE.LEVEL_UP_GIFT, - [PayManager.PURCHARSE_ACT_TYPE.LEVEL_FUND] = BIReport.GIFT_TYPE.LEVEL_FUND, + [PayManager.PURCHARSE_ACT_TYPE.GROWTH_FUND] = BIReport.GIFT_TYPE.GROWTH_FUND, [PayManager.PURCHARSE_ACT_TYPE.BOUNTY] = BIReport.GIFT_TYPE.BOUNTY, }, [PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.GIFT_TYPE.GOLD_PIG, diff --git a/lua/app/module/fund/fund_manager.lua b/lua/app/module/fund/fund_manager.lua index 231ae975..13a49952 100644 --- a/lua/app/module/fund/fund_manager.lua +++ b/lua/app/module/fund/fund_manager.lua @@ -1,11 +1,11 @@ local FundManager = class("FundManager", BaseModule) function FundManager:showLevelFundUI() - UIManager:showUI("app/ui/fund/level_fund_ui") + UIManager:showUI("app/ui/fund/growth_fund_ui") end function FundManager:buyLevelFund(id) - if not DataManager.FundData:getIsOpen() then + if not DataManager.GrowthFundData:getIsOpen() then return end PayManager:purchasePackage(id, PayManager.PURCHARSE_TYPE.ACT_GIFT) @@ -14,15 +14,15 @@ end function FundManager:claimFundRewards() local claimRewards = {} local playerLevel = DataManager.PlayerData:getLv() - local FundData = DataManager.FundData - local levelInfoIds = FundData:getCurrLevelInfoList() - local isBoughtBase = FundData:getIsBoughtBase() - local isBoughtAdvance = FundData:getIsBoughtAdvance() - local freeClaimed = FundData:getFreeClaimedMap() - local baseClaimed = FundData:getBaseClaimedMap() - local advanceClaimed = FundData:getAdvanceClaimedMap() - for _, id in ipairs(levelInfoIds) do - local levelFundInfo = FundData:getLevelFundCfg()[id] + local GrowthFundData = DataManager.GrowthFundData + local gradeInfoIds = GrowthFundData:getCurrGradeInfoList() + local isBoughtBase = GrowthFundData:getIsBoughtBase() + local isBoughtAdvance = GrowthFundData:getIsBoughtAdvance() + local freeClaimed = GrowthFundData:getFreeClaimedMap() + local baseClaimed = GrowthFundData:getBaseClaimedMap() + local advanceClaimed = GrowthFundData:getAdvanceClaimedMap() + for _, id in ipairs(gradeInfoIds) do + local levelFundInfo = GrowthFundData:getLevelFundCfg()[id] if levelFundInfo then if playerLevel >= levelFundInfo.level then -- 等级到了 if not freeClaimed[id] then -- 能领但是没有领 @@ -66,7 +66,7 @@ function FundManager:onClaimFundRewards(result) if result.rewards then GFunc.showRewardBox(result.rewards) end - DataManager.FundData:onClaimFundRewards(result.id_with_lv) + DataManager.GrowthFundData:onClaimFundRewards(result.id_with_lv) end end diff --git a/lua/app/module/maincity/maincity_const.lua b/lua/app/module/maincity/maincity_const.lua index d887e565..a8fa62c0 100644 --- a/lua/app/module/maincity/maincity_const.lua +++ b/lua/app/module/maincity/maincity_const.lua @@ -24,7 +24,7 @@ MainCityConst.LEFT_SIDE_BARS = { MainCityConst.RIGHT_SIDE_BARS = { "app/ui/main_city/cell/side_bar_gold_pig_cell", - "app/ui/main_city/cell/side_bar_level_fund_cell", + "app/ui/main_city/cell/side_bar_growth_fund_cell", "app/ui/main_city/cell/side_bar_beginner_gift_cell", "app/ui/main_city/cell/side_bar_grow_up_gift_1_cell", "app/ui/main_city/cell/side_bar_grow_up_gift_2_cell", diff --git a/lua/app/ui/fund/cell/level_fund_cell.lua b/lua/app/ui/fund/cell/growth_fund_cell.lua similarity index 51% rename from lua/app/ui/fund/cell/level_fund_cell.lua rename to lua/app/ui/fund/cell/growth_fund_cell.lua index fa151873..7127d00e 100644 --- a/lua/app/ui/fund/cell/level_fund_cell.lua +++ b/lua/app/ui/fund/cell/growth_fund_cell.lua @@ -1,60 +1,60 @@ -local LevelFundCell = class("LevelFundCell", BaseCell) +local GrowthFundCell = class("GrowthFundCell", BaseCell) -local Fund_REWARD_CELL = "app/ui/fund/cell/level_fund_reward_cell" +local Fund_REWARD_CELL = "app/ui/fund/cell/growth_fund_reward_cell" -function LevelFundCell:init() +function GrowthFundCell:init() local uiMap = self:getUIMap() local width = GConst.UI_SCREEN_WIDTH - self.fundRewardCell1 = uiMap["level_fund_cell.fund_reward_cell_1"]:addLuaComponent(Fund_REWARD_CELL) + self.fundRewardCell1 = uiMap["growth_fund_cell.fund_reward_cell_1"]:addLuaComponent(Fund_REWARD_CELL) self.fundRewardCell1:setAnchoredPositionX(-width/3) self.fundRewardCell1:addClickListener(function() if self.fundId == nil then return end - local iCslaimed = DataManager.FundData:getIsClaimedBase(self.fundId) - local needLevel = DataManager.FundData:getNeedLevel(self.fundId) + local iCslaimed = DataManager.GrowthFundData:getIsClaimedBase(self.fundId) + local needLevel = DataManager.GrowthFundData:getNeedLevel(self.fundId) local playerLevel = DataManager.PlayerData:getLv() if not iCslaimed and playerLevel >= needLevel then ModuleManager.FundManager:claimFundRewards() else - local freeReward = DataManager.FundData:getFreeFundRewards(self.fundId) + local freeReward = DataManager.GrowthFundData:getFreeFundRewards(self.fundId) local reward = freeReward and freeReward[1] if reward then ModuleManager.TipsManager:showRewardTips(reward.id, reward.type, self.fundRewardCell1:getBaseObject()) end end end) - self.fundRewardCell2 = uiMap["level_fund_cell.fund_reward_cell_2"]:addLuaComponent(Fund_REWARD_CELL) + self.fundRewardCell2 = uiMap["growth_fund_cell.fund_reward_cell_2"]:addLuaComponent(Fund_REWARD_CELL) self.fundRewardCell2:addClickListener(function() if self.fundId == nil then return end - local iCslaimed = DataManager.FundData:getIsClaimedBase(self.fundId) - local needLevel = DataManager.FundData:getNeedLevel(self.fundId) + local iCslaimed = DataManager.GrowthFundData:getIsClaimedBase(self.fundId) + local needLevel = DataManager.GrowthFundData:getNeedLevel(self.fundId) local playerLevel = DataManager.PlayerData:getLv() - if not iCslaimed and playerLevel >= needLevel and DataManager.FundData:getIsBoughtBase(self.fundId) then + if not iCslaimed and playerLevel >= needLevel and DataManager.GrowthFundData:getIsBoughtBase(self.fundId) then ModuleManager.FundManager:claimFundRewards() else - local baseReward = DataManager.FundData:getBaseFundRewards(self.fundId) + local baseReward = DataManager.GrowthFundData:getBaseFundRewards(self.fundId) local reward = baseReward and baseReward[1] if reward then ModuleManager.TipsManager:showRewardTips(reward.id, reward.type, self.fundRewardCell2:getBaseObject()) end end end) - self.fundRewardCell3 = uiMap["level_fund_cell.fund_reward_cell_3"]:addLuaComponent(Fund_REWARD_CELL) + self.fundRewardCell3 = uiMap["growth_fund_cell.fund_reward_cell_3"]:addLuaComponent(Fund_REWARD_CELL) self.fundRewardCell3:addClickListener(function() if self.fundId == nil then return end - local iCslaimed = DataManager.FundData:getIsClaimedAdvance(self.fundId) - local needLevel = DataManager.FundData:getNeedLevel(self.fundId) + local iCslaimed = DataManager.GrowthFundData:getIsClaimedAdvance(self.fundId) + local needLevel = DataManager.GrowthFundData:getNeedLevel(self.fundId) local playerLevel = DataManager.PlayerData:getLv() - if not iCslaimed and playerLevel >= needLevel and DataManager.FundData:getIsBoughtAdvance(self.fundId) then + if not iCslaimed and playerLevel >= needLevel and DataManager.GrowthFundData:getIsBoughtAdvance(self.fundId) then ModuleManager.FundManager:claimFundRewards() else - local advanceReward = DataManager.FundData:getAdvanceFundRewards(self.fundId) + local advanceReward = DataManager.GrowthFundData:getAdvanceFundRewards(self.fundId) local reward = advanceReward and advanceReward[1] if reward then ModuleManager.TipsManager:showRewardTips(reward.id, reward.type, self.fundRewardCell3:getBaseObject()) @@ -62,28 +62,28 @@ function LevelFundCell:init() end end) self.fundRewardCell3:setAnchoredPositionX(width/3) - self.levelBg = uiMap["level_fund_cell.lv_bg"] + self.levelBg = uiMap["growth_fund_cell.lv_bg"] self.levelBg:setAnchoredPositionX(-width/6) - self.levelGrayImg = uiMap["level_fund_cell.lv_bg.gray"] - self.levelTx = uiMap["level_fund_cell.lv_bg.tx"] + self.levelGrayImg = uiMap["growth_fund_cell.lv_bg.gray"] + self.levelTx = uiMap["growth_fund_cell.lv_bg.tx"] end -function LevelFundCell:refresh(id) +function GrowthFundCell:refresh(id) self.fundId = id - local FundData = DataManager.FundData - local needLevel = DataManager.FundData:getNeedLevel(id) + local GrowthFundData = DataManager.GrowthFundData + local needLevel = DataManager.GrowthFundData:getNeedLevel(id) local playerLevel = DataManager.PlayerData:getLv() local isActive = playerLevel >= needLevel self.levelGrayImg:setVisible(not isActive) self.levelTx:setText(GFunc.intToString(needLevel)) - local freeReward, baseReward, advanceReward = FundData:getAllStepFundRewards(id) - self.fundRewardCell1:refresh(freeReward[1], isActive and 1 or 0, false, FundData:getIsClaimedFree(id)) - self.fundRewardCell2:refresh(baseReward[1], isActive and 2 or 0, not FundData:getIsBoughtBase(id), FundData:getIsClaimedBase(id)) - self.fundRewardCell3:refresh(advanceReward[1], isActive and 3 or 0, not FundData:getIsBoughtAdvance(id), FundData:getIsClaimedAdvance(id)) + local freeReward, baseReward, advanceReward = GrowthFundData:getAllStepFundRewards(id) + self.fundRewardCell1:refresh(freeReward[1], isActive and 1 or 0, false, GrowthFundData:getIsClaimedFree(id)) + self.fundRewardCell2:refresh(baseReward[1], isActive and 2 or 0, not GrowthFundData:getIsBoughtBase(id), GrowthFundData:getIsClaimedBase(id)) + self.fundRewardCell3:refresh(advanceReward[1], isActive and 3 or 0, not GrowthFundData:getIsBoughtAdvance(id), GrowthFundData:getIsClaimedAdvance(id)) end -function LevelFundCell:setVisible(visible) +function GrowthFundCell:setVisible(visible) self.baseObject:setVisible(visible) end -return LevelFundCell \ No newline at end of file +return GrowthFundCell \ No newline at end of file diff --git a/lua/app/ui/fund/level_fund_ui.lua.meta b/lua/app/ui/fund/cell/growth_fund_cell.lua.meta similarity index 86% rename from lua/app/ui/fund/level_fund_ui.lua.meta rename to lua/app/ui/fund/cell/growth_fund_cell.lua.meta index f65e895f..871c0417 100644 --- a/lua/app/ui/fund/level_fund_ui.lua.meta +++ b/lua/app/ui/fund/cell/growth_fund_cell.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3380bc95e342186458dd56f3cdd4e4f0 +guid: 2bc37d625f652654b83c5cedaaa8c2f1 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/ui/fund/cell/level_fund_reward_cell.lua b/lua/app/ui/fund/cell/growth_fund_reward_cell.lua similarity index 82% rename from lua/app/ui/fund/cell/level_fund_reward_cell.lua rename to lua/app/ui/fund/cell/growth_fund_reward_cell.lua index 4bea8d9f..9ee479d8 100644 --- a/lua/app/ui/fund/cell/level_fund_reward_cell.lua +++ b/lua/app/ui/fund/cell/growth_fund_reward_cell.lua @@ -1,6 +1,6 @@ -local LevelFundRewardCell = class("LevelFundRewardCell", BaseCell) +local GrowthFundRewardCell = class("GrowthFundRewardCell", BaseCell) -function LevelFundRewardCell:init() +function GrowthFundRewardCell:init() local uiMap = self:getUIMap() self.bg = uiMap["fund_reward_cell.bg"] self.icon = uiMap["fund_reward_cell.icon"] @@ -18,7 +18,7 @@ function LevelFundRewardCell:init() end) end -function LevelFundRewardCell:refresh(reward, step, isLock, showCheck) +function GrowthFundRewardCell:refresh(reward, step, isLock, showCheck) if step == 0 then self.bg:setSprite(GConst.ATLAS_PATH.FUND, "fund_bg_5") elseif step == 1 then @@ -49,7 +49,7 @@ function LevelFundRewardCell:refresh(reward, step, isLock, showCheck) end end -function LevelFundRewardCell:_refreshItem(item) +function GrowthFundRewardCell:_refreshItem(item) local info = ConfigManager:getConfig("item")[item.id] if info == nil then return @@ -71,20 +71,20 @@ function LevelFundRewardCell:_refreshItem(item) end end -function LevelFundRewardCell:setVisible(visible) +function GrowthFundRewardCell:setVisible(visible) self.baseObject:setActive(visible) end -function LevelFundRewardCell:setAnchoredPositionX(x) +function GrowthFundRewardCell:setAnchoredPositionX(x) self.baseObject:setAnchoredPositionX(x) end -function LevelFundRewardCell:setTouchEnable(enable) +function GrowthFundRewardCell:setTouchEnable(enable) self.baseObject:setTouchEnable(enable) end -function LevelFundRewardCell:addClickListener(callback) +function GrowthFundRewardCell:addClickListener(callback) self.clickCallback = callback end -return LevelFundRewardCell \ No newline at end of file +return GrowthFundRewardCell \ No newline at end of file diff --git a/lua/app/ui/fund/cell/level_fund_cell.lua.meta b/lua/app/ui/fund/cell/growth_fund_reward_cell.lua.meta similarity index 86% rename from lua/app/ui/fund/cell/level_fund_cell.lua.meta rename to lua/app/ui/fund/cell/growth_fund_reward_cell.lua.meta index 86dd2f01..6e16472c 100644 --- a/lua/app/ui/fund/cell/level_fund_cell.lua.meta +++ b/lua/app/ui/fund/cell/growth_fund_reward_cell.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7f29b4252c5aeb64abafe246ea6c16e5 +guid: 3e3a08bdfecbd8b49ada85fa70fe5c8b ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/ui/fund/level_fund_ui.lua b/lua/app/ui/fund/growth_fund_ui.lua similarity index 52% rename from lua/app/ui/fund/level_fund_ui.lua rename to lua/app/ui/fund/growth_fund_ui.lua index a7541702..7c4a8ffc 100644 --- a/lua/app/ui/fund/level_fund_ui.lua +++ b/lua/app/ui/fund/growth_fund_ui.lua @@ -1,10 +1,10 @@ -local LevelFundUI = class("LevelFundUI", BaseUI) +local GrowthFundUI = class("GrowthFundUI", BaseUI) -function LevelFundUI:isFullScreen() +function GrowthFundUI:isFullScreen() return true end -function LevelFundUI:getCurrencyParams() +function GrowthFundUI:getCurrencyParams() if self.currencyParams == nil then self.currencyParams = { itemIds = { @@ -18,21 +18,21 @@ function LevelFundUI:getCurrencyParams() return self.currencyParams end -function LevelFundUI:getPrefabPath() - return "assets/prefabs/ui/fund/level_fund_ui.prefab" +function GrowthFundUI:getPrefabPath() + return "assets/prefabs/ui/fund/growth_fund_ui.prefab" end -function LevelFundUI:ctor() - self.fundLevel = DataManager.FundData:getFundLevel() - self:initLevelInfoList() +function GrowthFundUI:ctor() + self.fundGrade = DataManager.GrowthFundData:getFundGrade() + self:initGradeInfoList() end -function LevelFundUI:initLevelInfoList() - self.levelInfoList = DataManager.FundData:getCurrLevelInfoList() +function GrowthFundUI:initGradeInfoList() + self.gradeInfoList = DataManager.GrowthFundData:getCurrGradeInfoList() local playerLevel = DataManager.PlayerData:getLv() local cfg = ConfigManager:getConfig("act_level_fund") self.inactiveIndex = nil - for k, v in ipairs(self.levelInfoList) do + for k, v in ipairs(self.gradeInfoList) do if cfg[v] then if playerLevel < cfg[v].level then self.inactiveIndex = k @@ -41,20 +41,20 @@ function LevelFundUI:initLevelInfoList() end end if self.inactiveIndex == nil then - self.inactiveIndex = #self.levelInfoList + 1 + self.inactiveIndex = #self.gradeInfoList + 1 end end -function LevelFundUI:onClose() +function GrowthFundUI:onClose() if self.originTitleBgHeight then - self.uiMap["level_fund_ui.title_img.bg"]:setSizeDeltaY(self.originTitleBgHeight) + self.uiMap["growth_fund_ui.title_img.bg"]:setSizeDeltaY(self.originTitleBgHeight) end end -function LevelFundUI:onLoadRootComplete() +function GrowthFundUI:onLoadRootComplete() self.uiMap = self.root:genAllChildren() - self.uiMap["level_fund_ui.down.close_btn"]:addClickListener(function() + self.uiMap["growth_fund_ui.down.close_btn"]:addClickListener(function() self:closeUI() end) @@ -64,77 +64,77 @@ function LevelFundUI:onLoadRootComplete() self:bindData() end -function LevelFundUI:initTitle() - self.titleTx = self.uiMap["level_fund_ui.title_img.title_tx"] - self.titleDialogBg = self.uiMap["level_fund_ui.title_img.bg"] +function GrowthFundUI:initTitle() + self.titleTx = self.uiMap["growth_fund_ui.title_img.title_tx"] + self.titleDialogBg = self.uiMap["growth_fund_ui.title_img.bg"] self.originTitleBgHeight = self.titleDialogBg:fastGetSizeDeltaY() end -function LevelFundUI:initPayBtns() +function GrowthFundUI:initPayBtns() local width = GConst.UI_SCREEN_WIDTH - local freeTx = self.uiMap["level_fund_ui.title_bg_2.free_tx"] + local freeTx = self.uiMap["growth_fund_ui.title_bg_2.free_tx"] freeTx:setText(I18N:getGlobalText(I18N.GlobalConst.STR_FREE)) freeTx:setAnchoredPositionX(-width/3) - self.payBtn1 = self.uiMap["level_fund_ui.title_bg_2.btn_1"] + self.payBtn1 = self.uiMap["growth_fund_ui.title_bg_2.btn_1"] self.payBtn1:addClickListener(function() - ModuleManager.FundManager:buyLevelFund(DataManager.FundData:getFundBaseId()) + ModuleManager.FundManager:buyLevelFund(DataManager.GrowthFundData:getFundBaseId()) end) - self.payBtnTx1 = self.uiMap["level_fund_ui.title_bg_2.btn_1.text"] + self.payBtnTx1 = self.uiMap["growth_fund_ui.title_bg_2.btn_1.text"] - self.payBtn2 = self.uiMap["level_fund_ui.title_bg_2.btn_2"] + self.payBtn2 = self.uiMap["growth_fund_ui.title_bg_2.btn_2"] self.payBtn2:setAnchoredPositionX(width/3) self.payBtn2:addClickListener(function() - ModuleManager.FundManager:buyLevelFund(DataManager.FundData:getFundAdvanceId()) + ModuleManager.FundManager:buyLevelFund(DataManager.GrowthFundData:getFundAdvanceId()) end) - self.payBtnTx2 = self.uiMap["level_fund_ui.title_bg_2.btn_2.text"] + self.payBtnTx2 = self.uiMap["growth_fund_ui.title_bg_2.btn_2.text"] end -function LevelFundUI:initRewards() - self.scrollRect = self.uiMap["level_fund_ui.scrollrect"] +function GrowthFundUI:initRewards() + self.scrollRect = self.uiMap["growth_fund_ui.scrollrect"] self.scrollRectComp = self.scrollRect:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) self.scrollRectComp:addInitCallback(function() - return "app/ui/fund/cell/level_fund_cell" + return "app/ui/fund/cell/growth_fund_cell" end) self.scrollRectComp:addRefreshCallback(function(index, cell) - cell:refresh(self.levelInfoList[index]) + cell:refresh(self.gradeInfoList[index]) end) self.scrollRectComp:clearCells() self.scrollRectComp:setTotalCount(0) - self.progressBg = self.uiMap["level_fund_ui.scrollrect.viewport.content.progress_bg"] - self.progressComp = self.uiMap["level_fund_ui.scrollrect.viewport.content.progress_bg.progress"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) - self.grayImg = self.uiMap["level_fund_ui.scrollrect.viewport.content.gray_img"] - self.horizontalLine = self.uiMap["level_fund_ui.scrollrect.viewport.content.line_img"] - self.verticalLine1 = self.uiMap["level_fund_ui.scrollrect.viewport.content.vertical_line_1"] - self.verticalLine2 = self.uiMap["level_fund_ui.scrollrect.viewport.content.vertical_line_2"] + self.progressBg = self.uiMap["growth_fund_ui.scrollrect.viewport.content.progress_bg"] + self.progressComp = self.uiMap["growth_fund_ui.scrollrect.viewport.content.progress_bg.progress"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) + self.grayImg = self.uiMap["growth_fund_ui.scrollrect.viewport.content.gray_img"] + self.horizontalLine = self.uiMap["growth_fund_ui.scrollrect.viewport.content.line_img"] + self.verticalLine1 = self.uiMap["growth_fund_ui.scrollrect.viewport.content.vertical_line_1"] + self.verticalLine2 = self.uiMap["growth_fund_ui.scrollrect.viewport.content.vertical_line_2"] end -function LevelFundUI:bindData() - self:bind(DataManager.FundData, "dirty", function() - if self.fundLevel ~= DataManager.FundData:getFundLevel() then - self.fundLevel = DataManager.FundData:getFundLevel() - self:initLevelInfoList() +function GrowthFundUI:bindData() + self:bind(DataManager.GrowthFundData, "dirty", function() + if self.fundGrade ~= DataManager.GrowthFundData:getFundGrade() then + self.fundGrade = DataManager.GrowthFundData:getFundGrade() + self:initGradeInfoList() end self:onRefresh() end) end -function LevelFundUI:onRefresh() +function GrowthFundUI:onRefresh() self:refreshTitle() self:refreshPayBtns() self:refreshRewards() end -function LevelFundUI:refreshTitle() - local fundLevel = DataManager.FundData:getFundLevel() - if fundLevel == 1 then - self.uiMap["level_fund_ui.title_img"]:setTexture("assets/arts/textures/background/fund/fund_bg_1.png") - elseif fundLevel == 2 then - self.uiMap["level_fund_ui.title_img"]:setTexture("assets/arts/textures/background/fund/fund_bg_2.png") +function GrowthFundUI:refreshTitle() + local fundGrade = DataManager.GrowthFundData:getFundGrade() + if fundGrade == 1 then + self.uiMap["growth_fund_ui.title_img"]:setTexture("assets/arts/textures/background/fund/fund_bg_1.png") + elseif fundGrade == 2 then + self.uiMap["growth_fund_ui.title_img"]:setTexture("assets/arts/textures/background/fund/fund_bg_2.png") end - self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.LEVEL_FUND_DESC_1, fundLevel)) + self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.LEVEL_FUND_DESC_1, fundGrade)) local height = self.titleTx:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO).preferredHeight + 58 if height < self.originTitleBgHeight then height = self.originTitleBgHeight @@ -142,17 +142,17 @@ function LevelFundUI:refreshTitle() self.titleDialogBg:setSizeDeltaY(height) end -function LevelFundUI:refreshPayBtns() - if not DataManager.FundData:getIsBoughtBase() then - local rechargeId = DataManager.FundData:getCurrLevelBaseRechargeId() +function GrowthFundUI:refreshPayBtns() + if not DataManager.GrowthFundData:getIsBoughtBase() then + local rechargeId = DataManager.GrowthFundData:getCurrGradeBaseRechargeId() self.payBtnTx1:setText(GFunc.getFormatPrice(rechargeId)) self.payBtn1:setTouchEnable(true) else self.payBtnTx1:setText(I18N:getGlobalText(I18N.GlobalConst.ALREADY_ACTIVE)) self.payBtn1:setTouchEnable(false) end - if not DataManager.FundData:getIsBoughtAdvance() then - local rechargeId = DataManager.FundData:getCurrLevelAdvanceRechargeId() + if not DataManager.GrowthFundData:getIsBoughtAdvance() then + local rechargeId = DataManager.GrowthFundData:getCurrGradeAdvanceRechargeId() self.payBtnTx2:setText(GFunc.getFormatPrice(rechargeId)) self.payBtn2:setTouchEnable(true) else @@ -161,11 +161,11 @@ function LevelFundUI:refreshPayBtns() end end -function LevelFundUI:refreshRewards() - local count = #self.levelInfoList +function GrowthFundUI:refreshRewards() + local count = #self.gradeInfoList if self.scrollRectComp:getTotalCount() <= 0 then self.scrollRectComp:refillCells(count) - local minIndex = DataManager.FundData:getMinUnclaimedRewardIndex() + local minIndex = DataManager.GrowthFundData:getMinUnclaimedRewardIndex() if minIndex > 1 then self.scrollRectComp:moveToIndex(minIndex) end @@ -200,4 +200,4 @@ function LevelFundUI:refreshRewards() self.horizontalLine:setAnchoredPositionY(-topRecoveryOffset - (self.inactiveIndex - 1)*cellWidth) end -return LevelFundUI \ No newline at end of file +return GrowthFundUI \ No newline at end of file diff --git a/lua/app/ui/main_city/cell/side_bar_level_fund_cell.lua.meta b/lua/app/ui/fund/growth_fund_ui.lua.meta similarity index 86% rename from lua/app/ui/main_city/cell/side_bar_level_fund_cell.lua.meta rename to lua/app/ui/fund/growth_fund_ui.lua.meta index fb7a3b35..dc167370 100644 --- a/lua/app/ui/main_city/cell/side_bar_level_fund_cell.lua.meta +++ b/lua/app/ui/fund/growth_fund_ui.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 14a96472379bd3b45a9544e750fa0f10 +guid: 5a975799c3c9cc14fafc8e2c8d9cf4a7 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua b/lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua new file mode 100644 index 00000000..a1efe9ec --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua @@ -0,0 +1,24 @@ +local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell" +local SideBarGrowthFundCell = class("SideBarGrowthFundCell", SideBarBaseCellComp) + +function SideBarGrowthFundCell:getIsOpen() + return DataManager.GrowthFundData:getIsOpen() +end + +function SideBarGrowthFundCell:getIconRes() + return "main_btn_fund" +end + +function SideBarGrowthFundCell:onClick() + ModuleManager.FundManager:showLevelFundUI() +end + +function SideBarGrowthFundCell:getIsShowRedPoint() + return DataManager.GrowthFundData:getIfCanClaimReward() +end + +function SideBarGrowthFundCell:getHasShake() + return true +end + +return SideBarGrowthFundCell \ No newline at end of file diff --git a/lua/app/ui/fund/cell/level_fund_reward_cell.lua.meta b/lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua.meta similarity index 86% rename from lua/app/ui/fund/cell/level_fund_reward_cell.lua.meta rename to lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua.meta index 3f54d7bc..da3aa0f0 100644 --- a/lua/app/ui/fund/cell/level_fund_reward_cell.lua.meta +++ b/lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b6e1fcafc8ff9f4459edefaa8e079e3e +guid: 89fd1069c28a504499e23bd0718b4d8a ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/ui/main_city/cell/side_bar_level_fund_cell.lua b/lua/app/ui/main_city/cell/side_bar_level_fund_cell.lua deleted file mode 100644 index a7d242fe..00000000 --- a/lua/app/ui/main_city/cell/side_bar_level_fund_cell.lua +++ /dev/null @@ -1,24 +0,0 @@ -local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell" -local SideBarLevelFundCell = class("SideBarLevelFundCell", SideBarBaseCellComp) - -function SideBarLevelFundCell:getIsOpen() - return DataManager.FundData:getIsOpen() -end - -function SideBarLevelFundCell:getIconRes() - return "main_btn_fund" -end - -function SideBarLevelFundCell:onClick() - ModuleManager.FundManager:showLevelFundUI() -end - -function SideBarLevelFundCell:getIsShowRedPoint() - return DataManager.FundData:getIfCanClaimReward() -end - -function SideBarLevelFundCell:getHasShake() - return true -end - -return SideBarLevelFundCell \ No newline at end of file diff --git a/lua/app/userdata/fund/fund_data.lua.meta b/lua/app/userdata/fund/fund_data.lua.meta deleted file mode 100644 index 172ebcdf..00000000 --- a/lua/app/userdata/fund/fund_data.lua.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: d9943057ffc3dd541bfff544d512abee -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/userdata/fund/fund_data.lua b/lua/app/userdata/fund/growth_fund_data.lua similarity index 68% rename from lua/app/userdata/fund/fund_data.lua rename to lua/app/userdata/fund/growth_fund_data.lua index 5b96e49d..746dad1c 100644 --- a/lua/app/userdata/fund/fund_data.lua +++ b/lua/app/userdata/fund/growth_fund_data.lua @@ -1,16 +1,16 @@ -local FundData = class("FundData", BaseData) +local GrowthFundData = class("GrowthFundData", BaseData) local ACT_GIFT_FUND_BASE_ID_1 = 60202 local ACT_GIFT_FUND_BASE_ID_2 = 60402 local ACT_GIFT_FUND_ADVANCE_ID_1 = 60102 local ACT_GIFT_FUND_ADVANCE_ID_2 = 60302 -function FundData:ctor() +function GrowthFundData:ctor() self.data.dirty = false self.isClaimAll = false end -function FundData:init(data) +function GrowthFundData:init(data) data = data or GConst.EMPTY_TABLE self.freeClaimed = {} @@ -37,51 +37,51 @@ function FundData:init(data) self.advanceClaimedCount = self.advanceClaimedCount + 1 end end - self:initLevelInfo() - self:initFundLevel() + self:initGrowthInfo() + self:initFundGrade() end -function FundData:initLevelInfo() - if not self.levelInfoMap then - self.levelInfoMap = {} +function GrowthFundData:initGrowthInfo() + if not self.growthInfoMap then + self.growthInfoMap = {} local cfg = self:getLevelFundCfg() for id, info in pairs(cfg) do - if not self.levelInfoMap[info.stage] then - self.levelInfoMap[info.stage] = {} + if not self.growthInfoMap[info.stage] then + self.growthInfoMap[info.stage] = {} end - table.insert(self.levelInfoMap[info.stage], id) + table.insert(self.growthInfoMap[info.stage], id) end - for level, _ in pairs(self.levelInfoMap) do - table.sort(self.levelInfoMap[level], function(a, b) + for grade, _ in pairs(self.growthInfoMap) do + table.sort(self.growthInfoMap[grade], function(a, b) return a < b end) end end end -function FundData:initFundLevel() - local fundLevel = 1 +function GrowthFundData:initFundGrade() + local fundGrade = 1 local totalCount = 0 while true do - local levelInfoIds = self.levelInfoMap[fundLevel] - if levelInfoIds == nil then - fundLevel = fundLevel - 1 + local growInfoIds = self.growthInfoMap[fundGrade] + if growInfoIds == nil then + fundGrade = fundGrade - 1 break end - totalCount = totalCount + #levelInfoIds + totalCount = totalCount + #growInfoIds if self.freeClaimedCount >= totalCount and self.baseClaimedCount >= totalCount and self.advanceClaimedCount >= totalCount then - fundLevel = fundLevel + 1 + fundGrade = fundGrade + 1 else break end end - if fundLevel < 1 then - fundLevel = 1 + if fundGrade < 1 then + fundGrade = 1 end - self.data.fundLevel = fundLevel - if self.data.fundLevel == 2 then + self.data.fundGrade = fundGrade + if self.data.fundGrade == 2 then self.fundBaseId = ACT_GIFT_FUND_BASE_ID_2 self.fundAdvanceId = ACT_GIFT_FUND_ADVANCE_ID_2 if self.freeClaimedCount >= totalCount and self.baseClaimedCount >= totalCount and self.advanceClaimedCount >= totalCount then @@ -93,58 +93,58 @@ function FundData:initFundLevel() end end -function FundData:markDirty() +function GrowthFundData:markDirty() self.data.dirty = not self.data.dirty end -function FundData:getIsOpen() +function GrowthFundData:getIsOpen() if self.isClaimAll then return false end return ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.FUND, true) end -function FundData:getFundLevel() - return self.data.fundLevel +function GrowthFundData:getFundGrade() + return self.data.fundGrade end -function FundData:getFundBaseId() +function GrowthFundData:getFundBaseId() return self.fundBaseId end -function FundData:getFundAdvanceId() +function GrowthFundData:getFundAdvanceId() return self.fundAdvanceId end -function FundData:getCurrLevelBaseRechargeId() +function GrowthFundData:getCurrGradeBaseRechargeId() local info = self:getActGiftCfg()[self.fundBaseId] return info.recharge_id end -function FundData:getCurrLevelAdvanceRechargeId() +function GrowthFundData:getCurrGradeAdvanceRechargeId() local info = self:getActGiftCfg()[self.fundAdvanceId] return info.recharge_id end -function FundData:getActGiftCfg() +function GrowthFundData:getActGiftCfg() if self.cfg == nil then self.cfg = ConfigManager:getConfig("act_gift") end return self.cfg end -function FundData:getLevelFundCfg() +function GrowthFundData:getLevelFundCfg() if self.levelFundCfg == nil then self.levelFundCfg = ConfigManager:getConfig("act_level_fund") end return self.levelFundCfg end -function FundData:getCurrLevelInfoList() - return self.levelInfoMap[self.data.fundLevel] or GConst.EMPTY_TABLE +function GrowthFundData:getCurrGradeInfoList() + return self.growthInfoMap[self.data.fundGrade] or GConst.EMPTY_TABLE end -function FundData:getNeedLevel(id) +function GrowthFundData:getNeedLevel(id) local levelFundInfo = self:getLevelFundCfg()[id] if levelFundInfo == nil then return 9999 @@ -152,7 +152,7 @@ function FundData:getNeedLevel(id) return levelFundInfo.level end -function FundData:getAllStepFundRewards(id) +function GrowthFundData:getAllStepFundRewards(id) local levelFundInfo = self:getLevelFundCfg()[id] if levelFundInfo == nil then return nil, nil, nil @@ -160,7 +160,7 @@ function FundData:getAllStepFundRewards(id) return levelFundInfo.reward_free, levelFundInfo.reward_small, levelFundInfo.reward end -function FundData:getFreeFundRewards(id) +function GrowthFundData:getFreeFundRewards(id) local levelFundInfo = self:getLevelFundCfg()[id] if levelFundInfo == nil then return nil @@ -168,7 +168,7 @@ function FundData:getFreeFundRewards(id) return levelFundInfo.reward_free end -function FundData:getBaseFundRewards(id) +function GrowthFundData:getBaseFundRewards(id) local levelFundInfo = self:getLevelFundCfg()[id] if levelFundInfo == nil then return nil @@ -176,7 +176,7 @@ function FundData:getBaseFundRewards(id) return levelFundInfo.reward_small end -function FundData:getAdvanceFundRewards(id) +function GrowthFundData:getAdvanceFundRewards(id) local levelFundInfo = self:getLevelFundCfg()[id] if levelFundInfo == nil then return nil @@ -184,45 +184,45 @@ function FundData:getAdvanceFundRewards(id) return levelFundInfo.reward end -function FundData:getIsBoughtBase() +function GrowthFundData:getIsBoughtBase() return DataManager.ShopData:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, self.fundBaseId) > 0 end -function FundData:getIsBoughtAdvance() +function GrowthFundData:getIsBoughtAdvance() return DataManager.ShopData:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, self.fundAdvanceId) > 0 end -function FundData:getFreeClaimedMap() +function GrowthFundData:getFreeClaimedMap() return self.freeClaimed end -function FundData:getIsClaimedFree(id) +function GrowthFundData:getIsClaimedFree(id) return self.freeClaimed[id] end -function FundData:getBaseClaimedMap() +function GrowthFundData:getBaseClaimedMap() return self.baseClaimed end -function FundData:getIsClaimedBase(id) +function GrowthFundData:getIsClaimedBase(id) return self.baseClaimed[id] end -function FundData:getAdvanceClaimedMap() +function GrowthFundData:getAdvanceClaimedMap() return self.advanceClaimed end -function FundData:getIsClaimedAdvance(id) +function GrowthFundData:getIsClaimedAdvance(id) return self.advanceClaimed[id] end -function FundData:getMinUnclaimedRewardIndex() +function GrowthFundData:getMinUnclaimedRewardIndex() local playerLevel = DataManager.PlayerData:getLv() - local levelInfoIds = self:getCurrLevelInfoList() + local growInfoIds = self:getCurrGradeInfoList() local minIndex = 0 local isBoughtBase = self:getIsBoughtBase() local isBoughtAdvance = self:getIsBoughtAdvance() - for k, id in ipairs(levelInfoIds) do + for k, id in ipairs(growInfoIds) do local levelFundInfo = self:getLevelFundCfg()[id] if levelFundInfo then if playerLevel >= levelFundInfo.level then -- 等级到了 @@ -251,14 +251,14 @@ function FundData:getMinUnclaimedRewardIndex() end -- 是否有未领取的奖励 -function FundData:getIfCanClaimReward() +function GrowthFundData:getIfCanClaimReward() if not self:getIsOpen() then return false end return self:getMinUnclaimedRewardIndex() > 0 end -function FundData:onClaimFundRewards(list) +function GrowthFundData:onClaimFundRewards(list) if list == nil then return end @@ -283,12 +283,12 @@ function FundData:onClaimFundRewards(list) end end end - self:initFundLevel() + self:initFundGrade() self:markDirty() end -function FundData:onBoughtFund() +function GrowthFundData:onBoughtFund() self:markDirty() end -return FundData \ No newline at end of file +return GrowthFundData \ No newline at end of file diff --git a/lua/app/userdata/fund/growth_fund_data.lua.meta b/lua/app/userdata/fund/growth_fund_data.lua.meta new file mode 100644 index 00000000..20975dae --- /dev/null +++ b/lua/app/userdata/fund/growth_fund_data.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b4b9202b724428843a59d421a713fe4b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/userdata/shop/shop_data.lua b/lua/app/userdata/shop/shop_data.lua index 36090e3c..9afcaec6 100644 --- a/lua/app/userdata/shop/shop_data.lua +++ b/lua/app/userdata/shop/shop_data.lua @@ -100,8 +100,8 @@ function ShopData:updateGiftInfo(gift) local cfgName = PayManager.PURCHARSE_TYPE_CONFIG[giftType] if cfgName then local cfg = ConfigManager:getConfig(cfgName) - if cfg and cfg[giftId] and cfg[giftId].type == PayManager.PURCHARSE_ACT_TYPE.LEVEL_FUND then - DataManager.FundData:onBoughtFund(giftId) + if cfg and cfg[giftId] and cfg[giftId].type == PayManager.PURCHARSE_ACT_TYPE.GROWTH_FUND then + DataManager.GrowthFundData:onBoughtFund(giftId) end end end From 792830c90e01a6fd7957e1df35504de2ae8863ed Mon Sep 17 00:00:00 2001 From: CloudJ Date: Mon, 29 May 2023 11:03:43 +0800 Subject: [PATCH 12/31] =?UTF-8?q?=E9=A6=96=E5=85=85=E7=A4=BC=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/event_manager.lua | 1 + lua/app/module/maincity/maincity_const.lua | 1 + lua/app/module/shop/shop_const.lua | 1 + .../cell/side_bar_first_recharge_cell.lua | 20 ++++++++ .../side_bar_first_recharge_cell.lua.meta | 10 ++++ lua/app/ui/main_city/main_city_ui.lua | 22 ++++++++- lua/app/ui/shop/gift_pop_ui.lua | 35 ++++++++++++-- lua/app/userdata/shop/shop_data.lua | 47 ++++++++++++++++--- 8 files changed, 124 insertions(+), 13 deletions(-) create mode 100644 lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua create mode 100644 lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua.meta diff --git a/lua/app/common/event_manager.lua b/lua/app/common/event_manager.lua index 20e2c3ce..b6700344 100644 --- a/lua/app/common/event_manager.lua +++ b/lua/app/common/event_manager.lua @@ -27,6 +27,7 @@ EventManager.CUSTOM_EVENT = { BOSS_ENTER_ANI_OVER = "BOSS_ENTER_ANI_OVER", TIME_TRIGGERED_NEW_EMAIL = "TIME_TRIGGERED_NEW_EMAIL", -- 邮件到时间请求是否有新邮件 SKILL_REFRESH_SUCC = "SKILL_REFRESH_SUCC", + GO_SHOP = "GO_SHOP", -- 跳转商店 -- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN", -- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER" } diff --git a/lua/app/module/maincity/maincity_const.lua b/lua/app/module/maincity/maincity_const.lua index d887e565..70d65af4 100644 --- a/lua/app/module/maincity/maincity_const.lua +++ b/lua/app/module/maincity/maincity_const.lua @@ -25,6 +25,7 @@ MainCityConst.LEFT_SIDE_BARS = { MainCityConst.RIGHT_SIDE_BARS = { "app/ui/main_city/cell/side_bar_gold_pig_cell", "app/ui/main_city/cell/side_bar_level_fund_cell", + "app/ui/main_city/cell/side_bar_first_recharge_cell", "app/ui/main_city/cell/side_bar_beginner_gift_cell", "app/ui/main_city/cell/side_bar_grow_up_gift_1_cell", "app/ui/main_city/cell/side_bar_grow_up_gift_2_cell", diff --git a/lua/app/module/shop/shop_const.lua b/lua/app/module/shop/shop_const.lua index 02eee668..94e2b4ed 100644 --- a/lua/app/module/shop/shop_const.lua +++ b/lua/app/module/shop/shop_const.lua @@ -1,5 +1,6 @@ local ShopConst = {} +ShopConst.FIRST_RECHARGE_ID = 10102 -- 首充礼包ID ShopConst.BEGINNER_GIFT_ID = 40102 -- 新手礼包ID ShopConst.MAIN_UI_POP_TYPE = { -- 当触发弹窗时,相关联的类型礼包也要触发 [PayManager.PURCHARSE_TYPE.ACT_GIFT] = { diff --git a/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua b/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua new file mode 100644 index 00000000..6c4c70e2 --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua @@ -0,0 +1,20 @@ +local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell" +local SideBarFirstRechargeCell = class("SideBarFirstRechargeCell", SideBarBaseCellComp) + +function SideBarFirstRechargeCell:getIsOpen() + return DataManager.ShopData:getShowFirstRechargeSideBar() +end + +function SideBarFirstRechargeCell:getIconRes() + return "main_btn_gift_3" -- TODOJ +end + +function SideBarFirstRechargeCell:onClick() + ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID) +end + +function SideBarFirstRechargeCell:getIsShowRedPoint() + return false +end + +return SideBarFirstRechargeCell \ No newline at end of file diff --git a/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua.meta b/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua.meta new file mode 100644 index 00000000..09f7fa0a --- /dev/null +++ b/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 19280ea11e6e84d4a8e2c067c3127203 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index a5e20f6c..721c0e64 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -130,6 +130,16 @@ function MainCityUI:_addListeners() -- 引导完成时 检测主界面的弹窗是否要触发 self:checkGift() end) + self:addEventListener(EventManager.CUSTOM_EVENT.GO_SHOP, function(params) + if self.selectedIndex == MainCityUI.CLICK_BTN_TYPE[3] then + return + end + BIReport:postHomeBtnCilck(BIReport.CLICK_BTN_TYPE[MainCityUI.CLICK_BTN_TYPE[3]]) + self.bottomBtnSpines[3]:playAnimComplete("born", false, false, function() + self.bottomBtnSpines[3]:playAnim("idle", false, false) + end) + self:refreshBottom(3, true) + end) DataManager.MailData:checkNewMail() end @@ -833,6 +843,7 @@ function MainCityUI:checkGift() -- 先遍历找出符合弹出的类型 local beginnerGiftIds = {} local levelUpGiftIds = {} + local firstRechargeIds = {} for _, actId in ipairs(popUpGift) do local cfgInfo = DataManager.ShopData:getActGiftConfig()[actId] if cfgInfo then @@ -844,8 +855,17 @@ function MainCityUI:checkGift() if cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT then table.insert(levelUpGiftIds, actId) end + -- 首充礼包 + if cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE then + table.insert(firstRechargeIds, actId) + end end end + -- 首充礼包 + if #firstRechargeIds then + ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, firstRechargeIds[1]) + return true + end -- 新手礼包 if #beginnerGiftIds > 0 then ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, beginnerGiftIds[1]) @@ -856,8 +876,6 @@ function MainCityUI:checkGift() ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, levelUpGiftIds[1]) return true end - - return true end -- 特殊的 成长礼包 local popUpGift = DataManager.ShopData:getPopUpGiftByType(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT) diff --git a/lua/app/ui/shop/gift_pop_ui.lua b/lua/app/ui/shop/gift_pop_ui.lua index 3026ef52..e1bc814b 100644 --- a/lua/app/ui/shop/gift_pop_ui.lua +++ b/lua/app/ui/shop/gift_pop_ui.lua @@ -5,6 +5,7 @@ local GIFT_BG_NAME = { [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_2_1.png", -- TODOJ [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_5_1.png", -- TODOJ [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_3_1.png", -- TODOJ + [PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = "assets/arts/textures/background/shop/shop_gift_banner_1_1.png", -- TODOJ }, [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_1_1.png", -- TODOJ [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_4_1.png", -- TODOJ @@ -14,6 +15,7 @@ local GIFT_TITLE_TEXT = { [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = "新手礼包TD", -- TODOJ [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = "金币礼包TD", -- TODOJ [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = "助力礼包TD", -- TODOJ + [PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = "首充礼包TD", -- TODOJ }, [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "章节礼包TD", -- TODOJ [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = "成长礼包TD", -- TODOJ @@ -148,6 +150,21 @@ function GiftPopUI:refresh(needCheck) self.buyBtnTx:setText(GFunc.getFormatPrice(rechargeId)) end + -- 对于首充礼包,有跳转商店和领取2个分支 + if self.actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and self.actId == GConst.ShopConst.FIRST_RECHARGE_ID then + local canGet = DataManager.ShopData:getHasFirstRechargeReward() + if canGet then + self.buyBtnTx:setText("领取TD") -- TODOJ + else + local hasGet = DataManager.ShopData:getHasGotFirstRechargeReward() + if hasGet then + self:closeUI() + else + self.buyBtnTx:setText("前往商店TD") -- TODOJ + end + end + end + self:updateTime() end @@ -157,10 +174,7 @@ function GiftPopUI:updateTime() if self.actType == PayManager.PURCHARSE_TYPE.ACT_GIFT then local cfgInfo = DataManager.ShopData:getActGiftConfig()[self.actId] if cfgInfo then - if cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE then -- 首充礼包 - hasTime = true - self.timeText:setText("TODOJ") -- TODOJ - elseif cfgInfo and cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT then -- 金币礼包 + if cfgInfo and cfgInfo.type == PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT then -- 金币礼包 hasTime = true local remainTime = 0 local triggerTime = DataManager.ShopData:getCoinGiftTriggerTime() @@ -187,7 +201,18 @@ function GiftPopUI:updateTime() end function GiftPopUI:onClickGift() - PayManager:purchasePackage(self.actId, self.actType) + -- 对于首充礼包,有跳转商店和领取2个分支 + if self.actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and self.actId == GConst.ShopConst.FIRST_RECHARGE_ID then + local canGet = DataManager.ShopData:getHasFirstRechargeReward() + if canGet then + PayManager:purchasePackage(self.actId, self.actType) + else + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_SHOP) + self:closeUI() + end + else + PayManager:purchasePackage(self.actId, self.actType) + end end -- 如果还有需要显示的 则直接刷新而不是关闭本界面 diff --git a/lua/app/userdata/shop/shop_data.lua b/lua/app/userdata/shop/shop_data.lua index 36090e3c..8567a3d5 100644 --- a/lua/app/userdata/shop/shop_data.lua +++ b/lua/app/userdata/shop/shop_data.lua @@ -6,6 +6,7 @@ end function ShopData:initBase() self:initActChapterStoreData() + self:initFirstRecharge() self:initCrossDay() end @@ -117,9 +118,6 @@ function ShopData:markPopUpGift(actType, actId) if not self.needPopUpGift[actType] then self.needPopUpGift[actType] = {} end - - Logger.logHighlight("markPopUpGift -- actType:%s actId:%s",actType, actId) - table.insert(self.needPopUpGift[actType], actId) end @@ -128,9 +126,6 @@ function ShopData:removePopUpGift(actType, actId) if self.needPopUpGift[actType] then for index, id in ipairs(self.needPopUpGift[actType]) do if id == actId then - - Logger.logHighlight("removePopUpGift -- actType:%s actId:%s",actType, actId) - table.remove(self.needPopUpGift[actType], index) break end @@ -717,4 +712,44 @@ end -- 成长礼包结束 ---------------------------------------------------------------------------------------------- +-- 首充 ********************************************************************************************** + +-- 用于标记是否弹窗 要求等级不低于2 未领取该奖励 +function ShopData:initFirstRecharge() + local lv = DataManager.PlayerData:getLv() + if lv > 1 and not self:getHasGotFirstRechargeReward() then + self:markPopUpGift(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID) + end +end + +-- 是否有首充奖励 有支付且未领取 +function ShopData:getHasFirstRechargeReward() + local pay = DataManager.PlayerData:getTotalPayAmount() + if pay > 0 and not self:getHasGotFirstRechargeReward() then + return true + else + return false + end +end + +-- 是否已领取首充奖励 +function ShopData:getHasGotFirstRechargeReward() + -- 通用act礼包中是否有已购 + local boughtNum = self:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID) + return boughtNum > 0 +end + +-- 侧边栏是否展示 要求等级不低于2 未领取该奖励 +function ShopData:getShowFirstRechargeSideBar() + local lv = DataManager.PlayerData:getLv() + if lv > 1 and not self:getHasGotFirstRechargeReward() then + return true + else + return false + end +end + +-- 首充结束 ---------------------------------------------------------------------------------------------- + + return ShopData \ No newline at end of file From 2d51debf5af00d8ae2cc2fcd71ccddee840e9f59 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 29 May 2023 11:06:24 +0800 Subject: [PATCH 13/31] =?UTF-8?q?=E6=98=BE=E7=A4=BAi=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/team/battle_team.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index 9682aa24..c6d052f1 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -278,13 +278,13 @@ function BattleTeam:addBuff(buffEffect) else table.insert(self.buffList, buffEffect) self:updateBuffState(buffEffect.buff, 1) - if buffEffect.buff:getIcon() then - self.battleController:refreshBuff(self.side, self.buffList) - end - needRecycle = buffEffect end + if buffEffect.buff:getIcon() then + self.battleController:refreshBuff(self.side, self.buffList) + end + return needRecycle end From e99af16f39a857853f1918db56a702686a299f1a Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 29 May 2023 11:15:30 +0800 Subject: [PATCH 14/31] =?UTF-8?q?=E4=BB=8E=E4=BB=BB=E5=8A=A1=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=8E=BB=E6=88=98=E4=BB=A4=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=B4=AD=E4=B9=B0=E4=B8=80=E5=AE=9A=E8=A6=81?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E8=B4=AD=E4=B9=B0=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/task/cell/daily_task_cell.lua | 4 ++++ lua/app/userdata/bounty/bounty_data.lua | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lua/app/ui/task/cell/daily_task_cell.lua b/lua/app/ui/task/cell/daily_task_cell.lua index 3bd8ac4f..349c3726 100644 --- a/lua/app/ui/task/cell/daily_task_cell.lua +++ b/lua/app/ui/task/cell/daily_task_cell.lua @@ -37,6 +37,10 @@ function DailyTaskCell:init() self.lockBg = uiMap["task_cell.lock_bg"] local lockBtn = uiMap["task_cell.lock_node.lock_btn.btn"] lockBtn:addClickListener(function() + if DataManager.BountyData:getIsOpen() then + DataManager.BountyData:clearPopBought() + ModuleManager.BountyManager:showBountyMainUI() + end end) local lockBtnTx = uiMap["task_cell.lock_node.lock_btn.btn.text"] lockBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.STR_UNLOCK)) diff --git a/lua/app/userdata/bounty/bounty_data.lua b/lua/app/userdata/bounty/bounty_data.lua index 5b4dfbfd..2b39c96e 100644 --- a/lua/app/userdata/bounty/bounty_data.lua +++ b/lua/app/userdata/bounty/bounty_data.lua @@ -335,6 +335,10 @@ function BountyData:markPopBought() LocalData:setBountyPopTime(self.popBoughtTime) end +function BountyData:clearPopBought() + self.popBoughtTime = 0 +end + function BountyData:getRechargeId(advanced) local cfg = ConfigManager:getConfig("act_gift") local id = self:getGiftId(advanced) From 28cebc3702a764c808252cb74fc5df7522246f5b Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 29 May 2023 11:20:00 +0800 Subject: [PATCH 15/31] =?UTF-8?q?=E5=BC=95=E5=AF=BC=E8=A1=A8=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/battle/battle_ui.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index ff40fb45..85dc3ea6 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -1920,7 +1920,10 @@ function BattleUI:showTutorialFinger(posIdList) end self.showTutorialFingerSeq:AppendCallback(function() self.battleController:clearGridSequence() + self.tutorialFinger:setAnchoredPositionX(DEFAULT_X) + self:showBoardMask(nil) end) + self.showTutorialFingerSeq:AppendInterval(1) self.showTutorialFingerSeq:SetLoops(-1) end From b00c0eb831def40b05cddbca71958fbfc772f60a Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 29 May 2023 11:26:25 +0800 Subject: [PATCH 16/31] =?UTF-8?q?buff=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/userdata/battle/skill/battle_skill_entity.lua | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lua/app/userdata/battle/skill/battle_skill_entity.lua b/lua/app/userdata/battle/skill/battle_skill_entity.lua index feb962b4..9142ebde 100644 --- a/lua/app/userdata/battle/skill/battle_skill_entity.lua +++ b/lua/app/userdata/battle/skill/battle_skill_entity.lua @@ -115,15 +115,13 @@ function BattleSkillEntity:addSkillEffectParams(effect) for _, entity in ipairs(self.effectList) do if entity:getName() == effect.type then buffEntity = entity - break + buffEntity:setEffectNum(buffEntity:getEffectNum() + effect.num) end end if not buffEntity then buffEntity = BattleBuffEntity:create() buffEntity:init(effect, self.owner, self) table.insert(self.effectList, buffEntity) - else - buffEntity:setEffectNum(buffEntity:getEffectNum() + effect.num) end end @@ -132,15 +130,13 @@ function BattleSkillEntity:addSkillEffectRound(effect) for _, entity in ipairs(self.effectList) do if entity:getName() == effect.type then buffEntity = entity - break + buffEntity:setRound(buffEntity:getRound() + effect.round) end end if not buffEntity then buffEntity = BattleBuffEntity:create() buffEntity:init(effect, self.owner, self) table.insert(self.effectList, buffEntity) - else - buffEntity:setRound(buffEntity:getRound() + effect.round) end end From a68579db48eb3d9ae15e372a2323f1274faaecf6 Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 29 May 2023 12:01:46 +0800 Subject: [PATCH 17/31] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/task/task_main_ui.lua | 4 +-- lua/app/userdata/task/daily_task_data.lua | 43 +++++++++++++---------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/lua/app/ui/task/task_main_ui.lua b/lua/app/ui/task/task_main_ui.lua index 09bff2d7..fe5a7bb3 100644 --- a/lua/app/ui/task/task_main_ui.lua +++ b/lua/app/ui/task/task_main_ui.lua @@ -17,10 +17,10 @@ local function sortTask(taskList) if completeA then return a.id < b.id else -- 没有完成的优先显示战令解锁 - if a.bountyLock == b.bountyLock then + if a.lock == b.lock then return a.id < b.id else - return a.bountyLock + return b.lock end end else diff --git a/lua/app/userdata/task/daily_task_data.lua b/lua/app/userdata/task/daily_task_data.lua index e66ffa3e..601a17f2 100644 --- a/lua/app/userdata/task/daily_task_data.lua +++ b/lua/app/userdata/task/daily_task_data.lua @@ -46,24 +46,28 @@ function DailyTaskData:init(data) type = v.type, reset = v.reset } - if not dailyTaskObj.claimed and dailyTaskObj.progress >= dailyTaskObj.needProgress then - dailyTaskObj.redPoint = true - if dailyTaskObj.type == 1 then - dailyRedPoint = dailyRedPoint + 1 - else - challengeRedPoint = challengeRedPoint + 1 - end - else - dailyTaskObj.redPoint = false - end if v.bounty then - if self.isUnlockBountyDailyTask then - dailyTaskObj.lock = false - else - dailyTaskObj.lock = true - end + if self.isUnlockBountyDailyTask then + dailyTaskObj.lock = false + else + dailyTaskObj.lock = true + end + else + dailyTaskObj.lock = false end - if not dailyTaskObj.lock then -- 只有解锁的任务才注册监听任务进度 + if dailyTaskObj.lock then + dailyTaskObj.redPoint = false + else + if not dailyTaskObj.claimed and dailyTaskObj.progress >= dailyTaskObj.needProgress then + dailyTaskObj.redPoint = true + if dailyTaskObj.type == 1 then + dailyRedPoint = dailyRedPoint + 1 + else + challengeRedPoint = challengeRedPoint + 1 + end + else + dailyTaskObj.redPoint = false + end local list = self.taskTypeMap[taskInfo.type] if list == nil then list = {} @@ -130,11 +134,11 @@ function DailyTaskData:refreshDailyTask(task) dailyTaskObj.type = dailyTaskInfo.type dailyTaskObj.reset = dailyTaskInfo.reset local redPoint = false - if not dailyTaskObj.claimed and dailyTaskObj.progress >= dailyTaskObj.needProgress then + if not dailyTaskObj.lock and not dailyTaskObj.claimed and dailyTaskObj.progress >= dailyTaskObj.needProgress then redPoint = true end local originTaskType = originTaskInfo.type - if originTaskType ~= taskInfo.type then -- 任务类型变了 + if not dailyTaskObj.lock and originTaskType ~= taskInfo.type then -- 任务类型变了 self:unregisterTask(id, originTaskType) self:registerTask(dailyTaskObj, taskInfo.type) end @@ -307,6 +311,9 @@ function DailyTaskData:getIfCanClaimTask(task) end function DailyTaskData:addTaskProgress(task, taskType, count) + if task.lock then + return + end local currProgress = task.progress if currProgress >= task.needProgress then return From 85cdf222c6e929dd5735b3aba62ea8032562d41b Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 29 May 2023 12:05:26 +0800 Subject: [PATCH 18/31] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B2=A1=E5=BC=80=E5=90=AF=E5=89=8D=E4=BC=9A=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90=E5=BE=97toast?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/event_manager.lua | 4 ++-- lua/app/module/task/task_manager.lua | 6 ++++-- lua/app/userdata/task/daily_task_data.lua | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lua/app/common/event_manager.lua b/lua/app/common/event_manager.lua index 20e2c3ce..d03ded0a 100644 --- a/lua/app/common/event_manager.lua +++ b/lua/app/common/event_manager.lua @@ -23,9 +23,9 @@ EventManager.CUSTOM_EVENT = { SHOW_ELIMINATION_TUTORAIL = "SHOW_ELIMINATION_TUTORAIL", BOARD_FILL_OVER = "BOARD_FILL_OVER", LOGIN_REQ_SUCCESS = "LOGIN_REQ_SUCCESS", - DAILY_TASK_ADD_PROGRESS = "DAILY_TASK_ADD_PROGRESS", + DAILY_TASK_COMPLETE = "DAILY_TASK_COMPLETE", -- 每日任务完成 BOSS_ENTER_ANI_OVER = "BOSS_ENTER_ANI_OVER", - TIME_TRIGGERED_NEW_EMAIL = "TIME_TRIGGERED_NEW_EMAIL", -- 邮件到时间请求是否有新邮件 + TIME_TRIGGERED_NEW_EMAIL = "TIME_TRIGGERED_NEW_EMAIL", -- 邮件到时间请求是否有新邮件 SKILL_REFRESH_SUCC = "SKILL_REFRESH_SUCC", -- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN", -- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER" diff --git a/lua/app/module/task/task_manager.lua b/lua/app/module/task/task_manager.lua index ad54959e..9621afcd 100644 --- a/lua/app/module/task/task_manager.lua +++ b/lua/app/module/task/task_manager.lua @@ -2,8 +2,10 @@ local TaskManager = class("TaskManager", BaseModule) local BATTLE_TASK_FIELD = GConst.BattleConst.BATTLE_TASK_FIELD function TaskManager:init() - self:addEventListener(EventManager.CUSTOM_EVENT.DAILY_TASK_ADD_PROGRESS, function(id, taskId, from, to) - ModuleManager.TaskToastManager:showToast(id, taskId, from, to) + self:addEventListener(EventManager.CUSTOM_EVENT.DAILY_TASK_COMPLETE, function(id, taskId, from, to) + if DataManager.DailyTaskData:getIsOpen() then + ModuleManager.TaskToastManager:showToast(id, taskId, from, to) + end end) self:addEventListener(EventManager.CUSTOM_EVENT.UI_SHOW_COMPLETE, function() ModuleManager.TaskToastManager:checkOnOpenUI() diff --git a/lua/app/userdata/task/daily_task_data.lua b/lua/app/userdata/task/daily_task_data.lua index 601a17f2..ca3dffe7 100644 --- a/lua/app/userdata/task/daily_task_data.lua +++ b/lua/app/userdata/task/daily_task_data.lua @@ -321,7 +321,7 @@ function DailyTaskData:addTaskProgress(task, taskType, count) local can = self:getIfCanClaimTask(task) task.progress = task.progress + count if not can and self:getIfCanClaimTask(task) then - EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.DAILY_TASK_ADD_PROGRESS, task.id, task.taskId, currProgress, task.needProgress) + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.DAILY_TASK_COMPLETE, task.id, task.taskId, currProgress, task.needProgress) if task.type == 1 and task.reset == 1 and taskType ~= GConst.TaskConst.TASK_TYPE.COMPLETED_DALY_TASK then ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.COMPLETED_DALY_TASK) end From f8a4bf7935b9519e001edd0ca6049de33a51571f Mon Sep 17 00:00:00 2001 From: CloudJ Date: Mon, 29 May 2023 14:05:32 +0800 Subject: [PATCH 19/31] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cell/side_bar_beginner_gift_cell.lua | 2 +- .../cell/side_bar_first_recharge_cell.lua | 2 +- .../cell/side_bar_grow_up_gift_1_cell.lua | 2 +- .../cell/side_bar_grow_up_gift_2_cell.lua | 2 +- lua/app/ui/shop/box_hero_ui.lua | 8 +++--- lua/app/ui/shop/box_level_ui.lua | 8 +++--- lua/app/ui/shop/box_level_up_ui.lua | 10 +++---- lua/app/ui/shop/box_open_ui.lua | 4 +-- lua/app/ui/shop/box_reward_ui.lua | 4 +-- lua/app/ui/shop/cell/beginner_sell_cell.lua | 4 +-- lua/app/ui/shop/cell/box_sell_cell.lua | 20 ++++++------- lua/app/ui/shop/cell/chapter_cell.lua | 4 +-- lua/app/ui/shop/cell/coin_sell_cell.lua | 4 +-- lua/app/ui/shop/cell/gem_cell.lua | 6 ++-- lua/app/ui/shop/cell/gem_sell_cell.lua | 6 +--- lua/app/ui/shop/cell/gold_cell.lua | 6 ++-- lua/app/ui/shop/cell/gold_sell_cell.lua | 2 +- lua/app/ui/shop/cell/grow_cell.lua | 4 +-- lua/app/ui/shop/cell/hot_cell.lua | 4 +-- lua/app/ui/shop/cell/hot_sell_cell.lua | 8 +++--- lua/app/ui/shop/cell/level_cell.lua | 4 +-- lua/app/ui/shop/gift_pop_ui.lua | 28 +++++++++---------- lua/app/ui/shop/shop_comp.lua | 8 +++--- lua/app/userdata/shop/shop_data.lua | 13 +++++---- 24 files changed, 80 insertions(+), 83 deletions(-) diff --git a/lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua b/lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua index c1dd3bd1..26ab3ff1 100644 --- a/lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua @@ -6,7 +6,7 @@ function SideBarBeginnerGiftCell:getIsOpen() end function SideBarBeginnerGiftCell:getIconRes() - return "main_btn_gift_1" -- TODOJ + return "main_btn_gift_1" end function SideBarBeginnerGiftCell:onClick() diff --git a/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua b/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua index 6c4c70e2..30233d01 100644 --- a/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua @@ -6,7 +6,7 @@ function SideBarFirstRechargeCell:getIsOpen() end function SideBarFirstRechargeCell:getIconRes() - return "main_btn_gift_3" -- TODOJ + return "main_btn_gift_3" end function SideBarFirstRechargeCell:onClick() diff --git a/lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua index 4e33bd44..f0e1a329 100644 --- a/lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua @@ -6,7 +6,7 @@ function SideBarGrowUpGift1Cell:getIsOpen() end function SideBarGrowUpGift1Cell:getIconRes() - return "main_btn_gift_2" -- TODOJ + return "main_btn_gift_2" end function SideBarGrowUpGift1Cell:onClick() diff --git a/lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua index 5e4dcd1a..e0edbbcb 100644 --- a/lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua @@ -6,7 +6,7 @@ function SideBarGrowUpGift2Cell:getIsOpen() end function SideBarGrowUpGift2Cell:getIconRes() - return "main_btn_gift_2" -- TODOJ + return "main_btn_gift_2" end function SideBarGrowUpGift2Cell:onClick() diff --git a/lua/app/ui/shop/box_hero_ui.lua b/lua/app/ui/shop/box_hero_ui.lua index 5e12fde3..b001c724 100644 --- a/lua/app/ui/shop/box_hero_ui.lua +++ b/lua/app/ui/shop/box_hero_ui.lua @@ -1,12 +1,12 @@ local BoxHeroUI = class("BoxHeroUI", BaseUI) local TITLE_TEXT = { - [GConst.SummonConst.SUMMON_TYPE.LV_1] = "普通宝箱TD", -- TODOJ - [GConst.SummonConst.SUMMON_TYPE.LV_2] = "精致宝箱TD", - [GConst.SummonConst.SUMMON_TYPE.LV_3] = "珍贵宝箱TD" + [GConst.SummonConst.SUMMON_TYPE.LV_1] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_1), -- 普通宝箱 + [GConst.SummonConst.SUMMON_TYPE.LV_2] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_2), -- 精致宝箱 + [GConst.SummonConst.SUMMON_TYPE.LV_3] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_3), -- 珍贵宝箱 } local ICON_NAME = { - [GConst.SummonConst.SUMMON_TYPE.LV_1] = "shop_chest_1", -- TODOJ + [GConst.SummonConst.SUMMON_TYPE.LV_1] = "shop_chest_1", [GConst.SummonConst.SUMMON_TYPE.LV_2] = "shop_chest_2", [GConst.SummonConst.SUMMON_TYPE.LV_3] = "shop_chest_3" } diff --git a/lua/app/ui/shop/box_level_ui.lua b/lua/app/ui/shop/box_level_ui.lua index 5d202806..0112b1d7 100644 --- a/lua/app/ui/shop/box_level_ui.lua +++ b/lua/app/ui/shop/box_level_ui.lua @@ -36,7 +36,7 @@ function BoxLevelUI:onLoadRootComplete() self.box1Add2ItemCell = CellManager:addCellComp(self.uiMap["box_level_ui.bg.box_1.add_node_2.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL) self.box1Add2Text = self.uiMap["box_level_ui.bg.box_1.add_node_2.text"] self.box1Desc = self.uiMap["box_level_ui.bg.box_1.none_text"] - self.box1Desc:setText("无额外奖励加成TD") -- TODOJ + self.box1Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成 self.box2Node = self.uiMap["box_level_ui.bg.box_2"] self.box2Add1Node = self.uiMap["box_level_ui.bg.box_2.add_node_1"] @@ -46,7 +46,7 @@ function BoxLevelUI:onLoadRootComplete() self.box2Add2ItemCell = CellManager:addCellComp(self.uiMap["box_level_ui.bg.box_2.add_node_2.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL) self.box2Add2Text = self.uiMap["box_level_ui.bg.box_2.add_node_2.text"] self.box2Desc = self.uiMap["box_level_ui.bg.box_2.none_text"] - self.box2Desc:setText("无额外奖励加成TD") -- TODOJ + self.box2Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成 self.box3Node = self.uiMap["box_level_ui.bg.box_3"] self.box3Add1Node = self.uiMap["box_level_ui.bg.box_3.add_node_1"] @@ -56,10 +56,10 @@ function BoxLevelUI:onLoadRootComplete() self.box3Add2ItemCell = CellManager:addCellComp(self.uiMap["box_level_ui.bg.box_3.add_node_2.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL) self.box3Add2Text = self.uiMap["box_level_ui.bg.box_3.add_node_2.text"] self.box3Desc = self.uiMap["box_level_ui.bg.box_3.none_text"] - self.box3Desc:setText("无额外奖励加成TD") -- TODOJ + self.box3Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成 self.bottomDesc = self.uiMap["box_level_ui.bg.title"] - self.bottomDesc:setText("开宝箱提升等级，增加宝箱奖励TD") -- TODOJ + self.bottomDesc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_5)) -- 开宝箱提升等级,增加宝箱奖励 self.leftArrow:addClickListener(function() self.level = self.level - 1 diff --git a/lua/app/ui/shop/box_level_up_ui.lua b/lua/app/ui/shop/box_level_up_ui.lua index 033a0420..25fae603 100644 --- a/lua/app/ui/shop/box_level_up_ui.lua +++ b/lua/app/ui/shop/box_level_up_ui.lua @@ -30,7 +30,7 @@ function BoxLevelUpUI:onLoadRootComplete() self.box1Add2ItemCell = CellManager:addCellComp(self.uiMap["box_level_up_ui.box_1.add_node_2.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL) self.box1Add2Text = self.uiMap["box_level_up_ui.box_1.add_node_2.text"] self.box1Desc = self.uiMap["box_level_up_ui.box_1.none_text"] - self.box1Desc:setText("无额外奖励加成TD") -- TODOJ + self.box1Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成 self.box2Node = self.uiMap["box_level_up_ui.box_2"] self.box2Add1Node = self.uiMap["box_level_up_ui.box_2.add_node_1"] @@ -40,7 +40,7 @@ function BoxLevelUpUI:onLoadRootComplete() self.box2Add2ItemCell = CellManager:addCellComp(self.uiMap["box_level_up_ui.box_2.add_node_2.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL) self.box2Add2Text = self.uiMap["box_level_up_ui.box_2.add_node_2.text"] self.box2Desc = self.uiMap["box_level_up_ui.box_2.none_text"] - self.box2Desc:setText("无额外奖励加成TD") -- TODOJ + self.box2Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成 self.box3Node = self.uiMap["box_level_up_ui.box_3"] self.box3Add1Node = self.uiMap["box_level_up_ui.box_3.add_node_1"] @@ -50,7 +50,7 @@ function BoxLevelUpUI:onLoadRootComplete() self.box3Add2ItemCell = CellManager:addCellComp(self.uiMap["box_level_up_ui.box_3.add_node_2.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL) self.box3Add2Text = self.uiMap["box_level_up_ui.box_3.add_node_2.text"] self.box3Desc = self.uiMap["box_level_up_ui.box_3.none_text"] - self.box3Desc:setText("无额外奖励加成TD") -- TODOJ + self.box3Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成 self.closeTx = self.uiMap["box_level_up_ui.close_tx"] @@ -58,9 +58,9 @@ function BoxLevelUpUI:onLoadRootComplete() end function BoxLevelUpUI:refresh() - self.titleTx:setText("宝箱等级提升!TD") -- TODOJ + self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_6)) -- 宝箱等级提升! self.lvTx:setText("Lv." .. tostring(self.level)) - self.closeTx:setText("点击继续TD") -- TODOJ + self.closeTx:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_TO_CONTINUE)) -- 点击继续 self.box1Add1Node:setVisible(false) self.box1Add2Node:setVisible(false) diff --git a/lua/app/ui/shop/box_open_ui.lua b/lua/app/ui/shop/box_open_ui.lua index c091b969..e6cf95ef 100644 --- a/lua/app/ui/shop/box_open_ui.lua +++ b/lua/app/ui/shop/box_open_ui.lua @@ -1,7 +1,7 @@ local BoxOpenUI = class("BoxOpenUI", BaseUI) local ICON_NAME = { - [GConst.SummonConst.SUMMON_TYPE.LV_1] = "shop_chest_1", -- TODOJ + [GConst.SummonConst.SUMMON_TYPE.LV_1] = "shop_chest_1", [GConst.SummonConst.SUMMON_TYPE.LV_2] = "shop_chest_2", [GConst.SummonConst.SUMMON_TYPE.LV_3] = "shop_chest_3" } @@ -28,7 +28,7 @@ function BoxOpenUI:onLoadRootComplete() self.btnText = self.uiMap["box_open_ui.open_btn.text"] self.boxImg:setSprite(GConst.ATLAS_PATH.SHOP, ICON_NAME[self.summonType]) - self.btnText:setText("立即打开") -- TODOJ + self.btnText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_7)) -- 立即打开 self.openBtn:addClickListener(function() ModuleManager.ShopManager:showBoxRewardUI(self.params) diff --git a/lua/app/ui/shop/box_reward_ui.lua b/lua/app/ui/shop/box_reward_ui.lua index df9fa8be..222e0523 100644 --- a/lua/app/ui/shop/box_reward_ui.lua +++ b/lua/app/ui/shop/box_reward_ui.lua @@ -35,7 +35,7 @@ function BoxRewardUI:onLoadRootComplete() self.uiMap = self.root:genAllChildren() self.titleTx = self.uiMap["box_reward_ui.title.text"] - self.titleTx:setText("恭喜获得TD") -- TODOJ + self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_8)) -- 恭喜获得 self.scrollRectObj = self.uiMap["box_reward_ui.scroll_rect"] self.scrollRect = self.scrollRectObj:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) @@ -60,7 +60,7 @@ function BoxRewardUI:onLoadRootComplete() end self.closeTx = self.uiMap["box_reward_ui.close_tx"] - self.closeTx:setText("点击关闭TD") -- TODOJ + self.closeTx:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_CLOSE_DESC)) self.mask = self.uiMap["box_reward_ui.mask"] self.mask:addClickListener(function() diff --git a/lua/app/ui/shop/cell/beginner_sell_cell.lua b/lua/app/ui/shop/cell/beginner_sell_cell.lua index d0674590..10c20019 100644 --- a/lua/app/ui/shop/cell/beginner_sell_cell.lua +++ b/lua/app/ui/shop/cell/beginner_sell_cell.lua @@ -51,9 +51,9 @@ function BeginnerSellCell:refresh() self.offImg:setVisible(false) end -- 限购 - self.limitText:setText("限购1次TD") -- 章节礼包默认限购1次 TODOJ + self.limitText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, 1)) -- 限购1次 -- 标题 - self.titleText:setText("新手礼包TD") -- TODOJ + self.titleText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_11)) -- 新手礼包 -- 奖励 local rewardList = cfgInfo.reward local count = rewardList and #rewardList or 0 diff --git a/lua/app/ui/shop/cell/box_sell_cell.lua b/lua/app/ui/shop/cell/box_sell_cell.lua index 46c1de02..2b1a4aaf 100644 --- a/lua/app/ui/shop/cell/box_sell_cell.lua +++ b/lua/app/ui/shop/cell/box_sell_cell.lua @@ -8,24 +8,24 @@ function BoxSellCell:init() local uiMap = self.baseObject:genAllChildren() self.bg = uiMap["box_sell_cell.bg"] local boxNameTx1 = uiMap["box_sell_cell.bg.box_1.name_tx"] - boxNameTx1:setText("临时文本:普通宝箱") + boxNameTx1:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_1)) -- 普通宝箱 local boxDescTx1 = uiMap["box_sell_cell.bg.box_1.desc_tx"] - boxDescTx1:setText("临时文本:必出普通英雄") + boxDescTx1:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_24)) -- 必出普通英雄 self.boxBuyBtn1 = uiMap["box_sell_cell.bg.box_1.buy_btn"] self.boxBuyBtnCoin1 = uiMap["box_sell_cell.bg.box_1.buy_btn.coin"] self.boxBuyBtnTx1 = uiMap["box_sell_cell.bg.box_1.buy_btn.buy_tx"] local boxNameTx2 = uiMap["box_sell_cell.bg.box_2.name_tx"] - boxNameTx2:setText("临时文本:精致宝箱") + boxNameTx2:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_2)) -- 精致宝箱 local boxDescTx2 = uiMap["box_sell_cell.bg.box_2.desc_tx"] - boxDescTx2:setText("临时文本:必出稀有英雄") + boxDescTx2:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_25)) -- 必出稀有英雄 self.boxBuyBtn2 = uiMap["box_sell_cell.bg.box_2.buy_btn"] self.boxBuyBtnCoin2 = uiMap["box_sell_cell.bg.box_2.buy_btn.coin"] self.boxBuyBtnTx2 = uiMap["box_sell_cell.bg.box_2.buy_btn.buy_tx"] self.box3 = uiMap["box_sell_cell.bg.box_3"] local boxNameTx3 = uiMap["box_sell_cell.bg.box_3.name_tx"] - boxNameTx3:setText("临时文本:珍贵") + boxNameTx3:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_3)) -- 珍贵宝箱 local boxDescTx3 = uiMap["box_sell_cell.bg.box_3.desc_tx"] - boxDescTx3:setText("临时文本:必出史诗英雄") + boxDescTx3:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_26)) -- 必出史诗英雄 self.boxBuyBtn3 = uiMap["box_sell_cell.bg.box_3.buy_btn"] self.boxBuyBtnCoin3 = uiMap["box_sell_cell.bg.box_3.buy_btn.coin"] self.boxBuyBtnTx3 = uiMap["box_sell_cell.bg.box_3.buy_btn.buy_tx"] @@ -34,7 +34,7 @@ function BoxSellCell:init() self.progressTx = uiMap["box_sell_cell.bg.progress_tx"] self.helpBtn = uiMap["box_sell_cell.bg.help_btn"] local titleTx = uiMap["box_sell_cell.title_bg.text"] - titleTx:setText("临时文本:宝箱") + titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_27)) -- 宝箱 self.boxBuyBtn1:addClickListener(function() self:onClickBox(GConst.SummonConst.SUMMON_TYPE.LV_1) @@ -72,12 +72,12 @@ function BoxSellCell:refreshLv() local lv = DataManager.SummonData:getSummonLevel() local exp = DataManager.SummonData:getSummonExp() local maxExp = DataManager.SummonData:getSummonMaxExp() - self.progressLv:setText("Lv." .. tostring(lv)) -- TODOJ + self.progressLv:setText("Lv." .. tostring(lv)) if maxExp and maxExp > 0 then - self.progressTx:setText(tostring(exp) .. "/" .. tostring(maxExp)) -- TODOJ + self.progressTx:setText(tostring(exp) .. "/" .. tostring(maxExp)) self.progressSlider.value = exp / maxExp else - self.progressTx:setText("MAX") -- TODOJ + self.progressTx:setText(I18N:getGlobalText(I18N.GlobalConst.STR_MAX)) self.progressSlider.value = 1 end end diff --git a/lua/app/ui/shop/cell/chapter_cell.lua b/lua/app/ui/shop/cell/chapter_cell.lua index ceb58a85..3d7f187e 100644 --- a/lua/app/ui/shop/cell/chapter_cell.lua +++ b/lua/app/ui/shop/cell/chapter_cell.lua @@ -67,9 +67,9 @@ function ChapterCell:refresh(idx, cfgInfo, totalCount, arrowCallback) -- 超值 self.offText:setText(tostring(cfgInfo.value * 100) .. "%") -- 限购 - self.limitText:setText("限购1次TD") -- 章节礼包默认限购1次 TODOJ + self.limitText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, 1)) -- 限购1次 -- 标题 - self.titleText:setText("第" .. tostring(cfgInfo.chapter) .. "章礼包TD") -- TODOJ + self.titleText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_19, tostring(cfgInfo.chapter))) -- 第{0}章礼包 -- 奖励 local rewardList = cfgInfo.reward local count = rewardList and #rewardList or 0 diff --git a/lua/app/ui/shop/cell/coin_sell_cell.lua b/lua/app/ui/shop/cell/coin_sell_cell.lua index 914eb2be..5989b888 100644 --- a/lua/app/ui/shop/cell/coin_sell_cell.lua +++ b/lua/app/ui/shop/cell/coin_sell_cell.lua @@ -47,9 +47,9 @@ function CoinSellCell:refresh() -- 超值 self.offText:setText(tostring(cfgInfo.value) .. "%") -- 限购 - self.limitText:setText("限购" .. tostring(cfgInfo.limit) .. "次TD") -- TODOJ + self.limitText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, tostring(cfgInfo.limit))) -- 限购{0}次 -- 标题 - self.titleText:setText("金币礼包TD") -- TODOJ + self.titleText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_14)) -- 奖励 local rewardList = cfgInfo.reward local count = rewardList and #rewardList or 0 diff --git a/lua/app/ui/shop/cell/gem_cell.lua b/lua/app/ui/shop/cell/gem_cell.lua index 721e4cd2..bd43350f 100644 --- a/lua/app/ui/shop/cell/gem_cell.lua +++ b/lua/app/ui/shop/cell/gem_cell.lua @@ -17,7 +17,7 @@ function GemCell:init() self.adText = uiMap["gem_cell.ad.desc"] self.sellOutText = uiMap["gem_cell.sell_out"] - self.sellOutText:setText("已购买TD") -- TODOJ + self.sellOutText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20)) end function GemCell:refresh(id, cfgInfo) @@ -39,7 +39,7 @@ function GemCell:refresh(id, cfgInfo) GFunc.setAdsSprite(self.adImg) local adLeftCount = adMaxTimes - bought if adLeftCount > 0 then - self.adText:setText("免费(" .. tostring(adLeftCount) .. ")TD") -- TODOJ + self.adText:setText(I18N:getGlobalText(I18N.GlobalConst.STR_FREE) .. "(" .. tostring(adLeftCount) .. ")") -- 免费(x) GFunc.centerImgAndTx(self.adImg, self.adText, 5) self.sellOutText:setVisible(false) @@ -56,7 +56,7 @@ function GemCell:refresh(id, cfgInfo) if hasDoubleTimes then -- 有双倍效果 self.doubleNode:setVisible(true) - self.doubleDesc:setText("剩余次数:" .. tostring(leftDoubleTimes) .. "TD") -- TODOJ + self.doubleDesc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_21, tostring(leftDoubleTimes))) -- 剩余次数:{0} self.doubleText:setText("+" .. tostring(reward.num * 2)) GFunc.centerImgAndTx(self.doubleImg, self.doubleText, 5) self.doubleOriginText:setText(reward.num) diff --git a/lua/app/ui/shop/cell/gem_sell_cell.lua b/lua/app/ui/shop/cell/gem_sell_cell.lua index 204a79ff..37b2c5f4 100644 --- a/lua/app/ui/shop/cell/gem_sell_cell.lua +++ b/lua/app/ui/shop/cell/gem_sell_cell.lua @@ -3,7 +3,7 @@ local GemSellCell = class("GemSellCell", BaseCell) function GemSellCell:init() local uiMap = self.baseObject:genAllChildren() local titleTx = uiMap["gem_sell_cell.title_bg.text"] - titleTx:setText("临时文本:钻石") + titleTx:setText(ModuleManager.ItemManager:getItemName(GConst.ItemConst.ITEM_ID_GEM)) self.cells = {} self.cellHeight = 0 @@ -49,8 +49,4 @@ function GemSellCell:setVisible(visible) self.baseObject:setVisible(visible) end -function GemSellCell:onClickGift(id) - Logger.logHighlight("Click id:%s", id) -- TODOJ -end - return GemSellCell \ No newline at end of file diff --git a/lua/app/ui/shop/cell/gold_cell.lua b/lua/app/ui/shop/cell/gold_cell.lua index 995d99af..7825e5fe 100644 --- a/lua/app/ui/shop/cell/gold_cell.lua +++ b/lua/app/ui/shop/cell/gold_cell.lua @@ -14,7 +14,7 @@ function GoldCell:init() self.descText = uiMap["gold_cell.desc"] self.sellOutText = uiMap["gold_cell.sell_out"] - self.sellOutText:setText("已购买TD") -- TODOJ + self.sellOutText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20)) -- 已购买 end function GoldCell:refresh(id, cfgInfo) @@ -33,7 +33,7 @@ function GoldCell:refresh(id, cfgInfo) local bought = DataManager.ShopData:getCommonDailyCoinAdBuyCount() -- 金币礼包购买次数 local adLeftCount = adMaxTimes - bought if adLeftCount > 0 then - self.adText:setText("免费(" .. tostring(adLeftCount) .. ")TD") -- TODOJ + self.adText:setText(I18N:getGlobalText(I18N.GlobalConst.STR_FREE) .. "(" .. tostring(adLeftCount) .. ")") -- 免费(x) GFunc.centerImgAndTx(self.adImg, self.adText, 5) self.sellOutText:setVisible(false) @@ -54,7 +54,7 @@ function GoldCell:refresh(id, cfgInfo) end self.nameText:setText(GFunc.num2Str(goldNum)) - self.descText:setText("金币礼包:" .. tostring(id) .. "TD") -- TODOJ + self.descText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_14)) -- 金币礼包 self:addClickListener(function() self:onClickGift(id, isFree) diff --git a/lua/app/ui/shop/cell/gold_sell_cell.lua b/lua/app/ui/shop/cell/gold_sell_cell.lua index d3a3904c..7cd52e9c 100644 --- a/lua/app/ui/shop/cell/gold_sell_cell.lua +++ b/lua/app/ui/shop/cell/gold_sell_cell.lua @@ -3,7 +3,7 @@ local GoldSellCell = class("GoldSellCell", BaseCell) function GoldSellCell:init() local uiMap = self.baseObject:genAllChildren() local titleTx = uiMap["gold_sell_cell.title_bg.text"] - titleTx:setText("临时文本:金币") + titleTx:setText(ModuleManager.ItemManager:getItemName(GConst.ItemConst.ITEM_ID_GOLD)) self.cells = {} self.cellHeight = 0 diff --git a/lua/app/ui/shop/cell/grow_cell.lua b/lua/app/ui/shop/cell/grow_cell.lua index 6abd2af5..63a8adbe 100644 --- a/lua/app/ui/shop/cell/grow_cell.lua +++ b/lua/app/ui/shop/cell/grow_cell.lua @@ -46,9 +46,9 @@ function GrowCell:refresh(idx, gift) -- 超值 self.offText:setText(tostring(cfgInfo.value) .. "%") -- 限购 - self.limitText:setText("限购" .. tostring(cfgInfo.limit) .. "次TD") -- TODOJ + self.limitText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, tostring(cfgInfo.limit))) -- 限购{0}次 -- 标题 - self.titleText:setText("成长礼包TD") -- TODOJ + self.titleText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_13)) -- 成长礼包 -- 奖励 local rewardList = cfgInfo.reward local count = rewardList and #rewardList or 0 diff --git a/lua/app/ui/shop/cell/hot_cell.lua b/lua/app/ui/shop/cell/hot_cell.lua index 35ddc775..9859c8aa 100644 --- a/lua/app/ui/shop/cell/hot_cell.lua +++ b/lua/app/ui/shop/cell/hot_cell.lua @@ -21,7 +21,7 @@ function HotCell:init() self.heroNumText = uiMap["hot_cell.hero.num_tx"] self.sellOutText = uiMap["hot_cell.sell_out"] - self.sellOutText:setText("已购买TD") -- TODOJ + self.sellOutText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20)) -- 已购买 end function HotCell:refresh(data) @@ -57,7 +57,7 @@ function HotCell:refresh(data) GFunc.setAdsSprite(self.adImg) local adLeftCount = DataManager.ShopData:getMallDailyFirstItemAdMaxCount() - bought if adLeftCount > 0 then - self.adText:setText("免费(" .. tostring(adLeftCount) .. ")TD") -- TODOJ + self.adText:setText(I18N:getGlobalText(I18N.GlobalConst.STR_FREE) .. "(" .. tostring(adLeftCount) .. ")") -- 免费(x) GFunc.centerImgAndTx(self.adImg, self.adText, 5) self.sellOutText:setVisible(false) diff --git a/lua/app/ui/shop/cell/hot_sell_cell.lua b/lua/app/ui/shop/cell/hot_sell_cell.lua index f255de99..8b2ed387 100644 --- a/lua/app/ui/shop/cell/hot_sell_cell.lua +++ b/lua/app/ui/shop/cell/hot_sell_cell.lua @@ -6,9 +6,9 @@ function HotSellCell:init() local uiMap = self.baseObject:genAllChildren() self.cellHeight = self.baseObject:fastGetSizeDeltaY() + 20 - uiMap["hot_sell_cell.title_bg.text"]:setText("临时文本:每日特惠") + uiMap["hot_sell_cell.title_bg.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_28)) -- 每日特惠 uiMap["hot_sell_cell.help_btn"]:addClickListener(function() - + -- TODOJ end) self.timeTx = uiMap["hot_sell_cell.time_tx"] self.cells = {} @@ -39,7 +39,7 @@ function HotSellCell:refresh() self.refreshAdImg:setVisible(true) GFunc.setAdsSprite(self.refreshAdImg) self.refreshGemImg:setVisible(false) - self.refreshText:setText("刷新TD") -- TODOJ + self.refreshText:setText(I18N:getGlobalText(I18N.GlobalConst.STR_REFRESH)) self.refreshBtn:addRedPoint(70, 30, 0.6) elseif gemRefreshCount > 0 then self.refreshBtn:setVisible(true) @@ -68,7 +68,7 @@ function HotSellCell:refreshTime() if remainTime < 0 then remainTime = 0 end - self.timeTx:setText("刷新时间TD:" .. GFunc.getTimeStrWithHMS(remainTime)) -- TODOJ + self.timeTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_22, GFunc.getTimeStrWithHMS(remainTime)))-- 刷新时间:{0} end function HotSellCell:getCellHeight() diff --git a/lua/app/ui/shop/cell/level_cell.lua b/lua/app/ui/shop/cell/level_cell.lua index 95f716e0..99325557 100644 --- a/lua/app/ui/shop/cell/level_cell.lua +++ b/lua/app/ui/shop/cell/level_cell.lua @@ -43,9 +43,9 @@ function LevelCell:refresh(idx, cfgInfo, clickCallback) -- 超值 self.offText:setText(tostring(cfgInfo.value) .. "%") -- 限购 - self.limitText:setText("限购1次TD") -- 默认限购1次 TODOJ + self.limitText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_18, 1)) -- 限购1次 -- 标题 - self.titleText:setText(tostring(cfgInfo.parameter) .. "级助力礼包TD") -- TODOJ + self.titleText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_23, tostring(cfgInfo.parameter))) -- {0}级助力礼包 -- 奖励 local rewardList = cfgInfo.reward local count = rewardList and #rewardList or 0 diff --git a/lua/app/ui/shop/gift_pop_ui.lua b/lua/app/ui/shop/gift_pop_ui.lua index e1bc814b..381fdc14 100644 --- a/lua/app/ui/shop/gift_pop_ui.lua +++ b/lua/app/ui/shop/gift_pop_ui.lua @@ -2,23 +2,23 @@ local GiftPopUI = class("GiftPopUI", BaseUI) local GIFT_BG_NAME = { [PayManager.PURCHARSE_TYPE.ACT_GIFT] = { - [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_2_1.png", -- TODOJ - [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_5_1.png", -- TODOJ - [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_3_1.png", -- TODOJ - [PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = "assets/arts/textures/background/shop/shop_gift_banner_1_1.png", -- TODOJ + [PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = "assets/arts/textures/background/shop/shop_gift_banner_1_1.png", + [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_3_1.png", + [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_4_1.png", + [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_6_1.png", }, - [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_1_1.png", -- TODOJ - [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_4_1.png", -- TODOJ + [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_2_1.png", + [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_5_1.png", } local GIFT_TITLE_TEXT = { [PayManager.PURCHARSE_TYPE.ACT_GIFT] = { - [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = "新手礼包TD", -- TODOJ - [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = "金币礼包TD", -- TODOJ - [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = "助力礼包TD", -- TODOJ - [PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = "首充礼包TD", -- TODOJ + [PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_9), + [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_11), + [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_12), + [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_14), }, - [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "章节礼包TD", -- TODOJ - [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = "成长礼包TD", -- TODOJ + [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_10), + [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_13), } local MAX_ITEM_NUM = 4 @@ -154,13 +154,13 @@ function GiftPopUI:refresh(needCheck) if self.actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and self.actId == GConst.ShopConst.FIRST_RECHARGE_ID then local canGet = DataManager.ShopData:getHasFirstRechargeReward() if canGet then - self.buyBtnTx:setText("领取TD") -- TODOJ + self.buyBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM)) else local hasGet = DataManager.ShopData:getHasGotFirstRechargeReward() if hasGet then self:closeUI() else - self.buyBtnTx:setText("前往商店TD") -- TODOJ + self.buyBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_15)) -- 前往商店 end end end diff --git a/lua/app/ui/shop/shop_comp.lua b/lua/app/ui/shop/shop_comp.lua index 14eabb26..e031b27d 100644 --- a/lua/app/ui/shop/shop_comp.lua +++ b/lua/app/ui/shop/shop_comp.lua @@ -38,10 +38,10 @@ function ShopComp:initTitlePage() self.subTitleIcon2 = self.uiMap["shop_comp.title_node.btn_cell_2.icon"] self.subTitleBtn2 = self.uiMap["shop_comp.title_node.btn_cell_2"] - self.subTitleText1:setText("特惠商品TD") -- TODOJ 特惠商品 - self.subTitleSelectText1:setText("特惠商品TD") -- TODOJ 特惠商品 - self.subTitleText2:setText("主要商品TD") -- TODOJ 主要商品 - self.subTitleSelectText2:setText("主要商品TD") -- TODOJ 主要商品 + self.subTitleText1:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_16)) -- 特惠商品 + self.subTitleSelectText1:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_16)) -- 特惠商品 + self.subTitleText2:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_17)) -- 主要商品 + self.subTitleSelectText2:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_17)) -- 主要商品 self.subTitleBtn1:addClickListener(function() self:switchPage(PAGE_DISCOUNT) diff --git a/lua/app/userdata/shop/shop_data.lua b/lua/app/userdata/shop/shop_data.lua index 892e3313..61cdbcfc 100644 --- a/lua/app/userdata/shop/shop_data.lua +++ b/lua/app/userdata/shop/shop_data.lua @@ -257,7 +257,7 @@ function ShopData:addMallDailyAdResetCount() end function ShopData:getMallDailyAdLeftCount() - return 1 - self.mallDailyAdResetCount -- TODOJ 目前无配置表 + return 1 - self.mallDailyAdResetCount -- 目前无配置表 end function ShopData:getMallDailyDiamondResetCount() @@ -269,7 +269,7 @@ function ShopData:addMallDailyDiamondResetCount() end function ShopData:getMallDailyDiamondLeftCount() - return 1 - self.mallDailyDiamondResetCount -- TODOJ 目前无配置表 + return 1 - self.mallDailyDiamondResetCount -- 目前无配置表 end function ShopData:getMallDailyGoods() @@ -277,17 +277,17 @@ function ShopData:getMallDailyGoods() end function ShopData:getMallDailyDiamondResetCost() - return 30 -- TODOJ 目前无配置表 + return 30 -- 目前无配置表 end -- 每日特惠 广告商品最大购买次数 function ShopData:getMallDailyFirstItemAdMaxCount() - return 1 -- TODOJ 目前无配置表 + return 1 -- 目前无配置表 end -- 每日特惠 常规商品最大购买次数 function ShopData:getMallDailyGoodsLimitCount() - return 1 -- TODOJ 目前无配置表 + return 1 -- 目前无配置表 end -- 每日特惠 是否开启 @@ -416,8 +416,9 @@ function ShopData:getBeginnerGiftHasBuy() end end +-- 新手礼包侧边栏展示时间 function ShopData:getBeginnerGiftSideBarDurationTime() - return 3 * 24 * 3600 -- 暂无配置表 TODOJ + return 3 * 24 * 3600 -- 目前无配置表 end -- 未购买且在开服的3天内 From 5493c1b0eb9dce185b4d3463c865c7502bcb078f Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 29 May 2023 14:34:31 +0800 Subject: [PATCH 20/31] =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/white_res_manager.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/app/common/white_res_manager.lua b/lua/app/common/white_res_manager.lua index 87297896..10226726 100644 --- a/lua/app/common/white_res_manager.lua +++ b/lua/app/common/white_res_manager.lua @@ -11,6 +11,7 @@ local GAME_RES_WHITE_LIST = { GConst.ATLAS_PATH.ICON_ITEM, GConst.ATLAS_PATH.ICON_HERO, GConst.ATLAS_PATH.ICON_BUFF, + GConst.ATLAS_PATH.ICON_TASK, } ---- 预加载游戏资源 From d47baeebc1f94cc8db4a8fadcaf7544f430ff456 Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 29 May 2023 15:06:25 +0800 Subject: [PATCH 21/31] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E8=8B=B1=E9=9B=84=E8=A7=A3=E9=94=81=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/buff.lua | 32 +- lua/app/config/buff_daily_challenge.lua | 102 +- lua/app/config/chapter.lua | 16 +- lua/app/config/chapter_board.lua | 8252 +++++++++++------ lua/app/config/func_open.lua | 7 +- lua/app/config/hero.lua | 38 +- .../localization_global_const.lua | 30 + lua/app/config/skill.lua | 193 +- lua/app/config/skill_rogue.lua | 335 +- lua/app/config/strings/cn/global.lua | 30 + lua/app/config/strings/cn/skill.lua | 6 +- lua/app/config/strings/cn/skill_rogue.lua | 18 +- lua/app/ui/common/cell/hero_cell.lua | 18 +- lua/app/userdata/hero/hero_entity.lua | 6 +- 14 files changed, 5889 insertions(+), 3194 deletions(-) diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index eed7f60a..2f349a01 100644 --- a/lua/app/config/buff.lua +++ b/lua/app/config/buff.lua @@ -269,7 +269,7 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["decr"]=1, - ["icon"]="normal_attack_dec" + ["icon"]="high" }, [38]={ ["name"]="block", @@ -343,19 +343,19 @@ local buff = { ["stack"]=1, ["decr"]=2, ["formula"]=4, - ["icon"]="shield" + ["icon"]="burn" }, [49]={ ["name"]="vulnerable", ["buff_type"]=1, ["decr"]=2, - ["icon"]="shield" + ["icon"]="vulnerable" }, [50]={ ["name"]="frozen", ["buff_type"]=7, ["decr"]=2, - ["icon"]="shield", + ["icon"]="frozen", ["control_priority"]=1 }, [51]={ @@ -364,59 +364,59 @@ local buff = { ["stack"]=2, ["decr"]=2, ["formula"]=4, - ["icon"]="shield" + ["icon"]="poison" }, [52]={ ["name"]="imprison", ["buff_type"]=7, ["decr"]=2, - ["icon"]="shield", + ["icon"]="imprison", ["control_priority"]=4 }, [53]={ ["name"]="corrupt", ["buff_type"]=1, ["decr"]=2, - ["icon"]="shield" + ["icon"]="corrupt" }, [54]={ ["name"]="bleed", ["buff_type"]=7, ["decr"]=2, ["formula"]=4, - ["icon"]="shield" + ["icon"]="bleed" }, [55]={ ["name"]="weaken", ["buff_type"]=1, ["decr"]=2, - ["icon"]="shield" + ["icon"]="weaken" }, [56]={ ["name"]="lethargy", ["buff_type"]=8, ["stack"]=1, ["decr"]=2, - ["icon"]="shield", + ["icon"]="lethargy", ["control_priority"]=3 }, [57]={ ["name"]="curse", ["buff_type"]=1, ["decr"]=2, - ["icon"]="shield" + ["icon"]="curse" }, [58]={ ["name"]="lock", ["buff_type"]=7, ["decr"]=2, - ["icon"]="shield" + ["icon"]="lock" }, [59]={ ["name"]="first_hand", ["buff_type"]=1, ["decr"]=1, - ["icon"]="shield" + ["icon"]="first_hand" }, [60]={ ["name"]="skill_hurt_add", @@ -428,20 +428,20 @@ local buff = { ["name"]="undead", ["buff_type"]=7, ["decr"]=1, - ["icon"]="shield" + ["icon"]="undead" }, [62]={ ["name"]="counterattack", ["buff_type"]=1, ["stack"]=1, ["decr"]=1, - ["icon"]="shield" + ["icon"]="counterattack" }, [63]={ ["name"]="thorns", ["buff_type"]=1, ["decr"]=1, - ["icon"]="shield" + ["icon"]="thorns" }, [64]={ ["name"]="dmg_dec_red_add", diff --git a/lua/app/config/buff_daily_challenge.lua b/lua/app/config/buff_daily_challenge.lua index 6e3b2c4c..acb758e7 100644 --- a/lua/app/config/buff_daily_challenge.lua +++ b/lua/app/config/buff_daily_challenge.lua @@ -69,10 +69,10 @@ local buff_daily_challenge = { ["buff_type"]=1, ["effect"]={ { - ["type"]="shield", - ["num"]=10000, - ["ratio"]=1000, - ["round"]=999 + ["type"]="wavehealp", + ["num"]=100, + ["ratio"]=10000, + ["round"]=0 } }, ["obj"]=1 @@ -81,27 +81,15 @@ local buff_daily_challenge = { ["buff_type"]=1, ["effect"]={ { - ["type"]="wavehealp", - ["num"]=100, - ["ratio"]=10000, - ["round"]=0 + ["type"]="cured_add", + ["num"]=500, + ["ratio"]=500, + ["round"]=999 } }, ["obj"]=1 }, [8]={ - ["buff_type"]=1, - ["effect"]={ - { - ["type"]="cured_add", - ["num"]=500, - ["ratio"]=500, - ["round"]=999 - } - }, - ["obj"]=1 - }, - [9]={ ["buff_type"]=1, ["effect"]={ { @@ -113,31 +101,7 @@ local buff_daily_challenge = { }, ["obj"]=1 }, - [10]={ - ["buff_type"]=1, - ["effect"]={ - { - ["type"]="cured_add", - ["num"]=500, - ["ratio"]=500, - ["round"]=999 - } - }, - ["obj"]=1 - }, - [11]={ - ["buff_type"]=2, - ["effect"]={ - { - ["type"]="hpp_add", - ["num"]=2000, - ["ratio"]=1000, - ["round"]=999 - } - }, - ["obj"]=2 - }, - [12]={ + [9]={ ["buff_type"]=2, ["effect"]={ { @@ -149,7 +113,7 @@ local buff_daily_challenge = { }, ["obj"]=2 }, - [13]={ + [10]={ ["buff_type"]=2, ["effect"]={ { @@ -161,7 +125,7 @@ local buff_daily_challenge = { }, ["obj"]=2 }, - [14]={ + [11]={ ["buff_type"]=2, ["effect"]={ { @@ -173,7 +137,7 @@ local buff_daily_challenge = { }, ["obj"]=2 }, - [15]={ + [12]={ ["buff_type"]=2, ["effect"]={ { @@ -185,7 +149,7 @@ local buff_daily_challenge = { }, ["obj"]=2 }, - [16]={ + [13]={ ["buff_type"]=2, ["effect"]={ { @@ -197,43 +161,7 @@ local buff_daily_challenge = { }, ["obj"]=2 }, - [17]={ - ["buff_type"]=2, - ["effect"]={ - { - ["type"]="dec_dmg_all_add", - ["num"]=500, - ["ratio"]=1000, - ["round"]=999 - } - }, - ["obj"]=2 - }, - [18]={ - ["buff_type"]=2, - ["effect"]={ - { - ["type"]="cured_dec", - ["num"]=1000, - ["ratio"]=1000, - ["round"]=999 - } - }, - ["obj"]=2 - }, - [19]={ - ["buff_type"]=2, - ["effect"]={ - { - ["type"]="block", - ["num"]=500, - ["ratio"]=1000, - ["round"]=999 - } - }, - ["obj"]=2 - }, - [20]={ + [14]={ ["buff_type"]=2, ["effect"]={ { @@ -247,6 +175,6 @@ local buff_daily_challenge = { } } local config = { -data=buff_daily_challenge,count=20 +data=buff_daily_challenge,count=14 } return config \ No newline at end of file diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 9bd76357..0a9bb764 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -456,7 +456,7 @@ local chapter = { }, ["mystery_box"]={ 1, - 3 + 4 }, ["mystery_box_reward"]={ { @@ -856,7 +856,7 @@ local chapter = { }, ["mystery_box"]={ 1, - 4 + 3 }, ["mystery_box_reward"]={ { @@ -1059,7 +1059,7 @@ local chapter = { }, ["mystery_box"]={ 2, - 3 + 4 }, ["mystery_box_reward"]={ { @@ -1277,8 +1277,8 @@ local chapter = { 13001 }, ["mystery_box"]={ - 1, - 4 + 2, + 3 }, ["mystery_box_reward"]={ { @@ -1496,7 +1496,7 @@ local chapter = { 15001 }, ["mystery_box"]={ - 3, + 2, 4 }, ["mystery_box_reward"]={ @@ -1715,8 +1715,8 @@ local chapter = { 17001 }, ["mystery_box"]={ - 2, - 3 + 1, + 4 }, ["mystery_box_reward"]={ { diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index ca0dcc85..c9f67b0a 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -1221,80 +1221,28 @@ local chapter_board = { 0 }, { - 0, - 1 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, + 3, 0 }, { 0, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 1 - }, - { - 4, - 1 - }, - { - 4, 3 }, { - 4, + 0, 2 }, { - 4, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 4 - }, - { - 4, - 4 - }, - { - 4, + 0, 3 }, { - 4, - 4 + 1, + 0 }, { - 4, - 4 + 1, + 0 }, { 1, @@ -1306,22 +1254,18 @@ local chapter_board = { }, { 0, - 0 + 2 }, { 0, - 0 + 3 }, { 0, - 0 + 2 }, { - 0, - 0 - }, - { - 0, + 3, 0 }, { @@ -1337,15 +1281,43 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { - 3, + 2, 0 }, { - 3, + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 14, + 0 + }, + { + 2, 0 }, { @@ -1377,7 +1349,7 @@ local chapter_board = { 0 }, { - 3, + 1, 0 }, { @@ -1393,17 +1365,243 @@ local chapter_board = { 0 }, { - 3, + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { 3, 0 }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 3, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 17, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 1, 0 @@ -1416,30 +1614,6 @@ local chapter_board = { }, [8]={ ["board"]={ - { - 1, - 0 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, { 1, 0 @@ -1450,18 +1624,10 @@ local chapter_board = { }, { 0, - 1 - }, - { - 4, - 2 - }, - { - 4, 3 }, { - 4, + 0, 4 }, { @@ -1481,15 +1647,75 @@ local chapter_board = { 0 }, { - 0, + 1, 0 }, { 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, 0 }, { 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { @@ -1513,7 +1739,7 @@ local chapter_board = { 0 }, { - 3, + 14, 0 }, { @@ -1580,34 +1806,6 @@ local chapter_board = { 1, 0 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 1, 0 @@ -1620,110 +1818,22 @@ local chapter_board = { 1, 0 }, - { - 2, - 0 - }, - { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 2, - 0 - }, { 1, 0 }, - { - 1, - 0 - }, - { - 2, - 0 - }, { 0, 3 }, { 0, - 2 - }, - { - 0, - 3 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, 1 }, { - 4, - 2 - }, - { - 4, - 3 - }, - { - 4, + 0, 4 }, - { - 4, - 5 - }, { 1, 0 @@ -1732,53 +1842,25 @@ local chapter_board = { 1, 0 }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, { 1, 0 }, { 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 + 2 }, { 0, - 0 + 1 + }, + { + 0, + 1 + }, + { + 0, + 4 }, { 1, @@ -1792,6 +1874,90 @@ local chapter_board = { 3, 0 }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 7, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 14, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 7, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 3, 0 @@ -1804,10 +1970,42 @@ local chapter_board = { 3, 0 }, + { + 7, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, { 3, 0 }, + { + 7, + 0 + }, + { + 1, + 0 + }, { 1, 0 @@ -1820,82 +2018,26 @@ local chapter_board = { 1, 0 }, - { - 3, - 0 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, { 0, 3 }, { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 1 - }, - { - 4, - 2 - }, - { - 4, - 1 - }, - { - 4, - 2 - }, - { - 4, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 3 - }, - { - 4, + 0, 4 }, { - 4, - 5 + 0, + 4 }, { - 4, - 1 - }, - { - 4, + 0, 2 }, + { + 0, + 1 + }, { 1, 0 @@ -1905,23 +2047,23 @@ local chapter_board = { 0 }, { - 0, + 2, 0 }, { 0, - 0 + 4 }, { 0, - 0 + 2 }, { 0, - 0 + 1 }, { - 0, + 2, 0 }, { @@ -1937,16 +2079,16 @@ local chapter_board = { 0 }, { - 3, - 0 + 0, + 2 }, { - 1, - 0 + 0, + 4 }, { - 3, - 0 + 0, + 1 }, { 2, @@ -1964,6 +2106,22 @@ local chapter_board = { 3, 0 }, + { + 2, + 0 + }, + { + 7, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, { 1, 0 @@ -1972,6 +2130,172 @@ local chapter_board = { 1, 0 }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 14, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, { 1, 0 @@ -1980,6 +2304,78 @@ local chapter_board = { 3, 0 }, + { + 2, + 0 + }, + { + 7, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 17, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, { 1, 0 @@ -2022,23 +2418,23 @@ local chapter_board = { }, { 0, - 3 + 1 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 }, { 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 + 2 }, { 1, @@ -2049,111 +2445,55 @@ local chapter_board = { 0 }, { - 0, - 4 + 4, + 1 }, { - 0, + 4, + 1 + }, + { + 4, 3 }, { - 0, - 4 + 4, + 2 }, { - 0, - 4 - }, - { - 0, - 3 + 4, + 2 }, { 1, 0 }, { - 5, + 1, + 0 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 4, 3 }, { - 3, - 0 - }, - { - 5, + 4, 4 }, { - 3, - 0 - }, - { - 5, - 3 - }, - { - 3, - 0 - }, - { - 5, - 3 - }, - { - 3, - 0 - }, - { - 5, + 4, 4 }, { - 3, - 0 - }, - { - 5, - 4 - }, - { - 3, - 0 - }, - { - 5, - 4 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 1, 0 }, { @@ -2189,23 +2529,79 @@ local chapter_board = { 0 }, { - 0, + 3, 0 }, { - 0, + 3, 0 }, { - 0, + 3, 0 }, { - 0, + 3, 0 }, { - 0, + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 14, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, 0 }, { @@ -2221,8 +2617,16 @@ local chapter_board = { 0 }, { - 1, - 0 + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 }, { 0, @@ -2233,40 +2637,36 @@ local chapter_board = { 4 }, { - 0, + 1, + 0 + }, + { + 1, + 0 + }, + { + 4, 2 }, { - 1, - 0 + 4, + 2 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, + 4, 3 }, { - 0, - 2 - }, - { - 0, + 4, 4 }, { - 0, - 3 + 4, + 4 }, { - 0, - 3 + 1, + 0 }, { 1, @@ -2278,23 +2678,15 @@ local chapter_board = { }, { 0, - 4 + 0 }, { 0, - 2 + 0 }, { 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 2 + 0 }, { 1, @@ -2304,88 +2696,12 @@ local chapter_board = { 1, 0 }, - { - 5, - 2 - }, - { - 5, - 4 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, { 1, 0 }, { - 2, - 0 - }, - { - 5, - 4 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 5, - 4 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 5, - 2 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 2 - }, - { - 2, - 0 - }, - { - 2, + 1, 0 }, { @@ -2401,156 +2717,378 @@ local chapter_board = { 0 }, { - 3, + 1, 0 }, { - 3, + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, 0 }, { 2, 0 + }, + { + 14, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 17, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 } } }, [13]={ ["board"]={ { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 1 + 1, + 0 }, { 2, 0 }, { - 5, + 0, 2 }, { - 3, - 0 - }, - { - 5, + 0, 3 }, { - 5, - 5 - }, - { - 3, - 0 - }, - { - 5, - 1 + 0, + 2 }, { 2, 0 }, { - 5, + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, 2 }, { - 5, + 0, 3 }, { - 5, - 3 + 2, + 0 }, { - 5, - 5 + 1, + 0 }, { - 5, - 5 + 1, + 0 }, { - 5, + 2, 1 }, { - 5, + 3, + 2 + }, + { + 3, + 3 + }, + { + 3, 4 }, { - 5, - 4 - }, - { - 5, - 4 + 2, + 5 }, { 1, @@ -2560,28 +3098,80 @@ local chapter_board = { 1, 0 }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 1, + 0 + }, { 1, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 1, 0 }, { - 5, - 4 + 1, + 0 + }, + { + 0, + 0 }, { 3, 0 }, { - 5, - 4 + 3, + 0 }, { - 1, + 3, + 0 + }, + { + 0, 0 }, { @@ -2592,21 +3182,223 @@ local chapter_board = { 1, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 14, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ { 1, 0 }, { - 5, + 2, + 0 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 1 + }, + { + 3, + 2 + }, + { + 3, + 3 + }, + { + 3, 4 }, { - 5, - 4 + 2, + 5 }, { - 5, - 4 + 1, + 0 + }, + { + 1, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 17, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 }, { 1, @@ -2626,35 +3418,7 @@ local chapter_board = { }, { 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 0, - 3 + 1 }, { 0, @@ -2677,21 +3441,117 @@ local chapter_board = { 0 }, { - 3, - 0 - }, - { - 3, - 0 + 4, + 1 }, { 4, 2 }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 5 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 14, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, { 3, 0 }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 3, 0 @@ -2704,80 +3564,12 @@ local chapter_board = { 1, 0 }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, { 1, 0 }, { - 1, - 0 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 3, 0 }, { @@ -2826,11 +3618,11 @@ local chapter_board = { }, { 0, - 1 + 4 }, { 0, - 1 + 4 }, { 0, @@ -2844,6 +3636,176 @@ local chapter_board = { 1, 0 }, + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 14, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ { 1, 0 @@ -2854,15 +3816,15 @@ local chapter_board = { }, { 0, - 2 + 4 }, { 0, - 2 + 4 }, { 0, - 2 + 3 }, { 0, @@ -2872,10 +3834,86 @@ local chapter_board = { 1, 0 }, + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 0, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 5, + 3 + }, { 3, 0 }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, { 3, 0 @@ -2885,8 +3923,16 @@ local chapter_board = { 0 }, { - 4, - 1 + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 }, { 3, @@ -2933,84 +3979,28 @@ local chapter_board = { 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { - 4, - 1 - }, - { - 3, + 17, 0 }, { - 3, + 0, + 0 + }, + { + 0, 0 }, { 1, 0 - }, - { - 1, - 0 - }, - { - 5, - 5 - }, - { - 5, - 5 - }, - { - 5, - 2 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 1, - 0 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 2 - }, - { - 5, - 3 - }, - { - 5, - 2 } } }, @@ -3026,7 +4016,7 @@ local chapter_board = { }, { 0, - 5 + 3 }, { 0, @@ -3034,7 +4024,7 @@ local chapter_board = { }, { 0, - 5 + 2 }, { 1, @@ -3049,8 +4039,12 @@ local chapter_board = { 0 }, { - 2, - 0 + 0, + 3 + }, + { + 0, + 2 }, { 0, @@ -3058,14 +4052,66 @@ local chapter_board = { }, { 0, - 5 + 3 }, { 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 4, 4 }, { - 2, + 4, + 2 + }, + { + 4, + 4 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, 0 }, { @@ -3077,8 +4123,12 @@ local chapter_board = { 0 }, { - 2, - 0 + 5, + 2 + }, + { + 5, + 4 }, { 5, @@ -3101,39 +4151,15 @@ local chapter_board = { 0 }, { - 2, - 0 + 5, + 4 }, { - 3, - 0 + 5, + 2 }, { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, + 14, 0 }, { @@ -3142,23 +4168,7 @@ local chapter_board = { }, { 5, - 2 - }, - { - 5, - 2 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 + 4 }, { 2, @@ -3173,84 +4183,32 @@ local chapter_board = { 0 }, { - 2, + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { 2, 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 } } }, [17]={ ["board"]={ - { - 1, - 0 - }, { 0, - 4 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 0, - 5 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 + 3 }, { 0, @@ -3258,7 +4216,7 @@ local chapter_board = { }, { 0, - 5 + 1 }, { 0, @@ -3269,11 +4227,63 @@ local chapter_board = { 3 }, { - 1, + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 1 + }, + { + 2, 0 }, { - 1, + 5, + 2 + }, + { + 3, 0 }, { @@ -3284,132 +4294,310 @@ local chapter_board = { 5, 5 }, + { + 3, + 0 + }, { 5, - 4 + 1 + }, + { + 2, + 0 }, { 5, 2 }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, { 5, 1 }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, { 1, 0 }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, { 1, 0 }, { - 2, + 1, 0 }, + { + 1, + 0 + }, + { + 5, + 4 + }, + { + 14, + 0 + }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 1 + }, { 2, 0 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 + 5, + 2 }, { 3, 0 }, { - 2, - 0 + 5, + 3 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 + 5, + 5 }, { 3, 0 }, { - 2, - 0 + 5, + 1 }, { 2, 0 }, { - 2, + 5, + 2 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 5, + 1 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 1, 0 }, { - 2, + 1, 0 }, { - 2, + 1, 0 }, { - 2, + 1, 0 }, { - 3, + 5, + 4 + }, + { + 17, 0 }, { - 2, + 5, + 4 + }, + { + 1, 0 }, { - 2, + 1, 0 }, { - 2, + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 1, 0 } } @@ -3421,39 +4609,7 @@ local chapter_board = { 0 }, { - 5, - 2 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 5, - 1 - }, - { - 2, + 3, 0 }, { @@ -3462,94 +4618,130 @@ local chapter_board = { }, { 0, - 3 + 4 }, { 0, - 3 - }, - { - 0, - 1 + 4 }, { 3, 0 }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 4, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 5, 1 }, { - 2, + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, 0 }, { 5, 2 }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 5, - 1 - }, - { - 2, - 0 - }, { 5, 2 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 + 14, + 3 }, { 5, - 4 - }, - { - 2, - 0 + 3 }, { 5, - 5 + 3 }, { - 2, - 0 - }, - { - 2, + 1, 0 }, { @@ -3557,27 +4749,7 @@ local chapter_board = { 0 }, { - 3, - 0 - }, - { - 5, - 4 - }, - { - 2, - 0 - }, - { - 5, - 5 - }, - { - 2, - 0 - }, - { - 3, + 1, 0 }, { @@ -3593,15 +4765,31 @@ local chapter_board = { 0 }, { - 3, + 1, 0 }, { - 3, + 1, 0 }, { - 3, + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, 0 }, { @@ -3621,47 +4809,23 @@ local chapter_board = { 0 }, { - 1, - 0 + 0, + 3 }, { 0, - 2 + 1 }, { 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 2 + 1 }, { 0, - 2 + 3 }, { 0, - 5 - }, - { - 4, 4 }, { @@ -3673,11 +4837,7 @@ local chapter_board = { 0 }, { - 3, - 0 - }, - { - 4, + 0, 3 }, { @@ -3686,16 +4846,76 @@ local chapter_board = { }, { 0, - 5 + 2 }, { - 4, + 0, + 2 + }, + { + 0, 4 }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 4, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, { 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, { 1, 0 @@ -3705,124 +4925,96 @@ local chapter_board = { 0 }, { - 4, - 3 + 3, + 0 }, { 4, 1 }, { - 4, - 1 + 3, + 0 }, { - 4, + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, 5 }, { - 0, - 0 + 5, + 5 }, { - 3, - 0 + 5, + 1 }, { - 3, - 0 + 5, + 3 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 3, - 0 + 5, + 3 }, { 1, 0 }, { - 3, + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 3 + }, + { + 14, 0 }, { - 3, - 0 + 5, + 1 }, { - 3, - 0 + 5, + 3 }, { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 + 5, + 1 } } }, [20]={ ["board"]={ + { + 1, + 0 + }, { 1, 0 }, { 0, - 3 + 5 }, { 0, @@ -3830,18 +5022,38 @@ local chapter_board = { }, { 0, - 2 + 5 }, { - 0, - 3 + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 }, { 0, 4 }, { - 1, + 0, + 5 + }, + { + 0, + 4 + }, + { + 3, 0 }, { @@ -3849,87 +5061,51 @@ local chapter_board = { 0 }, { - 0, - 2 + 3, + 0 }, { - 0, - 2 + 2, + 0 }, { - 0, + 5, 3 }, { - 0, - 2 - }, - { - 0, + 5, 3 }, { - 1, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 4, + 5, 3 }, { - 4, - 2 + 2, + 0 }, { - 4, - 1 - }, - { - 4, - 1 - }, - { - 4, - 1 + 3, + 0 }, { 2, 0 }, { - 0, + 3, + 0 + }, + { + 2, + 0 + }, + { + 14, + 0 + }, + { + 2, 0 }, { @@ -3937,7 +5113,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -3945,7 +5121,39 @@ local chapter_board = { 0 }, { - 3, + 2, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, 0 }, { @@ -3953,35 +5161,11 @@ local chapter_board = { 0 }, { - 0, + 2, 0 }, { - 0, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 0, + 2, 0 }, { @@ -3993,21 +5177,223 @@ local chapter_board = { 0 }, { - 0, + 1, + 0 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 1, 0 }, { 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, 0 }, { 0, + 4 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 3, 0 }, { 1, 0 }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 5, + 3 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 17, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 1, + 0 + }, { 1, 0 @@ -4017,25 +5403,29 @@ local chapter_board = { [21]={ ["board"]={ { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 2, + 1, 0 }, + { + 0, + 4 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, { 1, 0 @@ -4054,15 +5444,15 @@ local chapter_board = { }, { 0, - 4 + 5 }, { 0, 3 }, { - 2, - 0 + 0, + 3 }, { 1, @@ -4073,115 +5463,39 @@ local chapter_board = { 0 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 5, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 5, + 0, 3 }, { 0, - 0 + 5 }, { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 5, + 0, 4 }, { 0, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 5, - 3 + 2 }, { 0, + 1 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, 0 }, { @@ -4189,7 +5503,55 @@ local chapter_board = { 0 }, { - 1, + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 14, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, 0 }, { @@ -4197,7 +5559,27 @@ local chapter_board = { 0 }, { - 3, + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, 0 }, { @@ -4205,11 +5587,15 @@ local chapter_board = { 0 }, { - 5, - 4 + 2, + 0 }, { - 1, + 2, + 0 + }, + { + 2, 0 } } @@ -4220,13 +5606,45 @@ local chapter_board = { 1, 0 }, + { + 5, + 2 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, { 0, 1 }, + { + 1, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, { 0, - 3 + 4 }, { 0, @@ -4238,35 +5656,123 @@ local chapter_board = { }, { 0, + 1 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 2, + 0 + }, + { + 5, 5 }, { - 1, + 2, + 0 + }, + { + 2, 0 }, { 1, 0 }, - { - 0, - 1 - }, - { - 0, - 2 - }, { 3, 0 }, { - 0, + 5, 4 }, { - 0, - 4 + 14, + 0 + }, + { + 5, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 }, { 1, @@ -4277,19 +5783,61 @@ local chapter_board = { 0 }, { - 0, + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 5, 2 }, { - 3, + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 1, 0 }, { - 3, - 0 + 5, + 1 }, { - 3, + 2, 0 }, { @@ -4297,127 +5845,167 @@ local chapter_board = { 4 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 4, - 4 - }, - { - 3, - 0 - }, - { - 4, - 4 - }, - { - 4, - 2 - }, - { - 4, - 2 - }, - { - 4, - 1 + 0, + 3 }, { 0, - 0 - }, - { - 4, - 4 - }, - { - 3, - 0 - }, - { - 4, - 4 + 3 }, { 0, - 0 - }, - { - 4, 1 }, - { - 4, - 1 - }, - { - 4, - 3 - }, - { - 4, - 3 - }, { 3, 0 }, { - 4, - 3 - }, - { - 4, - 3 - }, - { - 4, + 5, 1 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 5, + 1 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 2, + 0 + }, + { + 5, + 5 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 17, + 0 + }, + { + 5, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 } } }, [23]={ ["board"]={ { - 2, + 1, + 0 + }, + { + 1, 0 }, { @@ -4426,78 +6014,18 @@ local chapter_board = { }, { 0, - 3 + 5 }, { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 2, + 1, 0 }, { - 2, + 1, 0 }, { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, + 1, 0 }, { @@ -4506,7 +6034,15 @@ local chapter_board = { }, { 4, - 4 + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 }, { 4, @@ -4516,16 +6052,64 @@ local chapter_board = { 1, 0 }, + { + 1, + 0 + }, + { + 3, + 0 + }, { 4, + 3 + }, + { + 0, + 2 + }, + { + 0, 5 }, + { + 4, + 4 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 4, + 3 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, { 4, 5 }, { - 1, + 0, + 0 + }, + { + 3, 0 }, { @@ -4541,7 +6125,7 @@ local chapter_board = { 0 }, { - 3, + 0, 0 }, { @@ -4557,15 +6141,7 @@ local chapter_board = { 0 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 1, 0 }, { @@ -4604,6 +6180,14 @@ local chapter_board = { 1, 0 }, + { + 14, + 0 + }, + { + 1, + 0 + }, { 1, 0 @@ -4621,13 +6205,17 @@ local chapter_board = { 0 }, { - 4, - 2 + 0, + 3 }, { 0, 4 }, + { + 0, + 2 + }, { 0, 3 @@ -4636,138 +6224,340 @@ local chapter_board = { 0, 4 }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 4, + 3 + }, { 4, 2 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 3, - 0 - }, - { - 0, - 2 - }, - { - 3, - 0 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 3, - 0 - }, - { - 0, - 1 - }, - { - 3, - 0 - }, - { - 0, - 5 - }, - { - 3, - 0 - }, - { - 0, - 3 - }, - { - 3, - 0 - }, { 4, 1 }, { 4, + 1 + }, + { + 4, + 1 + }, + { + 2, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 14, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, 2 }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, { 4, 3 }, { 4, - 4 + 2 }, { 4, - 5 + 1 + }, + { + 4, + 1 + }, + { + 4, + 1 + }, + { + 2, + 0 + }, + { + 0, + 0 }, { 3, 0 }, { - 1, + 3, 0 }, { - 1, + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, 0 }, { 0, 0 }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, { 3, 0 @@ -4784,20 +6574,12 @@ local chapter_board = { 1, 0 }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, 0 }, { - 3, + 17, 0 }, { @@ -4817,8 +6599,8 @@ local chapter_board = { [25]={ ["board"]={ { - 1, - 0 + 0, + 3 }, { 0, @@ -4826,7 +6608,27 @@ local chapter_board = { }, { 0, - 2 + 3 + }, + { + 0, + 4 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 4 }, { 0, @@ -4838,7 +6640,43 @@ local chapter_board = { }, { 0, - 2 + 3 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 5, + 4 }, { 1, @@ -4852,12 +6690,114 @@ local chapter_board = { 1, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, { 0, - 2 + 0 }, { - 4, + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 14, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 0, 3 }, { @@ -4865,71 +6805,51 @@ local chapter_board = { 4 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 + 0, + 3 }, { 0, 4 }, { - 4, - 2 + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 4 }, { 0, 3 }, { - 4, + 0, 4 }, { 0, - 2 + 3 }, { - 3, + 2, 0 }, { - 3, + 1, 0 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 4, - 1 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 1, 0 }, { @@ -4937,15 +6857,7 @@ local chapter_board = { 0 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 2, 0 }, { @@ -4953,7 +6865,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -4961,28 +6873,8 @@ local chapter_board = { 0 }, { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 + 5, + 4 }, { 1, @@ -5000,6 +6892,78 @@ local chapter_board = { 3, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 17, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 3 + }, + { + 0, + 0 + }, { 1, 0 @@ -5008,6 +6972,22 @@ local chapter_board = { 1, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 4 + }, { 1, 0 @@ -5022,15 +7002,11 @@ local chapter_board = { }, { 0, - 5 + 1 }, { 0, - 4 - }, - { - 0, - 3 + 1 }, { 0, @@ -5038,62 +7014,10 @@ local chapter_board = { }, { 0, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 1 - }, - { - 4, - 2 - }, - { - 4, 3 }, { - 4, - 4 - }, - { - 4, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 4, - 1 - }, - { - 4, - 2 - }, - { - 4, - 3 - }, - { - 4, - 4 - }, - { - 4, + 0, 5 }, { @@ -5106,27 +7030,23 @@ local chapter_board = { }, { 0, + 1 + }, + { + 0, + 2 + }, + { + 3, 0 }, { 0, - 0 + 3 }, { 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 + 5 }, { 1, @@ -5136,32 +7056,16 @@ local chapter_board = { 3, 0 }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, + 2 + }, + { + 3, + 0 + }, + { + 3, 0 }, { @@ -5170,182 +7074,186 @@ local chapter_board = { }, { 0, + 5 + }, + { + 3, 0 }, { 3, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 14, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 4 + }, + { + 3, + 0 + }, + { + 4, + 4 + }, + { + 4, + 2 + }, + { + 4, + 2 + }, + { + 4, + 1 + }, { 0, 0 }, { - 1, - 0 - }, - { - 1, - 0 + 4, + 4 }, { 3, 0 }, { - 1, + 4, + 4 + }, + { + 0, 0 }, { - 1, - 0 + 4, + 1 }, { - 1, - 0 + 4, + 1 + }, + { + 4, + 3 + }, + { + 4, + 3 }, { 3, 0 }, { - 1, - 0 + 4, + 3 + }, + { + 4, + 3 + }, + { + 4, + 1 } } }, [27]={ ["board"]={ { - 1, + 2, 0 }, { 0, - 3 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 4, - 3 - }, - { - 3, - 0 - }, - { - 0, - 5 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 4, - 3 - }, - { - 4, 2 }, { - 3, + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 2, + 0 + }, + { + 2, 0 }, { 0, - 5 - }, - { - 0, - 1 - }, - { - 0, - 4 - }, - { - 3, - 0 - }, - { - 4, - 1 - }, - { - 4, 2 }, { - 4, - 1 + 0, + 2 }, { - 3, + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 2, 0 }, { @@ -5356,6 +7264,50 @@ local chapter_board = { 2, 0 }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 1, + 0 + }, + { + 4, + 5 + }, + { + 4, + 5 + }, + { + 1, + 0 + }, { 3, 0 @@ -5368,20 +7320,16 @@ local chapter_board = { 0, 0 }, + { + 14, + 0 + }, { 0, 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 0, 0 }, { @@ -5396,6 +7344,38 @@ local chapter_board = { 3, 0 }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 1, 0 @@ -5421,8 +7401,8 @@ local chapter_board = { 0 }, { - 3, - 0 + 4, + 2 }, { 0, @@ -5430,15 +7410,15 @@ local chapter_board = { }, { 0, - 4 + 3 }, { 0, 4 }, { - 3, - 0 + 4, + 2 }, { 1, @@ -5452,81 +7432,191 @@ local chapter_board = { 3, 0 }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, { 0, 3 }, { 0, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 4, 4 }, + { + 4, + 5 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 14, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 4, + 2 + }, { 0, 4 }, { - 3, - 0 + 0, + 3 }, { - 3, - 0 + 0, + 4 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 + 4, + 2 }, { 1, @@ -5540,14 +7630,130 @@ local chapter_board = { 3, 0 }, + { + 0, + 3 + }, + { + 0, + 0 + }, + { + 0, + 3 + }, { 3, 0 }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, { 3, 0 }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 0, + 3 + }, + { + 3, + 0 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 5 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, { 1, 0 @@ -5569,7 +7775,7 @@ local chapter_board = { 0 }, { - 0, + 17, 0 }, { @@ -5580,34 +7786,6 @@ local chapter_board = { 1, 0 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, { 1, 0 @@ -5621,8 +7799,12 @@ local chapter_board = { 0 }, { - 1, - 0 + 0, + 4 + }, + { + 0, + 2 }, { 0, @@ -5630,51 +7812,67 @@ local chapter_board = { }, { 0, + 4 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 4, 3 }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 4, + 2 + }, { 0, 3 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 + 4, + 4 }, { 0, - 5 - }, - { - 0, - 5 - }, - { - 5, - 5 - }, - { - 0, - 5 - }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 + 2 }, { 3, @@ -5693,19 +7891,7 @@ local chapter_board = { 0 }, { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, + 4, 1 }, { @@ -5720,50 +7906,14 @@ local chapter_board = { 3, 0 }, - { - 5, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 3, 0 }, { - 3, + 2, 0 }, - { - 5, - 4 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 3 - }, { 3, 0 @@ -5777,8 +7927,40 @@ local chapter_board = { 0 }, { - 5, - 5 + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 14, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 }, { 1, @@ -5797,11 +7979,7 @@ local chapter_board = { 0 }, { - 5, - 2 - }, - { - 3, + 1, 0 }, { @@ -5816,9 +7994,13 @@ local chapter_board = { }, [30]={ ["board"]={ + { + 1, + 0 + }, { 0, - 3 + 5 }, { 0, @@ -5837,13 +8019,187 @@ local chapter_board = { 1 }, { - 5, - 2 + 1, + 0 }, { 1, 0 }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 3, + 0 + }, + { + 14, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 0, + 5 + }, { 0, 4 @@ -5853,19 +8209,43 @@ local chapter_board = { 3 }, { - 5, + 0, + 1 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 4, + 1 + }, + { + 4, 2 }, { - 2, - 0 + 4, + 3 }, { - 2, - 0 + 4, + 4 }, { - 2, + 4, + 5 + }, + { + 1, 0 }, { @@ -5873,55 +8253,27 @@ local chapter_board = { 0 }, { - 2, - 0 + 4, + 1 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 5, + 4, 2 }, { - 3, + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 5 + }, + { + 1, 0 }, { @@ -5929,27 +8281,31 @@ local chapter_board = { 0 }, { - 5, - 2 - }, - { - 3, + 0, 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { - 3, + 0, 0 }, { - 3, + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, 0 }, { @@ -5965,19 +8321,7 @@ local chapter_board = { 0 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 1, 0 }, { @@ -5988,13 +8332,33 @@ local chapter_board = { 1, 0 }, + { + 1, + 0 + }, + { + 0, + 0 + }, { 3, 0 }, { - 5, - 2 + 17, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 }, { 1, @@ -6004,13 +8368,25 @@ local chapter_board = { 3, 0 }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 3, 0 }, { - 5, - 2 + 1, + 0 } } }, @@ -6021,23 +8397,23 @@ local chapter_board = { 0 }, { - 2, - 0 + 0, + 3 + }, + { + 0, + 1 }, { 0, 4 }, { - 0, - 2 + 1, + 0 }, { - 0, - 2 - }, - { - 2, + 1, 0 }, { @@ -6049,23 +8425,189 @@ local chapter_board = { 0 }, { - 2, + 3, 0 }, { 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 4, + 3 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 4, + 3 + }, + { + 4, 2 }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 4, + 1 + }, + { + 4, + 2 + }, + { + 4, + 1 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 0 + }, + { + 14, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, { 0, 3 }, + { + 0, + 1 + }, { 0, 4 }, { - 2, + 1, 0 }, { @@ -6073,95 +8615,111 @@ local chapter_board = { 0 }, { - 5, - 1 - }, - { - 2, + 1, 0 }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 2, - 0 - }, - { - 5, - 1 - }, { 1, 0 }, { - 2, - 0 - }, - { - 2, + 3, 0 }, { 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 4, 3 }, { - 2, + 3, 0 }, { - 2, - 0 + 0, + 5 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, + 0, 1 }, { - 2, + 0, + 4 + }, + { + 1, 0 }, { - 2, + 3, 0 }, { - 2, + 4, + 3 + }, + { + 4, + 2 + }, + { + 3, 0 }, { - 5, + 0, + 5 + }, + { + 0, 1 }, { - 1, + 0, + 4 + }, + { + 3, 0 }, { - 1, - 0 + 4, + 1 }, { - 1, + 4, + 2 + }, + { + 4, + 1 + }, + { + 3, 0 }, { @@ -6173,7 +8731,19 @@ local chapter_board = { 0 }, { - 2, + 3, + 0 + }, + { + 0, + 0 + }, + { + 17, + 0 + }, + { + 0, 0 }, { @@ -6189,11 +8759,15 @@ local chapter_board = { 0 }, { - 1, + 3, 0 }, { - 1, + 3, + 0 + }, + { + 3, 0 }, { @@ -6224,17 +8798,45 @@ local chapter_board = { 3, 0 }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 3, 0 }, { 0, - 5 + 4 }, { - 3, - 0 + 0, + 4 + }, + { + 0, + 4 }, { 3, @@ -6245,28 +8847,60 @@ local chapter_board = { 0 }, { - 1, + 3, 0 }, { - 5, - 3 + 3, + 0 }, { - 5, + 0, 3 }, { 0, - 5 + 4 }, { - 5, - 3 + 0, + 4 }, { - 5, - 3 + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 }, { 1, @@ -6284,72 +8918,36 @@ local chapter_board = { 3, 0 }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 0, - 5 - }, - { - 3, 0 }, { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 0, - 5 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, + 14, 0 }, { 0, - 5 - }, - { - 3, - 0 - }, - { - 3, 0 }, { @@ -6361,27 +8959,15 @@ local chapter_board = { 0 }, { - 5, - 1 - }, - { - 5, - 1 + 1, + 0 }, { 0, - 5 + 0 }, { - 5, - 1 - }, - { - 5, - 1 - }, - { - 1, + 0, 0 }, { @@ -6389,23 +8975,11 @@ local chapter_board = { 0 }, { - 1, + 0, 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 0, 0 }, { @@ -6421,51 +8995,23 @@ local chapter_board = { 0 }, { - 2, + 1, 0 }, - { - 0, - 1 - }, { 0, 3 }, { 0, - 4 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 0, - 1 + 3 }, { 0, 3 }, { - 0, - 4 - }, - { - 2, + 1, 0 }, { @@ -6473,36 +9019,36 @@ local chapter_board = { 0 }, { - 5, - 1 + 1, + 0 + }, + { + 0, + 5 + }, + { + 0, + 5 }, { 5, 5 }, - { - 5, - 1 - }, { 0, - 3 - }, - { - 5, - 4 - }, - { - 5, 5 }, { - 5, - 1 + 0, + 5 }, { - 5, - 2 + 1, + 0 + }, + { + 1, + 0 }, { 3, @@ -6524,84 +9070,112 @@ local chapter_board = { 3, 0 }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, { 5, 2 }, { - 5, - 3 + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 14, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 }, { 5, 3 }, { - 5, - 4 + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 }, { 5, - 4 + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 }, { 5, - 4 + 2 }, { - 5, - 3 - }, - { - 5, - 3 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 3, 0 }, { @@ -6617,64 +9191,16 @@ local chapter_board = { [34]={ ["board"]={ { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 1 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 5, - 3 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 3, + 1, 0 }, { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, + 1, 0 }, { 0, - 1 + 2 }, { 0, @@ -6684,90 +9210,6 @@ local chapter_board = { 0, 4 }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 5, - 2 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, { 1, 0 @@ -6780,10 +9222,130 @@ local chapter_board = { 1, 0 }, + { + 5, + 1 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 5, + 3 + }, { 1, 0 }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 5 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, { 3, 0 @@ -6804,6 +9366,216 @@ local chapter_board = { 1, 0 }, + { + 3, + 0 + }, + { + 14, + 0 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + }, + ["mystery_box_board"]={ + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 1 + }, + { + 0, + 5 + }, + { + 0, + 4 + }, + { + 0, + 1 + }, + { + 5, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 5 + }, + { + 2, + 0 + }, + { + 0, + 2 + }, + { + 2, + 0 + }, + { + 5, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 3 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 5, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 17, + 0 + }, + { + 3, + 0 + }, { 1, 0 diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua index 7549ae23..e3e83f67 100644 --- a/lua/app/config/func_open.lua +++ b/lua/app/config/func_open.lua @@ -5,6 +5,7 @@ local func_open = { }, ["bounty_open"]={ ["stage"]=3, + ["pop_ups"]=1, ["icon"]="main_bounty" }, ["task"]={ @@ -16,7 +17,7 @@ local func_open = { ["icon"]="main_act_level_gift" }, ["idle_drop"]={ - ["stage"]=2, + ["stage"]=3, ["icon"]="main_idle_drop" }, ["act_sevenday"]={ @@ -24,7 +25,7 @@ local func_open = { ["icon"]="main_act_sevenday" }, ["mall"]={ - ["stage"]=1, + ["stage"]=2, ["icon"]="main_mall" }, ["mall_daily"]={ @@ -33,10 +34,12 @@ local func_open = { }, ["store_box_open"]={ ["stage"]=2, + ["pop_ups"]=1, ["icon"]="main_store_box" }, ["store_box_3_open"]={ ["stage"]=5, + ["pop_ups"]=1, ["icon"]="main_store_box_3" }, ["daily_challenge"]={ diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index 5cb6d0b6..83b4e700 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -113,7 +113,7 @@ local hero = { ["model_id"]="p0014", ["icon"]="6", ["item_id"]=13001, - ["unlock_chapter"]=3, + ["unlock_chapter"]=12, ["is_show"]=1 }, [13002]={ @@ -172,7 +172,7 @@ local hero = { ["model_id"]="p0009", ["icon"]="11", ["item_id"]=13002, - ["unlock_chapter"]=3, + ["unlock_chapter"]=20, ["is_show"]=1 }, [14001]={ @@ -231,7 +231,7 @@ local hero = { ["model_id"]="p0011", ["icon"]="16", ["item_id"]=14001, - ["unlock_chapter"]=3, + ["unlock_chapter"]=25, ["is_show"]=1 }, [22001]={ @@ -348,7 +348,7 @@ local hero = { ["model_id"]="p0010", ["icon"]="12", ["item_id"]=23001, - ["unlock_chapter"]=3, + ["unlock_chapter"]=16, ["is_show"]=1 }, [23002]={ @@ -407,7 +407,7 @@ local hero = { ["model_id"]="p0012", ["icon"]="7", ["item_id"]=23002, - ["unlock_chapter"]=3, + ["unlock_chapter"]=9, ["is_show"]=1 }, [24001]={ @@ -466,7 +466,7 @@ local hero = { ["model_id"]="p0007", ["icon"]="17", ["item_id"]=24001, - ["unlock_chapter"]=3, + ["unlock_chapter"]=21, ["is_show"]=1 }, [32001]={ @@ -583,7 +583,7 @@ local hero = { ["model_id"]="p0006", ["icon"]="8", ["item_id"]=33001, - ["unlock_chapter"]=3, + ["unlock_chapter"]=4, ["is_show"]=1 }, [33002]={ @@ -642,7 +642,7 @@ local hero = { ["model_id"]="p0020", ["icon"]="13", ["item_id"]=33002, - ["unlock_chapter"]=3, + ["unlock_chapter"]=18, ["is_show"]=1 }, [34001]={ @@ -701,7 +701,7 @@ local hero = { ["model_id"]="p0016", ["icon"]="18", ["item_id"]=34001, - ["unlock_chapter"]=3, + ["unlock_chapter"]=2, ["is_show"]=1 }, [42001]={ @@ -818,7 +818,7 @@ local hero = { ["model_id"]="p0022", ["icon"]="9", ["item_id"]=43001, - ["unlock_chapter"]=3, + ["unlock_chapter"]=6, ["is_show"]=1 }, [43002]={ @@ -874,10 +874,10 @@ local hero = { 4920000, 5490000 }, - ["model_id"]="p0003", + ["model_id"]="p0021", ["icon"]="14", ["item_id"]=43002, - ["unlock_chapter"]=3, + ["unlock_chapter"]=14, ["is_show"]=1 }, [44001]={ @@ -936,7 +936,7 @@ local hero = { ["model_id"]="p0008", ["icon"]="19", ["item_id"]=44001, - ["unlock_chapter"]=3, + ["unlock_chapter"]=10, ["is_show"]=1 }, [52001]={ @@ -995,7 +995,8 @@ local hero = { ["model_id"]="p0004", ["icon"]="5", ["item_id"]=52001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=2, + ["is_show"]=1 }, [53001]={ ["position"]=5, @@ -1053,7 +1054,7 @@ local hero = { ["model_id"]="p0015", ["icon"]="10", ["item_id"]=53001, - ["unlock_chapter"]=3, + ["unlock_chapter"]=22, ["is_show"]=1 }, [53002]={ @@ -1109,10 +1110,10 @@ local hero = { 4920000, 5490000 }, - ["model_id"]="p0004", + ["model_id"]="p0019", ["icon"]="15", ["item_id"]=53002, - ["unlock_chapter"]=3, + ["unlock_chapter"]=8, ["is_show"]=1 }, [54001]={ @@ -1168,10 +1169,9 @@ local hero = { 4920000, 5490000 }, - ["model_id"]="p0004", + ["model_id"]="p0023", ["icon"]="20", ["item_id"]=54001, - ["unlock_chapter"]=3, ["is_show"]=1 } } diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 30f40594..9b9b0621 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -145,6 +145,36 @@ local LocalizationGlobalConst = SEVEN_DAY_DESC_2 = "SEVEN_DAY_DESC_2", FUNC_UNLOCK = "FUNC_UNLOCK", MAIN_BTN_3 = "MAIN_BTN_3", + SHOP_DESC_1 = "SHOP_DESC_1", + SHOP_DESC_2 = "SHOP_DESC_2", + SHOP_DESC_3 = "SHOP_DESC_3", + SHOP_DESC_4 = "SHOP_DESC_4", + SHOP_DESC_5 = "SHOP_DESC_5", + SHOP_DESC_6 = "SHOP_DESC_6", + SHOP_DESC_7 = "SHOP_DESC_7", + SHOP_DESC_8 = "SHOP_DESC_8", + SHOP_DESC_9 = "SHOP_DESC_9", + SHOP_DESC_10 = "SHOP_DESC_10", + SHOP_DESC_11 = "SHOP_DESC_11", + SHOP_DESC_12 = "SHOP_DESC_12", + SHOP_DESC_13 = "SHOP_DESC_13", + SHOP_DESC_14 = "SHOP_DESC_14", + SHOP_DESC_15 = "SHOP_DESC_15", + SHOP_DESC_16 = "SHOP_DESC_16", + SHOP_DESC_17 = "SHOP_DESC_17", + SHOP_DESC_18 = "SHOP_DESC_18", + SHOP_DESC_19 = "SHOP_DESC_19", + SHOP_DESC_20 = "SHOP_DESC_20", + SHOP_DESC_21 = "SHOP_DESC_21", + SHOP_DESC_22 = "SHOP_DESC_22", + SHOP_DESC_23 = "SHOP_DESC_23", + SHOP_DESC_24 = "SHOP_DESC_24", + SHOP_DESC_25 = "SHOP_DESC_25", + SHOP_DESC_26 = "SHOP_DESC_26", + SHOP_DESC_27 = "SHOP_DESC_27", + SHOP_DESC_28 = "SHOP_DESC_28", + SHOP_DESC_29 = "SHOP_DESC_29", + HERO_DESC_11 = "HERO_DESC_11", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 863abfc9..6122b768 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -395,11 +395,6 @@ local skill = { 2, 3 }, - ["block_time"]={ - 360, - 1360, - 2500 - }, ["skill_position"]=1, ["shake_time"]=200, ["shake_type"]=5, @@ -488,11 +483,6 @@ local skill = { 2, 3 }, - ["block_time"]={ - 360, - 1360, - 2500 - }, ["skill_position"]=1, ["shake_time"]=200, ["shake_type"]=5, @@ -711,13 +701,6 @@ local skill = { 4, 6 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1510, - 1810 - }, ["skill_position"]=1, ["shake_time"]=200, ["shake_type"]=5, @@ -823,13 +806,6 @@ local skill = { 4, 6 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1510, - 1810 - }, ["skill_position"]=1, ["shake_time"]=200, ["shake_type"]=5, @@ -973,10 +949,6 @@ local skill = { 1, 2 }, - ["block_time"]={ - 250, - 1400 - }, ["skill_position"]=1, ["shake_time"]=200, ["shake_type"]=5, @@ -1439,12 +1411,6 @@ local skill = { 3, 4 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1510 - }, ["skill_position"]=2, ["shake_time"]=200, ["shake_type"]=5, @@ -1515,12 +1481,6 @@ local skill = { 3, 4 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1510 - }, ["skill_position"]=2, ["shake_time"]=200, ["shake_type"]=5, @@ -1583,7 +1543,7 @@ local skill = { [2300125]={ ["position"]=2, ["effect_type"]=2, - ["trigger"]=8, + ["trigger"]=10, ["effect"]={ { ["type"]="atkp_yellow_add", @@ -1774,13 +1734,6 @@ local skill = { 4, 5 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1510, - 1760 - }, ["skill_position"]=1, ["shake_time"]=200, ["shake_type"]=5, @@ -3963,12 +3916,6 @@ local skill = { 3, 4 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1760 - }, ["skill_position"]=2, ["shake_time"]=200, ["shake_type"]=6, @@ -4146,12 +4093,29 @@ local skill = { ["effect"]={ { ["type"]="hurt_purple", - ["num"]=50000, + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_purple", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_purple", + ["num"]=30000, ["ratio"]=10000, ["round"]=0 } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3 + }, ["skill_position"]=2, ["shake_time"]=200, ["shake_type"]=6, @@ -4341,12 +4305,29 @@ local skill = { ["effect"]={ { ["type"]="hurt_purple", - ["num"]=60000, + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_purple", + ["num"]=15000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_purple", + ["num"]=35000, ["ratio"]=10000, ["round"]=0 } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3 + }, ["skill_position"]=2, ["shake_time"]=200, ["shake_type"]=6, @@ -4386,12 +4367,29 @@ local skill = { ["effect"]={ { ["type"]="hurt_purple", - ["num"]=60000, + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_purple", + ["num"]=15000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_purple", + ["num"]=35000, ["ratio"]=10000, ["round"]=0 } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3 + }, ["skill_position"]=2, ["shake_time"]=200, ["shake_type"]=6, @@ -4405,7 +4403,7 @@ local skill = { ["effect"]={ { ["type"]="skill_hurt_add", - ["num"]=5000, + ["num"]=1000, ["ratio"]=10000, ["round"]=999 } @@ -4925,9 +4923,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["skill_position"]=1, ["cd"]=2, ["cd_start"]=0, @@ -4985,13 +4980,6 @@ local skill = { 4, 5 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1510, - 1760 - }, ["skill_position"]=1, ["cd"]=3, ["cd_start"]=0, @@ -5045,9 +5033,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["skill_position"]=2, ["cd"]=3, ["cd_start"]=0, @@ -5158,11 +5143,6 @@ local skill = { 2, 3 }, - ["block_time"]={ - 360, - 1360, - 2500 - }, ["skill_position"]=1, ["cd"]=3, ["cd_start"]=0, @@ -5247,9 +5227,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["skill_position"]=2, ["cd"]=2, ["cd_start"]=0, @@ -5308,12 +5285,6 @@ local skill = { 3, 4 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1510 - }, ["skill_position"]=2, ["cd"]=3, ["cd_start"]=0, @@ -5350,9 +5321,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["skill_position"]=2, ["cd"]=2, ["cd_start"]=0, @@ -5488,13 +5456,6 @@ local skill = { 4, 6 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1510, - 1810 - }, ["skill_position"]=1, ["cd"]=2, ["cd_start"]=0, @@ -5564,12 +5525,6 @@ local skill = { 3, 4 }, - ["block_time"]={ - 760, - 1010, - 1260, - 1760 - }, ["skill_position"]=2, ["cd"]=3, ["cd_start"]=0, @@ -5600,9 +5555,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=3, ["cd_start"]=2, ["name_act"]="skill01" @@ -5626,9 +5578,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5657,9 +5606,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5703,9 +5649,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5745,9 +5688,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -5777,9 +5717,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=2, ["cd_start"]=1, ["shake_time"]=200, @@ -5809,9 +5746,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 2500 - }, ["cd"]=3, ["cd_start"]=0, ["name_act"]="skill01" @@ -5856,9 +5790,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 2500 - }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, @@ -5916,9 +5847,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -5947,9 +5875,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, @@ -5979,9 +5904,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -6016,9 +5938,6 @@ local skill = { ["effect_block"]={ 1 }, - ["block_time"]={ - 1000 - }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 03c8234e..5d85d128 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -686,7 +686,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=1, - ["icon"]="59" + ["icon"]="171" }, [1200101]={ ["limit_times"]=1, @@ -704,7 +704,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="43" + ["icon"]="31" }, [1200102]={ ["limit_times"]=1, @@ -721,7 +721,7 @@ local skill_rogue = { } }, ["obj"]=1, - ["icon"]="44" + ["icon"]="32" }, [1200103]={ ["limit_times"]=1, @@ -738,7 +738,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="44" + ["icon"]="33" }, [1200104]={ ["limit_times"]=1, @@ -764,7 +764,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="43" + ["icon"]="34" }, [1200105]={ ["limit_times"]=1, @@ -784,7 +784,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="35" }, [1200106]={ ["limit_times"]=1, @@ -801,7 +801,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="36" }, [1200107]={ ["unlock"]=1200105, @@ -823,7 +823,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="37" }, [1300100]={ ["limit_times"]=1, @@ -831,7 +831,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=1, - ["icon"]="59" + ["icon"]="176" }, [1300101]={ ["limit_times"]=1, @@ -848,7 +848,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="43" + ["icon"]="66" }, [1300102]={ ["limit_times"]=1, @@ -865,7 +865,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="44" + ["icon"]="67" }, [1300103]={ ["limit_times"]=1, @@ -876,7 +876,7 @@ local skill_rogue = { 1300123 }, ["skill_position"]=1, - ["icon"]="44" + ["icon"]="68" }, [1300104]={ ["unlock"]=1300101, @@ -895,7 +895,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="43" + ["icon"]="69" }, [1300105]={ ["limit_times"]=1, @@ -915,7 +915,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="70" }, [1300106]={ ["unlock"]=1300105, @@ -937,7 +937,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="71" }, [1300107]={ ["limit_times"]=1, @@ -954,14 +954,15 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="72" }, [1300200]={ ["limit_times"]=1, ["weight"]=100000, ["qlt"]=4, ["type"]=6, - ["skill_position"]=1 + ["skill_position"]=1, + ["icon"]="181" }, [1300201]={ ["limit_times"]=1, @@ -979,7 +980,7 @@ local skill_rogue = { ["range"]=2 } }, - ["icon"]="36" + ["icon"]="101" }, [1300202]={ ["limit_times"]=1, @@ -996,7 +997,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="44" + ["icon"]="102" }, [1300203]={ ["limit_times"]=1, @@ -1007,7 +1008,7 @@ local skill_rogue = { 1300222 }, ["skill_position"]=1, - ["icon"]="36" + ["icon"]="103" }, [1300204]={ ["limit_times"]=1, @@ -1025,9 +1026,10 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="36" + ["icon"]="104" }, [1300205]={ + ["unlock"]=1300203, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, @@ -1037,7 +1039,7 @@ local skill_rogue = { 5000 }, ["skill_position"]=1, - ["icon"]="36" + ["icon"]="105" }, [1300206]={ ["limit_times"]=1, @@ -1054,7 +1056,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="106" }, [1300207]={ ["limit_times"]=1, @@ -1077,14 +1079,15 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="36" + ["icon"]="107" }, [1400100]={ ["limit_times"]=1, ["weight"]=100000, ["qlt"]=4, ["type"]=6, - ["skill_position"]=1 + ["skill_position"]=1, + ["icon"]="186" }, [1400101]={ ["limit_times"]=1, @@ -1101,7 +1104,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="36" + ["icon"]="136" }, [1400102]={ ["limit_times"]=1, @@ -1118,7 +1121,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="137" }, [1400103]={ ["limit_times"]=1, @@ -1135,7 +1138,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="36" + ["icon"]="138" }, [1400104]={ ["limit_times"]=1, @@ -1152,7 +1155,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="139" }, [1400105]={ ["unlock"]=1400101, @@ -1171,7 +1174,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="36" + ["icon"]="140" }, [1400106]={ ["limit_times"]=1, @@ -1188,7 +1191,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="45" + ["icon"]="141" }, [1400107]={ ["limit_times"]=1, @@ -1208,7 +1211,7 @@ local skill_rogue = { } }, ["obj"]=3, - ["icon"]="36" + ["icon"]="142" }, [2200100]={ ["limit_times"]=1, @@ -1216,7 +1219,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=2, - ["icon"]="56" + ["icon"]="172" }, [2200101]={ ["limit_times"]=1, @@ -1228,7 +1231,7 @@ local skill_rogue = { 30000 }, ["skill_position"]=2, - ["icon"]="65" + ["icon"]="38" }, [2200102]={ ["limit_times"]=1, @@ -1239,7 +1242,7 @@ local skill_rogue = { 2200123 }, ["skill_position"]=2, - ["icon"]="34" + ["icon"]="39" }, [2200103]={ ["limit_times"]=1, @@ -1256,7 +1259,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="44" + ["icon"]="40" }, [2200104]={ ["limit_times"]=1, @@ -1273,7 +1276,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="45" + ["icon"]="41" }, [2200105]={ ["limit_times"]=1, @@ -1290,7 +1293,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="36" + ["icon"]="42" }, [2200106]={ ["unlock"]=2200102, @@ -1317,7 +1320,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="45" + ["icon"]="43" }, [2200107]={ ["limit_times"]=1, @@ -1334,7 +1337,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="36" + ["icon"]="44" }, [2300100]={ ["limit_times"]=1, @@ -1342,7 +1345,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=2, - ["icon"]="56" + ["icon"]="182" }, [2300101]={ ["limit_times"]=1, @@ -1359,7 +1362,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="51" + ["icon"]="108" }, [2300102]={ ["limit_times"]=1, @@ -1370,7 +1373,7 @@ local skill_rogue = { 2300122 }, ["skill_position"]=2, - ["icon"]="51" + ["icon"]="109" }, [2300103]={ ["limit_times"]=1, @@ -1387,7 +1390,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="45" + ["icon"]="110" }, [2300104]={ ["unlock"]=2300101, @@ -1406,7 +1409,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="49" + ["icon"]="111" }, [2300105]={ ["limit_times"]=1, @@ -1419,11 +1422,11 @@ local skill_rogue = { ["type"]="add_skill", ["num"]=2300125, ["ratio"]=10000, - ["round"]=1 + ["round"]=0 } }, ["obj"]=4, - ["icon"]="51" + ["icon"]="112" }, [2300106]={ ["unlock"]=2300103, @@ -1442,7 +1445,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="51" + ["icon"]="113" }, [2300107]={ ["limit_times"]=1, @@ -1459,7 +1462,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="45" + ["icon"]="114" }, [2300200]={ ["limit_times"]=1, @@ -1467,7 +1470,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=2, - ["icon"]="56" + ["icon"]="177" }, [2300201]={ ["limit_times"]=1, @@ -1493,7 +1496,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="51" + ["icon"]="73" }, [2300202]={ ["limit_times"]=1, @@ -1510,7 +1513,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="45" + ["icon"]="74" }, [2300203]={ ["limit_times"]=1, @@ -1527,7 +1530,7 @@ local skill_rogue = { } }, ["obj"]=1, - ["icon"]="45" + ["icon"]="75" }, [2300204]={ ["limit_times"]=1, @@ -1553,7 +1556,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="49" + ["icon"]="76" }, [2300205]={ ["limit_times"]=1, @@ -1573,7 +1576,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="51" + ["icon"]="77" }, [2300206]={ ["unlock"]=2300205, @@ -1595,7 +1598,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="51" + ["icon"]="78" }, [2300207]={ ["limit_times"]=1, @@ -1612,7 +1615,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="45" + ["icon"]="79" }, [2400100]={ ["limit_times"]=1, @@ -1620,7 +1623,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=2, - ["icon"]="61" + ["icon"]="187" }, [2400101]={ ["limit_times"]=1, @@ -1646,7 +1649,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="49" + ["icon"]="143" }, [2400102]={ ["limit_times"]=1, @@ -1663,7 +1666,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="50" + ["icon"]="144" }, [2400103]={ ["unlock"]=2400102, @@ -1682,7 +1685,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="51" + ["icon"]="145" }, [2400104]={ ["limit_times"]=1, @@ -1699,7 +1702,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="45" + ["icon"]="146" }, [2400105]={ ["limit_times"]=1, @@ -1710,7 +1713,7 @@ local skill_rogue = { 2400123 }, ["skill_position"]=2, - ["icon"]="49" + ["icon"]="147" }, [2400106]={ ["unlock"]=2400105, @@ -1723,7 +1726,7 @@ local skill_rogue = { 2400124 }, ["skill_position"]=2, - ["icon"]="50" + ["icon"]="148" }, [2400107]={ ["limit_times"]=1, @@ -1740,7 +1743,7 @@ local skill_rogue = { } }, ["obj"]=4, - ["icon"]="51" + ["icon"]="149" }, [3200100]={ ["limit_times"]=1, @@ -1748,7 +1751,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=3, - ["icon"]="55" + ["icon"]="173" }, [3200101]={ ["limit_times"]=1, @@ -1765,7 +1768,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="63" + ["icon"]="45" }, [3200102]={ ["limit_times"]=1, @@ -1782,7 +1785,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="64" + ["icon"]="46" }, [3200103]={ ["limit_times"]=1, @@ -1795,7 +1798,7 @@ local skill_rogue = { }, ["skill_position"]=3, ["obj"]=5, - ["icon"]="33" + ["icon"]="47" }, [3200104]={ ["limit_times"]=1, @@ -1830,7 +1833,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="55" + ["icon"]="48" }, [3200105]={ ["limit_times"]=1, @@ -1847,7 +1850,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="63" + ["icon"]="49" }, [3200106]={ ["unlock"]=3200105, @@ -1866,7 +1869,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="64" + ["icon"]="50" }, [3200107]={ ["limit_times"]=1, @@ -1883,7 +1886,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="33" + ["icon"]="51" }, [3300100]={ ["limit_times"]=1, @@ -1891,7 +1894,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=3, - ["icon"]="60" + ["icon"]="178" }, [3300101]={ ["limit_times"]=1, @@ -1903,7 +1906,7 @@ local skill_rogue = { 500 }, ["skill_position"]=3, - ["icon"]="67" + ["icon"]="80" }, [3300102]={ ["limit_times"]=1, @@ -1920,7 +1923,7 @@ local skill_rogue = { } }, ["obj"]=1, - ["icon"]="47" + ["icon"]="81" }, [3300103]={ ["limit_times"]=1, @@ -1946,7 +1949,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="67" + ["icon"]="82" }, [3300104]={ ["limit_times"]=1, @@ -1963,7 +1966,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="47" + ["icon"]="83" }, [3300105]={ ["limit_times"]=1, @@ -1980,7 +1983,7 @@ local skill_rogue = { } }, ["obj"]=1, - ["icon"]="48" + ["icon"]="84" }, [3300106]={ ["unlock"]=3300104, @@ -1999,7 +2002,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="47" + ["icon"]="85" }, [3300107]={ ["limit_times"]=1, @@ -2019,7 +2022,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="48" + ["icon"]="86" }, [3300200]={ ["limit_times"]=1, @@ -2027,7 +2030,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=3, - ["icon"]="38" + ["icon"]="183" }, [3300201]={ ["limit_times"]=1, @@ -2044,7 +2047,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="38" + ["icon"]="115" }, [3300202]={ ["limit_times"]=1, @@ -2061,7 +2064,7 @@ local skill_rogue = { } }, ["obj"]=1, - ["icon"]="38" + ["icon"]="116" }, [3300203]={ ["limit_times"]=1, @@ -2073,7 +2076,7 @@ local skill_rogue = { 30000 }, ["skill_position"]=3, - ["icon"]="38" + ["icon"]="117" }, [3300204]={ ["limit_times"]=1, @@ -2084,7 +2087,7 @@ local skill_rogue = { 3300222 }, ["skill_position"]=3, - ["icon"]="38" + ["icon"]="118" }, [3300205]={ ["unlock"]=3300204, @@ -2097,7 +2100,7 @@ local skill_rogue = { 5000 }, ["skill_position"]=3, - ["icon"]="38" + ["icon"]="119" }, [3300206]={ ["limit_times"]=1, @@ -2114,7 +2117,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="38" + ["icon"]="120" }, [3300207]={ ["unlock"]=3300204, @@ -2127,7 +2130,7 @@ local skill_rogue = { 3300223 }, ["skill_position"]=3, - ["icon"]="38" + ["icon"]="121" }, [3400100]={ ["limit_times"]=1, @@ -2135,7 +2138,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=3, - ["icon"]="67" + ["icon"]="188" }, [3400101]={ ["limit_times"]=1, @@ -2152,7 +2155,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="67" + ["icon"]="150" }, [3400102]={ ["limit_times"]=1, @@ -2178,7 +2181,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="67" + ["icon"]="151" }, [3400103]={ ["limit_times"]=1, @@ -2195,7 +2198,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="67" + ["icon"]="152" }, [3400104]={ ["unlock"]=3400101, @@ -2214,7 +2217,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="67" + ["icon"]="153" }, [3400105]={ ["limit_times"]=1, @@ -2231,7 +2234,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="67" + ["icon"]="154" }, [3400106]={ ["unlock"]=3400106, @@ -2250,7 +2253,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="67" + ["icon"]="155" }, [3400107]={ ["limit_times"]=1, @@ -2270,7 +2273,7 @@ local skill_rogue = { } }, ["obj"]=5, - ["icon"]="67" + ["icon"]="156" }, [4200100]={ ["limit_times"]=1, @@ -2278,7 +2281,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=4, - ["icon"]="57" + ["icon"]="174" }, [4200101]={ ["limit_times"]=1, @@ -2292,7 +2295,7 @@ local skill_rogue = { ["range"]=2 } }, - ["icon"]="39" + ["icon"]="52" }, [4200102]={ ["limit_times"]=1, @@ -2309,7 +2312,7 @@ local skill_rogue = { } }, ["obj"]=1, - ["icon"]="38" + ["icon"]="53" }, [4200103]={ ["limit_times"]=1, @@ -2326,7 +2329,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="45" + ["icon"]="54" }, [4200104]={ ["limit_times"]=1, @@ -2340,7 +2343,7 @@ local skill_rogue = { ["range"]=2 } }, - ["icon"]="39" + ["icon"]="55" }, [4200105]={ ["limit_times"]=1, @@ -2357,7 +2360,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="38" + ["icon"]="56" }, [4200106]={ ["limit_times"]=1, @@ -2374,7 +2377,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="45" + ["icon"]="57" }, [4200107]={ ["unlock"]=4200105, @@ -2393,7 +2396,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="39" + ["icon"]="58" }, [4300100]={ ["limit_times"]=1, @@ -2401,7 +2404,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=4, - ["icon"]="57" + ["icon"]="179" }, [4300101]={ ["limit_times"]=1, @@ -2427,7 +2430,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="39" + ["icon"]="87" }, [4300102]={ ["limit_times"]=1, @@ -2444,7 +2447,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="38" + ["icon"]="88" }, [4300103]={ ["limit_times"]=1, @@ -2456,7 +2459,7 @@ local skill_rogue = { 1 }, ["skill_position"]=4, - ["icon"]="45" + ["icon"]="89" }, [4300104]={ ["limit_times"]=1, @@ -2468,7 +2471,7 @@ local skill_rogue = { 30000 }, ["skill_position"]=4, - ["icon"]="39" + ["icon"]="90" }, [4300105]={ ["limit_times"]=1, @@ -2485,7 +2488,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="38" + ["icon"]="91" }, [4300106]={ ["limit_times"]=1, @@ -2502,7 +2505,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="45" + ["icon"]="92" }, [4300107]={ ["unlock"]=4300106, @@ -2521,14 +2524,15 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="39" + ["icon"]="93" }, [4300300]={ ["limit_times"]=1, ["weight"]=100000, ["qlt"]=4, + ["type"]=6, ["skill_position"]=4, - ["icon"]="57" + ["icon"]="184" }, [4300301]={ ["limit_times"]=1, @@ -2540,12 +2544,13 @@ local skill_rogue = { 1 }, ["skill_position"]=4, - ["icon"]="39" + ["icon"]="122" }, [4300302]={ ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, + ["type"]=12, ["skill_position"]=4, ["effect"]={ { @@ -2556,7 +2561,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="38" + ["icon"]="123" }, [4300303]={ ["limit_times"]=1, @@ -2573,7 +2578,7 @@ local skill_rogue = { } }, ["obj"]=1, - ["icon"]="45" + ["icon"]="124" }, [4300304]={ ["unlock"]=4300302, @@ -2581,6 +2586,7 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, + ["type"]=12, ["skill_position"]=4, ["effect"]={ { @@ -2591,12 +2597,13 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="39" + ["icon"]="125" }, [4300305]={ ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, + ["type"]=12, ["skill_position"]=4, ["effect"]={ { @@ -2607,7 +2614,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="38" + ["icon"]="126" }, [4300306]={ ["limit_times"]=1, @@ -2633,7 +2640,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="45" + ["icon"]="127" }, [4300307]={ ["unlock"]=4300305, @@ -2641,6 +2648,7 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, + ["type"]=12, ["skill_position"]=4, ["effect"]={ { @@ -2651,7 +2659,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="39" + ["icon"]="128" }, [4400100]={ ["limit_times"]=1, @@ -2659,7 +2667,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=4, - ["icon"]="62" + ["icon"]="189" }, [4400101]={ ["limit_times"]=1, @@ -2671,7 +2679,7 @@ local skill_rogue = { 1 }, ["skill_position"]=4, - ["icon"]="39" + ["icon"]="157" }, [4400102]={ ["limit_times"]=1, @@ -2688,7 +2696,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="39" + ["icon"]="158" }, [4400103]={ ["limit_times"]=1, @@ -2702,7 +2710,7 @@ local skill_rogue = { ["range"]=3 } }, - ["icon"]="39" + ["icon"]="159" }, [4400104]={ ["limit_times"]=1, @@ -2714,7 +2722,7 @@ local skill_rogue = { 1 }, ["skill_position"]=4, - ["icon"]="39" + ["icon"]="160" }, [4400105]={ ["limit_times"]=1, @@ -2731,7 +2739,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="39" + ["icon"]="161" }, [4400106]={ ["limit_times"]=1, @@ -2748,7 +2756,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="39" + ["icon"]="162" }, [4400107]={ ["unlock"]=4400105, @@ -2767,7 +2775,7 @@ local skill_rogue = { } }, ["obj"]=6, - ["icon"]="39" + ["icon"]="163" }, [5200100]={ ["limit_times"]=1, @@ -2775,7 +2783,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=5, - ["icon"]="58" + ["icon"]="175" }, [5200101]={ ["limit_times"]=1, @@ -2787,7 +2795,7 @@ local skill_rogue = { 600 }, ["skill_position"]=5, - ["icon"]="41" + ["icon"]="59" }, [5200102]={ ["limit_times"]=1, @@ -2804,7 +2812,7 @@ local skill_rogue = { } }, ["obj"]=1, - ["icon"]="44" + ["icon"]="60" }, [5200103]={ ["limit_times"]=1, @@ -2816,7 +2824,7 @@ local skill_rogue = { 1 }, ["skill_position"]=5, - ["icon"]="42" + ["icon"]="61" }, [5200104]={ ["limit_times"]=1, @@ -2842,7 +2850,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="67" + ["icon"]="62" }, [5200105]={ ["limit_times"]=1, @@ -2853,7 +2861,7 @@ local skill_rogue = { 5200121 }, ["skill_position"]=5, - ["icon"]="66" + ["icon"]="63" }, [5200106]={ ["limit_times"]=1, @@ -2870,7 +2878,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="58" + ["icon"]="64" }, [5200107]={ ["unlock"]=5200105, @@ -2882,7 +2890,7 @@ local skill_rogue = { 5200122 }, ["skill_position"]=5, - ["icon"]="66" + ["icon"]="65" }, [5300100]={ ["limit_times"]=1, @@ -2890,7 +2898,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=5, - ["icon"]="58" + ["icon"]="180" }, [5300101]={ ["limit_times"]=1, @@ -2907,7 +2915,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="41" + ["icon"]="94" }, [5300102]={ ["limit_times"]=1, @@ -2924,7 +2932,7 @@ local skill_rogue = { } }, ["obj"]=1, - ["icon"]="44" + ["icon"]="95" }, [5300103]={ ["limit_times"]=1, @@ -2941,7 +2949,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="42" + ["icon"]="96" }, [5300104]={ ["unlock"]=5300101, @@ -2960,7 +2968,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="67" + ["icon"]="97" }, [5300105]={ ["limit_times"]=1, @@ -2977,7 +2985,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="66" + ["icon"]="98" }, [5300106]={ ["unlock"]=5300105, @@ -2996,7 +3004,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="58" + ["icon"]="99" }, [5300107]={ ["limit_times"]=1, @@ -3013,7 +3021,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="66" + ["icon"]="100" }, [5300200]={ ["limit_times"]=1, @@ -3021,7 +3029,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=6, ["skill_position"]=5, - ["icon"]="58" + ["icon"]="185" }, [5300201]={ ["limit_times"]=1, @@ -3047,7 +3055,7 @@ local skill_rogue = { ["range"]=1 } }, - ["icon"]="41" + ["icon"]="129" }, [5300202]={ ["limit_times"]=1, @@ -3064,7 +3072,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="44" + ["icon"]="130" }, [5300203]={ ["limit_times"]=1, @@ -3073,10 +3081,10 @@ local skill_rogue = { ["type"]=7, ["parameter"]={ 1, - 30000 + 10000 }, ["skill_position"]=5, - ["icon"]="42" + ["icon"]="131" }, [5300204]={ ["limit_times"]=1, @@ -3093,7 +3101,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="67" + ["icon"]="132" }, [5300205]={ ["limit_times"]=1, @@ -3110,7 +3118,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="66" + ["icon"]="133" }, [5300206]={ ["unlock"]=5300202, @@ -3129,7 +3137,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="58" + ["icon"]="134" }, [5300207]={ ["unlock"]=5300205, @@ -3148,15 +3156,14 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="66" + ["icon"]="135" }, [5400100]={ ["limit_times"]=1, ["weight"]=100000, ["qlt"]=4, ["type"]=6, - ["skill_position"]=5, - ["icon"]="58" + ["skill_position"]=5 }, [5400101]={ ["limit_times"]=1, @@ -3165,10 +3172,10 @@ local skill_rogue = { ["type"]=7, ["parameter"]={ 1, - 30000 + 10000 }, ["skill_position"]=5, - ["icon"]="41" + ["icon"]="190" }, [5400102]={ ["limit_times"]=1, @@ -3185,7 +3192,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="44" + ["icon"]="164" }, [5400103]={ ["limit_times"]=1, @@ -3202,7 +3209,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="42" + ["icon"]="165" }, [5400104]={ ["limit_times"]=1, @@ -3219,7 +3226,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="67" + ["icon"]="166" }, [5400105]={ ["limit_times"]=1, @@ -3230,7 +3237,7 @@ local skill_rogue = { 5400123 }, ["skill_position"]=5, - ["icon"]="66" + ["icon"]="167" }, [5400106]={ ["limit_times"]=1, @@ -3247,7 +3254,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="58" + ["icon"]="168" }, [5400107]={ ["limit_times"]=1, @@ -3264,7 +3271,7 @@ local skill_rogue = { } }, ["obj"]=7, - ["icon"]="66" + ["icon"]="169" } } local config = { diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 308306ae..1ea9e591 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -145,6 +145,36 @@ local localization_global = ["SEVEN_DAY_DESC_2"] = "已完成任务数:{0}/{1}", ["FUNC_UNLOCK"] = "解锁新功能", ["MAIN_BTN_3"] = "商城", + ["SHOP_DESC_1"] = "普通宝箱", + ["SHOP_DESC_2"] = "精致宝箱", + ["SHOP_DESC_3"] = "珍贵宝箱", + ["SHOP_DESC_4"] = "无额外奖励加成", + ["SHOP_DESC_5"] = "开宝箱提升等级,增加宝箱奖励", + ["SHOP_DESC_6"] = "宝箱等级提升!", + ["SHOP_DESC_7"] = "立即打开", + ["SHOP_DESC_8"] = "恭喜获得", + ["SHOP_DESC_9"] = "首充礼包", + ["SHOP_DESC_10"] = "章节礼包", + ["SHOP_DESC_11"] = "新手礼包", + ["SHOP_DESC_12"] = "助力礼包", + ["SHOP_DESC_13"] = "成长礼包", + ["SHOP_DESC_14"] = "金币礼包", + ["SHOP_DESC_15"] = "前往商店", + ["SHOP_DESC_16"] = "特惠商品", + ["SHOP_DESC_17"] = "主要商品", + ["SHOP_DESC_18"] = "限购{0}次", + ["SHOP_DESC_19"] = "第{0}章礼包", + ["SHOP_DESC_20"] = "已购买", + ["SHOP_DESC_21"] = "剩余次数:{0}", + ["SHOP_DESC_22"] = "刷新时间:{0}", + ["SHOP_DESC_23"] = "{0}级助力礼包", + ["SHOP_DESC_24"] = "必出普通英雄", + ["SHOP_DESC_25"] = "必出稀有英雄", + ["SHOP_DESC_26"] = "必出史诗英雄", + ["SHOP_DESC_27"] = "宝箱", + ["SHOP_DESC_28"] = "每日特惠", + ["SHOP_DESC_29"] = "\"每日特惠\"将每日刷新,通过观看广告可以额外刷新", + ["HERO_DESC_11"] = "活动获得", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/skill.lua b/lua/app/config/strings/cn/skill.lua index d16415e5..2922d3a0 100644 --- a/lua/app/config/strings/cn/skill.lua +++ b/lua/app/config/strings/cn/skill.lua @@ -30,7 +30,7 @@ local skill = { ["desc"]="急速治疗：使用后本次恢复生命。" }, [3300220]={ - ["desc"]="森林狼：使用后本次伤害提升，并造成多次技能伤害。" + ["desc"]="狼袭瞬杀：使用后本次伤害提升，并造成多次技能伤害。" }, [3400120]={ ["desc"]="流星追月：使用后本次伤害提升，并造成一次巨量技能伤害。" @@ -42,7 +42,7 @@ local skill = { ["desc"]="霜冻冰晶：额外造成一次技能伤害，附加冰霜效果，1回合。" }, [4300220]={ - ["desc"]="鸦姐：额外造成一次技能伤害，附加腐败效果，1回合。" + ["desc"]="腐败利刃：额外造成一次技能伤害，附加腐败效果，1回合。" }, [4400120]={ ["desc"]="冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。" @@ -51,7 +51,7 @@ local skill = { ["desc"]="护盾术：为团队附加一个护盾，1回合。" }, [5300120]={ - ["desc"]="魔女琪琪：额外造成一次大量技能伤害。" + ["desc"]="魔法扫帚：额外造成一次大量技能伤害。" }, [5300220]={ ["desc"]="灵魂猎手：额外造成一次大量技能伤害。" diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index 3bdc51a6..3460b2b2 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -468,28 +468,28 @@ local skill_rogue = { ["desc"]="霜冻冰晶附加的冰盾，可反伤400%。" }, [4300300]={ - ["desc"]="解锁鸦姐技能：额外造成一次技能伤害，附加腐败效果，1回合。" + ["desc"]="解锁腐败利刃：额外造成一次技能伤害，附加腐败效果，1回合。" }, [4300301]={ - ["desc"]="鸦姐技能附加的腐败效果，回合数+1." + ["desc"]="腐败利刃附加的腐败效果，回合数+1." }, [4300302]={ - ["desc"]="鸦姐技能对易伤敌人附加冰霜效果，1回合。" + ["desc"]="腐败利刃对易伤敌人附加冰霜效果，1回合。" }, [4300303]={ - ["desc"]="鸦姐技能使用时本次普攻伤害提升15%。" + ["desc"]="腐败利刃使用时本次普攻伤害提升15%。" }, [4300304]={ - ["desc"]="鸦姐技能附加的冰霜效果，回合数+1。" + ["desc"]="腐败利刃附加的冰霜效果，回合数+1。" }, [4300305]={ - ["desc"]="鸦姐技能附加虚弱效果，2回合。" + ["desc"]="腐败利刃附加虚弱效果，2回合。" }, [4300306]={ - ["desc"]="鸦姐技能沿＋方向可额外消除4格。" + ["desc"]="腐败利刃沿＋方向可额外消除4格。" }, [4300307]={ - ["desc"]="鸦姐技能附加的虚弱效果，回合数+2。" + ["desc"]="腐败利刃附加的虚弱效果，回合数+2。" }, [4400100]={ ["desc"]="解锁冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。" @@ -606,7 +606,7 @@ local skill_rogue = { ["desc"]="蝴蝶技能激活所需能量-2。" }, [5400106]={ - ["desc"]="蝴蝶技能每击杀1个敌人，技能伤害提升50%。" + ["desc"]="蝴蝶技能每击杀1个敌人，技能伤害提升10%。" }, [5400107]={ ["desc"]="蝴蝶技能击杀敌人后将增加蝴蝶技能能量2点。" diff --git a/lua/app/ui/common/cell/hero_cell.lua b/lua/app/ui/common/cell/hero_cell.lua index 2b27d96a..51d7b38c 100644 --- a/lua/app/ui/common/cell/hero_cell.lua +++ b/lua/app/ui/common/cell/hero_cell.lua @@ -42,19 +42,25 @@ function HeroCell:refresh(heroEntity, isGray) self.progress:setSprite(GConst.ATLAS_PATH.COMMON, "common_progress_2", nil, self.progress:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER)) end self.progress:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = fragmentCount / needFragmentCount - self.lvTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, heroEntity:getLv())) if heroEntity:isUnlock() then - self.lvTx:setVisible(true) + if heroEntity:isActived() then + self.lvTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, heroEntity:getLv())) + self.lvTx:setVisible(true) + else + self.lvTx:setVisible(false) + end self.progressBg:setVisible(not heroEntity:isMaxLv()) self.unlockTx:setVisible(false) - if not heroEntity:isActived() then - self.lvTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_11)) - end else self.lvTx:setVisible(false) self.progressBg:setVisible(false) self.unlockTx:setVisible(true) - self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_10, heroEntity:getUnlcokChapter())) + local unlcokChapter = heroEntity:getUnlcokChapter() + if unlcokChapter then + self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_10, unlcokChapter)) + else + self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_11)) + end end end diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index d0f4da5f..f55e40d6 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -107,7 +107,7 @@ function HeroEntity:getCfgAtk(lv) end function HeroEntity:getUnlcokChapter() - return self.config.unlock_chapter or 0 + return self.config.unlock_chapter end function HeroEntity:updateAllAttr() @@ -165,10 +165,10 @@ function HeroEntity:isUnlock() if self:isActived() then return true end - if self:getUnlcokChapter() <= DataManager.ChapterData:getMaxChapterId() or self:canLvUp() then + local unlockChapter = self:getUnlcokChapter() + if unlockChapter and unlockChapter <= DataManager.ChapterData:getMaxChapterId() then return true end - return false end From c4efa0e41b3f1183a4c137e4e16686e182259c37 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 29 May 2023 15:07:46 +0800 Subject: [PATCH 22/31] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/net/net_manager.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/app/net/net_manager.lua b/lua/app/net/net_manager.lua index f4dbb5f4..3a45cd2a 100644 --- a/lua/app/net/net_manager.lua +++ b/lua/app/net/net_manager.lua @@ -246,6 +246,8 @@ function NetManager:connect(domain, port, callback, socketName) GFunc.showMessageBox(params) end else + UIManager:hideWaitNet(true) + LocalData:setLastLoginInfo(NetManager.LOGIN_TYPE.TOKEN, pbData.id, pbData.token) LocalData:setAccountInfo(pbData) BIReport:updateAccountId(pbData.id) From 2fffb5c88afa00b267d7e4f147075e4174714a99 Mon Sep 17 00:00:00 2001 From: CloudJ Date: Mon, 29 May 2023 15:10:04 +0800 Subject: [PATCH 23/31] =?UTF-8?q?=E5=95=86=E5=9F=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/maincity/maincity_const.lua | 1 - lua/app/ui/shop/cell/gem_sell_cell.lua | 4 ++-- lua/app/ui/shop/cell/hot_sell_cell.lua | 15 +++++++-------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/lua/app/module/maincity/maincity_const.lua b/lua/app/module/maincity/maincity_const.lua index de41901b..23ba40e6 100644 --- a/lua/app/module/maincity/maincity_const.lua +++ b/lua/app/module/maincity/maincity_const.lua @@ -24,7 +24,6 @@ MainCityConst.LEFT_SIDE_BARS = { MainCityConst.RIGHT_SIDE_BARS = { "app/ui/main_city/cell/side_bar_gold_pig_cell", - "app/ui/main_city/cell/side_bar_level_fund_cell", "app/ui/main_city/cell/side_bar_growth_fund_cell", "app/ui/main_city/cell/side_bar_first_recharge_cell", "app/ui/main_city/cell/side_bar_beginner_gift_cell", diff --git a/lua/app/ui/shop/cell/gem_sell_cell.lua b/lua/app/ui/shop/cell/gem_sell_cell.lua index 37b2c5f4..56c9af48 100644 --- a/lua/app/ui/shop/cell/gem_sell_cell.lua +++ b/lua/app/ui/shop/cell/gem_sell_cell.lua @@ -8,8 +8,8 @@ function GemSellCell:init() self.cells = {} self.cellHeight = 0 local cellHeight = nil - local cfg = ConfigManager:getConfig("mall_treasure") - for i = 1, 19 do -- 正常9个 提审19个 暂未处理提审模式 -- TODOJ + local cfg = ConfigManager:getConfig("mall_treasure") -- 审核模式读取另一张表 + for i = 1, 19 do -- 正常9个 提审19个 local cell = uiMap["gem_sell_cell.cell_" .. i] if cellHeight == nil then local w, h = cell:fastGetSizeDelta() diff --git a/lua/app/ui/shop/cell/hot_sell_cell.lua b/lua/app/ui/shop/cell/hot_sell_cell.lua index 8b2ed387..b9aec6fd 100644 --- a/lua/app/ui/shop/cell/hot_sell_cell.lua +++ b/lua/app/ui/shop/cell/hot_sell_cell.lua @@ -8,7 +8,7 @@ function HotSellCell:init() uiMap["hot_sell_cell.title_bg.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_28)) -- 每日特惠 uiMap["hot_sell_cell.help_btn"]:addClickListener(function() - -- TODOJ + ModuleManager.TipsManager:showDescTips(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_29), uiMap["hot_sell_cell.help_btn"]:getBaseObject()) end) self.timeTx = uiMap["hot_sell_cell.time_tx"] self.cells = {} @@ -30,25 +30,24 @@ end function HotSellCell:refresh() local goods = DataManager.ShopData:getMallDailyGoods() - local freeRefreshCount = DataManager.ShopData:getMallDailyAdLeftCount() -- 免费刷新次数 - local gemRefreshCount = DataManager.ShopData:getMallDailyDiamondLeftCount() -- 钻石刷新次数 + local freeRefreshCount = DataManager.ShopData:getMallDailyAdLeftCount() -- 剩余免费刷新次数 + local gemRefreshCount = DataManager.ShopData:getMallDailyDiamondLeftCount() -- 剩余钻石刷新次数 local gemRefreshCost = DataManager.ShopData:getMallDailyDiamondResetCost() -- 钻石刷新消耗 - if freeRefreshCount > 0 then - self.refreshBtn:setVisible(true) + self.refreshBtn:setActive(true) self.refreshAdImg:setVisible(true) GFunc.setAdsSprite(self.refreshAdImg) self.refreshGemImg:setVisible(false) self.refreshText:setText(I18N:getGlobalText(I18N.GlobalConst.STR_REFRESH)) - self.refreshBtn:addRedPoint(70, 30, 0.6) + self.refreshBtn:addRedPoint(80, 30, 0.6) elseif gemRefreshCount > 0 then - self.refreshBtn:setVisible(true) + self.refreshBtn:setActive(true) self.refreshAdImg:setVisible(false) self.refreshGemImg:setVisible(true) self.refreshText:setText(gemRefreshCost) self.refreshBtn:removeRedPoint() else - self.refreshBtn:setVisible(false) + self.refreshBtn:setActive(false) self.refreshBtn:removeRedPoint() end From 71b9dd23a1b9ae8abd801cc47fc78b46288cdf0e Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 29 May 2023 15:19:24 +0800 Subject: [PATCH 24/31] =?UTF-8?q?=E8=A7=A3=E9=94=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/hero.lua | 1 - lua/app/config/skill.lua | 15 ++++++++++++--- lua/app/ui/common/cell/hero_cell.lua | 17 +++++++++++------ 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index 83b4e700..0d41d19f 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -231,7 +231,6 @@ local hero = { ["model_id"]="p0011", ["icon"]="16", ["item_id"]=14001, - ["unlock_chapter"]=25, ["is_show"]=1 }, [22001]={ diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 6122b768..b7124e65 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -3730,7 +3730,10 @@ local skill = { ["link"]=1, ["position"]=5, ["method"]=1, - ["skill_type"]=0, + ["skill_type"]=1, + ["boardrange"]={ + + }, ["battle_icon"]="5", ["effect_type"]=1, ["trigger"]=1, @@ -3753,7 +3756,10 @@ local skill = { ["link"]=1, ["position"]=5, ["method"]=1, - ["skill_type"]=0, + ["skill_type"]=1, + ["boardrange"]={ + + }, ["battle_icon"]="5", ["effect_type"]=1, ["trigger"]=1, @@ -3776,7 +3782,10 @@ local skill = { ["link"]=1, ["position"]=5, ["method"]=1, - ["skill_type"]=0, + ["skill_type"]=1, + ["boardrange"]={ + + }, ["battle_icon"]="5", ["effect_type"]=1, ["trigger"]=1, diff --git a/lua/app/ui/common/cell/hero_cell.lua b/lua/app/ui/common/cell/hero_cell.lua index 51d7b38c..5bd027da 100644 --- a/lua/app/ui/common/cell/hero_cell.lua +++ b/lua/app/ui/common/cell/hero_cell.lua @@ -53,13 +53,18 @@ function HeroCell:refresh(heroEntity, isGray) self.unlockTx:setVisible(false) else self.lvTx:setVisible(false) - self.progressBg:setVisible(false) - self.unlockTx:setVisible(true) - local unlcokChapter = heroEntity:getUnlcokChapter() - if unlcokChapter then - self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_10, unlcokChapter)) + if canLvUp then + self.unlockTx:setVisible(false) + self.progressBg:setVisible(true) else - self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_11)) + self.unlockTx:setVisible(true) + self.progressBg:setVisible(false) + local unlcokChapter = heroEntity:getUnlcokChapter() + if unlcokChapter then + self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_10, unlcokChapter)) + else + self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_11)) + end end end end From 550a51efa7befbf26082b294ed1559aadb0022f3 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 29 May 2023 15:21:56 +0800 Subject: [PATCH 25/31] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E6=97=B6=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E6=88=98=E6=96=97=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/component/battle_unit_comp.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index dc5dd155..3dc16991 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1601,6 +1601,8 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, d self:onAttackOver() end + self.battleController:resetTimeSpeed() + self:changeState(UNIT_STATE.DEAD) elseif damage < 0 then self:playHurt() From 5565fb2f8c3c6e1b7b4511f140c879dcab1d91b4 Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 29 May 2023 15:21:58 +0800 Subject: [PATCH 26/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/chapter_daily_challenge.lua | 4460 ++++------------- .../strings/cn/buff_daily_challenge.lua | 36 +- .../strings/de/buff_daily_challenge.lua | 20 +- .../strings/en/buff_daily_challenge.lua | 20 +- .../strings/fr/buff_daily_challenge.lua | 20 +- .../strings/id/buff_daily_challenge.lua | 20 +- .../strings/ja/buff_daily_challenge.lua | 20 +- .../strings/ko/buff_daily_challenge.lua | 20 +- .../strings/pt/buff_daily_challenge.lua | 20 +- .../strings/ru/buff_daily_challenge.lua | 20 +- .../strings/th/buff_daily_challenge.lua | 20 +- .../strings/vi/buff_daily_challenge.lua | 20 +- .../strings/zh/buff_daily_challenge.lua | 20 +- 13 files changed, 1110 insertions(+), 3606 deletions(-) diff --git a/lua/app/config/chapter_daily_challenge.lua b/lua/app/config/chapter_daily_challenge.lua index 1349a0ea..71cfbbc6 100644 --- a/lua/app/config/chapter_daily_challenge.lua +++ b/lua/app/config/chapter_daily_challenge.lua @@ -65,326 +65,6 @@ local chapter_daily_challenge = { } }, ["begin_buff_id"]={ - { - 1, - 1 - }, - { - 2, - 1 - }, - { - 3, - 1 - }, - { - 4, - 1 - }, - { - 5, - 1 - }, - { - 6, - 1 - }, - { - 7, - 1 - }, - { - 8, - 1 - }, - { - 9, - 1 - }, - { - 10, - 1 - }, - { - 1, - 2 - }, - { - 2, - 2 - }, - { - 3, - 2 - }, - { - 4, - 2 - }, - { - 5, - 2 - }, - { - 6, - 2 - }, - { - 7, - 2 - }, - { - 8, - 2 - }, - { - 9, - 2 - }, - { - 10, - 2 - }, - { - 1, - 3 - }, - { - 2, - 3 - }, - { - 3, - 3 - }, - { - 4, - 3 - }, - { - 5, - 3 - }, - { - 6, - 3 - }, - { - 7, - 3 - }, - { - 8, - 3 - }, - { - 9, - 3 - }, - { - 10, - 3 - }, - { - 1, - 4 - }, - { - 2, - 4 - }, - { - 3, - 4 - }, - { - 4, - 4 - }, - { - 5, - 4 - }, - { - 6, - 4 - }, - { - 7, - 4 - }, - { - 8, - 4 - }, - { - 9, - 4 - }, - { - 10, - 4 - }, - { - 1, - 5 - }, - { - 2, - 5 - }, - { - 3, - 5 - }, - { - 4, - 5 - }, - { - 5, - 5 - }, - { - 6, - 5 - }, - { - 7, - 5 - }, - { - 8, - 5 - }, - { - 9, - 5 - }, - { - 10, - 5 - }, - { - 1, - 6 - }, - { - 2, - 6 - }, - { - 3, - 6 - }, - { - 4, - 6 - }, - { - 5, - 6 - }, - { - 6, - 6 - }, - { - 7, - 6 - }, - { - 8, - 6 - }, - { - 9, - 6 - }, - { - 10, - 6 - }, - { - 1, - 7 - }, - { - 2, - 7 - }, - { - 3, - 7 - }, - { - 4, - 7 - }, - { - 5, - 7 - }, - { - 6, - 7 - }, - { - 7, - 7 - }, - { - 8, - 7 - }, - { - 9, - 7 - }, - { - 10, - 7 - }, - { - 1, - 8 - }, - { - 2, - 8 - }, - { - 3, - 8 - }, - { - 4, - 8 - }, - { - 5, - 8 - }, - { - 6, - 8 - }, - { - 7, - 8 - }, - { - 8, - 8 - }, - { - 9, - 8 - }, - { - 10, - 8 - }, { 1, 9 @@ -393,10 +73,6 @@ local chapter_daily_challenge = { 2, 9 }, - { - 3, - 9 - }, { 4, 9 @@ -415,15 +91,7 @@ local chapter_daily_challenge = { }, { 8, - 9 - }, - { - 9, - 9 - }, - { - 10, - 9 + 10 }, { 1, @@ -458,12 +126,116 @@ local chapter_daily_challenge = { 10 }, { - 9, - 10 + 1, + 11 }, { - 10, - 10 + 2, + 11 + }, + { + 3, + 11 + }, + { + 4, + 11 + }, + { + 5, + 11 + }, + { + 6, + 11 + }, + { + 7, + 11 + }, + { + 8, + 11 + }, + { + 1, + 12 + }, + { + 2, + 12 + }, + { + 3, + 12 + }, + { + 4, + 12 + }, + { + 5, + 12 + }, + { + 6, + 12 + }, + { + 1, + 13 + }, + { + 2, + 13 + }, + { + 3, + 13 + }, + { + 5, + 13 + }, + { + 6, + 13 + }, + { + 7, + 13 + }, + { + 8, + 13 + }, + { + 1, + 14 + }, + { + 3, + 14 + }, + { + 4, + 14 + }, + { + 5, + 14 + }, + { + 6, + 14 + }, + { + 7, + 14 + }, + { + 8, + 14 } } }, @@ -533,326 +305,6 @@ local chapter_daily_challenge = { } }, ["begin_buff_id"]={ - { - 1, - 1 - }, - { - 2, - 1 - }, - { - 3, - 1 - }, - { - 4, - 1 - }, - { - 5, - 1 - }, - { - 6, - 1 - }, - { - 7, - 1 - }, - { - 8, - 1 - }, - { - 9, - 1 - }, - { - 10, - 1 - }, - { - 1, - 2 - }, - { - 2, - 2 - }, - { - 3, - 2 - }, - { - 4, - 2 - }, - { - 5, - 2 - }, - { - 6, - 2 - }, - { - 7, - 2 - }, - { - 8, - 2 - }, - { - 9, - 2 - }, - { - 10, - 2 - }, - { - 1, - 3 - }, - { - 2, - 3 - }, - { - 3, - 3 - }, - { - 4, - 3 - }, - { - 5, - 3 - }, - { - 6, - 3 - }, - { - 7, - 3 - }, - { - 8, - 3 - }, - { - 9, - 3 - }, - { - 10, - 3 - }, - { - 1, - 4 - }, - { - 2, - 4 - }, - { - 3, - 4 - }, - { - 4, - 4 - }, - { - 5, - 4 - }, - { - 6, - 4 - }, - { - 7, - 4 - }, - { - 8, - 4 - }, - { - 9, - 4 - }, - { - 10, - 4 - }, - { - 1, - 5 - }, - { - 2, - 5 - }, - { - 3, - 5 - }, - { - 4, - 5 - }, - { - 5, - 5 - }, - { - 6, - 5 - }, - { - 7, - 5 - }, - { - 8, - 5 - }, - { - 9, - 5 - }, - { - 10, - 5 - }, - { - 1, - 6 - }, - { - 2, - 6 - }, - { - 3, - 6 - }, - { - 4, - 6 - }, - { - 5, - 6 - }, - { - 6, - 6 - }, - { - 7, - 6 - }, - { - 8, - 6 - }, - { - 9, - 6 - }, - { - 10, - 6 - }, - { - 1, - 7 - }, - { - 2, - 7 - }, - { - 3, - 7 - }, - { - 4, - 7 - }, - { - 5, - 7 - }, - { - 6, - 7 - }, - { - 7, - 7 - }, - { - 8, - 7 - }, - { - 9, - 7 - }, - { - 10, - 7 - }, - { - 1, - 8 - }, - { - 2, - 8 - }, - { - 3, - 8 - }, - { - 4, - 8 - }, - { - 5, - 8 - }, - { - 6, - 8 - }, - { - 7, - 8 - }, - { - 8, - 8 - }, - { - 9, - 8 - }, - { - 10, - 8 - }, { 1, 9 @@ -861,10 +313,6 @@ local chapter_daily_challenge = { 2, 9 }, - { - 3, - 9 - }, { 4, 9 @@ -883,15 +331,7 @@ local chapter_daily_challenge = { }, { 8, - 9 - }, - { - 9, - 9 - }, - { - 10, - 9 + 10 }, { 1, @@ -926,12 +366,116 @@ local chapter_daily_challenge = { 10 }, { - 9, - 10 + 1, + 11 }, { - 10, - 10 + 2, + 11 + }, + { + 3, + 11 + }, + { + 4, + 11 + }, + { + 5, + 11 + }, + { + 6, + 11 + }, + { + 7, + 11 + }, + { + 8, + 11 + }, + { + 1, + 12 + }, + { + 2, + 12 + }, + { + 3, + 12 + }, + { + 4, + 12 + }, + { + 5, + 12 + }, + { + 6, + 12 + }, + { + 1, + 13 + }, + { + 2, + 13 + }, + { + 3, + 13 + }, + { + 5, + 13 + }, + { + 6, + 13 + }, + { + 7, + 13 + }, + { + 8, + 13 + }, + { + 1, + 14 + }, + { + 3, + 14 + }, + { + 4, + 14 + }, + { + 5, + 14 + }, + { + 6, + 14 + }, + { + 7, + 14 + }, + { + 8, + 14 } } }, @@ -1001,326 +545,6 @@ local chapter_daily_challenge = { } }, ["begin_buff_id"]={ - { - 1, - 1 - }, - { - 2, - 1 - }, - { - 3, - 1 - }, - { - 4, - 1 - }, - { - 5, - 1 - }, - { - 6, - 1 - }, - { - 7, - 1 - }, - { - 8, - 1 - }, - { - 9, - 1 - }, - { - 10, - 1 - }, - { - 1, - 2 - }, - { - 2, - 2 - }, - { - 3, - 2 - }, - { - 4, - 2 - }, - { - 5, - 2 - }, - { - 6, - 2 - }, - { - 7, - 2 - }, - { - 8, - 2 - }, - { - 9, - 2 - }, - { - 10, - 2 - }, - { - 1, - 3 - }, - { - 2, - 3 - }, - { - 3, - 3 - }, - { - 4, - 3 - }, - { - 5, - 3 - }, - { - 6, - 3 - }, - { - 7, - 3 - }, - { - 8, - 3 - }, - { - 9, - 3 - }, - { - 10, - 3 - }, - { - 1, - 4 - }, - { - 2, - 4 - }, - { - 3, - 4 - }, - { - 4, - 4 - }, - { - 5, - 4 - }, - { - 6, - 4 - }, - { - 7, - 4 - }, - { - 8, - 4 - }, - { - 9, - 4 - }, - { - 10, - 4 - }, - { - 1, - 5 - }, - { - 2, - 5 - }, - { - 3, - 5 - }, - { - 4, - 5 - }, - { - 5, - 5 - }, - { - 6, - 5 - }, - { - 7, - 5 - }, - { - 8, - 5 - }, - { - 9, - 5 - }, - { - 10, - 5 - }, - { - 1, - 6 - }, - { - 2, - 6 - }, - { - 3, - 6 - }, - { - 4, - 6 - }, - { - 5, - 6 - }, - { - 6, - 6 - }, - { - 7, - 6 - }, - { - 8, - 6 - }, - { - 9, - 6 - }, - { - 10, - 6 - }, - { - 1, - 7 - }, - { - 2, - 7 - }, - { - 3, - 7 - }, - { - 4, - 7 - }, - { - 5, - 7 - }, - { - 6, - 7 - }, - { - 7, - 7 - }, - { - 8, - 7 - }, - { - 9, - 7 - }, - { - 10, - 7 - }, - { - 1, - 8 - }, - { - 2, - 8 - }, - { - 3, - 8 - }, - { - 4, - 8 - }, - { - 5, - 8 - }, - { - 6, - 8 - }, - { - 7, - 8 - }, - { - 8, - 8 - }, - { - 9, - 8 - }, - { - 10, - 8 - }, { 1, 9 @@ -1329,10 +553,6 @@ local chapter_daily_challenge = { 2, 9 }, - { - 3, - 9 - }, { 4, 9 @@ -1351,15 +571,7 @@ local chapter_daily_challenge = { }, { 8, - 9 - }, - { - 9, - 9 - }, - { - 10, - 9 + 10 }, { 1, @@ -1394,12 +606,116 @@ local chapter_daily_challenge = { 10 }, { - 9, - 10 + 1, + 11 }, { - 10, - 10 + 2, + 11 + }, + { + 3, + 11 + }, + { + 4, + 11 + }, + { + 5, + 11 + }, + { + 6, + 11 + }, + { + 7, + 11 + }, + { + 8, + 11 + }, + { + 1, + 12 + }, + { + 2, + 12 + }, + { + 3, + 12 + }, + { + 4, + 12 + }, + { + 5, + 12 + }, + { + 6, + 12 + }, + { + 1, + 13 + }, + { + 2, + 13 + }, + { + 3, + 13 + }, + { + 5, + 13 + }, + { + 6, + 13 + }, + { + 7, + 13 + }, + { + 8, + 13 + }, + { + 1, + 14 + }, + { + 3, + 14 + }, + { + 4, + 14 + }, + { + 5, + 14 + }, + { + 6, + 14 + }, + { + 7, + 14 + }, + { + 8, + 14 } } }, @@ -1469,326 +785,6 @@ local chapter_daily_challenge = { } }, ["begin_buff_id"]={ - { - 1, - 1 - }, - { - 2, - 1 - }, - { - 3, - 1 - }, - { - 4, - 1 - }, - { - 5, - 1 - }, - { - 6, - 1 - }, - { - 7, - 1 - }, - { - 8, - 1 - }, - { - 9, - 1 - }, - { - 10, - 1 - }, - { - 1, - 2 - }, - { - 2, - 2 - }, - { - 3, - 2 - }, - { - 4, - 2 - }, - { - 5, - 2 - }, - { - 6, - 2 - }, - { - 7, - 2 - }, - { - 8, - 2 - }, - { - 9, - 2 - }, - { - 10, - 2 - }, - { - 1, - 3 - }, - { - 2, - 3 - }, - { - 3, - 3 - }, - { - 4, - 3 - }, - { - 5, - 3 - }, - { - 6, - 3 - }, - { - 7, - 3 - }, - { - 8, - 3 - }, - { - 9, - 3 - }, - { - 10, - 3 - }, - { - 1, - 4 - }, - { - 2, - 4 - }, - { - 3, - 4 - }, - { - 4, - 4 - }, - { - 5, - 4 - }, - { - 6, - 4 - }, - { - 7, - 4 - }, - { - 8, - 4 - }, - { - 9, - 4 - }, - { - 10, - 4 - }, - { - 1, - 5 - }, - { - 2, - 5 - }, - { - 3, - 5 - }, - { - 4, - 5 - }, - { - 5, - 5 - }, - { - 6, - 5 - }, - { - 7, - 5 - }, - { - 8, - 5 - }, - { - 9, - 5 - }, - { - 10, - 5 - }, - { - 1, - 6 - }, - { - 2, - 6 - }, - { - 3, - 6 - }, - { - 4, - 6 - }, - { - 5, - 6 - }, - { - 6, - 6 - }, - { - 7, - 6 - }, - { - 8, - 6 - }, - { - 9, - 6 - }, - { - 10, - 6 - }, - { - 1, - 7 - }, - { - 2, - 7 - }, - { - 3, - 7 - }, - { - 4, - 7 - }, - { - 5, - 7 - }, - { - 6, - 7 - }, - { - 7, - 7 - }, - { - 8, - 7 - }, - { - 9, - 7 - }, - { - 10, - 7 - }, - { - 1, - 8 - }, - { - 2, - 8 - }, - { - 3, - 8 - }, - { - 4, - 8 - }, - { - 5, - 8 - }, - { - 6, - 8 - }, - { - 7, - 8 - }, - { - 8, - 8 - }, - { - 9, - 8 - }, - { - 10, - 8 - }, { 1, 9 @@ -1797,10 +793,6 @@ local chapter_daily_challenge = { 2, 9 }, - { - 3, - 9 - }, { 4, 9 @@ -1819,15 +811,7 @@ local chapter_daily_challenge = { }, { 8, - 9 - }, - { - 9, - 9 - }, - { - 10, - 9 + 10 }, { 1, @@ -1862,12 +846,116 @@ local chapter_daily_challenge = { 10 }, { - 9, - 10 + 1, + 11 }, { - 10, - 10 + 2, + 11 + }, + { + 3, + 11 + }, + { + 4, + 11 + }, + { + 5, + 11 + }, + { + 6, + 11 + }, + { + 7, + 11 + }, + { + 8, + 11 + }, + { + 1, + 12 + }, + { + 2, + 12 + }, + { + 3, + 12 + }, + { + 4, + 12 + }, + { + 5, + 12 + }, + { + 6, + 12 + }, + { + 1, + 13 + }, + { + 2, + 13 + }, + { + 3, + 13 + }, + { + 5, + 13 + }, + { + 6, + 13 + }, + { + 7, + 13 + }, + { + 8, + 13 + }, + { + 1, + 14 + }, + { + 3, + 14 + }, + { + 4, + 14 + }, + { + 5, + 14 + }, + { + 6, + 14 + }, + { + 7, + 14 + }, + { + 8, + 14 } } }, @@ -1937,326 +1025,6 @@ local chapter_daily_challenge = { } }, ["begin_buff_id"]={ - { - 1, - 1 - }, - { - 2, - 1 - }, - { - 3, - 1 - }, - { - 4, - 1 - }, - { - 5, - 1 - }, - { - 6, - 1 - }, - { - 7, - 1 - }, - { - 8, - 1 - }, - { - 9, - 1 - }, - { - 10, - 1 - }, - { - 1, - 2 - }, - { - 2, - 2 - }, - { - 3, - 2 - }, - { - 4, - 2 - }, - { - 5, - 2 - }, - { - 6, - 2 - }, - { - 7, - 2 - }, - { - 8, - 2 - }, - { - 9, - 2 - }, - { - 10, - 2 - }, - { - 1, - 3 - }, - { - 2, - 3 - }, - { - 3, - 3 - }, - { - 4, - 3 - }, - { - 5, - 3 - }, - { - 6, - 3 - }, - { - 7, - 3 - }, - { - 8, - 3 - }, - { - 9, - 3 - }, - { - 10, - 3 - }, - { - 1, - 4 - }, - { - 2, - 4 - }, - { - 3, - 4 - }, - { - 4, - 4 - }, - { - 5, - 4 - }, - { - 6, - 4 - }, - { - 7, - 4 - }, - { - 8, - 4 - }, - { - 9, - 4 - }, - { - 10, - 4 - }, - { - 1, - 5 - }, - { - 2, - 5 - }, - { - 3, - 5 - }, - { - 4, - 5 - }, - { - 5, - 5 - }, - { - 6, - 5 - }, - { - 7, - 5 - }, - { - 8, - 5 - }, - { - 9, - 5 - }, - { - 10, - 5 - }, - { - 1, - 6 - }, - { - 2, - 6 - }, - { - 3, - 6 - }, - { - 4, - 6 - }, - { - 5, - 6 - }, - { - 6, - 6 - }, - { - 7, - 6 - }, - { - 8, - 6 - }, - { - 9, - 6 - }, - { - 10, - 6 - }, - { - 1, - 7 - }, - { - 2, - 7 - }, - { - 3, - 7 - }, - { - 4, - 7 - }, - { - 5, - 7 - }, - { - 6, - 7 - }, - { - 7, - 7 - }, - { - 8, - 7 - }, - { - 9, - 7 - }, - { - 10, - 7 - }, - { - 1, - 8 - }, - { - 2, - 8 - }, - { - 3, - 8 - }, - { - 4, - 8 - }, - { - 5, - 8 - }, - { - 6, - 8 - }, - { - 7, - 8 - }, - { - 8, - 8 - }, - { - 9, - 8 - }, - { - 10, - 8 - }, { 1, 9 @@ -2265,10 +1033,6 @@ local chapter_daily_challenge = { 2, 9 }, - { - 3, - 9 - }, { 4, 9 @@ -2287,15 +1051,7 @@ local chapter_daily_challenge = { }, { 8, - 9 - }, - { - 9, - 9 - }, - { - 10, - 9 + 10 }, { 1, @@ -2330,12 +1086,116 @@ local chapter_daily_challenge = { 10 }, { - 9, - 10 + 1, + 11 }, { - 10, - 10 + 2, + 11 + }, + { + 3, + 11 + }, + { + 4, + 11 + }, + { + 5, + 11 + }, + { + 6, + 11 + }, + { + 7, + 11 + }, + { + 8, + 11 + }, + { + 1, + 12 + }, + { + 2, + 12 + }, + { + 3, + 12 + }, + { + 4, + 12 + }, + { + 5, + 12 + }, + { + 6, + 12 + }, + { + 1, + 13 + }, + { + 2, + 13 + }, + { + 3, + 13 + }, + { + 5, + 13 + }, + { + 6, + 13 + }, + { + 7, + 13 + }, + { + 8, + 13 + }, + { + 1, + 14 + }, + { + 3, + 14 + }, + { + 4, + 14 + }, + { + 5, + 14 + }, + { + 6, + 14 + }, + { + 7, + 14 + }, + { + 8, + 14 } } }, @@ -2405,326 +1265,6 @@ local chapter_daily_challenge = { } }, ["begin_buff_id"]={ - { - 1, - 1 - }, - { - 2, - 1 - }, - { - 3, - 1 - }, - { - 4, - 1 - }, - { - 5, - 1 - }, - { - 6, - 1 - }, - { - 7, - 1 - }, - { - 8, - 1 - }, - { - 9, - 1 - }, - { - 10, - 1 - }, - { - 1, - 2 - }, - { - 2, - 2 - }, - { - 3, - 2 - }, - { - 4, - 2 - }, - { - 5, - 2 - }, - { - 6, - 2 - }, - { - 7, - 2 - }, - { - 8, - 2 - }, - { - 9, - 2 - }, - { - 10, - 2 - }, - { - 1, - 3 - }, - { - 2, - 3 - }, - { - 3, - 3 - }, - { - 4, - 3 - }, - { - 5, - 3 - }, - { - 6, - 3 - }, - { - 7, - 3 - }, - { - 8, - 3 - }, - { - 9, - 3 - }, - { - 10, - 3 - }, - { - 1, - 4 - }, - { - 2, - 4 - }, - { - 3, - 4 - }, - { - 4, - 4 - }, - { - 5, - 4 - }, - { - 6, - 4 - }, - { - 7, - 4 - }, - { - 8, - 4 - }, - { - 9, - 4 - }, - { - 10, - 4 - }, - { - 1, - 5 - }, - { - 2, - 5 - }, - { - 3, - 5 - }, - { - 4, - 5 - }, - { - 5, - 5 - }, - { - 6, - 5 - }, - { - 7, - 5 - }, - { - 8, - 5 - }, - { - 9, - 5 - }, - { - 10, - 5 - }, - { - 1, - 6 - }, - { - 2, - 6 - }, - { - 3, - 6 - }, - { - 4, - 6 - }, - { - 5, - 6 - }, - { - 6, - 6 - }, - { - 7, - 6 - }, - { - 8, - 6 - }, - { - 9, - 6 - }, - { - 10, - 6 - }, - { - 1, - 7 - }, - { - 2, - 7 - }, - { - 3, - 7 - }, - { - 4, - 7 - }, - { - 5, - 7 - }, - { - 6, - 7 - }, - { - 7, - 7 - }, - { - 8, - 7 - }, - { - 9, - 7 - }, - { - 10, - 7 - }, - { - 1, - 8 - }, - { - 2, - 8 - }, - { - 3, - 8 - }, - { - 4, - 8 - }, - { - 5, - 8 - }, - { - 6, - 8 - }, - { - 7, - 8 - }, - { - 8, - 8 - }, - { - 9, - 8 - }, - { - 10, - 8 - }, { 1, 9 @@ -2733,10 +1273,6 @@ local chapter_daily_challenge = { 2, 9 }, - { - 3, - 9 - }, { 4, 9 @@ -2755,15 +1291,7 @@ local chapter_daily_challenge = { }, { 8, - 9 - }, - { - 9, - 9 - }, - { - 10, - 9 + 10 }, { 1, @@ -2798,12 +1326,116 @@ local chapter_daily_challenge = { 10 }, { - 9, - 10 + 1, + 11 }, { - 10, - 10 + 2, + 11 + }, + { + 3, + 11 + }, + { + 4, + 11 + }, + { + 5, + 11 + }, + { + 6, + 11 + }, + { + 7, + 11 + }, + { + 8, + 11 + }, + { + 1, + 12 + }, + { + 2, + 12 + }, + { + 3, + 12 + }, + { + 4, + 12 + }, + { + 5, + 12 + }, + { + 6, + 12 + }, + { + 1, + 13 + }, + { + 2, + 13 + }, + { + 3, + 13 + }, + { + 5, + 13 + }, + { + 6, + 13 + }, + { + 7, + 13 + }, + { + 8, + 13 + }, + { + 1, + 14 + }, + { + 3, + 14 + }, + { + 4, + 14 + }, + { + 5, + 14 + }, + { + 6, + 14 + }, + { + 7, + 14 + }, + { + 8, + 14 } } }, @@ -2873,326 +1505,6 @@ local chapter_daily_challenge = { } }, ["begin_buff_id"]={ - { - 1, - 1 - }, - { - 2, - 1 - }, - { - 3, - 1 - }, - { - 4, - 1 - }, - { - 5, - 1 - }, - { - 6, - 1 - }, - { - 7, - 1 - }, - { - 8, - 1 - }, - { - 9, - 1 - }, - { - 10, - 1 - }, - { - 1, - 2 - }, - { - 2, - 2 - }, - { - 3, - 2 - }, - { - 4, - 2 - }, - { - 5, - 2 - }, - { - 6, - 2 - }, - { - 7, - 2 - }, - { - 8, - 2 - }, - { - 9, - 2 - }, - { - 10, - 2 - }, - { - 1, - 3 - }, - { - 2, - 3 - }, - { - 3, - 3 - }, - { - 4, - 3 - }, - { - 5, - 3 - }, - { - 6, - 3 - }, - { - 7, - 3 - }, - { - 8, - 3 - }, - { - 9, - 3 - }, - { - 10, - 3 - }, - { - 1, - 4 - }, - { - 2, - 4 - }, - { - 3, - 4 - }, - { - 4, - 4 - }, - { - 5, - 4 - }, - { - 6, - 4 - }, - { - 7, - 4 - }, - { - 8, - 4 - }, - { - 9, - 4 - }, - { - 10, - 4 - }, - { - 1, - 5 - }, - { - 2, - 5 - }, - { - 3, - 5 - }, - { - 4, - 5 - }, - { - 5, - 5 - }, - { - 6, - 5 - }, - { - 7, - 5 - }, - { - 8, - 5 - }, - { - 9, - 5 - }, - { - 10, - 5 - }, - { - 1, - 6 - }, - { - 2, - 6 - }, - { - 3, - 6 - }, - { - 4, - 6 - }, - { - 5, - 6 - }, - { - 6, - 6 - }, - { - 7, - 6 - }, - { - 8, - 6 - }, - { - 9, - 6 - }, - { - 10, - 6 - }, - { - 1, - 7 - }, - { - 2, - 7 - }, - { - 3, - 7 - }, - { - 4, - 7 - }, - { - 5, - 7 - }, - { - 6, - 7 - }, - { - 7, - 7 - }, - { - 8, - 7 - }, - { - 9, - 7 - }, - { - 10, - 7 - }, - { - 1, - 8 - }, - { - 2, - 8 - }, - { - 3, - 8 - }, - { - 4, - 8 - }, - { - 5, - 8 - }, - { - 6, - 8 - }, - { - 7, - 8 - }, - { - 8, - 8 - }, - { - 9, - 8 - }, - { - 10, - 8 - }, { 1, 9 @@ -3201,10 +1513,6 @@ local chapter_daily_challenge = { 2, 9 }, - { - 3, - 9 - }, { 4, 9 @@ -3223,15 +1531,7 @@ local chapter_daily_challenge = { }, { 8, - 9 - }, - { - 9, - 9 - }, - { - 10, - 9 + 10 }, { 1, @@ -3266,12 +1566,116 @@ local chapter_daily_challenge = { 10 }, { - 9, - 10 + 1, + 11 }, { - 10, - 10 + 2, + 11 + }, + { + 3, + 11 + }, + { + 4, + 11 + }, + { + 5, + 11 + }, + { + 6, + 11 + }, + { + 7, + 11 + }, + { + 8, + 11 + }, + { + 1, + 12 + }, + { + 2, + 12 + }, + { + 3, + 12 + }, + { + 4, + 12 + }, + { + 5, + 12 + }, + { + 6, + 12 + }, + { + 1, + 13 + }, + { + 2, + 13 + }, + { + 3, + 13 + }, + { + 5, + 13 + }, + { + 6, + 13 + }, + { + 7, + 13 + }, + { + 8, + 13 + }, + { + 1, + 14 + }, + { + 3, + 14 + }, + { + 4, + 14 + }, + { + 5, + 14 + }, + { + 6, + 14 + }, + { + 7, + 14 + }, + { + 8, + 14 } } }, @@ -3341,326 +1745,6 @@ local chapter_daily_challenge = { } }, ["begin_buff_id"]={ - { - 1, - 1 - }, - { - 2, - 1 - }, - { - 3, - 1 - }, - { - 4, - 1 - }, - { - 5, - 1 - }, - { - 6, - 1 - }, - { - 7, - 1 - }, - { - 8, - 1 - }, - { - 9, - 1 - }, - { - 10, - 1 - }, - { - 1, - 2 - }, - { - 2, - 2 - }, - { - 3, - 2 - }, - { - 4, - 2 - }, - { - 5, - 2 - }, - { - 6, - 2 - }, - { - 7, - 2 - }, - { - 8, - 2 - }, - { - 9, - 2 - }, - { - 10, - 2 - }, - { - 1, - 3 - }, - { - 2, - 3 - }, - { - 3, - 3 - }, - { - 4, - 3 - }, - { - 5, - 3 - }, - { - 6, - 3 - }, - { - 7, - 3 - }, - { - 8, - 3 - }, - { - 9, - 3 - }, - { - 10, - 3 - }, - { - 1, - 4 - }, - { - 2, - 4 - }, - { - 3, - 4 - }, - { - 4, - 4 - }, - { - 5, - 4 - }, - { - 6, - 4 - }, - { - 7, - 4 - }, - { - 8, - 4 - }, - { - 9, - 4 - }, - { - 10, - 4 - }, - { - 1, - 5 - }, - { - 2, - 5 - }, - { - 3, - 5 - }, - { - 4, - 5 - }, - { - 5, - 5 - }, - { - 6, - 5 - }, - { - 7, - 5 - }, - { - 8, - 5 - }, - { - 9, - 5 - }, - { - 10, - 5 - }, - { - 1, - 6 - }, - { - 2, - 6 - }, - { - 3, - 6 - }, - { - 4, - 6 - }, - { - 5, - 6 - }, - { - 6, - 6 - }, - { - 7, - 6 - }, - { - 8, - 6 - }, - { - 9, - 6 - }, - { - 10, - 6 - }, - { - 1, - 7 - }, - { - 2, - 7 - }, - { - 3, - 7 - }, - { - 4, - 7 - }, - { - 5, - 7 - }, - { - 6, - 7 - }, - { - 7, - 7 - }, - { - 8, - 7 - }, - { - 9, - 7 - }, - { - 10, - 7 - }, - { - 1, - 8 - }, - { - 2, - 8 - }, - { - 3, - 8 - }, - { - 4, - 8 - }, - { - 5, - 8 - }, - { - 6, - 8 - }, - { - 7, - 8 - }, - { - 8, - 8 - }, - { - 9, - 8 - }, - { - 10, - 8 - }, { 1, 9 @@ -3669,10 +1753,6 @@ local chapter_daily_challenge = { 2, 9 }, - { - 3, - 9 - }, { 4, 9 @@ -3691,15 +1771,7 @@ local chapter_daily_challenge = { }, { 8, - 9 - }, - { - 9, - 9 - }, - { - 10, - 9 + 10 }, { 1, @@ -3734,12 +1806,116 @@ local chapter_daily_challenge = { 10 }, { - 9, - 10 + 1, + 11 }, { - 10, - 10 + 2, + 11 + }, + { + 3, + 11 + }, + { + 4, + 11 + }, + { + 5, + 11 + }, + { + 6, + 11 + }, + { + 7, + 11 + }, + { + 8, + 11 + }, + { + 1, + 12 + }, + { + 2, + 12 + }, + { + 3, + 12 + }, + { + 4, + 12 + }, + { + 5, + 12 + }, + { + 6, + 12 + }, + { + 1, + 13 + }, + { + 2, + 13 + }, + { + 3, + 13 + }, + { + 5, + 13 + }, + { + 6, + 13 + }, + { + 7, + 13 + }, + { + 8, + 13 + }, + { + 1, + 14 + }, + { + 3, + 14 + }, + { + 4, + 14 + }, + { + 5, + 14 + }, + { + 6, + 14 + }, + { + 7, + 14 + }, + { + 8, + 14 } } }, @@ -3809,326 +1985,6 @@ local chapter_daily_challenge = { } }, ["begin_buff_id"]={ - { - 1, - 1 - }, - { - 2, - 1 - }, - { - 3, - 1 - }, - { - 4, - 1 - }, - { - 5, - 1 - }, - { - 6, - 1 - }, - { - 7, - 1 - }, - { - 8, - 1 - }, - { - 9, - 1 - }, - { - 10, - 1 - }, - { - 1, - 2 - }, - { - 2, - 2 - }, - { - 3, - 2 - }, - { - 4, - 2 - }, - { - 5, - 2 - }, - { - 6, - 2 - }, - { - 7, - 2 - }, - { - 8, - 2 - }, - { - 9, - 2 - }, - { - 10, - 2 - }, - { - 1, - 3 - }, - { - 2, - 3 - }, - { - 3, - 3 - }, - { - 4, - 3 - }, - { - 5, - 3 - }, - { - 6, - 3 - }, - { - 7, - 3 - }, - { - 8, - 3 - }, - { - 9, - 3 - }, - { - 10, - 3 - }, - { - 1, - 4 - }, - { - 2, - 4 - }, - { - 3, - 4 - }, - { - 4, - 4 - }, - { - 5, - 4 - }, - { - 6, - 4 - }, - { - 7, - 4 - }, - { - 8, - 4 - }, - { - 9, - 4 - }, - { - 10, - 4 - }, - { - 1, - 5 - }, - { - 2, - 5 - }, - { - 3, - 5 - }, - { - 4, - 5 - }, - { - 5, - 5 - }, - { - 6, - 5 - }, - { - 7, - 5 - }, - { - 8, - 5 - }, - { - 9, - 5 - }, - { - 10, - 5 - }, - { - 1, - 6 - }, - { - 2, - 6 - }, - { - 3, - 6 - }, - { - 4, - 6 - }, - { - 5, - 6 - }, - { - 6, - 6 - }, - { - 7, - 6 - }, - { - 8, - 6 - }, - { - 9, - 6 - }, - { - 10, - 6 - }, - { - 1, - 7 - }, - { - 2, - 7 - }, - { - 3, - 7 - }, - { - 4, - 7 - }, - { - 5, - 7 - }, - { - 6, - 7 - }, - { - 7, - 7 - }, - { - 8, - 7 - }, - { - 9, - 7 - }, - { - 10, - 7 - }, - { - 1, - 8 - }, - { - 2, - 8 - }, - { - 3, - 8 - }, - { - 4, - 8 - }, - { - 5, - 8 - }, - { - 6, - 8 - }, - { - 7, - 8 - }, - { - 8, - 8 - }, - { - 9, - 8 - }, - { - 10, - 8 - }, { 1, 9 @@ -4137,10 +1993,6 @@ local chapter_daily_challenge = { 2, 9 }, - { - 3, - 9 - }, { 4, 9 @@ -4159,15 +2011,7 @@ local chapter_daily_challenge = { }, { 8, - 9 - }, - { - 9, - 9 - }, - { - 10, - 9 + 10 }, { 1, @@ -4202,12 +2046,116 @@ local chapter_daily_challenge = { 10 }, { - 9, - 10 + 1, + 11 }, { - 10, - 10 + 2, + 11 + }, + { + 3, + 11 + }, + { + 4, + 11 + }, + { + 5, + 11 + }, + { + 6, + 11 + }, + { + 7, + 11 + }, + { + 8, + 11 + }, + { + 1, + 12 + }, + { + 2, + 12 + }, + { + 3, + 12 + }, + { + 4, + 12 + }, + { + 5, + 12 + }, + { + 6, + 12 + }, + { + 1, + 13 + }, + { + 2, + 13 + }, + { + 3, + 13 + }, + { + 5, + 13 + }, + { + 6, + 13 + }, + { + 7, + 13 + }, + { + 8, + 13 + }, + { + 1, + 14 + }, + { + 3, + 14 + }, + { + 4, + 14 + }, + { + 5, + 14 + }, + { + 6, + 14 + }, + { + 7, + 14 + }, + { + 8, + 14 } } }, @@ -4277,326 +2225,6 @@ local chapter_daily_challenge = { } }, ["begin_buff_id"]={ - { - 1, - 1 - }, - { - 2, - 1 - }, - { - 3, - 1 - }, - { - 4, - 1 - }, - { - 5, - 1 - }, - { - 6, - 1 - }, - { - 7, - 1 - }, - { - 8, - 1 - }, - { - 9, - 1 - }, - { - 10, - 1 - }, - { - 1, - 2 - }, - { - 2, - 2 - }, - { - 3, - 2 - }, - { - 4, - 2 - }, - { - 5, - 2 - }, - { - 6, - 2 - }, - { - 7, - 2 - }, - { - 8, - 2 - }, - { - 9, - 2 - }, - { - 10, - 2 - }, - { - 1, - 3 - }, - { - 2, - 3 - }, - { - 3, - 3 - }, - { - 4, - 3 - }, - { - 5, - 3 - }, - { - 6, - 3 - }, - { - 7, - 3 - }, - { - 8, - 3 - }, - { - 9, - 3 - }, - { - 10, - 3 - }, - { - 1, - 4 - }, - { - 2, - 4 - }, - { - 3, - 4 - }, - { - 4, - 4 - }, - { - 5, - 4 - }, - { - 6, - 4 - }, - { - 7, - 4 - }, - { - 8, - 4 - }, - { - 9, - 4 - }, - { - 10, - 4 - }, - { - 1, - 5 - }, - { - 2, - 5 - }, - { - 3, - 5 - }, - { - 4, - 5 - }, - { - 5, - 5 - }, - { - 6, - 5 - }, - { - 7, - 5 - }, - { - 8, - 5 - }, - { - 9, - 5 - }, - { - 10, - 5 - }, - { - 1, - 6 - }, - { - 2, - 6 - }, - { - 3, - 6 - }, - { - 4, - 6 - }, - { - 5, - 6 - }, - { - 6, - 6 - }, - { - 7, - 6 - }, - { - 8, - 6 - }, - { - 9, - 6 - }, - { - 10, - 6 - }, - { - 1, - 7 - }, - { - 2, - 7 - }, - { - 3, - 7 - }, - { - 4, - 7 - }, - { - 5, - 7 - }, - { - 6, - 7 - }, - { - 7, - 7 - }, - { - 8, - 7 - }, - { - 9, - 7 - }, - { - 10, - 7 - }, - { - 1, - 8 - }, - { - 2, - 8 - }, - { - 3, - 8 - }, - { - 4, - 8 - }, - { - 5, - 8 - }, - { - 6, - 8 - }, - { - 7, - 8 - }, - { - 8, - 8 - }, - { - 9, - 8 - }, - { - 10, - 8 - }, { 1, 9 @@ -4605,10 +2233,6 @@ local chapter_daily_challenge = { 2, 9 }, - { - 3, - 9 - }, { 4, 9 @@ -4627,15 +2251,7 @@ local chapter_daily_challenge = { }, { 8, - 9 - }, - { - 9, - 9 - }, - { - 10, - 9 + 10 }, { 1, @@ -4670,12 +2286,116 @@ local chapter_daily_challenge = { 10 }, { - 9, - 10 + 1, + 11 }, { - 10, - 10 + 2, + 11 + }, + { + 3, + 11 + }, + { + 4, + 11 + }, + { + 5, + 11 + }, + { + 6, + 11 + }, + { + 7, + 11 + }, + { + 8, + 11 + }, + { + 1, + 12 + }, + { + 2, + 12 + }, + { + 3, + 12 + }, + { + 4, + 12 + }, + { + 5, + 12 + }, + { + 6, + 12 + }, + { + 1, + 13 + }, + { + 2, + 13 + }, + { + 3, + 13 + }, + { + 5, + 13 + }, + { + 6, + 13 + }, + { + 7, + 13 + }, + { + 8, + 13 + }, + { + 1, + 14 + }, + { + 3, + 14 + }, + { + 4, + 14 + }, + { + 5, + 14 + }, + { + 6, + 14 + }, + { + 7, + 14 + }, + { + 8, + 14 } } } diff --git a/lua/app/config/strings/cn/buff_daily_challenge.lua b/lua/app/config/strings/cn/buff_daily_challenge.lua index 2e337caa..358151aa 100644 --- a/lua/app/config/strings/cn/buff_daily_challenge.lua +++ b/lua/app/config/strings/cn/buff_daily_challenge.lua @@ -15,52 +15,34 @@ local buff_daily_challenge = { ["desc"]="技能伤害+15%" }, [6]={ - ["desc"]="回合开始前生成一个10%最大生命值的护盾" + ["desc"]="回合开始前生命值+1%" }, [7]={ - ["desc"]="回合开始前生命值+1%" + ["desc"]="生命值恢复效果+5%" }, [8]={ - ["desc"]="生命值恢复效果+5%" - }, - [9]={ ["desc"]="回合开始前生命值+1%" }, - [10]={ - ["desc"]="生命值恢复效果+5%" - }, - [11]={ - ["desc"]="敌方生命值+20%" - }, - [12]={ + [9]={ ["desc"]="敌方攻击力+5%" }, - [13]={ + [10]={ ["desc"]="敌方造成伤害+5%" }, - [14]={ + [11]={ ["desc"]="敌方普攻次数+1" }, - [15]={ + [12]={ ["desc"]="治疗效果-10%" }, - [16]={ + [13]={ ["desc"]="敌方格挡概率+5%" }, - [17]={ - ["desc"]="受到所有伤害-5%" - }, - [18]={ - ["desc"]="治疗效果-10%" - }, - [19]={ - ["desc"]="敌方格挡概率+5%" - }, - [20]={ + [14]={ ["desc"]="受到所有伤害-5%" } } local config = { -data=buff_daily_challenge,count=20 +data=buff_daily_challenge,count=14 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/buff_daily_challenge.lua b/lua/app/config/strings/de/buff_daily_challenge.lua index 71f213fa..b83bf3ba 100644 --- a/lua/app/config/strings/de/buff_daily_challenge.lua +++ b/lua/app/config/strings/de/buff_daily_challenge.lua @@ -40,27 +40,9 @@ local buff_daily_challenge = { }, [14]={ - }, - [15]={ - - }, - [16]={ - - }, - [17]={ - - }, - [18]={ - - }, - [19]={ - - }, - [20]={ - } } local config = { -data=buff_daily_challenge,count=20 +data=buff_daily_challenge,count=14 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/buff_daily_challenge.lua b/lua/app/config/strings/en/buff_daily_challenge.lua index 71f213fa..b83bf3ba 100644 --- a/lua/app/config/strings/en/buff_daily_challenge.lua +++ b/lua/app/config/strings/en/buff_daily_challenge.lua @@ -40,27 +40,9 @@ local buff_daily_challenge = { }, [14]={ - }, - [15]={ - - }, - [16]={ - - }, - [17]={ - - }, - [18]={ - - }, - [19]={ - - }, - [20]={ - } } local config = { -data=buff_daily_challenge,count=20 +data=buff_daily_challenge,count=14 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/buff_daily_challenge.lua b/lua/app/config/strings/fr/buff_daily_challenge.lua index 71f213fa..b83bf3ba 100644 --- a/lua/app/config/strings/fr/buff_daily_challenge.lua +++ b/lua/app/config/strings/fr/buff_daily_challenge.lua @@ -40,27 +40,9 @@ local buff_daily_challenge = { }, [14]={ - }, - [15]={ - - }, - [16]={ - - }, - [17]={ - - }, - [18]={ - - }, - [19]={ - - }, - [20]={ - } } local config = { -data=buff_daily_challenge,count=20 +data=buff_daily_challenge,count=14 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/buff_daily_challenge.lua b/lua/app/config/strings/id/buff_daily_challenge.lua index 71f213fa..b83bf3ba 100644 --- a/lua/app/config/strings/id/buff_daily_challenge.lua +++ b/lua/app/config/strings/id/buff_daily_challenge.lua @@ -40,27 +40,9 @@ local buff_daily_challenge = { }, [14]={ - }, - [15]={ - - }, - [16]={ - - }, - [17]={ - - }, - [18]={ - - }, - [19]={ - - }, - [20]={ - } } local config = { -data=buff_daily_challenge,count=20 +data=buff_daily_challenge,count=14 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/buff_daily_challenge.lua b/lua/app/config/strings/ja/buff_daily_challenge.lua index 71f213fa..b83bf3ba 100644 --- a/lua/app/config/strings/ja/buff_daily_challenge.lua +++ b/lua/app/config/strings/ja/buff_daily_challenge.lua @@ -40,27 +40,9 @@ local buff_daily_challenge = { }, [14]={ - }, - [15]={ - - }, - [16]={ - - }, - [17]={ - - }, - [18]={ - - }, - [19]={ - - }, - [20]={ - } } local config = { -data=buff_daily_challenge,count=20 +data=buff_daily_challenge,count=14 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/buff_daily_challenge.lua b/lua/app/config/strings/ko/buff_daily_challenge.lua index 71f213fa..b83bf3ba 100644 --- a/lua/app/config/strings/ko/buff_daily_challenge.lua +++ b/lua/app/config/strings/ko/buff_daily_challenge.lua @@ -40,27 +40,9 @@ local buff_daily_challenge = { }, [14]={ - }, - [15]={ - - }, - [16]={ - - }, - [17]={ - - }, - [18]={ - - }, - [19]={ - - }, - [20]={ - } } local config = { -data=buff_daily_challenge,count=20 +data=buff_daily_challenge,count=14 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/buff_daily_challenge.lua b/lua/app/config/strings/pt/buff_daily_challenge.lua index 71f213fa..b83bf3ba 100644 --- a/lua/app/config/strings/pt/buff_daily_challenge.lua +++ b/lua/app/config/strings/pt/buff_daily_challenge.lua @@ -40,27 +40,9 @@ local buff_daily_challenge = { }, [14]={ - }, - [15]={ - - }, - [16]={ - - }, - [17]={ - - }, - [18]={ - - }, - [19]={ - - }, - [20]={ - } } local config = { -data=buff_daily_challenge,count=20 +data=buff_daily_challenge,count=14 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/buff_daily_challenge.lua b/lua/app/config/strings/ru/buff_daily_challenge.lua index 71f213fa..b83bf3ba 100644 --- a/lua/app/config/strings/ru/buff_daily_challenge.lua +++ b/lua/app/config/strings/ru/buff_daily_challenge.lua @@ -40,27 +40,9 @@ local buff_daily_challenge = { }, [14]={ - }, - [15]={ - - }, - [16]={ - - }, - [17]={ - - }, - [18]={ - - }, - [19]={ - - }, - [20]={ - } } local config = { -data=buff_daily_challenge,count=20 +data=buff_daily_challenge,count=14 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/buff_daily_challenge.lua b/lua/app/config/strings/th/buff_daily_challenge.lua index 71f213fa..b83bf3ba 100644 --- a/lua/app/config/strings/th/buff_daily_challenge.lua +++ b/lua/app/config/strings/th/buff_daily_challenge.lua @@ -40,27 +40,9 @@ local buff_daily_challenge = { }, [14]={ - }, - [15]={ - - }, - [16]={ - - }, - [17]={ - - }, - [18]={ - - }, - [19]={ - - }, - [20]={ - } } local config = { -data=buff_daily_challenge,count=20 +data=buff_daily_challenge,count=14 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/buff_daily_challenge.lua b/lua/app/config/strings/vi/buff_daily_challenge.lua index 71f213fa..b83bf3ba 100644 --- a/lua/app/config/strings/vi/buff_daily_challenge.lua +++ b/lua/app/config/strings/vi/buff_daily_challenge.lua @@ -40,27 +40,9 @@ local buff_daily_challenge = { }, [14]={ - }, - [15]={ - - }, - [16]={ - - }, - [17]={ - - }, - [18]={ - - }, - [19]={ - - }, - [20]={ - } } local config = { -data=buff_daily_challenge,count=20 +data=buff_daily_challenge,count=14 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/buff_daily_challenge.lua b/lua/app/config/strings/zh/buff_daily_challenge.lua index 71f213fa..b83bf3ba 100644 --- a/lua/app/config/strings/zh/buff_daily_challenge.lua +++ b/lua/app/config/strings/zh/buff_daily_challenge.lua @@ -40,27 +40,9 @@ local buff_daily_challenge = { }, [14]={ - }, - [15]={ - - }, - [16]={ - - }, - [17]={ - - }, - [18]={ - - }, - [19]={ - - }, - [20]={ - } } local config = { -data=buff_daily_challenge,count=20 +data=buff_daily_challenge,count=14 } return config \ No newline at end of file From 81fe73352d494179ea866b8e56862c6484dda2ad Mon Sep 17 00:00:00 2001 From: CloudJ Date: Mon, 29 May 2023 15:38:13 +0800 Subject: [PATCH 27/31] =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/main_city/main_city_ui.lua | 21 ++++++++++++++------- lua/app/ui/shop/cell/gem_sell_cell.lua | 4 ++-- lua/app/userdata/shop/shop_data.lua | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 721c0e64..93d022a8 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -131,14 +131,16 @@ function MainCityUI:_addListeners() self:checkGift() end) self:addEventListener(EventManager.CUSTOM_EVENT.GO_SHOP, function(params) - if self.selectedIndex == MainCityUI.CLICK_BTN_TYPE[3] then - return + if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL, false) then + if self.selectedIndex == MainCityUI.CLICK_BTN_TYPE[3] then + return + end + BIReport:postHomeBtnCilck(BIReport.CLICK_BTN_TYPE[MainCityUI.CLICK_BTN_TYPE[3]]) + self.bottomBtnSpines[3]:playAnimComplete("born", false, false, function() + self.bottomBtnSpines[3]:playAnim("idle", false, false) + end) + self:refreshBottom(3, true) end - BIReport:postHomeBtnCilck(BIReport.CLICK_BTN_TYPE[MainCityUI.CLICK_BTN_TYPE[3]]) - self.bottomBtnSpines[3]:playAnimComplete("born", false, false, function() - self.bottomBtnSpines[3]:playAnim("idle", false, false) - end) - self:refreshBottom(3, true) end) DataManager.MailData:checkNewMail() end @@ -216,6 +218,11 @@ function MainCityUI:initBottomUI() for i = 1, 3 do local cellCom = CellManager:addCellComp(uiMap["main_ui.bottom_node.bottom_btn_cell_" .. i], BOTTOM_BTN_CELL) cellCom:addClickListener(function() + if i == 3 then -- 商城有开启条件 + if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL, false) then + return + end + end if self.selectedIndex == i then return end diff --git a/lua/app/ui/shop/cell/gem_sell_cell.lua b/lua/app/ui/shop/cell/gem_sell_cell.lua index 56c9af48..ce9930fc 100644 --- a/lua/app/ui/shop/cell/gem_sell_cell.lua +++ b/lua/app/ui/shop/cell/gem_sell_cell.lua @@ -8,7 +8,7 @@ function GemSellCell:init() self.cells = {} self.cellHeight = 0 local cellHeight = nil - local cfg = ConfigManager:getConfig("mall_treasure") -- 审核模式读取另一张表 + local cfg = DataManager.ShopData:getMallTreasureConfig() -- 审核模式读取另一张表 for i = 1, 19 do -- 正常9个 提审19个 local cell = uiMap["gem_sell_cell.cell_" .. i] if cellHeight == nil then @@ -30,7 +30,7 @@ function GemSellCell:init() end function GemSellCell:refresh() - local cfg = ConfigManager:getConfig("mall_treasure") + local cfg = DataManager.ShopData:getMallTreasureConfig() for k, v in ipairs(self.cells) do local id = k -- 目前配置表结构如此 v:refresh(id, cfg[id]) diff --git a/lua/app/userdata/shop/shop_data.lua b/lua/app/userdata/shop/shop_data.lua index 61cdbcfc..cd7f598c 100644 --- a/lua/app/userdata/shop/shop_data.lua +++ b/lua/app/userdata/shop/shop_data.lua @@ -351,7 +351,7 @@ end -- 常驻钻石礼包 ********************************************************************************************** function ShopData:getMallTreasureConfig() - return ConfigManager:getConfig("mall_treasure") + return ConfigManager:getConfig("mall_treasure") -- 审核模式会去读另一张表 TODOJ end -- 常驻钻石礼包结束 ---------------------------------------------------------------------------------------------- From 2f15a426bc60bc28df00bd126b40290910602913 Mon Sep 17 00:00:00 2001 From: CloudJ Date: Mon, 29 May 2023 16:25:50 +0800 Subject: [PATCH 28/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/event_manager.lua | 1 + lua/app/global/global_const.lua | 1 + lua/app/module/shop/shop_const.lua | 27 ++++++++++++++++++++++++++ lua/app/module/shop/shop_manager.lua | 23 +++++++++++++++++----- lua/app/ui/main_city/main_city_ui.lua | 2 +- lua/app/ui/shop/cell/gem_cell.lua | 3 ++- lua/app/ui/shop/cell/gold_cell.lua | 16 ++++++++++++--- lua/app/ui/shop/cell/hot_cell.lua | 2 +- lua/app/ui/shop/cell/hot_sell_cell.lua | 13 +++++++++++-- 9 files changed, 75 insertions(+), 13 deletions(-) diff --git a/lua/app/common/event_manager.lua b/lua/app/common/event_manager.lua index 5f4fd13f..921aa902 100644 --- a/lua/app/common/event_manager.lua +++ b/lua/app/common/event_manager.lua @@ -28,6 +28,7 @@ EventManager.CUSTOM_EVENT = { TIME_TRIGGERED_NEW_EMAIL = "TIME_TRIGGERED_NEW_EMAIL", -- 邮件到时间请求是否有新邮件 SKILL_REFRESH_SUCC = "SKILL_REFRESH_SUCC", GO_SHOP = "GO_SHOP", -- 跳转商店 + UPDATE_MAIN_MALL_HEIGHT = "UPDATE_MAIN_MALL_HEIGHT", -- 更新主要商品的高度 -- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN", -- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER" } diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index 9ece3038..40a68039 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -265,6 +265,7 @@ GConst.MESSAGE_BOX_TYPE = { GConst.MESSAGE_BOX_SHOW_TODAY = { BOUNTY_BUY_LEVEL = 1, + HOT_SELL_BUY = 2, } GConst.QUALITY_TYPE = diff --git a/lua/app/module/shop/shop_const.lua b/lua/app/module/shop/shop_const.lua index 94e2b4ed..e0377914 100644 --- a/lua/app/module/shop/shop_const.lua +++ b/lua/app/module/shop/shop_const.lua @@ -10,4 +10,31 @@ ShopConst.MAIN_UI_POP_TYPE = { -- 当触发弹窗时,相关联的类型礼包也 [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = true } +ShopConst.GEM_ICON_NAME = { + [1] = "shop_diamond_1", + [2] = "shop_diamond_1", + [3] = "shop_diamond_2", + [4] = "shop_diamond_3", + [5] = "shop_diamond_4", + [6] = "shop_diamond_5", + [7] = "shop_diamond_6", + [8] = "shop_diamond_7", + [9] = "shop_diamond_8", + [10] = "shop_diamond_8", + [11] = "shop_diamond_8", + [12] = "shop_diamond_8", + [13] = "shop_diamond_8", + [14] = "shop_diamond_8", + [15] = "shop_diamond_8", + [16] = "shop_diamond_8", + [17] = "shop_diamond_8", + [18] = "shop_diamond_8", + [19] = "shop_diamond_8", +} +ShopConst.COIN_ICON_NAME = { + [1] = "shop_species_1", + [2] = "shop_species_2", + [3] = "shop_species_3", +} + return ShopConst \ No newline at end of file diff --git a/lua/app/module/shop/shop_manager.lua b/lua/app/module/shop/shop_manager.lua index 5a6851e6..23bdd846 100644 --- a/lua/app/module/shop/shop_manager.lua +++ b/lua/app/module/shop/shop_manager.lua @@ -63,11 +63,24 @@ function ShopManager:buyMallDailyGift(id, isAd) end end - local responseData = { - rewards = rewards, - costs = costs - } - self:sendMessage(ProtoMsgType.FromMsgEnum.BuyMallDailyReq, params, responseData, self.buyMallDailyGiftFinish, BIReport.ITEM_GET_TYPE.MALL_DAILY) + -- 二次弹窗确认 + local isCoin = costs.id == GConst.ItemConst.ITEM_ID_GOLD + local params ={ + titleTx = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_31), + content = isCoin and I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_32) or I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_33), + boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, + showToday = GConst.MESSAGE_BOX_SHOW_TODAY.HOT_SELL_BUY, + costId = costs.id, + costNum = costs.num, + okFunc = function() + local responseData = { + rewards = rewards, + costs = costs + } + self:sendMessage(ProtoMsgType.FromMsgEnum.BuyMallDailyReq, params, responseData, self.buyMallDailyGiftFinish, BIReport.ITEM_GET_TYPE.MALL_DAILY) + end, + } + GFunc.showMessageBox(params) end function ShopManager:buyMallDailyGiftFinish(result) diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 93d022a8..936282b0 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -130,7 +130,7 @@ function MainCityUI:_addListeners() -- 引导完成时 检测主界面的弹窗是否要触发 self:checkGift() end) - self:addEventListener(EventManager.CUSTOM_EVENT.GO_SHOP, function(params) + self:addEventListener(EventManager.CUSTOM_EVENT.GO_SHOP, function() if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL, false) then if self.selectedIndex == MainCityUI.CLICK_BTN_TYPE[3] then return diff --git a/lua/app/ui/shop/cell/gem_cell.lua b/lua/app/ui/shop/cell/gem_cell.lua index bd43350f..0dc48263 100644 --- a/lua/app/ui/shop/cell/gem_cell.lua +++ b/lua/app/ui/shop/cell/gem_cell.lua @@ -31,6 +31,7 @@ function GemCell:refresh(id, cfgInfo) local hasDoubleTimes = bought < limit local leftDoubleTimes = limit - bought + self.icon:setSprite(GConst.ATLAS_PATH.SHOP, GConst.ShopConst.GEM_ICON_NAME[id]) if isFree then -- 免费广告 self.adNode:setVisible(true) self.priceText:setVisible(false) @@ -43,7 +44,7 @@ function GemCell:refresh(id, cfgInfo) GFunc.centerImgAndTx(self.adImg, self.adText, 5) self.sellOutText:setVisible(false) - self:getBaseObject():addRedPoint(105, 150, 0.6) + self:getBaseObject():addRedPoint(100, 145, 0.6) else self.adNode:setVisible(false) self.sellOutText:setVisible(true) diff --git a/lua/app/ui/shop/cell/gold_cell.lua b/lua/app/ui/shop/cell/gold_cell.lua index 7825e5fe..70434791 100644 --- a/lua/app/ui/shop/cell/gold_cell.lua +++ b/lua/app/ui/shop/cell/gold_cell.lua @@ -23,8 +23,9 @@ function GoldCell:refresh(id, cfgInfo) local adMaxTimes = cfgInfo.daily or 0 local goldNum = DataManager.ShopData:getCommonDailyCoinNum(idleTime) + self.icon:setSprite(GConst.ATLAS_PATH.SHOP, GConst.ShopConst.COIN_ICON_NAME[id]) + local isFree = adMaxTimes > 0 - if isFree then -- 免费广告 self.adNode:setVisible(true) self.costNode:setVisible(false) @@ -37,7 +38,7 @@ function GoldCell:refresh(id, cfgInfo) GFunc.centerImgAndTx(self.adImg, self.adText, 5) self.sellOutText:setVisible(false) - self:getBaseObject():addRedPoint(105, 150, 0.6) + self:getBaseObject():addRedPoint(100, 145, 0.6) else self.adNode:setVisible(false) self.sellOutText:setVisible(true) @@ -82,7 +83,16 @@ function GoldCell:onClickGift(id, isAd) if not GFunc.checkCost(costs.id, costs.num, true) then return end - ModuleManager.ShopManager:buyMallIdleCoin(id, isAd) + -- 二次提示 + local params = { + content = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_33), -- 是否使用钻石刷新每日特惠? + boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, + okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK), + okFunc = function() + ModuleManager.ShopManager:buyMallIdleCoin(id, isAd) + end + } + GFunc.showMessageBox(params) end end diff --git a/lua/app/ui/shop/cell/hot_cell.lua b/lua/app/ui/shop/cell/hot_cell.lua index 9859c8aa..3ee3541c 100644 --- a/lua/app/ui/shop/cell/hot_cell.lua +++ b/lua/app/ui/shop/cell/hot_cell.lua @@ -61,7 +61,7 @@ function HotCell:refresh(data) GFunc.centerImgAndTx(self.adImg, self.adText, 5) self.sellOutText:setVisible(false) - self:getBaseObject():addRedPoint(105, 150, 0.6) + self:getBaseObject():addRedPoint(100, 145, 0.6) else self.adNode:setVisible(false) self.sellOutText:setVisible(true) diff --git a/lua/app/ui/shop/cell/hot_sell_cell.lua b/lua/app/ui/shop/cell/hot_sell_cell.lua index b9aec6fd..15550963 100644 --- a/lua/app/ui/shop/cell/hot_sell_cell.lua +++ b/lua/app/ui/shop/cell/hot_sell_cell.lua @@ -8,7 +8,7 @@ function HotSellCell:init() uiMap["hot_sell_cell.title_bg.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_28)) -- 每日特惠 uiMap["hot_sell_cell.help_btn"]:addClickListener(function() - ModuleManager.TipsManager:showDescTips(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_29), uiMap["hot_sell_cell.help_btn"]:getBaseObject()) + ModuleManager.TipsManager:showDescTips(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_29), uiMap["hot_sell_cell.help_btn"]) end) self.timeTx = uiMap["hot_sell_cell.time_tx"] self.cells = {} @@ -93,7 +93,16 @@ function HotSellCell:onClickRefresh() end) elseif gemRefreshCount > 0 then if GFunc.checkCost(GConst.ItemConst.ITEM_ID_GEM, gemRefreshCost, true) then - ModuleManager.ShopManager:resetMallDailyGift(2) + -- 二次提示 + local params = { + content = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_30), -- 是否使用钻石刷新每日特惠? + boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, + okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK), + okFunc = function() + ModuleManager.ShopManager:resetMallDailyGift(2) + end + } + GFunc.showMessageBox(params) end end end From 23fca8d7bf14ed095d17486d7a16809d2364c4fe Mon Sep 17 00:00:00 2001 From: CloudJ Date: Mon, 29 May 2023 17:15:54 +0800 Subject: [PATCH 29/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A6=96=E5=85=85?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/pay_manager.lua | 1 - lua/app/module/shop/shop_manager.lua | 52 +++++---- .../cell/side_bar_beginner_gift_cell.lua | 2 +- .../cell/side_bar_first_recharge_cell.lua | 2 +- .../cell/side_bar_grow_up_gift_1_cell.lua | 2 +- .../cell/side_bar_grow_up_gift_2_cell.lua | 2 +- lua/app/ui/shop/first_recharge_pop_ui.lua | 107 ++++++++++++++++++ .../ui/shop/first_recharge_pop_ui.lua.meta | 10 ++ 8 files changed, 153 insertions(+), 25 deletions(-) create mode 100644 lua/app/ui/shop/first_recharge_pop_ui.lua create mode 100644 lua/app/ui/shop/first_recharge_pop_ui.lua.meta diff --git a/lua/app/common/pay_manager.lua b/lua/app/common/pay_manager.lua index ff78d38d..436f9b98 100644 --- a/lua/app/common/pay_manager.lua +++ b/lua/app/common/pay_manager.lua @@ -103,7 +103,6 @@ function PayManager:getGiftConfigInfo(purchaseType, id) return end local cfg = ConfigManager:getConfig(cfgName) - local cfg = ConfigManager:getConfig(cfgName) if not cfg or not cfg[id] then return end diff --git a/lua/app/module/shop/shop_manager.lua b/lua/app/module/shop/shop_manager.lua index 23bdd846..1ceb87d4 100644 --- a/lua/app/module/shop/shop_manager.lua +++ b/lua/app/module/shop/shop_manager.lua @@ -24,13 +24,17 @@ end -- 触发弹窗礼包 function ShopManager:triggerGiftPopUI(actType, actId) if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACT_GIFT_SHOW_OPEN, true) then - UIManager:showUI("app/ui/shop/gift_pop_ui", {type = actType, id = actId}) + self:showGiftPopUI(actType, actId, false) DataManager.ShopData:removePopUpGift(actType, actId) end end -function ShopManager:showGiftPopUI(actType, actId) - UIManager:showUI("app/ui/shop/gift_pop_ui", {type = actType, id = actId, onlySelf = true}) +function ShopManager:showGiftPopUI(actType, actId, onlySelf) + if actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ShopConst.FIRST_RECHARGE_ID then + UIManager:showUI("app/ui/shop/first_recharge_pop_ui") + else + UIManager:showUI("app/ui/shop/gift_pop_ui", {type = actType, id = actId, onlySelf = onlySelf}) + end end -- 触发金币弹窗礼包 @@ -64,23 +68,31 @@ function ShopManager:buyMallDailyGift(id, isAd) end -- 二次弹窗确认 - local isCoin = costs.id == GConst.ItemConst.ITEM_ID_GOLD - local params ={ - titleTx = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_31), - content = isCoin and I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_32) or I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_33), - boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, - showToday = GConst.MESSAGE_BOX_SHOW_TODAY.HOT_SELL_BUY, - costId = costs.id, - costNum = costs.num, - okFunc = function() - local responseData = { - rewards = rewards, - costs = costs - } - self:sendMessage(ProtoMsgType.FromMsgEnum.BuyMallDailyReq, params, responseData, self.buyMallDailyGiftFinish, BIReport.ITEM_GET_TYPE.MALL_DAILY) - end, - } - GFunc.showMessageBox(params) + if costs then + local isCoin = costs.id == GConst.ItemConst.ITEM_ID_GOLD + local params ={ + titleTx = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_31), + content = isCoin and I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_32) or I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_33), + boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, + showToday = GConst.MESSAGE_BOX_SHOW_TODAY.HOT_SELL_BUY, + costId = costs.id, + costNum = costs.num, + okFunc = function() + local responseData = { + rewards = rewards, + costs = costs + } + self:sendMessage(ProtoMsgType.FromMsgEnum.BuyMallDailyReq, params, responseData, self.buyMallDailyGiftFinish, BIReport.ITEM_GET_TYPE.MALL_DAILY) + end, + } + GFunc.showMessageBox(params) + else + local responseData = { + rewards = rewards, + costs = costs + } + self:sendMessage(ProtoMsgType.FromMsgEnum.BuyMallDailyReq, params, responseData, self.buyMallDailyGiftFinish, BIReport.ITEM_GET_TYPE.MALL_DAILY) + end end function ShopManager:buyMallDailyGiftFinish(result) diff --git a/lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua b/lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua index 26ab3ff1..5fcfbc4f 100644 --- a/lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua @@ -10,7 +10,7 @@ function SideBarBeginnerGiftCell:getIconRes() end function SideBarBeginnerGiftCell:onClick() - ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.BEGINNER_GIFT_ID) + ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.BEGINNER_GIFT_ID, true) end function SideBarBeginnerGiftCell:getIsShowRedPoint() diff --git a/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua b/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua index 30233d01..c5cf24c9 100644 --- a/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua @@ -10,7 +10,7 @@ function SideBarFirstRechargeCell:getIconRes() end function SideBarFirstRechargeCell:onClick() - ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID) + ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID, true) end function SideBarFirstRechargeCell:getIsShowRedPoint() diff --git a/lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua index f0e1a329..c8888638 100644 --- a/lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_1_cell.lua @@ -12,7 +12,7 @@ end function SideBarGrowUpGift1Cell:onClick() local gift = DataManager.ShopData:getValidGrowUpGifts()[1] if gift then - ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, gift.current_grow_up_id) + ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, gift.current_grow_up_id, true) end end diff --git a/lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua index e0edbbcb..2d8fe520 100644 --- a/lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_grow_up_gift_2_cell.lua @@ -12,7 +12,7 @@ end function SideBarGrowUpGift2Cell:onClick() local gift = DataManager.ShopData:getValidGrowUpGifts()[2] if gift then - ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, gift.current_grow_up_id) + ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, gift.current_grow_up_id, true) end end diff --git a/lua/app/ui/shop/first_recharge_pop_ui.lua b/lua/app/ui/shop/first_recharge_pop_ui.lua new file mode 100644 index 00000000..ce07fd8b --- /dev/null +++ b/lua/app/ui/shop/first_recharge_pop_ui.lua @@ -0,0 +1,107 @@ +local FirstRechargePopUI = class("FirstRechargePopUI", BaseUI) +local MAX_ITEM_NUM = 3 + +function FirstRechargePopUI:ctor() +end + +function FirstRechargePopUI:isFullScreen() + return false +end + +function FirstRechargePopUI:getPrefabPath() + return "assets/prefabs/ui/shop/first_recharge_pop_ui.prefab" +end + +function FirstRechargePopUI:onLoadRootComplete() + self.uiMap = self.root:genAllChildren() + self.uiMap["first_recharge_pop_ui.close_btn"]:addClickListener(function() + self:closeUI() + end) + + self.titleTx = self.uiMap["first_recharge_pop_ui.bg.title_bg.title"] + self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_34)) -- 首充豪礼 + + self.itemNodeList = {} + self.itemCellList = {} + self.itemTextList = {} + self.itemHelpList = {} + for i = 1, MAX_ITEM_NUM do + table.insert(self.itemNodeList, self.uiMap["first_recharge_pop_ui.bg.item_" .. i]) + table.insert(self.itemCellList, CellManager:addCellComp(self.uiMap["first_recharge_pop_ui.bg.item_".. i .. ".item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL)) + table.insert(self.itemTextList, self.uiMap["first_recharge_pop_ui.bg.item_".. i .. ".num"]) + table.insert(self.itemHelpList, self.uiMap["first_recharge_pop_ui.bg.item_" .. i .. ".help"]) + end + + self.descText = self.uiMap["first_recharge_pop_ui.bg.desc_text"] + self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_35)) -- 充值购买任意商品,即可获得如下奖励,仅此一次！ + + self.funcBtn = self.uiMap["first_recharge_pop_ui.bg.func_btn"] + self.btnJumpText = self.uiMap["first_recharge_pop_ui.bg.func_btn.jump_text"] + self.btnGetText = self.uiMap["first_recharge_pop_ui.bg.func_btn.get_text"] + self.btnIcon = self.uiMap["first_recharge_pop_ui.bg.func_btn.icon"] + + self.btnJumpText:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_36)) -- 商店 + self.btnGetText:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM)) -- 领取 + + self.funcBtn:addClickListener(function() + self:onClickFuncBtn() + end) + + self:_bind() + self:refresh() +end + +function FirstRechargePopUI:_bind() + self:bind(DataManager.ShopData, "isDirty", function() + self:refresh() + end) +end + +function FirstRechargePopUI:refresh() + local cfgInfo = PayManager:getGiftConfigInfo(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID) + local rewards = cfgInfo.reward or {} + for i = 1, MAX_ITEM_NUM do + if i <= #rewards then + self.itemNodeList[i]:setVisible(true) + self.itemCellList[i]:refreshByCfg(rewards[i].id, 0) + self.itemCellList[i]:setNum("") + self.itemTextList[i]:setText(rewards[i].num) + self.itemCellList[i]:addClickListener(function() + ModuleManager.TipsManager:showItemTips(rewards[i].id, self.itemCellList[i]:getBaseObject()) + end) + self.itemHelpList[i]:setVisible(false) + else + self.itemNodeList[i]:setVisible(false) + end + end + + -- 对于首充礼包,有跳转商店和领取2个分支 + local canGet = DataManager.ShopData:getHasFirstRechargeReward() + if canGet then + self.btnIcon:setVisible(false) + self.btnJumpText:setVisible(false) + self.btnGetText:setVisible(true) + else + local hasGet = DataManager.ShopData:getHasGotFirstRechargeReward() + if hasGet then + self:closeUI() + else + self.btnIcon:setVisible(true) + self.btnJumpText:setVisible(true) + self.btnGetText:setVisible(false) + end + end +end + +function FirstRechargePopUI:onClickFuncBtn() + -- 对于首充礼包,有跳转商店和领取2个分支 + local canGet = DataManager.ShopData:getHasFirstRechargeReward() + if canGet then + PayManager:purchasePackage(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID) + else + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_SHOP) + self:closeUI() + end +end + +return FirstRechargePopUI \ No newline at end of file diff --git a/lua/app/ui/shop/first_recharge_pop_ui.lua.meta b/lua/app/ui/shop/first_recharge_pop_ui.lua.meta new file mode 100644 index 00000000..a062972f --- /dev/null +++ b/lua/app/ui/shop/first_recharge_pop_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d1ea4328dc9ac714d8d6e25ef668467e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} From 34494cdb1f766ca15291be8f265e50b3d5f81456 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 29 May 2023 17:54:02 +0800 Subject: [PATCH 30/31] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/team/battle_team.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index c6d052f1..c5233966 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -400,6 +400,9 @@ function BattleTeam:doBuffWork() buffEffect = nil for i = count, 1, -1 do buffEffect = self.buffList[i] + if not buffEffect then + break + end buffEffect.round = buffEffect.round - 1 BattleBuffHandle.doBuffWork(self.mainUnit, buffEffect) if buffEffect.round <= 0 then From 058c2aec8a3d242e74a208ca7415e0edce21e853 Mon Sep 17 00:00:00 2001 From: CloudJ Date: Mon, 29 May 2023 18:06:40 +0800 Subject: [PATCH 31/31] =?UTF-8?q?=E5=95=86=E5=9F=8E=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cell/side_bar_first_recharge_cell.lua | 4 +++ lua/app/ui/main_city/main_city_ui.lua | 7 +++++ lua/app/ui/shop/first_recharge_pop_ui.lua | 2 +- lua/app/userdata/shop/shop_data.lua | 31 +++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua b/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua index c5cf24c9..16ccd14a 100644 --- a/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua @@ -9,6 +9,10 @@ function SideBarFirstRechargeCell:getIconRes() return "main_btn_gift_3" end +function SideBarFirstRechargeCell:getIsShowRedPoint() + return DataManager.ShopData:showFirstRechargeRp() +end + function SideBarFirstRechargeCell:onClick() ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID, true) end diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 936282b0..607157f8 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -201,6 +201,7 @@ function MainCityUI:_bind() self.subComps[self.selectedIndex]:refresh() end end + self:refreshBottomRp() end) self:bind(DataManager.SummonData, "isDirty", function() if self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.SHOP and self.subComps[self.selectedIndex] then @@ -767,6 +768,12 @@ function MainCityUI:refreshBottomRp() else heroRpObj:removeRedPoint() end + local shopRpObj = uiMap["main_ui.bottom_node.icons.ui_spine_obj_3.rp_node"] + if DataManager.ShopData:getRp() then + shopRpObj:addRedPoint(0, 0, 1) + else + shopRpObj:removeRedPoint() + end end function MainCityUI:refreshSettingBtn() diff --git a/lua/app/ui/shop/first_recharge_pop_ui.lua b/lua/app/ui/shop/first_recharge_pop_ui.lua index ce07fd8b..4090f6ab 100644 --- a/lua/app/ui/shop/first_recharge_pop_ui.lua +++ b/lua/app/ui/shop/first_recharge_pop_ui.lua @@ -97,7 +97,7 @@ function FirstRechargePopUI:onClickFuncBtn() -- 对于首充礼包,有跳转商店和领取2个分支 local canGet = DataManager.ShopData:getHasFirstRechargeReward() if canGet then - PayManager:purchasePackage(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID) + PayManager:purchasePackage(GConst.ShopConst.FIRST_RECHARGE_ID, PayManager.PURCHARSE_TYPE.ACT_GIFT) else EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_SHOP) self:closeUI() diff --git a/lua/app/userdata/shop/shop_data.lua b/lua/app/userdata/shop/shop_data.lua index cd7f598c..fdb07b14 100644 --- a/lua/app/userdata/shop/shop_data.lua +++ b/lua/app/userdata/shop/shop_data.lua @@ -750,7 +750,38 @@ function ShopData:getShowFirstRechargeSideBar() end end +-- 侧边栏红点 +function ShopData:showFirstRechargeRp() + return self:getHasFirstRechargeReward() +end + -- 首充结束 ---------------------------------------------------------------------------------------------- +-- 底部栏是否有红点 +function ShopData:getRp() + if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL) then + return false + end + + local isHotOpen = ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL_DAILY) + -- 主要商品 每日特惠广告道具 + local hotAdGoods = self:getMallDailyGoods() and self:getMallDailyGoods()[1] + local hotAdGoodsBuyCount = hotAdGoods and hotAdGoods.bought or 0 + local hotAdGoodsRp = self:getMallDailyFirstItemAdMaxCount() - hotAdGoodsBuyCount > 0 + -- 主要商品 每日特惠刷新 + local hotRefreshRp = self:getMallDailyAdLeftCount() > 0 + -- 主要商品 钻石广告道具 + local gemAdId = 1 -- 约定首位为免费栏位 + local cfgInfo = self:getMallTreasureConfig()[gemAdId] + local gemAdMaxTimes = cfgInfo.daily or 0 + local gemAdRp = gemAdMaxTimes - DataManager.ShopData:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.MALL_TREASURE, gemAdId) > 0 + -- 主要商品 金币广告道具 + local coinAdId = 1 -- 约定首位为免费栏位 + local cfgInfo = self:getMallGoldConfig()[coinAdId] + local coinAdMaxTimes = cfgInfo.daily or 0 + local coinAdRp = coinAdMaxTimes - DataManager.ShopData:getCommonDailyCoinAdBuyCount() > 0 + + return (isHotOpen and (hotAdGoodsRp or hotRefreshRp)) or gemAdRp or coinAdRp +end return ShopData \ No newline at end of file