From 0a5cedcf761b7558e33d4aee3168d9e069e8e366 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Fri, 12 Sep 2025 10:24:50 +0800 Subject: [PATCH 01/11] fix bug --- lua/app/ui/talent/cell/talent_cell.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lua/app/ui/talent/cell/talent_cell.lua b/lua/app/ui/talent/cell/talent_cell.lua index 04e273ce..21263e5c 100644 --- a/lua/app/ui/talent/cell/talent_cell.lua +++ b/lua/app/ui/talent/cell/talent_cell.lua @@ -19,15 +19,18 @@ end function TalentCell:refresh(idx, cfg, showAni) self.idx = idx - self.bg:setSprite(GConst.ATLAS_PATH.ICON_TALENT, "talent_b_" .. cfg.qlt) self.bg1:setSprite(GConst.ATLAS_PATH.ICON_TALENT, "talent_" .. idx) self.descTx1:setText(I18N:getText("talent", idx, "name")) local lv = DataManager.TalentData:getLevels(idx) self.descTx2:setText("Lv." .. lv) if showAni then self.bg:setActive(true) + self.bg:setSprite(GConst.ATLAS_PATH.ICON_TALENT, "talent_b_" .. cfg.qlt) self.animator.enabled = true self.animator:SetTrigger("t_open") + elseif lv <= 0 then + self.bg:setActive(true) + self.bg:setSprite(GConst.ATLAS_PATH.ICON_TALENT, "talent_b_0") else self.bg:setActive(false) end From 1e8c35c9a0f4129e7c195a76348a796a01fee3fe Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Fri, 12 Sep 2025 15:11:47 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=8A=BD=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/summon/summon_manager.lua | 22 ++- lua/app/ui/summon/summon_main_ui.lua | 176 +++++++++----------- lua/app/ui/summon/summon_reward_ui.lua | 33 ++-- lua/app/ui/summon/summon_unlock_ui.lua | 74 ++++++++ lua/app/ui/summon/summon_unlock_ui.lua.meta | 10 ++ lua/app/userdata/hero/hero_data.lua | 5 + lua/app/userdata/hero/hero_entity.lua | 8 + 7 files changed, 202 insertions(+), 126 deletions(-) create mode 100755 lua/app/ui/summon/summon_unlock_ui.lua create mode 100644 lua/app/ui/summon/summon_unlock_ui.lua.meta diff --git a/lua/app/module/summon/summon_manager.lua b/lua/app/module/summon/summon_manager.lua index bb82bc48..a95a0398 100644 --- a/lua/app/module/summon/summon_manager.lua +++ b/lua/app/module/summon/summon_manager.lua @@ -27,9 +27,9 @@ function SummonManager:showSummonOddsUI(summonId) UIManager:showUI("app/ui/summon/summon_odds_ui", {summonId = summonId}) end --- function SummonManager:showSummonResultUI(params) --- UIManager:showUI("app/ui/summon/summon_result_ui", params) --- end +function SummonManager:showSummonUnlockUI(params) + UIManager:showUI("app/ui/summon/summon_unlock_ui", params) +end --@region 协议 function SummonManager:onForceSummonReq(count, free, summonType) @@ -45,14 +45,14 @@ function SummonManager:onForceSummonRsp(result) return end DataManager.SummonData:updateSummonCount(result.reqData.id, result.reqData.times, result.reqData.free) - local newForce = {} + local newHero = {} local guarantee1 = DataManager.SummonData:getSummonWishGuarantee1(result.reqData.id) for _, reward in pairs(result.rewards) do - -- local isNew = DataManager.ForceData:getForceIsNew(reward.item.id) - -- if isNew then - -- table.insert(newForce, reward.item.id) - -- DataManager.ForceData:setForceIsNew(reward.item.id, false) - -- end + local isNew = DataManager.HeroData:getHeroIsNew(reward.item.id) + isNew = true + if isNew then + table.insert(newHero, reward.item.id) + end if guarantee1 then if DataManager.HeroData:getHeroQlt(reward.item.id) == 5 then DataManager.SummonData:setSummonTrigger(result.reqData.id, true) @@ -61,7 +61,7 @@ function SummonManager:onForceSummonRsp(result) end end end - EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.FORCE_SUMMON, result, newForce) + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.FORCE_SUMMON, result, newHero) -- BIReport:postForceSummon(result.reqData.free, result.reqData.times, result.rewards, result.costs) -- local params = { @@ -75,10 +75,8 @@ function SummonManager:onForceSummonRsp(result) -- DataManager.GameSettingData:showRateUIByForceSummon() -- end end - --@endregion - function SummonManager:onSummonWishSetReq(summonType, heroId) self:sendMessage(ProtoMsgType.FromMsgEnum.SummonWishSetReq, {id = summonType, hero = heroId}, {}, self.onSummonWishSetRsp, BIReport.ITEM_GET_TYPE.FORCE_SUMMON_WISH_HREO_ID) diff --git a/lua/app/ui/summon/summon_main_ui.lua b/lua/app/ui/summon/summon_main_ui.lua index b57b305b..dd195c68 100755 --- a/lua/app/ui/summon/summon_main_ui.lua +++ b/lua/app/ui/summon/summon_main_ui.lua @@ -11,7 +11,6 @@ local SummonMainUI = class("SummonMainUI", BaseUI) function SummonMainUI:ctor(params) self.page = params.summonId or 1 - self._bgVfxMap = {} end function SummonMainUI:getPrefabPath() @@ -39,12 +38,7 @@ function SummonMainUI:getCurrencyParams() end function SummonMainUI:onClose() - if self._bgVfxMap then - for k, v in pairs(self._bgVfxMap) do - v:destroy() - end - self._bgVfxMap = nil - end + self.heroNode:removeAllChildren() -- EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.MAIN_UI_CHECK_POP) end @@ -74,22 +68,10 @@ function SummonMainUI:onLoadRootComplete() self.btnWishTx = uiMap["summon_main_ui.node.btn_wish.unlock.tx_guarantee"] --心愿 self.btnWishIcon = uiMap["summon_main_ui.node.btn_wish.unlock.img_wish_icon"] --心愿 self.btnWishAddImg = uiMap["summon_main_ui.node.btn_wish.add_img"] + self.heroNode = uiMap["summon_main_ui.node.hero_node"] - -- self.toggleJump = uiMap["summon_main_ui.jump_tween"]:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TOGGLE) - -- self.isJumpTween = self.toggleJump.isOn - -- self.toggleJump.onValueChanged:AddListener(function(isOn) self.isJumpTween = isOn end) self.touchNode = uiMap["summon_main_ui.node.touch_node"] self.touchNode:setActive(false) - -- uiMap["summon_main_ui.jump_tween"]:setActive(false) - - -- self.vfx_b13_ui_chouka_bg_b01 = uiMap["summon_main_ui.vfx_b13_ui_chouka_bg_b01"] - -- self.wishMask = uiMap["summon_main_ui.node.btn_wish.unlock.mask"] - -- self.wishQlt = uiMap["summon_main_ui.node.btn_wish.unlock.qlt"] - -- self.wishMaskSlider = uiMap["summon_main_ui.node.btn_wish.unlock.mask"]:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE) - - -- self.descTx = uiMap["summon_main_ui.btn_wish.desc_tx"] - -- self.descTx = uiMap["summon_main_ui.btn_info.desc_tx"] - -- self.descTx = uiMap["summon_main_ui.jump_tween.desc_tx"] self.btnSummonFree:addClickListener(function() self:onSummon(1) end) @@ -105,6 +87,15 @@ function SummonMainUI:onLoadRootComplete() end) end) + self.vfxs = {} + self.vfx01s = {} + for i = 1, 4 do + self.vfxs[i] = uiMap["summon_main_ui.node.vfx_c1_chouka_0" .. i] + self.vfx01s[i] = uiMap["summon_main_ui.node.vfx_c1_chouka_0" .. i .. "_1"] + self.vfxs[i]:setActive(false) + self.vfx01s[i]:setActive(false) + end + uiMap["summon_main_ui.node.btn_info"]:addClickListener(function() ModuleManager.SummonManager:showSummonOddsUI(self.page) end) @@ -118,20 +109,6 @@ function SummonMainUI:onLoadRootComplete() uiMap["summon_main_ui.node.btn_info.desc_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.SUMMON_FORCE_3)) self.descBg = uiMap["summon_main_ui.node.desc_bg"] self.descTx = uiMap["summon_main_ui.node.desc_bg.desc_tx"] - -- self.spineHero = {} - -- for i = 1, 3 do - -- self.spineHero[i] = uiMap['summon_main_ui.ui_spine_obj_'..i] - -- if i ~= 1 then - -- self.spineHero[i]:setDefaultMix(0) - -- end - -- end - -- self.heroTips = {} - -- for i = 1, 2 do - -- self.heroTips[i] = {} - -- self.heroTips[i].tips = uiMap['summon_main_ui.node.hero_'..i] - -- self.heroTips[i].txName = uiMap['summon_main_ui.node.hero_'..i..'.tx_hero_name'] - -- self.heroTips[i].txDesc = uiMap['summon_main_ui.node.hero_'..i..'.tx_hero_desc'] - -- end self.btnTxs = { I18N:getGlobalText(I18N.GlobalConst.SUMMON_DESC_6), I18N:getGlobalText(I18N.GlobalConst.SUMMON_DESC_7), @@ -153,16 +130,16 @@ function SummonMainUI:onLoadRootComplete() end -------------抽奖相关--------- - self:addEventListener(EventManager.CUSTOM_EVENT.FORCE_SUMMON, function(result, newForce) + self:addEventListener(EventManager.CUSTOM_EVENT.FORCE_SUMMON, function(result, newHero) self:refreshWishBtn() - self:onSummonRsp(result, newForce) + self:onSummonRsp(result, newHero) end) - self:addEventListener(EventManager.CUSTOM_EVENT.FORCE_SUMMON_WISH_CLAIM, function(result, newForce) + self:addEventListener(EventManager.CUSTOM_EVENT.FORCE_SUMMON_WISH_CLAIM, function(result, newHero) self:refreshWishBtn() ModuleManager.SummonManager:showSummonRewardUI({ rewards = result.rewards, isWish = true, - newForce = newForce, + newHero = newHero, page = self.page }) end) @@ -232,38 +209,10 @@ function SummonMainUI:refreshPageBtn() for i = 1, 2 do if self.page == i then self.pageBtns[i]:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_btn_" .. i .."_1") - -- self.pageBtnTxs[i]:setText(self.btnTxs[i]) else self.pageBtns[i]:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_btn_" .. i .."_2") - -- self.pageBtnTxs[i]:setText("" .. self.btnTxs[i] .. "") end end - -- for i, v in ipairs(self.pageBtns) do - -- if i <= table.nums(summonList) then - -- local isRedPoint = false - -- if i == 1 then - -- if DataManager.SummonData:hasSummonFree(1) or GFunc.checkCost(GConst.ItemConst.ITEM_ID_QLT_5_FRAGMENT, 1, false) then - -- isRedPoint = true - -- end - -- else - -- local itemCost = DataManager.SummonData:getSummonItemCost(summonList[i]) - -- if itemCost then - -- local costId = GFunc.getRewardId(itemCost) - -- local costNum = GFunc.getRewardNum(itemCost) - -- if GFunc.checkCost(costId, costNum, false) then - -- isRedPoint = true - -- end - -- end - -- end - -- if isRedPoint then - -- v.btn:addRedPoint(33, 33, 1) - -- else - -- v.btn:removeRedPoint() - -- end - -- else - -- v.btn:setActive(false) - -- end - -- end end --刷新抽奖按钮 @@ -273,13 +222,10 @@ function SummonMainUI:refreshSummonBtn() self.btnSummonAd:setActive(adCount > 0) self.btnSummonFree:setActive(freeCount > 0) self.btnSummonOne:setActive(freeCount <= 0) - -- self.txFreeTime:setActive(not isFree and not DataManager.SummonData:getIsActivity()) local itemCost = DataManager.SummonData:getSummonItemCost(self.page) local costId = itemCost.id - -- local costNum = itemCost.num local hadNum = DataManager.BagData.ItemData:getItemNumById(costId) - -- local obj = DataManager.BagData.ItemData:getItemById(costId) if freeCount <= 0 then if hadNum >= 1 then self.txNumOne:setText(1) @@ -336,7 +282,6 @@ function SummonMainUI:refreshWishBtn() local summonCount = DataManager.SummonData:getSummonCount(self.page) local unlockCount = DataManager.SummonData:getSummonWishUnlock(self.page) self.isUnlock = summonCount >= unlockCount - -- self.txUnlock:setText(summonCount .. "/" .. unlockCount .. I18N:getGlobalText(I18N.GlobalConst.MAGIC_BOOK_DESC_4)) local wishCount = DataManager.SummonData:getSummonWishCount(self.page) local needCount = DataManager.SummonData:getSummonWishGuarantee2(self.page) self.btnWishTx:setText(wishCount .. "/" .. needCount) @@ -349,7 +294,6 @@ function SummonMainUI:refreshWishBtn() self.btnWishAddImg:setActive(false) else self.btnWishIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_alpha") - -- self.btnWish:setSprite(GConst.ATLAS_PATH.ICON_ITEM, "frame_1") self.btnWishAddImg:setActive(true) end end @@ -364,12 +308,15 @@ function SummonMainUI:refreshBtnRedPoint() end function SummonMainUI:onSummon(count, isAd) + self.heroNode:removeAllChildren() if isAd then AudioManager:playEffect(AudioManager.EFFECT_ID.UI_SUMMON_START) + self:disableTouch() ModuleManager.SummonManager:onForceSummonReq(count, 1, self.page) else local freeCount = DataManager.SummonData:getSummonFreeCount(self.page) if freeCount > 0 and count == 1 then + self:disableTouch() ModuleManager.SummonManager:onForceSummonReq(count, 2, self.page) return end @@ -397,6 +344,7 @@ function SummonMainUI:onSummon(count, isAd) end end AudioManager:playEffect(AudioManager.EFFECT_ID.UI_SUMMON_START) + self:disableTouch() ModuleManager.SummonManager:onForceSummonReq(count, 0, self.page) end GFunc.showMessageBox(params) @@ -409,41 +357,77 @@ function SummonMainUI:onSummon(count, isAd) end end AudioManager:playEffect(AudioManager.EFFECT_ID.UI_SUMMON_START) + self:disableTouch() ModuleManager.SummonManager:onForceSummonReq(count, 0, self.page) end end -function SummonMainUI:onSummonRsp(result, newForce) +function SummonMainUI:onSummonRsp(result, newHero) self:refreshSummonBtn() - self.summonResult = result - if self.isJumpTween or self.selectSpineId ~= 1 then + if not result.rewards or not result.rewards[1] then + self:enableTouch() + return + end + if self.aniSeq then + self.aniSeq:Kill() + self.aniSeq = nil + end + + for i = 1, 4 do + self.vfxs[i]:setActive(false) + self.vfx01s[i]:setActive(false) + end + local id = result.rewards[1].item.id + local qlt = DataManager.HeroData:getHeroQlt(id) - 2 + self.summonResult = result.rewards + self.aniSeq = self.root:createBindTweenSequence() + if self.vfxs[qlt] then + self.vfxs[qlt]:setActive(true) + end + self.aniSeq:AppendInterval(2) + self.aniSeq:AppendCallback(function() + self:showHero(1, newHero) + end) +end + +function SummonMainUI:showHero(idx, newHero) + if not self.summonResult[idx] then + self:enableTouch() + for i = 1, 4 do + self.vfxs[i]:setActive(false) + self.vfx01s[i]:setActive(false) + end ModuleManager.SummonManager:showSummonRewardUI({ - rewards = self.summonResult.rewards, - callback = function(count, isAd) - self:onSummon(count, isAd) + rewards = self.summonResult, + callback = function(count) + self:onSummon(count) end, - newForce = newForce, + newHero = newHero, page = self.page }) - else - self:disableTouch() - self.selectSpine:playAnimComplete("open01", false, true, function() - self.selectSpine:playAnim("idle02", true, false) - end, false, 0.4, function() - ModuleManager.SummonManager:showSummonRewardUI({ - rewards = self.summonResult.rewards, - callback = function(count) - self:onSummon(count) - end, - tweenEnd = function() - self:enableTouch() - self.selectSpine:playAnim("idle01", true, false) - end, - newForce = newForce, - page = self.page - }) - end) + return end + for i = 1, 4 do + self.vfx01s[i]:setActive(false) + end + local id = self.summonResult[idx].item.id + local cfg = DataManager.HeroData:getHeroConfig(id) + local qlt = cfg.qlt - 2 + self.heroNode:removeAllChildren() + SpineManager:loadHeroAsync(cfg.model_id, self.heroNode, function(spineObject) + spineObject:setActive(false) + spineObject:playAnimation("idle", true) + spineObject:setLocalScale(0.7, 0.7, 0.7) + if self.vfx01s[qlt] then + self.vfx01s[qlt]:setActive(true) + end + self:performWithDelayGlobal(function() + spineObject:setActive(true) + end, 0.25) + self:performWithDelayGlobal(function() + self:showHero(idx + 1, newHero) + end, 1) + end) end function SummonMainUI:disableTouch() diff --git a/lua/app/ui/summon/summon_reward_ui.lua b/lua/app/ui/summon/summon_reward_ui.lua index cd63acab..94a40764 100755 --- a/lua/app/ui/summon/summon_reward_ui.lua +++ b/lua/app/ui/summon/summon_reward_ui.lua @@ -13,8 +13,7 @@ function SummonRewardUI:ctor(params) self.rewards = params.rewards or {} self.isWish = params.isWish or false self.callback = params.callback - self.tweenEnd = params.tweenEnd - self.unlockList = params.newForce + self.unlockList = params.newHero or {} self.page = params.page end @@ -96,11 +95,6 @@ function SummonRewardUI:setCellEffectOrder(cell) effect:setSortingOrder(self:getUIOrder(), 10) end end -function SummonRewardUI:onClose() - if self.tweenEnd ~= nil then - self.tweenEnd() - end -end function SummonRewardUI:refreshSummonBtn() local freeCount = DataManager.SummonData:getSummonFreeCount(self.page) @@ -173,10 +167,10 @@ function SummonRewardUI:onRefresh() self.rewardOneCell:refresh(self.rewards[1], 0, self) local qlt = DataManager.HeroData:getHeroQlt(self.rewards[1].item.id) - if qlt == 4 or qlt == 5 then - offsetTime = offsetTime + 0.5 - self:doUITweenShake(0.7) - end + -- if qlt == 4 or qlt == 5 then + -- offsetTime = offsetTime + 0.5 + -- self:doUITweenShake(0.7) + -- end CS.DG.Tweening.DOVirtual.DelayedCall(0.3 + offsetTime, function() self:checkUnlockMap() self.btnGet:setActive(true) @@ -198,15 +192,15 @@ function SummonRewardUI:onRefresh() if self.rewards[i] then local delayTime = (i - 1) * 0.06 + offsetTime local qlt = DataManager.HeroData:getHeroQlt(self.rewards[i].item.id) - if qlt == 4 or qlt == 5 then - offsetTime = offsetTime + 1 - end + -- if qlt == 4 or qlt == 5 then + -- offsetTime = offsetTime + 1 + -- end self.rewardTenCells[i]:getBaseObject():setActive(false) self:performWithDelayGlobal(function() self.rewardTenCells[i]:refresh(self.rewards[i], i == 3 or i == 7, self) - if qlt == 4 or qlt == 5 then - self:doUITweenShake(0.3) - end + -- if qlt == 4 or qlt == 5 then + -- self:doUITweenShake(0.3) + -- end end, delayTime) end end @@ -237,6 +231,7 @@ function SummonRewardUI:doUITweenShake(delayTime) self.shakeSeq:AppendInterval(delayTime) self.shakeSeq:Append(self.tranBg:getTransform():DOShakeAnchorPos(duration, strength,vibrato, randomness, fadeOut)) end + function SummonRewardUI:checkUnlockMap() if self.unlockList == nil then return @@ -245,7 +240,9 @@ function SummonRewardUI:checkUnlockMap() return end if #self.unlockList > 0 then - ModuleManager.ForceManager:showForceUnlockUI(self.unlockList) + local params = {} + params.unlockList = self.unlockList + ModuleManager.SummonManager:showSummonUnlockUI(params) end end diff --git a/lua/app/ui/summon/summon_unlock_ui.lua b/lua/app/ui/summon/summon_unlock_ui.lua new file mode 100755 index 00000000..9a67e264 --- /dev/null +++ b/lua/app/ui/summon/summon_unlock_ui.lua @@ -0,0 +1,74 @@ +local SummonUnlockUI = class("SummonUnlockUI", BaseUI) + +local CELL_HEIGHT = 230 +local CELL_HEIGHT_1 = 120 +local NOT_OWN_NODE_HEIGHT = 56 +local DIFF_HEIGHT = 20 +local ForceCell = "app/ui/summon/cell/summon_force_cell" + +function SummonUnlockUI:isFullScreen() + return false +end + +function SummonUnlockUI:ctor(params) + params = params or {} + self.unlockList = params.unlockList or {} + self.idx = 1 +end + +function SummonUnlockUI:getPrefabPath() + return "assets/prefabs/ui/summon/summon_unlock_ui.prefab" +end + +function SummonUnlockUI:onClose() + self.heroNode:removeAllChildren() +end + +function SummonUnlockUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + self.root:addClickListener(function() + self:checkUnlockMap() + end) + + self.heroNode = uiMap["summon_unlock_ui.hero_node"] + self.nameTx = uiMap["summon_unlock_ui.name_tx"] + self.matchTx = uiMap["summon_unlock_ui.match_tx"] + self.matchImg = uiMap["summon_unlock_ui.match_tx.match_img"] + self.qltBg = uiMap["summon_unlock_ui.qlt_bg"] + self.qltBgTx = uiMap["summon_unlock_ui.qlt_bg.qlt_tx"] + + uiMap["summon_unlock_ui.title_bg.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_3)) + uiMap["summon_unlock_ui.continue_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_TO_CONTINUE)) +end + +function SummonUnlockUI:onRefresh() + self.heroNode:removeAllChildren() + self.heroId = table.remove(self.unlockList, 1) + local heroEntity = DataManager.HeroData:getHeroById(self.heroId) + local matchType = heroEntity:getMatchType() + local qlt = heroEntity:getQlt() + self.matchTx:setText(ModuleManager.HeroManager:getMatchTypeName(matchType)) + self.matchImg:setSprite(GConst.ATLAS_PATH.ICON_HERO, ModuleManager.HeroManager:getMatchTypeIcon(matchType)) + self.qltBg:setSprite(GFunc.getHeroQltImg(qlt)) + self.qltBgTx:setText(GFunc.getHeroQltStr(qlt)) + + self:loadHero() +end + +function SummonUnlockUI:loadHero() + local cfg = DataManager.HeroData:getHeroConfig(self.heroId) + SpineManager:loadHeroAsync(cfg.model_id, self.heroNode, function(spineObject) + spineObject:playAnimation("idle", true) + end) +end + +function SummonUnlockUI:checkUnlockMap() + if #self.unlockList <= 0 then + self:closeUI() + return + end + self.idx = self.idx + 1 + self:onRefresh() +end + +return SummonUnlockUI \ No newline at end of file diff --git a/lua/app/ui/summon/summon_unlock_ui.lua.meta b/lua/app/ui/summon/summon_unlock_ui.lua.meta new file mode 100644 index 00000000..3c40aa5d --- /dev/null +++ b/lua/app/ui/summon/summon_unlock_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d3de32bc1e0064d78ba113bdfbf65cc3 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/userdata/hero/hero_data.lua b/lua/app/userdata/hero/hero_data.lua index 01317eba..0873468a 100644 --- a/lua/app/userdata/hero/hero_data.lua +++ b/lua/app/userdata/hero/hero_data.lua @@ -145,6 +145,11 @@ function HeroData:setHeroLv(id, lv) BIReport:postFirstDayHeroLevel(id) end +function HeroData:getHeroIsNew(id) + local entity = self:getHeroById(id) + return entity and entity:getIsNew() or false +end + function HeroData:getMatchActiveHeroMap() return self.matchActiveHeroMap end diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index 90d9608e..822a2b73 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -9,6 +9,7 @@ function HeroEntity:ctor(cfgId, lv, skin, star) self.data.star = star or 0 self.config = ConfigManager:getConfig("hero")[self.cfgId] self.beginLv = 1 -- 激活等级 + self.isNew = false self.baseAttrOriginal = {} self.starAttr = {} @@ -282,6 +283,7 @@ function HeroEntity:setLv(lv, onlyChangeLv) if self.data.lv == lv then return end + self.isNew = lv == 1 self.oldLv = self.data.lv self.data.lv = lv self:_updateAllBaseAttr() @@ -294,6 +296,12 @@ function HeroEntity:setLv(lv, onlyChangeLv) end end +function HeroEntity:getIsNew() + local isNew = self.isNew + self.isNew = false + return isNew +end + function HeroEntity:getLv() return self.data.lv end From 5eab155fddc18bdb6a40fc89cd17485c90d971f1 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Fri, 12 Sep 2025 15:23:16 +0800 Subject: [PATCH 03/11] . --- lua/app/module/summon/summon_manager.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/app/module/summon/summon_manager.lua b/lua/app/module/summon/summon_manager.lua index a95a0398..78d3a730 100644 --- a/lua/app/module/summon/summon_manager.lua +++ b/lua/app/module/summon/summon_manager.lua @@ -49,7 +49,6 @@ function SummonManager:onForceSummonRsp(result) local guarantee1 = DataManager.SummonData:getSummonWishGuarantee1(result.reqData.id) for _, reward in pairs(result.rewards) do local isNew = DataManager.HeroData:getHeroIsNew(reward.item.id) - isNew = true if isNew then table.insert(newHero, reward.item.id) end From 1f9283c93b4af9082cf8fef119269c7e4326c3f5 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Fri, 12 Sep 2025 16:27:25 +0800 Subject: [PATCH 04/11] config --- lua/app/config/arena_robot.lua | 2134 ++- lua/app/config/attr.lua | 150 +- .../config/chapter_board_daily_challenge.lua | 11462 +++++++++------- lua/app/config/chapter_daily_challenge.lua | 1432 +- lua/app/config/monster_daily_challenge.lua | 3005 ++-- lua/app/config/skill.lua | 10 +- 6 files changed, 11442 insertions(+), 6751 deletions(-) diff --git a/lua/app/config/arena_robot.lua b/lua/app/config/arena_robot.lua index b0f50040..07f3a4ce 100644 --- a/lua/app/config/arena_robot.lua +++ b/lua/app/config/arena_robot.lua @@ -1,876 +1,2094 @@ local arena_robot = { [1]={ - ["name"]="Gresham", - ["score"]=917, - ["level"]=9, - ["avatar"]=3001, + ["name"]="Player5260", + ["score"]=900, + ["level"]=8, + ["avatar"]=35002, ["avatar_frame"]=1000, ["hero_id"]={ { - 13001, - 3 + 53001, + 25 }, { 23001, - 3 - }, - { - 33001, - 3 + 25 }, { 43001, - 3 + 25 }, { - 53001, - 3 + 14001, + 18 + }, + { + 34001, + 18 } } }, [2]={ - ["name"]="Gilroy", - ["score"]=929, - ["level"]=10, - ["avatar"]=1001, + ["name"]="Player7652", + ["score"]=917, + ["level"]=8, + ["avatar"]=24001, ["avatar_frame"]=1000, ["hero_id"]={ { 13001, - 5 + 25 }, { 23001, - 5 - }, - { - 33001, - 5 - }, - { - 43001, - 5 + 25 }, { 53001, - 5 + 25 + }, + { + 34001, + 18 + }, + { + 44001, + 18 } } }, [3]={ - ["name"]="Landry", - ["score"]=941, - ["level"]=10, - ["avatar"]=4001, + ["name"]="Player8333", + ["score"]=929, + ["level"]=8, + ["avatar"]=15001, ["avatar_frame"]=1000, ["hero_id"]={ - { - 13001, - 10 - }, - { - 23001, - 10 - }, { 33001, - 10 - }, - { - 43001, - 10 + 25 }, { 53001, - 10 + 25 + }, + { + 23001, + 25 + }, + { + 44001, + 18 + }, + { + 14001, + 18 } } }, [4]={ - ["name"]="Eva", - ["score"]=953, - ["level"]=9, - ["avatar"]=2001, + ["name"]="Player5025", + ["score"]=941, + ["level"]=8, + ["avatar"]=34001, ["avatar_frame"]=1000, ["hero_id"]={ { - 13001, - 15 + 23001, + 25 }, { - 23001, - 15 + 13001, + 25 }, { 33001, - 15 + 25 }, { - 43001, - 15 + 44001, + 18 }, { - 53001, - 15 + 54001, + 18 } } }, [5]={ - ["name"]="Prosperous", - ["score"]=959, - ["level"]=9, - ["avatar"]=5001, + ["name"]="Player8496", + ["score"]=953, + ["level"]=8, + ["avatar"]=24001, ["avatar_frame"]=1000, ["hero_id"]={ - { - 13001, - 20 - }, { 23001, - 20 - }, - { - 33001, - 20 - }, - { - 43001, - 20 + 25 }, { 53001, - 20 + 25 + }, + { + 34001, + 18 + }, + { + 44001, + 18 + }, + { + 14001, + 18 } } }, [6]={ - ["name"]="Fleming", - ["score"]=964, + ["name"]="Player1640", + ["score"]=959, ["level"]=8, - ["avatar"]=4001, + ["avatar"]=24001, ["avatar_frame"]=1000, ["hero_id"]={ { - 14001, - 20 - }, - { - 24001, - 20 + 13001, + 25 }, { 33001, - 20 + 25 }, { - 43001, - 20 + 54001, + 18 }, { - 53001, - 20 + 24001, + 18 + }, + { + 44001, + 18 } } }, [7]={ - ["name"]="Lola", - ["score"]=969, + ["name"]="Player3243", + ["score"]=964, ["level"]=8, - ["avatar"]=5001, + ["avatar"]=34001, ["avatar_frame"]=1000, ["hero_id"]={ { - 13001, - 20 + 43001, + 25 }, { 23001, - 20 + 25 }, { 34001, - 20 - }, - { - 44001, - 20 + 18 }, { 54001, - 20 + 18 + }, + { + 14001, + 18 } } }, [8]={ - ["name"]="Frances", - ["score"]=978, - ["level"]=9, - ["avatar"]=3001, + ["name"]="Player3883", + ["score"]=969, + ["level"]=8, + ["avatar"]=14001, ["avatar_frame"]=1000, ["hero_id"]={ { - 13001, - 20 + 53001, + 25 }, { - 23001, - 20 + 43001, + 25 + }, + { + 14001, + 18 }, { 34001, - 20 + 18 }, { - 44001, - 20 - }, - { - 54001, - 20 + 24001, + 18 } } }, [9]={ - ["name"]="Keith", - ["score"]=987, - ["level"]=7, - ["avatar"]=2001, + ["name"]="Player3405", + ["score"]=978, + ["level"]=8, + ["avatar"]=14001, ["avatar_frame"]=1000, ["hero_id"]={ { - 13001, - 20 - }, - { - 23001, - 20 + 53001, + 25 }, { 34001, - 20 + 18 + }, + { + 14001, + 18 + }, + { + 24001, + 18 }, { 44001, - 20 - }, - { - 54001, - 20 + 18 } } }, [10]={ - ["name"]="Winston", - ["score"]=996, - ["level"]=11, - ["avatar"]=1001, + ["name"]="Player1429", + ["score"]=987, + ["level"]=9, + ["avatar"]=35001, ["avatar_frame"]=1000, ["hero_id"]={ { 13001, - 20 - }, - { - 23001, - 20 - }, - { - 34001, - 20 - }, - { - 44001, - 20 + 25 }, { 54001, - 20 + 18 + }, + { + 44001, + 18 + }, + { + 24001, + 18 + }, + { + 34001, + 18 } } }, [11]={ - ["name"]="Halsey", - ["score"]=1006, - ["level"]=12, - ["avatar"]=5001, + ["name"]="Player6765", + ["score"]=996, + ["level"]=9, + ["avatar"]=54001, ["avatar_frame"]=1000, ["hero_id"]={ { - 13001, - 20 - }, - { - 23001, - 20 + 43001, + 25 }, { 34001, - 20 + 18 }, { - 44001, - 20 + 24001, + 18 }, { 54001, - 20 + 18 + }, + { + 14001, + 18 } } }, [12]={ - ["name"]="Stuart", - ["score"]=1018, - ["level"]=14, - ["avatar"]=5001, + ["name"]="Player5411", + ["score"]=1006, + ["level"]=9, + ["avatar"]=15001, ["avatar_frame"]=1000, ["hero_id"]={ { - 13001, - 20 + 53001, + 25 }, { - 23001, - 20 + 24001, + 18 }, { 34001, - 20 + 18 }, { 44001, - 20 + 18 }, { - 54001, - 20 + 14001, + 18 } } }, [13]={ - ["name"]="Dark-Haired", - ["score"]=1029, - ["level"]=13, - ["avatar"]=1001, + ["name"]="Player3518", + ["score"]=1018, + ["level"]=9, + ["avatar"]=55001, ["avatar_frame"]=1000, ["hero_id"]={ { - 13001, - 20 + 14001, + 18 }, { - 23001, - 20 + 24001, + 18 }, { 34001, - 20 + 18 }, { 44001, - 20 + 18 }, { 54001, - 20 + 18 } } }, [14]={ - ["name"]="Hilda", - ["score"]=1036, - ["level"]=10, - ["avatar"]=2001, + ["name"]="Player5769", + ["score"]=1029, + ["level"]=9, + ["avatar"]=24001, ["avatar_frame"]=1000, ["hero_id"]={ - { - 13001, - 20 - }, - { - 23001, - 20 - }, - { - 34001, - 20 - }, { 44001, - 20 + 18 }, { 54001, - 20 + 18 + }, + { + 34001, + 18 + }, + { + 24001, + 18 + }, + { + 14001, + 18 } } }, [15]={ - ["name"]="Idelle", - ["score"]=1046, - ["level"]=13, - ["avatar"]=2001, + ["name"]="Player3770", + ["score"]=1036, + ["level"]=9, + ["avatar"]=24001, ["avatar_frame"]=1000, ["hero_id"]={ { - 13001, - 20 - }, - { - 23001, - 20 + 24001, + 18 }, { 34001, - 20 + 18 }, { 44001, - 20 + 18 + }, + { + 14001, + 18 }, { 54001, - 20 + 18 } } }, [16]={ - ["name"]="Sibley", - ["score"]=1055, - ["level"]=11, - ["avatar"]=3001, + ["name"]="Player6063", + ["score"]=1046, + ["level"]=9, + ["avatar"]=54001, ["avatar_frame"]=1000, ["hero_id"]={ - { - 13001, - 20 - }, - { - 23001, - 20 - }, { 34001, - 20 + 18 }, { 44001, - 20 + 18 }, { 54001, - 20 + 18 + }, + { + 24001, + 18 + }, + { + 15001, + 2 } } }, [17]={ - ["name"]="Wolf", - ["score"]=1065, - ["level"]=11, - ["avatar"]=1001, + ["name"]="Player5365", + ["score"]=1055, + ["level"]=10, + ["avatar"]=14001, ["avatar_frame"]=1000, ["hero_id"]={ { - 13001, - 20 + 54001, + 18 }, { - 23001, - 20 - }, - { - 34001, - 20 + 14001, + 18 }, { 44001, - 20 + 18 }, { - 54001, - 20 + 24001, + 18 + }, + { + 35001, + 2 } } }, [18]={ - ["name"]="Renata", - ["score"]=1073, - ["level"]=13, - ["avatar"]=3001, + ["name"]="Player4279", + ["score"]=1065, + ["level"]=10, + ["avatar"]=54001, ["avatar_frame"]=1000, ["hero_id"]={ { - 13001, - 20 - }, - { - 23001, - 20 + 14001, + 18 }, { 34001, - 20 + 18 }, { - 44001, - 20 + 24001, + 18 }, { 54001, - 20 + 18 + }, + { + 45002, + 2 } } }, [19]={ - ["name"]="Lane", - ["score"]=1084, + ["name"]="Player2057", + ["score"]=1073, ["level"]=10, - ["avatar"]=4001, + ["avatar"]=45002, ["avatar_frame"]=1000, ["hero_id"]={ { - 13001, - 20 + 24001, + 18 }, { - 23001, - 20 + 14001, + 18 }, { 34001, - 20 - }, - { - 44001, - 20 + 18 }, { 54001, - 20 + 18 + }, + { + 45002, + 2 } } }, [20]={ - ["name"]="Fabian", - ["score"]=1095, - ["level"]=13, - ["avatar"]=4001, + ["name"]="Player1214", + ["score"]=1084, + ["level"]=11, + ["avatar"]=54001, ["avatar_frame"]=1000, ["hero_id"]={ - { - 13001, - 20 - }, - { - 23001, - 20 - }, { 34001, - 20 - }, - { - 44001, - 20 + 29 }, { 54001, - 20 + 29 + }, + { + 24001, + 29 + }, + { + 14001, + 29 + }, + { + 45001, + 5 } } }, [21]={ - ["name"]="Peace", - ["score"]=1104, - ["level"]=14, - ["avatar"]=1001, + ["name"]="Player3281", + ["score"]=1095, + ["level"]=12, + ["avatar"]=35002, ["avatar_frame"]=1000, ["hero_id"]={ - { - 15001, - 20 - }, - { - 23001, - 20 - }, - { - 25001, - 20 - }, { 44001, - 20 + 29 + }, + { + 24001, + 29 }, { 54001, - 20 + 29 + }, + { + 35002, + 5 + }, + { + 15002, + 5 } } }, [22]={ - ["name"]="Tanya", - ["score"]=1110, - ["level"]=15, - ["avatar"]=2001, + ["name"]="Player7036", + ["score"]=1104, + ["level"]=12, + ["avatar"]=34001, ["avatar_frame"]=1000, ["hero_id"]={ { - 15001, - 20 + 54001, + 29 }, { - 23001, - 20 + 14001, + 29 + }, + { + 34001, + 29 }, { 25001, - 20 + 5 }, { - 44001, - 20 - }, - { - 54001, - 20 + 45001, + 5 } } }, [23]={ - ["name"]="Trix", - ["score"]=1118, - ["level"]=13, - ["avatar"]=5001, + ["name"]="Player9448", + ["score"]=1110, + ["level"]=12, + ["avatar"]=14001, ["avatar_frame"]=1000, ["hero_id"]={ { - 15001, - 20 + 24001, + 29 }, { - 23001, - 20 + 14001, + 29 }, { - 25001, - 20 + 34001, + 29 }, { - 44001, - 20 + 55002, + 5 }, { - 54001, - 20 + 45002, + 5 } } }, [24]={ - ["name"]="Eugene", - ["score"]=1129, - ["level"]=16, - ["avatar"]=5001, + ["name"]="Player8711", + ["score"]=1118, + ["level"]=13, + ["avatar"]=44001, ["avatar_frame"]=1000, ["hero_id"]={ { - 15001, - 20 + 24001, + 29 }, { - 23001, - 20 - }, - { - 25001, - 20 + 34001, + 29 }, { 44001, - 20 + 29 }, { - 54001, - 20 + 55002, + 5 + }, + { + 15002, + 5 } } }, [25]={ - ["name"]="Loralie", - ["score"]=1140, + ["name"]="Player2331", + ["score"]=1129, ["level"]=14, - ["avatar"]=1001, + ["avatar"]=24001, ["avatar_frame"]=1000, ["hero_id"]={ - { - 15001, - 20 - }, - { - 23001, - 20 - }, - { - 25001, - 20 - }, - { - 44001, - 20 - }, { 54001, - 20 + 29 + }, + { + 34001, + 29 + }, + { + 24001, + 29 + }, + { + 15002, + 5 + }, + { + 45002, + 5 } } }, [26]={ - ["name"]="Henrietta", - ["score"]=1150, - ["level"]=13, - ["avatar"]=3001, + ["name"]="Player2220", + ["score"]=1140, + ["level"]=14, + ["avatar"]=44001, ["avatar_frame"]=1000, ["hero_id"]={ { - 15001, - 20 + 34001, + 29 }, { - 23001, - 20 - }, - { - 25001, - 20 + 24001, + 29 }, { 44001, - 20 + 29 }, { - 54001, - 20 + 55002, + 5 + }, + { + 15002, + 5 } } }, [27]={ - ["name"]="Willette", - ["score"]=1159, - ["level"]=14, - ["avatar"]=4001, + ["name"]="Player8230", + ["score"]=1150, + ["level"]=15, + ["avatar"]=14001, ["avatar_frame"]=1000, ["hero_id"]={ - { - 15001, - 20 - }, - { - 23001, - 20 - }, - { - 25001, - 20 - }, - { - 44001, - 20 - }, { 54001, - 20 + 36 + }, + { + 14001, + 36 + }, + { + 34001, + 36 + }, + { + 25002, + 11 + }, + { + 45002, + 11 } } }, [28]={ - ["name"]="Orlena", - ["score"]=1167, - ["level"]=14, - ["avatar"]=3001, + ["name"]="Player4781", + ["score"]=1159, + ["level"]=16, + ["avatar"]=24001, ["avatar_frame"]=1000, ["hero_id"]={ { - 15001, - 20 - }, - { - 23001, - 20 - }, - { - 25001, - 20 - }, - { - 44001, - 20 + 24001, + 36 }, { 54001, - 20 + 36 + }, + { + 45002, + 11 + }, + { + 35002, + 11 + }, + { + 15002, + 11 } } }, [29]={ - ["name"]="Irving", - ["score"]=1178, - ["level"]=15, - ["avatar"]=2001, + ["name"]="Player9839", + ["score"]=1167, + ["level"]=16, + ["avatar"]=45001, ["avatar_frame"]=1000, ["hero_id"]={ { - 15001, - 20 + 54001, + 36 }, { - 23001, - 20 + 14001, + 36 }, { 25001, - 20 + 11 }, { - 44001, - 20 + 35001, + 11 }, { - 54001, - 20 + 45001, + 11 } } }, [30]={ - ["name"]="Phyllis", + ["name"]="Player8087", + ["score"]=1178, + ["level"]=17, + ["avatar"]=14001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 14001, + 36 + }, + { + 44001, + 36 + }, + { + 55001, + 11 + }, + { + 35001, + 11 + }, + { + 25001, + 11 + } + } + }, + [31]={ + ["name"]="Player5802", ["score"]=1190, - ["level"]=16, - ["avatar"]=4001, + ["level"]=18, + ["avatar"]=15001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 54001, + 36 + }, + { + 24001, + 36 + }, + { + 15001, + 11 + }, + { + 35001, + 11 + }, + { + 45001, + 11 + } + } + }, + [32]={ + ["name"]="Player4023", + ["score"]=1199, + ["level"]=18, + ["avatar"]=25001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 54001, + 36 + }, + { + 14001, + 36 + }, + { + 45001, + 11 + }, + { + 25001, + 11 + }, + { + 35001, + 11 + } + } + }, + [33]={ + ["name"]="Player4650", + ["score"]=1207, + ["level"]=18, + ["avatar"]=14001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 14001, + 41 + }, + { + 44001, + 41 + }, + { + 55001, + 13 + }, + { + 35001, + 13 + }, + { + 25001, + 13 + } + } + }, + [34]={ + ["name"]="Player4371", + ["score"]=1217, + ["level"]=19, + ["avatar"]=25002, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 44001, + 41 + }, + { + 14001, + 41 + }, + { + 55002, + 13 + }, + { + 25002, + 13 + }, + { + 35002, + 13 + } + } + }, + [35]={ + ["name"]="Player3941", + ["score"]=1228, + ["level"]=19, + ["avatar"]=44001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 54001, + 41 + }, + { + 44001, + 41 + }, + { + 25002, + 13 + }, + { + 35002, + 13 + }, + { + 15002, + 13 + } + } + }, + [36]={ + ["name"]="Player3869", + ["score"]=1240, + ["level"]=20, + ["avatar"]=25001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 14001, + 41 + }, + { + 55001, + 13 + }, + { + 45001, + 13 + }, + { + 25001, + 13 + }, + { + 35001, + 13 + } + } + }, + [37]={ + ["name"]="Player9326", + ["score"]=1250, + ["level"]=20, + ["avatar"]=14001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 14001, + 41 + }, + { + 25002, + 13 + }, + { + 35002, + 13 + }, + { + 55002, + 13 + }, + { + 45002, + 13 + } + } + }, + [38]={ + ["name"]="Player2646", + ["score"]=1262, + ["level"]=21, + ["avatar"]=15001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 24001, + 41 + }, + { + 35001, + 13 + }, + { + 15001, + 13 + }, + { + 55001, + 13 + }, + { + 45001, + 13 + } + } + }, + [39]={ + ["name"]="Player7406", + ["score"]=1272, + ["level"]=21, + ["avatar"]=24001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 24001, + 46 + }, + { + 45001, + 16 + }, + { + 35001, + 16 + }, + { + 55001, + 16 + }, + { + 15001, + 16 + } + } + }, + [40]={ + ["name"]="Player4750", + ["score"]=1280, + ["level"]=21, + ["avatar"]=35002, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 54001, + 46 + }, + { + 35002, + 16 + }, + { + 25002, + 16 + }, + { + 45002, + 16 + }, + { + 15002, + 16 + } + } + }, + [41]={ + ["name"]="Player1352", + ["score"]=1291, + ["level"]=22, + ["avatar"]=15001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 54001, + 46 + }, + { + 25001, + 16 + }, + { + 15001, + 16 + }, + { + 45001, + 16 + }, + { + 35001, + 16 + } + } + }, + [42]={ + ["name"]="Player1599", + ["score"]=1300, + ["level"]=22, + ["avatar"]=35002, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 44001, + 46 + }, + { + 55002, + 16 + }, + { + 35002, + 16 + }, + { + 25002, + 16 + }, + { + 15002, + 16 + } + } + }, + [43]={ + ["name"]="Player3201", + ["score"]=1308, + ["level"]=22, + ["avatar"]=35001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 54001, + 46 + }, + { + 45001, + 16 + }, + { + 25001, + 16 + }, + { + 35001, + 16 + }, + { + 15001, + 16 + } + } + }, + [44]={ + ["name"]="Player1146", + ["score"]=1319, + ["level"]=23, + ["avatar"]=45002, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 34001, + 46 + }, + { + 15002, + 16 + }, + { + 25002, + 16 + }, + { + 45002, + 16 + }, + { + 55002, + 16 + } + } + }, + [45]={ + ["name"]="Player8425", + ["score"]=1327, + ["level"]=23, + ["avatar"]=15001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 54001, + 46 + }, + { + 25001, + 16 + }, + { + 15001, + 16 + }, + { + 45001, + 16 + }, + { + 35001, + 16 + } + } + }, + [46]={ + ["name"]="Player6190", + ["score"]=1339, + ["level"]=23, + ["avatar"]=25002, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 14001, + 51 + }, + { + 25002, + 18 + }, + { + 55002, + 18 + }, + { + 35002, + 18 + }, + { + 45002, + 18 + } + } + }, + [47]={ + ["name"]="Player7370", + ["score"]=1350, + ["level"]=23, + ["avatar"]=45001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 14001, + 51 + }, + { + 45001, + 18 + }, + { + 35001, + 18 + }, + { + 55001, + 18 + }, + { + 25001, + 18 + } + } + }, + [48]={ + ["name"]="Player2798", + ["score"]=1361, + ["level"]=24, + ["avatar"]=55002, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 55002, + 18 + }, + { + 25002, + 18 + }, + { + 15002, + 18 + }, + { + 35002, + 18 + }, + { + 45002, + 18 + } + } + }, + [49]={ + ["name"]="Player7591", + ["score"]=1369, + ["level"]=24, + ["avatar"]=55002, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 45002, + 18 + }, + { + 25002, + 18 + }, + { + 35002, + 18 + }, + { + 55002, + 18 + }, + { + 15002, + 18 + } + } + }, + [50]={ + ["name"]="Player6359", + ["score"]=1381, + ["level"]=24, + ["avatar"]=35001, ["avatar_frame"]=1000, ["hero_id"]={ { 15001, - 20 + 18 }, { - 23001, - 20 + 55001, + 18 + }, + { + 35001, + 18 }, { 25001, - 20 + 18 }, { - 44001, - 20 + 45001, + 18 + } + } + }, + [51]={ + ["name"]="Player6817", + ["score"]=1389, + ["level"]=24, + ["avatar"]=35002, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 45002, + 21 }, { - 54001, - 20 + 55002, + 21 + }, + { + 25002, + 21 + }, + { + 35002, + 21 + }, + { + 15002, + 21 + } + } + }, + [52]={ + ["name"]="Player4271", + ["score"]=1397, + ["level"]=25, + ["avatar"]=35002, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 25002, + 21 + }, + { + 35002, + 21 + }, + { + 45002, + 21 + }, + { + 55002, + 21 + }, + { + 15002, + 21 + } + } + }, + [53]={ + ["name"]="Player3387", + ["score"]=1405, + ["level"]=25, + ["avatar"]=55002, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 35002, + 21 + }, + { + 45002, + 21 + }, + { + 15002, + 21 + }, + { + 25002, + 21 + }, + { + 55002, + 21 + } + } + }, + [54]={ + ["name"]="Player3182", + ["score"]=1414, + ["level"]=25, + ["avatar"]=25001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 15001, + 21 + }, + { + 45001, + 21 + }, + { + 55001, + 21 + }, + { + 25001, + 21 + }, + { + 35001, + 21 + } + } + }, + [55]={ + ["name"]="Player8566", + ["score"]=1426, + ["level"]=25, + ["avatar"]=55002, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 45002, + 21 + }, + { + 25002, + 21 + }, + { + 35002, + 21 + }, + { + 15002, + 21 + }, + { + 55002, + 21 + } + } + }, + [56]={ + ["name"]="Player9496", + ["score"]=1438, + ["level"]=26, + ["avatar"]=45001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 25001, + 23 + }, + { + 15001, + 23 + }, + { + 45001, + 23 + }, + { + 35001, + 23 + }, + { + 55001, + 23 + } + } + }, + [57]={ + ["name"]="Player9462", + ["score"]=1449, + ["level"]=26, + ["avatar"]=25002, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 55002, + 23 + }, + { + 25002, + 23 + }, + { + 45002, + 23 + }, + { + 35002, + 23 + }, + { + 15002, + 23 + } + } + }, + [58]={ + ["name"]="Player2826", + ["score"]=1460, + ["level"]=27, + ["avatar"]=15001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 15001, + 23 + }, + { + 55001, + 23 + }, + { + 25001, + 23 + }, + { + 45001, + 23 + }, + { + 35001, + 23 + } + } + }, + [59]={ + ["name"]="Player4481", + ["score"]=1472, + ["level"]=27, + ["avatar"]=35002, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 25002, + 23 + }, + { + 35002, + 23 + }, + { + 45002, + 23 + }, + { + 15002, + 23 + }, + { + 55002, + 23 + } + } + }, + [60]={ + ["name"]="Player9021", + ["score"]=1480, + ["level"]=27, + ["avatar"]=26001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 45002, + 25 + }, + { + 15002, + 25 + }, + { + 35002, + 25 + }, + { + 55002, + 25 + }, + { + 26001, + 12 + } + } + }, + [61]={ + ["name"]="Player2860", + ["score"]=1490, + ["level"]=28, + ["avatar"]=46001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 45002, + 25 + }, + { + 35002, + 25 + }, + { + 25002, + 25 + }, + { + 55002, + 25 + }, + { + 16001, + 12 + } + } + }, + [62]={ + ["name"]="Player6002", + ["score"]=1498, + ["level"]=28, + ["avatar"]=35001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 55001, + 25 + }, + { + 45001, + 25 + }, + { + 35001, + 25 + }, + { + 25001, + 25 + }, + { + 16001, + 12 + } + } + }, + [63]={ + ["name"]="Player3411", + ["score"]=1509, + ["level"]=28, + ["avatar"]=26001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 55002, + 25 + }, + { + 35002, + 25 + }, + { + 45002, + 25 + }, + { + 15002, + 25 + }, + { + 26001, + 12 + } + } + }, + [64]={ + ["name"]="Player5935", + ["score"]=1521, + ["level"]=29, + ["avatar"]=16001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 35001, + 27 + }, + { + 45001, + 27 + }, + { + 25001, + 27 + }, + { + 55001, + 27 + }, + { + 16001, + 18 + } + } + }, + [65]={ + ["name"]="Player4420", + ["score"]=1529, + ["level"]=29, + ["avatar"]=25002, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 35002, + 27 + }, + { + 45002, + 27 + }, + { + 15002, + 27 + }, + { + 55002, + 27 + }, + { + 26001, + 18 + } + } + }, + [66]={ + ["name"]="Player4241", + ["score"]=1540, + ["level"]=29, + ["avatar"]=55002, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 55002, + 27 + }, + { + 25002, + 27 + }, + { + 35002, + 27 + }, + { + 45002, + 27 + }, + { + 16001, + 18 + } + } + }, + [67]={ + ["name"]="Player1723", + ["score"]=1549, + ["level"]=29, + ["avatar"]=15001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 35001, + 27 + }, + { + 15001, + 27 + }, + { + 45001, + 27 + }, + { + 55001, + 27 + }, + { + 26001, + 18 + } + } + }, + [68]={ + ["name"]="Player6105", + ["score"]=1557, + ["level"]=30, + ["avatar"]=15002, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 45002, + 28 + }, + { + 35002, + 28 + }, + { + 55002, + 28 + }, + { + 25002, + 28 + }, + { + 16001, + 18 + } + } + }, + [69]={ + ["name"]="Player4664", + ["score"]=1567, + ["level"]=30, + ["avatar"]=35002, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 45002, + 28 + }, + { + 55002, + 28 + }, + { + 15002, + 28 + }, + { + 35002, + 28 + }, + { + 26001, + 18 + } + } + }, + [70]={ + ["name"]="Player6001", + ["score"]=1576, + ["level"]=30, + ["avatar"]=46001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 45002, + 28 + }, + { + 15002, + 28 + }, + { + 35002, + 28 + }, + { + 55002, + 28 + }, + { + 26001, + 18 + } + } + }, + [71]={ + ["name"]="Player8726", + ["score"]=1587, + ["level"]=30, + ["avatar"]=35002, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 35002, + 28 + }, + { + 25002, + 28 + }, + { + 45002, + 28 + }, + { + 55002, + 28 + }, + { + 16001, + 18 + } + } + }, + [72]={ + ["name"]="Player8796", + ["score"]=1598, + ["level"]=31, + ["avatar"]=45001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 35001, + 29 + }, + { + 45001, + 29 + }, + { + 55001, + 29 + }, + { + 15001, + 29 + }, + { + 26001, + 18 } } } } local config = { -data=arena_robot,count=30 +data=arena_robot,count=72 } return config \ No newline at end of file diff --git a/lua/app/config/attr.lua b/lua/app/config/attr.lua index fda81c15..35d221e9 100644 --- a/lua/app/config/attr.lua +++ b/lua/app/config/attr.lua @@ -32,127 +32,152 @@ local attr = { [7]={ ["id"]=7, ["name"]="attr_crit_red", - ["power"]=500 + ["power"]=500, + ["is_percent"]=1 }, [8]={ ["id"]=8, ["name"]="attr_crit_yellow", - ["power"]=500 + ["power"]=500, + ["is_percent"]=1 }, [9]={ ["id"]=9, ["name"]="attr_crit_green", - ["power"]=500 + ["power"]=500, + ["is_percent"]=1 }, [10]={ ["id"]=10, ["name"]="attr_crit_blue", - ["power"]=500 + ["power"]=500, + ["is_percent"]=1 }, [11]={ ["id"]=11, ["name"]="attr_crit_purple", - ["power"]=500 + ["power"]=500, + ["is_percent"]=1 }, [12]={ ["id"]=12, ["name"]="attr_crit_time_red", - ["power"]=500 + ["power"]=500, + ["is_percent"]=1 }, [13]={ ["id"]=13, ["name"]="attr_crit_time_yellow", - ["power"]=500 + ["power"]=500, + ["is_percent"]=1 }, [14]={ ["id"]=14, ["name"]="attr_crit_time_green", - ["power"]=500 + ["power"]=500, + ["is_percent"]=1 }, [15]={ ["id"]=15, ["name"]="attr_crit_time_blue", - ["power"]=500 + ["power"]=500, + ["is_percent"]=1 }, [16]={ ["id"]=16, ["name"]="attr_crit_time_purple", - ["power"]=500 + ["power"]=500, + ["is_percent"]=1 }, [17]={ ["id"]=17, ["name"]="attr_cured_red", - ["power"]=100 + ["power"]=100, + ["is_percent"]=1 }, [18]={ ["id"]=18, ["name"]="attr_cured_yellow", - ["power"]=100 + ["power"]=100, + ["is_percent"]=1 }, [19]={ ["id"]=19, ["name"]="attr_cured_green", - ["power"]=100 + ["power"]=100, + ["is_percent"]=1 }, [20]={ ["id"]=20, ["name"]="attr_cured_blue", - ["power"]=100 + ["power"]=100, + ["is_percent"]=1 }, [21]={ ["id"]=21, ["name"]="attr_cured_purple", - ["power"]=100 + ["power"]=100, + ["is_percent"]=1 }, [22]={ ["id"]=22, ["name"]="attr_atkp_red", - ["power"]=100 + ["power"]=100, + ["is_percent"]=1 }, [23]={ ["id"]=23, ["name"]="attr_atkp_yellow", - ["power"]=100 + ["power"]=100, + ["is_percent"]=1 }, [24]={ ["id"]=24, ["name"]="attr_atkp_green", - ["power"]=100 + ["power"]=100, + ["is_percent"]=1 }, [25]={ ["id"]=25, ["name"]="attr_atkp_blue", - ["power"]=100 + ["power"]=100, + ["is_percent"]=1 }, [26]={ ["id"]=26, ["name"]="attr_atkp_purple", - ["power"]=100 + ["power"]=100, + ["is_percent"]=1 }, [27]={ ["id"]=27, ["name"]="attr_hpp_red", - ["power"]=100 + ["power"]=100, + ["is_percent"]=1 }, [28]={ ["id"]=28, ["name"]="attr_hpp_yellow", - ["power"]=100 + ["power"]=100, + ["is_percent"]=1 }, [29]={ ["id"]=29, ["name"]="attr_hpp_green", - ["power"]=100 + ["power"]=100, + ["is_percent"]=1 }, [30]={ ["id"]=30, ["name"]="attr_hpp_blue", - ["power"]=100 + ["power"]=100, + ["is_percent"]=1 }, [31]={ ["id"]=31, ["name"]="attr_hpp_purple", - ["power"]=100 + ["power"]=100, + ["is_percent"]=1 }, [32]={ ["id"]=32, @@ -207,52 +232,62 @@ local attr = { [42]={ ["id"]=42, ["name"]="attr_normal_hurtp_red", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [43]={ ["id"]=43, ["name"]="attr_normal_hurtp_yellow", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [44]={ ["id"]=44, ["name"]="attr_normal_hurtp_green", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [45]={ ["id"]=45, ["name"]="attr_normal_hurtp_blue", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [46]={ ["id"]=46, ["name"]="attr_normal_hurtp_purple", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [47]={ ["id"]=47, ["name"]="attr_skill_hurtp_red", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [48]={ ["id"]=48, ["name"]="attr_skill_hurtp_yellow", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [49]={ ["id"]=49, ["name"]="attr_skill_hurtp_green", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [50]={ ["id"]=50, ["name"]="attr_skill_hurtp_blue", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [51]={ ["id"]=51, ["name"]="attr_skill_hurtp_purple", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [52]={ ["id"]=52, @@ -282,52 +317,62 @@ local attr = { [57]={ ["id"]=57, ["name"]="attr_all_hurtp_red", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [58]={ ["id"]=58, ["name"]="attr_all_hurtp_yellow", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [59]={ ["id"]=59, ["name"]="attr_all_hurtp_green", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [60]={ ["id"]=60, ["name"]="attr_all_hurtp_blue", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [61]={ ["id"]=61, ["name"]="attr_all_hurtp_purple", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [62]={ ["id"]=62, ["name"]="attr_atkp_red_all", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [63]={ ["id"]=63, ["name"]="attr_atkp_yellow_all", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [64]={ ["id"]=64, ["name"]="attr_atkp_green_all", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [65]={ ["id"]=65, ["name"]="attr_atkp_blue_all", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [66]={ ["id"]=66, ["name"]="attr_atkp_purple_all", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [67]={ ["id"]=67, @@ -347,27 +392,32 @@ local attr = { [70]={ ["id"]=70, ["name"]="attr_crit_all", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [71]={ ["id"]=71, ["name"]="attr_crit_time_all", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [72]={ ["id"]=72, ["name"]="attr_normal_hurtp_all", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [73]={ ["id"]=73, ["name"]="attr_skill_hurtp_all", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [74]={ ["id"]=74, ["name"]="attr_atkp_all", - ["power"]=50 + ["power"]=50, + ["is_percent"]=1 }, [75]={ ["id"]=75, diff --git a/lua/app/config/chapter_board_daily_challenge.lua b/lua/app/config/chapter_board_daily_challenge.lua index 0a170ce6..a306f023 100644 --- a/lua/app/config/chapter_board_daily_challenge.lua +++ b/lua/app/config/chapter_board_daily_challenge.lua @@ -15,54 +15,6 @@ local chapter_board_daily_challenge = { }, { 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 2 - }, - { - 0, - 2 - }, - { - 0, - 5 - }, - { - 5, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 8, - 0 - }, - { - 5, 3 }, { @@ -70,15 +22,7 @@ local chapter_board_daily_challenge = { 2 }, { - 0, - 5 - }, - { - 5, - 4 - }, - { - 0, + 1, 0 }, { @@ -86,80 +30,80 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 1, 0 }, { - 5, + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 5 + }, + { + 0, + 1 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, 3 }, { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, + 0, 5 }, { 0, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 8, - 0 - }, - { - 1, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 + 3 }, { 1, @@ -193,6 +137,62 @@ local chapter_board_daily_challenge = { 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 @@ -202,27 +202,59 @@ local chapter_board_daily_challenge = { [2]={ ["board_daily_challenge"]={ { - 0, - 3 + 1, + 0 }, { 0, 4 }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 0, 3 }, { 0, - 4 + 1 }, { - 7, + 0, + 3 + }, + { + 1, 0 }, { - 7, + 1, 0 }, { @@ -231,7 +263,7 @@ local chapter_board_daily_challenge = { }, { 0, - 4 + 1 }, { 0, @@ -239,18 +271,18 @@ local chapter_board_daily_challenge = { }, { 0, - 4 + 2 }, { 0, 3 }, { - 7, - 0 + 0, + 1 }, { - 8, + 1, 0 }, { @@ -258,27 +290,19 @@ local chapter_board_daily_challenge = { 0 }, { - 7, + 1, 0 }, { - 7, - 0 + 0, + 4 }, { - 7, - 0 + 0, + 2 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 5, + 0, 4 }, { @@ -290,27 +314,7 @@ local chapter_board_daily_challenge = { 0 }, { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 5, - 3 - }, - { - 0, + 1, 0 }, { @@ -318,81 +322,77 @@ local chapter_board_daily_challenge = { 0 }, { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 5, + 0, 4 }, - { - 0, - 0 - }, - { - 1, - 0 - }, { 14, 0 }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 5, - 3 - }, { 0, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 5, 4 }, + { + 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 @@ -402,87 +402,7 @@ local chapter_board_daily_challenge = { [3]={ ["board_daily_challenge"]={ { - 7, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 1, 0 }, { @@ -490,83 +410,163 @@ local chapter_board_daily_challenge = { 0 }, { - 5, + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, 4 }, { - 5, + 0, + 2 + }, + { + 0, 4 }, { - 1, - 0 - }, - { - 5, - 5 - }, - { - 5, - 5 + 0, + 2 }, { 1, 0 }, { - 8, + 1, 0 }, { 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, 0 }, { 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 1, 0 }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, { 14, 0 }, { 0, + 1 + }, + { + 1, 0 }, { - 0, + 1, 0 }, { - 8, + 1, 0 }, { - 8, + 1, 0 }, { - 8, + 1, 0 }, { - 8, + 1, 0 }, { - 8, + 1, 0 }, { - 8, + 1, 0 }, { - 8, - 0 - }, - { - 8, + 1, 0 }, { @@ -606,12 +606,8 @@ local chapter_board_daily_challenge = { 0 }, { - 0, - 2 - }, - { - 0, - 2 + 2, + 0 }, { 0, @@ -619,14 +615,14 @@ local chapter_board_daily_challenge = { }, { 0, - 4 + 1 }, { 0, 4 }, { - 1, + 2, 0 }, { @@ -637,20 +633,24 @@ local chapter_board_daily_challenge = { 1, 0 }, + { + 2, + 0 + }, + { + 0, + 1 + }, { 0, 2 }, - { - 9, - 1 - }, { 0, 4 }, { - 1, + 2, 0 }, { @@ -661,96 +661,124 @@ local chapter_board_daily_challenge = { 1, 0 }, + { + 2, + 0 + }, + { + 2, + 0 + }, { 0, - 2 + 5 }, { - 9, - 1 + 2, + 0 }, { - 0, - 3 - }, - { - 9, - 1 - }, - { - 0, - 4 + 2, + 0 }, { 1, 0 }, { - 7, + 2, 0 }, { - 8, + 2, 0 }, { - 8, + 2, 0 }, { - 9, - 1 + 0, + 5 }, { - 8, + 2, 0 }, { - 8, + 2, 0 }, { - 7, + 2, 0 }, { - 8, + 1, 0 }, { - 7, + 2, 0 }, { - 8, + 2, 0 }, { - 8, + 0, + 5 + }, + { + 2, 0 }, { - 8, + 2, 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { - 8, + 2, 0 }, { - 7, + 0, + 5 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, 0 }, { @@ -758,43 +786,15 @@ local chapter_board_daily_challenge = { 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, + 1, 0 } } @@ -805,106 +805,26 @@ local chapter_board_daily_challenge = { 1, 0 }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 0, - 1 - }, - { - 1, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, { 1, 0 }, { 0, - 0 + 3 }, { 0, - 0 + 2 }, { 0, + 3 + }, + { + 1, 0 }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, { 1, 0 @@ -915,56 +835,120 @@ local chapter_board_daily_challenge = { }, { 0, - 0 + 2 }, { 0, - 0 + 2 }, { 0, - 0 + 3 }, { 0, - 0 + 2 }, { 0, - 0 - }, - { - 0, - 0 + 2 }, { 1, 0 }, { - 9, - 1 + 2, + 0 }, { - 9, - 1 + 2, + 0 }, { - 9, - 1 + 2, + 0 }, { - 9, - 1 + 2, + 0 }, { - 9, - 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 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, { 1, 0 @@ -978,15 +962,15 @@ local chapter_board_daily_challenge = { 0 }, { - 0, + 2, 0 }, { - 0, + 2, 0 }, { - 0, + 2, 0 }, { @@ -996,6 +980,22 @@ local chapter_board_daily_challenge = { { 1, 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 } } }, @@ -1010,24 +1010,16 @@ local chapter_board_daily_challenge = { 0 }, { - 1, - 0 - }, - { - 7, - 0 + 0, + 5 }, { 0, - 3 + 2 }, { 0, - 3 - }, - { - 0, - 3 + 5 }, { 1, @@ -1038,40 +1030,16 @@ local chapter_board_daily_challenge = { 0 }, { - 7, + 1, 0 }, - { - 7, - 0 - }, - { - 0, - 3 - }, - { - 9, - 1 - }, - { - 0, - 3 - }, { 1, 0 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 + 0, + 2 }, { 0, @@ -1079,66 +1047,98 @@ local chapter_board_daily_challenge = { }, { 0, - 3 - }, - { - 0, - 3 + 2 }, { 1, 0 }, { - 7, + 1, 0 }, { - 7, + 1, 0 }, { - 7, + 2, 0 }, { 0, + 5 + }, + { + 2, 3 }, { 0, - 3 + 5 }, { - 0, - 3 + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 }, { 14, 0 }, { - 7, + 2, 0 }, { - 7, + 2, 0 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 2, 0 }, { @@ -1146,27 +1146,23 @@ local chapter_board_daily_challenge = { 0 }, { - 7, + 2, 0 }, { - 7, + 2, 0 }, { - 7, + 2, 0 }, { - 7, + 2, 0 }, { - 7, - 0 - }, - { - 7, + 2, 0 }, { @@ -1178,16 +1174,20 @@ local chapter_board_daily_challenge = { 0 }, { - 13, - 5 + 1, + 0 }, { - 13, - 1 + 2, + 0 }, { - 13, - 2 + 2, + 0 + }, + { + 2, + 0 }, { 1, @@ -1201,6 +1201,58 @@ local chapter_board_daily_challenge = { }, [7]={ ["board_daily_challenge"]={ + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, { 1, 0 @@ -1215,152 +1267,20 @@ local chapter_board_daily_challenge = { }, { 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 2 - }, - { - 0, - 2 - }, - { - 0, - 5 - }, - { - 5, 4 }, { - 1, - 0 + 0, + 5 }, { - 1, - 0 - }, - { - 8, - 0 - }, - { - 5, + 0, 3 }, { 0, 2 }, - { - 0, - 5 - }, - { - 5, - 4 - }, - { - 0, - 0 - }, - { - 1, - 0 - }, - { - 8, - 0 - }, - { - 5, - 3 - }, - { - 5, - 1 - }, - { - 5, - 1 - }, - { - 5, - 5 - }, - { - 0, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 8, - 0 - }, - { - 1, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, { 1, 0 @@ -1370,15 +1290,11 @@ local chapter_board_daily_challenge = { 0 }, { - 1, + 3, 0 }, { - 1, - 0 - }, - { - 1, + 3, 0 }, { @@ -1386,7 +1302,11 @@ local chapter_board_daily_challenge = { 0 }, { - 1, + 3, + 0 + }, + { + 3, 0 }, { @@ -1394,92 +1314,116 @@ local chapter_board_daily_challenge = { 0 }, { - 1, + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, 0 } } }, [8]={ ["board_daily_challenge"]={ - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, { 1, 0 }, { 0, - 4 + 1 }, { 0, - 3 + 2 }, { 0, - 4 + 1 }, { 0, - 3 + 2 }, { - 7, - 0 - }, - { - 8, - 0 - }, - { - 1, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 5, - 4 + 0, + 1 }, { 1, @@ -1490,53 +1434,133 @@ local chapter_board_daily_challenge = { 0 }, { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 5, - 3 + 0, + 2 }, { 0, - 0 + 1 + }, + { + 0, + 2 + }, + { + 0, + 1 + }, + { + 0, + 2 }, { 1, 0 }, { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 5, + 0, 4 }, + { + 4, + 0 + }, + { + 0, + 4 + }, + { + 4, + 0 + }, + { + 0, + 4 + }, + { + 4, + 0 + }, + { + 0, + 4 + }, + { + 4, + 0 + }, + { + 0, + 4 + }, + { + 4, + 0 + }, + { + 0, + 4 + }, + { + 4, + 0 + }, + { + 0, + 4 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 4, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 0, 0 @@ -1545,54 +1569,30 @@ local chapter_board_daily_challenge = { 1, 0 }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, { 14, 0 }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 5, - 3 - }, { 0, 0 }, { - 1, + 0, 0 }, - { - 1, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 5, - 4 - }, { 1, 0 @@ -1601,120 +1601,92 @@ local chapter_board_daily_challenge = { }, [9]={ ["board_daily_challenge"]={ - { - 7, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, { 1, 0 }, { - 5, + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, 4 }, { - 5, + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, 4 }, { - 1, - 0 + 0, + 2 }, { - 5, - 5 - }, - { - 5, - 5 + 0, + 3 }, { 1, 0 }, { - 8, + 1, + 0 + }, + { + 4, + 3 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 4, + 4 + }, + { + 4, + 3 + }, + { + 1, + 0 + }, + { + 1, 0 }, { @@ -1725,82 +1697,114 @@ local chapter_board_daily_challenge = { 0, 0 }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 3, + 0 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, { 14, 0 }, { 0, - 0 + 2 }, { 0, + 4 + }, + { + 3, 0 }, { - 8, + 3, 0 }, { - 8, + 3, 0 }, { - 8, + 3, 0 }, { - 8, + 3, 0 }, { - 8, + 3, 0 }, { - 8, + 3, 0 }, { - 8, - 0 - }, - { - 8, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 3, 0 } } }, [10]={ ["board_daily_challenge"]={ + { + 1, + 0 + }, { 1, 0 @@ -1809,86 +1813,138 @@ local chapter_board_daily_challenge = { 0, 2 }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, { 0, 2 }, { 0, + 5 + }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 5, 3 }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, 2 }, { - 9, - 1 + 0, + 5 }, { - 0, + 5, 4 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, - 2 + 0 }, { - 9, - 1 + 1, + 0 }, { - 0, + 8, + 0 + }, + { + 5, 3 }, { - 9, + 5, 1 }, + { + 5, + 1 + }, + { + 5, + 5 + }, { 0, - 4 + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 8, + 0 }, { 1, 0 }, - { - 7, - 0 - }, { 8, 0 @@ -1897,34 +1953,6 @@ local chapter_board_daily_challenge = { 8, 0 }, - { - 9, - 1 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, { 8, 0 @@ -1934,23 +1962,23 @@ local chapter_board_daily_challenge = { 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { @@ -1958,76 +1986,72 @@ local chapter_board_daily_challenge = { 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, + 1, 0 } } }, [11]={ ["board_daily_challenge"]={ + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, { 1, 0 }, { 0, - 1 + 4 }, { 0, - 1 + 3 }, { 0, - 1 + 4 }, { 0, - 1 + 3 }, { - 0, - 1 + 7, + 0 }, { - 0, - 1 + 8, + 0 }, { 1, @@ -2053,85 +2077,37 @@ local chapter_board_daily_challenge = { 7, 0 }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, { 7, 0 }, { - 1, + 8, 0 }, { - 0, + 7, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 + 5, + 3 }, { 0, @@ -2142,48 +2118,52 @@ local chapter_board_daily_challenge = { 0 }, { - 9, - 1 + 7, + 0 }, { - 9, - 1 + 8, + 0 }, { - 9, - 1 + 7, + 0 }, { - 9, - 1 + 8, + 0 }, { - 9, - 1 + 5, + 4 + }, + { + 0, + 0 + }, + { + 1, + 0 }, { 14, 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, + 7, 0 }, { - 0, - 0 - }, - { - 0, - 0 + 5, + 3 }, { 0, @@ -2193,6 +2173,26 @@ local chapter_board_daily_challenge = { 1, 0 }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 5, + 4 + }, { 1, 0 @@ -2202,7 +2202,87 @@ local chapter_board_daily_challenge = { [12]={ ["board_daily_challenge"]={ { - 1, + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { @@ -2210,163 +2290,83 @@ local chapter_board_daily_challenge = { 0 }, { - 1, - 0 + 5, + 4 }, { - 7, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 + 5, + 4 }, { 1, 0 }, { - 1, - 0 + 5, + 5 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 0, - 3 - }, - { - 9, - 1 - }, - { - 0, - 3 + 5, + 5 }, { 1, 0 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 8, 0 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, 0 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 + 0 }, { 14, 0 }, { - 7, + 0, 0 }, { - 7, + 0, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 1, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 8, 0 }, { @@ -2378,16 +2378,16 @@ local chapter_board_daily_challenge = { 0 }, { - 13, - 5 + 1, + 0 }, { - 13, - 1 + 1, + 0 }, { - 13, - 2 + 1, + 0 }, { 1, @@ -2401,10 +2401,6 @@ local chapter_board_daily_challenge = { }, [13]={ ["board_daily_challenge"]={ - { - 1, - 0 - }, { 1, 0 @@ -2413,40 +2409,20 @@ local chapter_board_daily_challenge = { 0, 2 }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 2 - }, { 0, 2 }, { 0, - 5 + 3 }, { - 5, + 0, + 4 + }, + { + 0, 4 }, { @@ -2458,27 +2434,23 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 1, 0 }, - { - 5, - 3 - }, { 0, 2 }, { - 0, - 5 + 9, + 1 }, { - 5, + 0, 4 }, { - 0, + 1, 0 }, { @@ -2486,29 +2458,49 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 1, 0 }, { - 5, + 0, + 2 + }, + { + 9, + 1 + }, + { + 0, 3 }, { - 5, + 9, 1 }, { - 5, + 0, + 4 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 9, 1 }, - { - 5, - 5 - }, - { - 0, - 0 - }, { 8, 0 @@ -2518,23 +2510,7 @@ local chapter_board_daily_challenge = { 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, + 7, 0 }, { @@ -2542,7 +2518,7 @@ local chapter_board_daily_challenge = { 0 }, { - 1, + 7, 0 }, { @@ -2557,28 +2533,24 @@ local chapter_board_daily_challenge = { 8, 0 }, + { + 7, + 0 + }, { 8, 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 7, 0 }, { @@ -2586,72 +2558,76 @@ local chapter_board_daily_challenge = { 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, 0 } } }, [14]={ ["board_daily_challenge"]={ - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, { 1, 0 }, { 0, - 4 + 1 }, { 0, - 3 + 1 }, { 0, - 4 + 1 }, { 0, - 3 + 1 }, { - 7, - 0 + 0, + 1 }, { - 8, - 0 + 0, + 1 }, { 1, @@ -2678,8 +2654,56 @@ local chapter_board_daily_challenge = { 0 }, { - 5, - 4 + 7, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 }, { 1, @@ -2690,24 +2714,24 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 0, 0 }, { - 7, + 0, 0 }, { - 8, + 0, 0 }, { - 7, + 0, 0 }, { - 5, - 3 + 0, + 0 }, { 0, @@ -2718,52 +2742,48 @@ local chapter_board_daily_challenge = { 0 }, { - 7, - 0 + 9, + 1 }, { - 8, - 0 + 9, + 1 }, { - 7, - 0 + 9, + 1 }, { - 8, - 0 + 9, + 1 }, { - 5, - 4 - }, - { - 0, - 0 - }, - { - 1, - 0 + 9, + 1 }, { 14, 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { - 5, - 3 + 0, + 0 + }, + { + 0, + 0 }, { 0, @@ -2773,26 +2793,6 @@ local chapter_board_daily_challenge = { 1, 0 }, - { - 1, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 5, - 4 - }, { 1, 0 @@ -2802,87 +2802,7 @@ local chapter_board_daily_challenge = { [15]={ ["board_daily_challenge"]={ { - 7, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 1, 0 }, { @@ -2890,83 +2810,163 @@ local chapter_board_daily_challenge = { 0 }, { - 5, - 4 + 1, + 0 }, { - 5, - 4 + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 }, { 1, 0 }, { - 5, - 5 + 1, + 0 }, { - 5, - 5 + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 3 + }, + { + 9, + 1 + }, + { + 0, + 3 }, { 1, 0 }, { - 8, + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { 0, - 0 + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 }, { 14, 0 }, { - 0, + 7, 0 }, { - 0, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 1, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { @@ -2978,16 +2978,16 @@ local chapter_board_daily_challenge = { 0 }, { - 1, - 0 + 13, + 5 }, { - 1, - 0 + 13, + 1 }, { - 1, - 0 + 13, + 2 }, { 1, @@ -3001,6 +3001,10 @@ local chapter_board_daily_challenge = { }, [16]={ ["board_daily_challenge"]={ + { + 1, + 0 + }, { 1, 0 @@ -3009,86 +3013,138 @@ local chapter_board_daily_challenge = { 0, 2 }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, { 0, 2 }, { 0, + 5 + }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 5, 3 }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, 2 }, { - 9, - 1 + 0, + 5 }, { - 0, + 5, 4 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, - 2 + 0 }, { - 9, - 1 + 1, + 0 }, { - 0, + 8, + 0 + }, + { + 5, 3 }, { - 9, + 5, 1 }, + { + 5, + 1 + }, + { + 5, + 5 + }, { 0, - 4 + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 8, + 0 }, { 1, 0 }, - { - 7, - 0 - }, { 8, 0 @@ -3097,34 +3153,6 @@ local chapter_board_daily_challenge = { 8, 0 }, - { - 9, - 1 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, { 8, 0 @@ -3134,23 +3162,23 @@ local chapter_board_daily_challenge = { 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { @@ -3158,76 +3186,72 @@ local chapter_board_daily_challenge = { 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, + 1, 0 } } }, [17]={ ["board_daily_challenge"]={ + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, { 1, 0 }, { 0, - 1 + 4 }, { 0, - 1 + 3 }, { 0, - 1 + 4 }, { 0, - 1 + 3 }, { - 0, - 1 + 7, + 0 }, { - 0, - 1 + 8, + 0 }, { 1, @@ -3253,85 +3277,37 @@ local chapter_board_daily_challenge = { 7, 0 }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, { 7, 0 }, { - 1, + 8, 0 }, { - 0, + 7, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 + 5, + 3 }, { 0, @@ -3342,48 +3318,52 @@ local chapter_board_daily_challenge = { 0 }, { - 9, - 1 + 7, + 0 }, { - 9, - 1 + 8, + 0 }, { - 9, - 1 + 7, + 0 }, { - 9, - 1 + 8, + 0 }, { - 9, - 1 + 5, + 4 + }, + { + 0, + 0 + }, + { + 1, + 0 }, { 14, 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, + 7, 0 }, { - 0, - 0 - }, - { - 0, - 0 + 5, + 3 }, { 0, @@ -3393,6 +3373,26 @@ local chapter_board_daily_challenge = { 1, 0 }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 5, + 4 + }, { 1, 0 @@ -3402,7 +3402,87 @@ local chapter_board_daily_challenge = { [18]={ ["board_daily_challenge"]={ { - 1, + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { @@ -3410,163 +3490,83 @@ local chapter_board_daily_challenge = { 0 }, { - 1, - 0 + 5, + 4 }, { - 7, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 + 5, + 4 }, { 1, 0 }, { - 1, - 0 + 5, + 5 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 0, - 3 - }, - { - 9, - 1 - }, - { - 0, - 3 + 5, + 5 }, { 1, 0 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 8, 0 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, 0 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 + 0 }, { 14, 0 }, { - 7, + 0, 0 }, { - 7, + 0, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 1, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 8, 0 }, { @@ -3578,16 +3578,16 @@ local chapter_board_daily_challenge = { 0 }, { - 13, - 5 + 1, + 0 }, { - 13, - 1 + 1, + 0 }, { - 13, - 2 + 1, + 0 }, { 1, @@ -3601,10 +3601,6 @@ local chapter_board_daily_challenge = { }, [19]={ ["board_daily_challenge"]={ - { - 1, - 0 - }, { 1, 0 @@ -3613,40 +3609,20 @@ local chapter_board_daily_challenge = { 0, 2 }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 2 - }, { 0, 2 }, { 0, - 5 + 3 }, { - 5, + 0, + 4 + }, + { + 0, 4 }, { @@ -3658,27 +3634,23 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 1, 0 }, - { - 5, - 3 - }, { 0, 2 }, { - 0, - 5 + 9, + 1 }, { - 5, + 0, 4 }, { - 0, + 1, 0 }, { @@ -3686,29 +3658,49 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 1, 0 }, { - 5, + 0, + 2 + }, + { + 9, + 1 + }, + { + 0, 3 }, { - 5, + 9, 1 }, { - 5, + 0, + 4 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 9, 1 }, - { - 5, - 5 - }, - { - 0, - 0 - }, { 8, 0 @@ -3718,23 +3710,7 @@ local chapter_board_daily_challenge = { 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, + 7, 0 }, { @@ -3742,7 +3718,7 @@ local chapter_board_daily_challenge = { 0 }, { - 1, + 7, 0 }, { @@ -3757,28 +3733,24 @@ local chapter_board_daily_challenge = { 8, 0 }, + { + 7, + 0 + }, { 8, 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 7, 0 }, { @@ -3786,72 +3758,76 @@ local chapter_board_daily_challenge = { 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, 0 } } }, [20]={ ["board_daily_challenge"]={ - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, { 1, 0 }, { 0, - 4 + 1 }, { 0, - 3 + 1 }, { 0, - 4 + 1 }, { 0, - 3 + 1 }, { - 7, - 0 + 0, + 1 }, { - 8, - 0 + 0, + 1 }, { 1, @@ -3878,8 +3854,56 @@ local chapter_board_daily_challenge = { 0 }, { - 5, - 4 + 7, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 }, { 1, @@ -3890,24 +3914,24 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 0, 0 }, { - 7, + 0, 0 }, { - 8, + 0, 0 }, { - 7, + 0, 0 }, { - 5, - 3 + 0, + 0 }, { 0, @@ -3918,52 +3942,48 @@ local chapter_board_daily_challenge = { 0 }, { - 7, - 0 + 9, + 1 }, { - 8, - 0 + 9, + 1 }, { - 7, - 0 + 9, + 1 }, { - 8, - 0 + 9, + 1 }, { - 5, - 4 - }, - { - 0, - 0 - }, - { - 1, - 0 + 9, + 1 }, { 14, 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { - 5, - 3 + 0, + 0 + }, + { + 0, + 0 }, { 0, @@ -3973,26 +3993,6 @@ local chapter_board_daily_challenge = { 1, 0 }, - { - 1, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 5, - 4 - }, { 1, 0 @@ -4002,87 +4002,7 @@ local chapter_board_daily_challenge = { [21]={ ["board_daily_challenge"]={ { - 7, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 1, 0 }, { @@ -4090,83 +4010,163 @@ local chapter_board_daily_challenge = { 0 }, { - 5, - 4 + 1, + 0 }, { - 5, - 4 + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 }, { 1, 0 }, { - 5, - 5 + 1, + 0 }, { - 5, - 5 + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 3 + }, + { + 9, + 1 + }, + { + 0, + 3 }, { 1, 0 }, { - 8, + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { 0, - 0 + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 }, { 14, 0 }, { - 0, + 7, 0 }, { - 0, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 1, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { @@ -4178,16 +4178,16 @@ local chapter_board_daily_challenge = { 0 }, { - 1, - 0 + 13, + 5 }, { - 1, - 0 + 13, + 1 }, { - 1, - 0 + 13, + 2 }, { 1, @@ -4201,6 +4201,10 @@ local chapter_board_daily_challenge = { }, [22]={ ["board_daily_challenge"]={ + { + 1, + 0 + }, { 1, 0 @@ -4209,86 +4213,138 @@ local chapter_board_daily_challenge = { 0, 2 }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, { 0, 2 }, { 0, + 5 + }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 5, 3 }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, 2 }, { - 9, - 1 + 0, + 5 }, { - 0, + 5, 4 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, - 2 + 0 }, { - 9, - 1 + 1, + 0 }, { - 0, + 8, + 0 + }, + { + 5, 3 }, { - 9, + 5, 1 }, + { + 5, + 1 + }, + { + 5, + 5 + }, { 0, - 4 + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 8, + 0 }, { 1, 0 }, - { - 7, - 0 - }, { 8, 0 @@ -4297,34 +4353,6 @@ local chapter_board_daily_challenge = { 8, 0 }, - { - 9, - 1 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, { 8, 0 @@ -4334,23 +4362,23 @@ local chapter_board_daily_challenge = { 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { @@ -4358,76 +4386,72 @@ local chapter_board_daily_challenge = { 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, + 1, 0 } } }, [23]={ ["board_daily_challenge"]={ + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, { 1, 0 }, { 0, - 1 + 4 }, { 0, - 1 + 3 }, { 0, - 1 + 4 }, { 0, - 1 + 3 }, { - 0, - 1 + 7, + 0 }, { - 0, - 1 + 8, + 0 }, { 1, @@ -4453,85 +4477,37 @@ local chapter_board_daily_challenge = { 7, 0 }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, { 7, 0 }, { - 1, + 8, 0 }, { - 0, + 7, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 + 5, + 3 }, { 0, @@ -4542,48 +4518,52 @@ local chapter_board_daily_challenge = { 0 }, { - 9, - 1 + 7, + 0 }, { - 9, - 1 + 8, + 0 }, { - 9, - 1 + 7, + 0 }, { - 9, - 1 + 8, + 0 }, { - 9, - 1 + 5, + 4 + }, + { + 0, + 0 + }, + { + 1, + 0 }, { 14, 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, + 7, 0 }, { - 0, - 0 - }, - { - 0, - 0 + 5, + 3 }, { 0, @@ -4593,6 +4573,26 @@ local chapter_board_daily_challenge = { 1, 0 }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 5, + 4 + }, { 1, 0 @@ -4602,7 +4602,87 @@ local chapter_board_daily_challenge = { [24]={ ["board_daily_challenge"]={ { - 1, + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { @@ -4610,163 +4690,83 @@ local chapter_board_daily_challenge = { 0 }, { - 1, - 0 + 5, + 4 }, { - 7, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 + 5, + 4 }, { 1, 0 }, { - 1, - 0 + 5, + 5 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 0, - 3 - }, - { - 9, - 1 - }, - { - 0, - 3 + 5, + 5 }, { 1, 0 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 8, 0 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, 0 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 + 0 }, { 14, 0 }, { - 7, + 0, 0 }, { - 7, + 0, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 1, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 8, 0 }, { @@ -4778,16 +4778,16 @@ local chapter_board_daily_challenge = { 0 }, { - 13, - 5 + 1, + 0 }, { - 13, - 1 + 1, + 0 }, { - 13, - 2 + 1, + 0 }, { 1, @@ -4801,10 +4801,6 @@ local chapter_board_daily_challenge = { }, [25]={ ["board_daily_challenge"]={ - { - 1, - 0 - }, { 1, 0 @@ -4813,40 +4809,20 @@ local chapter_board_daily_challenge = { 0, 2 }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 2 - }, { 0, 2 }, { 0, - 5 + 3 }, { - 5, + 0, + 4 + }, + { + 0, 4 }, { @@ -4858,27 +4834,23 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 1, 0 }, - { - 5, - 3 - }, { 0, 2 }, { - 0, - 5 + 9, + 1 }, { - 5, + 0, 4 }, { - 0, + 1, 0 }, { @@ -4886,29 +4858,49 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 1, 0 }, { - 5, + 0, + 2 + }, + { + 9, + 1 + }, + { + 0, 3 }, { - 5, + 9, 1 }, { - 5, + 0, + 4 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 9, 1 }, - { - 5, - 5 - }, - { - 0, - 0 - }, { 8, 0 @@ -4918,23 +4910,7 @@ local chapter_board_daily_challenge = { 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, + 7, 0 }, { @@ -4942,7 +4918,7 @@ local chapter_board_daily_challenge = { 0 }, { - 1, + 7, 0 }, { @@ -4957,28 +4933,24 @@ local chapter_board_daily_challenge = { 8, 0 }, + { + 7, + 0 + }, { 8, 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 7, 0 }, { @@ -4986,72 +4958,76 @@ local chapter_board_daily_challenge = { 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, 0 } } }, [26]={ ["board_daily_challenge"]={ - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, { 1, 0 }, { 0, - 4 + 1 }, { 0, - 3 + 1 }, { 0, - 4 + 1 }, { 0, - 3 + 1 }, { - 7, - 0 + 0, + 1 }, { - 8, - 0 + 0, + 1 }, { 1, @@ -5078,8 +5054,56 @@ local chapter_board_daily_challenge = { 0 }, { - 5, - 4 + 7, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 }, { 1, @@ -5090,24 +5114,24 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 0, 0 }, { - 7, + 0, 0 }, { - 8, + 0, 0 }, { - 7, + 0, 0 }, { - 5, - 3 + 0, + 0 }, { 0, @@ -5118,52 +5142,48 @@ local chapter_board_daily_challenge = { 0 }, { - 7, - 0 + 9, + 1 }, { - 8, - 0 + 9, + 1 }, { - 7, - 0 + 9, + 1 }, { - 8, - 0 + 9, + 1 }, { - 5, - 4 - }, - { - 0, - 0 - }, - { - 1, - 0 + 9, + 1 }, { 14, 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { - 5, - 3 + 0, + 0 + }, + { + 0, + 0 }, { 0, @@ -5173,26 +5193,6 @@ local chapter_board_daily_challenge = { 1, 0 }, - { - 1, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 5, - 4 - }, { 1, 0 @@ -5202,87 +5202,7 @@ local chapter_board_daily_challenge = { [27]={ ["board_daily_challenge"]={ { - 7, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 1, 0 }, { @@ -5290,83 +5210,163 @@ local chapter_board_daily_challenge = { 0 }, { - 5, - 4 + 1, + 0 }, { - 5, - 4 + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 }, { 1, 0 }, { - 5, - 5 + 1, + 0 }, { - 5, - 5 + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 3 + }, + { + 9, + 1 + }, + { + 0, + 3 }, { 1, 0 }, { - 8, + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { 0, - 0 + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 }, { 14, 0 }, { - 0, + 7, 0 }, { - 0, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 1, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { @@ -5378,16 +5378,16 @@ local chapter_board_daily_challenge = { 0 }, { - 1, - 0 + 13, + 5 }, { - 1, - 0 + 13, + 1 }, { - 1, - 0 + 13, + 2 }, { 1, @@ -5401,6 +5401,10 @@ local chapter_board_daily_challenge = { }, [28]={ ["board_daily_challenge"]={ + { + 1, + 0 + }, { 1, 0 @@ -5409,86 +5413,138 @@ local chapter_board_daily_challenge = { 0, 2 }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, { 0, 2 }, { 0, + 5 + }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 5, 3 }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, 2 }, { - 9, - 1 + 0, + 5 }, { - 0, + 5, 4 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, - 2 + 0 }, { - 9, - 1 + 1, + 0 }, { - 0, + 8, + 0 + }, + { + 5, 3 }, { - 9, + 5, 1 }, + { + 5, + 1 + }, + { + 5, + 5 + }, { 0, - 4 + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 8, + 0 }, { 1, 0 }, - { - 7, - 0 - }, { 8, 0 @@ -5497,34 +5553,6 @@ local chapter_board_daily_challenge = { 8, 0 }, - { - 9, - 1 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, { 8, 0 @@ -5534,23 +5562,23 @@ local chapter_board_daily_challenge = { 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { @@ -5558,76 +5586,72 @@ local chapter_board_daily_challenge = { 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, + 1, 0 } } }, [29]={ ["board_daily_challenge"]={ + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, { 1, 0 }, { 0, - 1 + 4 }, { 0, - 1 + 3 }, { 0, - 1 + 4 }, { 0, - 1 + 3 }, { - 0, - 1 + 7, + 0 }, { - 0, - 1 + 8, + 0 }, { 1, @@ -5653,85 +5677,37 @@ local chapter_board_daily_challenge = { 7, 0 }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, { 7, 0 }, { - 1, + 8, 0 }, { - 0, + 7, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 + 5, + 3 }, { 0, @@ -5742,48 +5718,52 @@ local chapter_board_daily_challenge = { 0 }, { - 9, - 1 + 7, + 0 }, { - 9, - 1 + 8, + 0 }, { - 9, - 1 + 7, + 0 }, { - 9, - 1 + 8, + 0 }, { - 9, - 1 + 5, + 4 + }, + { + 0, + 0 + }, + { + 1, + 0 }, { 14, 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, + 7, 0 }, { - 0, - 0 - }, - { - 0, - 0 + 5, + 3 }, { 0, @@ -5793,6 +5773,26 @@ local chapter_board_daily_challenge = { 1, 0 }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 5, + 4 + }, { 1, 0 @@ -5802,7 +5802,87 @@ local chapter_board_daily_challenge = { [30]={ ["board_daily_challenge"]={ { - 1, + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { @@ -5810,163 +5890,83 @@ local chapter_board_daily_challenge = { 0 }, { - 1, - 0 + 5, + 4 }, { - 7, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 + 5, + 4 }, { 1, 0 }, { - 1, - 0 + 5, + 5 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 0, - 3 - }, - { - 9, - 1 - }, - { - 0, - 3 + 5, + 5 }, { 1, 0 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 8, 0 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, 0 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 + 0 }, { 14, 0 }, { - 7, + 0, 0 }, { - 7, + 0, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 1, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 8, 0 }, { @@ -5978,16 +5978,16 @@ local chapter_board_daily_challenge = { 0 }, { - 13, - 5 + 1, + 0 }, { - 13, - 1 + 1, + 0 }, { - 13, - 2 + 1, + 0 }, { 1, @@ -6001,10 +6001,6 @@ local chapter_board_daily_challenge = { }, [31]={ ["board_daily_challenge"]={ - { - 1, - 0 - }, { 1, 0 @@ -6013,40 +6009,20 @@ local chapter_board_daily_challenge = { 0, 2 }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 2 - }, { 0, 2 }, { 0, - 5 + 3 }, { - 5, + 0, + 4 + }, + { + 0, 4 }, { @@ -6058,27 +6034,23 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 1, 0 }, - { - 5, - 3 - }, { 0, 2 }, { - 0, - 5 + 9, + 1 }, { - 5, + 0, 4 }, { - 0, + 1, 0 }, { @@ -6086,29 +6058,49 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 1, 0 }, { - 5, + 0, + 2 + }, + { + 9, + 1 + }, + { + 0, 3 }, { - 5, + 9, 1 }, { - 5, + 0, + 4 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 9, 1 }, - { - 5, - 5 - }, - { - 0, - 0 - }, { 8, 0 @@ -6118,23 +6110,7 @@ local chapter_board_daily_challenge = { 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, + 7, 0 }, { @@ -6142,7 +6118,7 @@ local chapter_board_daily_challenge = { 0 }, { - 1, + 7, 0 }, { @@ -6157,28 +6133,24 @@ local chapter_board_daily_challenge = { 8, 0 }, + { + 7, + 0 + }, { 8, 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 7, 0 }, { @@ -6186,72 +6158,76 @@ local chapter_board_daily_challenge = { 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, 0 } } }, [32]={ ["board_daily_challenge"]={ - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, { 1, 0 }, { 0, - 4 + 1 }, { 0, - 3 + 1 }, { 0, - 4 + 1 }, { 0, - 3 + 1 }, { - 7, - 0 + 0, + 1 }, { - 8, - 0 + 0, + 1 }, { 1, @@ -6278,8 +6254,56 @@ local chapter_board_daily_challenge = { 0 }, { - 5, - 4 + 7, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 }, { 1, @@ -6290,24 +6314,24 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 0, 0 }, { - 7, + 0, 0 }, { - 8, + 0, 0 }, { - 7, + 0, 0 }, { - 5, - 3 + 0, + 0 }, { 0, @@ -6318,52 +6342,48 @@ local chapter_board_daily_challenge = { 0 }, { - 7, - 0 + 9, + 1 }, { - 8, - 0 + 9, + 1 }, { - 7, - 0 + 9, + 1 }, { - 8, - 0 + 9, + 1 }, { - 5, - 4 - }, - { - 0, - 0 - }, - { - 1, - 0 + 9, + 1 }, { 14, 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { - 5, - 3 + 0, + 0 + }, + { + 0, + 0 }, { 0, @@ -6373,26 +6393,6 @@ local chapter_board_daily_challenge = { 1, 0 }, - { - 1, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 5, - 4 - }, { 1, 0 @@ -6402,87 +6402,7 @@ local chapter_board_daily_challenge = { [33]={ ["board_daily_challenge"]={ { - 7, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 1, 0 }, { @@ -6490,83 +6410,163 @@ local chapter_board_daily_challenge = { 0 }, { - 5, - 4 + 1, + 0 }, { - 5, - 4 + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 }, { 1, 0 }, { - 5, - 5 + 1, + 0 }, { - 5, - 5 + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 3 + }, + { + 9, + 1 + }, + { + 0, + 3 }, { 1, 0 }, { - 8, + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { 0, - 0 + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 }, { 14, 0 }, { - 0, + 7, 0 }, { - 0, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 1, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { @@ -6578,16 +6578,16 @@ local chapter_board_daily_challenge = { 0 }, { - 1, - 0 + 13, + 5 }, { - 1, - 0 + 13, + 1 }, { - 1, - 0 + 13, + 2 }, { 1, @@ -6601,6 +6601,10 @@ local chapter_board_daily_challenge = { }, [34]={ ["board_daily_challenge"]={ + { + 1, + 0 + }, { 1, 0 @@ -6609,86 +6613,138 @@ local chapter_board_daily_challenge = { 0, 2 }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, { 0, 2 }, { 0, + 5 + }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 5, 3 }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, 2 }, { - 9, - 1 + 0, + 5 }, { - 0, + 5, 4 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, - 2 + 0 }, { - 9, - 1 + 1, + 0 }, { - 0, + 8, + 0 + }, + { + 5, 3 }, { - 9, + 5, 1 }, + { + 5, + 1 + }, + { + 5, + 5 + }, { 0, - 4 + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 8, + 0 }, { 1, 0 }, - { - 7, - 0 - }, { 8, 0 @@ -6697,34 +6753,6 @@ local chapter_board_daily_challenge = { 8, 0 }, - { - 9, - 1 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, { 8, 0 @@ -6734,23 +6762,23 @@ local chapter_board_daily_challenge = { 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { @@ -6758,76 +6786,72 @@ local chapter_board_daily_challenge = { 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, + 1, 0 } } }, [35]={ ["board_daily_challenge"]={ + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, { 1, 0 }, { 0, - 1 + 4 }, { 0, - 1 + 3 }, { 0, - 1 + 4 }, { 0, - 1 + 3 }, { - 0, - 1 + 7, + 0 }, { - 0, - 1 + 8, + 0 }, { 1, @@ -6853,85 +6877,37 @@ local chapter_board_daily_challenge = { 7, 0 }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, { 7, 0 }, { - 1, + 8, 0 }, { - 0, + 7, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 + 5, + 3 }, { 0, @@ -6942,48 +6918,52 @@ local chapter_board_daily_challenge = { 0 }, { - 9, - 1 + 7, + 0 }, { - 9, - 1 + 8, + 0 }, { - 9, - 1 + 7, + 0 }, { - 9, - 1 + 8, + 0 }, { - 9, - 1 + 5, + 4 + }, + { + 0, + 0 + }, + { + 1, + 0 }, { 14, 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, + 7, 0 }, { - 0, - 0 - }, - { - 0, - 0 + 5, + 3 }, { 0, @@ -6993,6 +6973,26 @@ local chapter_board_daily_challenge = { 1, 0 }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 5, + 4 + }, { 1, 0 @@ -7002,7 +7002,87 @@ local chapter_board_daily_challenge = { [36]={ ["board_daily_challenge"]={ { - 1, + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { @@ -7010,163 +7090,83 @@ local chapter_board_daily_challenge = { 0 }, { - 1, - 0 + 5, + 4 }, { - 7, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 + 5, + 4 }, { 1, 0 }, { - 1, - 0 + 5, + 5 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 0, - 3 - }, - { - 9, - 1 - }, - { - 0, - 3 + 5, + 5 }, { 1, 0 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 8, 0 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, 0 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 + 0 }, { 14, 0 }, { - 7, + 0, 0 }, { - 7, + 0, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 1, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 8, 0 }, { @@ -7178,16 +7178,16 @@ local chapter_board_daily_challenge = { 0 }, { - 13, - 5 + 1, + 0 }, { - 13, - 1 + 1, + 0 }, { - 13, - 2 + 1, + 0 }, { 1, @@ -7201,10 +7201,6 @@ local chapter_board_daily_challenge = { }, [37]={ ["board_daily_challenge"]={ - { - 1, - 0 - }, { 1, 0 @@ -7213,40 +7209,20 @@ local chapter_board_daily_challenge = { 0, 2 }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 2 - }, { 0, 2 }, { 0, - 5 + 3 }, { - 5, + 0, + 4 + }, + { + 0, 4 }, { @@ -7258,27 +7234,23 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 1, 0 }, - { - 5, - 3 - }, { 0, 2 }, { - 0, - 5 + 9, + 1 }, { - 5, + 0, 4 }, { - 0, + 1, 0 }, { @@ -7286,29 +7258,49 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 1, 0 }, { - 5, + 0, + 2 + }, + { + 9, + 1 + }, + { + 0, 3 }, { - 5, + 9, 1 }, { - 5, + 0, + 4 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 9, 1 }, - { - 5, - 5 - }, - { - 0, - 0 - }, { 8, 0 @@ -7318,23 +7310,7 @@ local chapter_board_daily_challenge = { 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, + 7, 0 }, { @@ -7342,7 +7318,7 @@ local chapter_board_daily_challenge = { 0 }, { - 1, + 7, 0 }, { @@ -7357,28 +7333,24 @@ local chapter_board_daily_challenge = { 8, 0 }, + { + 7, + 0 + }, { 8, 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 7, 0 }, { @@ -7386,72 +7358,76 @@ local chapter_board_daily_challenge = { 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, 0 } } }, [38]={ ["board_daily_challenge"]={ - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, { 1, 0 }, { 0, - 4 + 1 }, { 0, - 3 + 1 }, { 0, - 4 + 1 }, { 0, - 3 + 1 }, { - 7, - 0 + 0, + 1 }, { - 8, - 0 + 0, + 1 }, { 1, @@ -7478,8 +7454,56 @@ local chapter_board_daily_challenge = { 0 }, { - 5, - 4 + 7, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 }, { 1, @@ -7490,24 +7514,24 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 0, 0 }, { - 7, + 0, 0 }, { - 8, + 0, 0 }, { - 7, + 0, 0 }, { - 5, - 3 + 0, + 0 }, { 0, @@ -7518,52 +7542,48 @@ local chapter_board_daily_challenge = { 0 }, { - 7, - 0 + 9, + 1 }, { - 8, - 0 + 9, + 1 }, { - 7, - 0 + 9, + 1 }, { - 8, - 0 + 9, + 1 }, { - 5, - 4 - }, - { - 0, - 0 - }, - { - 1, - 0 + 9, + 1 }, { 14, 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { - 5, - 3 + 0, + 0 + }, + { + 0, + 0 }, { 0, @@ -7573,26 +7593,6 @@ local chapter_board_daily_challenge = { 1, 0 }, - { - 1, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 5, - 4 - }, { 1, 0 @@ -7602,87 +7602,7 @@ local chapter_board_daily_challenge = { [39]={ ["board_daily_challenge"]={ { - 7, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 1, 0 }, { @@ -7690,83 +7610,163 @@ local chapter_board_daily_challenge = { 0 }, { - 5, - 4 + 1, + 0 }, { - 5, - 4 + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 }, { 1, 0 }, { - 5, - 5 + 1, + 0 }, { - 5, - 5 + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 3 + }, + { + 9, + 1 + }, + { + 0, + 3 }, { 1, 0 }, { - 8, + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { 0, - 0 + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 }, { 14, 0 }, { - 0, + 7, 0 }, { - 0, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 1, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { @@ -7778,16 +7778,16 @@ local chapter_board_daily_challenge = { 0 }, { - 1, - 0 + 13, + 5 }, { - 1, - 0 + 13, + 1 }, { - 1, - 0 + 13, + 2 }, { 1, @@ -7801,6 +7801,10 @@ local chapter_board_daily_challenge = { }, [40]={ ["board_daily_challenge"]={ + { + 1, + 0 + }, { 1, 0 @@ -7809,86 +7813,138 @@ local chapter_board_daily_challenge = { 0, 2 }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, { 0, 2 }, { 0, + 5 + }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 5, 3 }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, 2 }, { - 9, - 1 + 0, + 5 }, { - 0, + 5, 4 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, - 2 + 0 }, { - 9, - 1 + 1, + 0 }, { - 0, + 8, + 0 + }, + { + 5, 3 }, { - 9, + 5, 1 }, + { + 5, + 1 + }, + { + 5, + 5 + }, { 0, - 4 + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 8, + 0 }, { 1, 0 }, - { - 7, - 0 - }, { 8, 0 @@ -7897,34 +7953,6 @@ local chapter_board_daily_challenge = { 8, 0 }, - { - 9, - 1 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, { 8, 0 @@ -7934,23 +7962,23 @@ local chapter_board_daily_challenge = { 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { @@ -7958,76 +7986,72 @@ local chapter_board_daily_challenge = { 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, + 1, 0 } } }, [41]={ ["board_daily_challenge"]={ + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, { 1, 0 }, { 0, - 1 + 4 }, { 0, - 1 + 3 }, { 0, - 1 + 4 }, { 0, - 1 + 3 }, { - 0, - 1 + 7, + 0 }, { - 0, - 1 + 8, + 0 }, { 1, @@ -8053,85 +8077,37 @@ local chapter_board_daily_challenge = { 7, 0 }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, { 7, 0 }, { - 1, + 8, 0 }, { - 0, + 7, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 + 5, + 3 }, { 0, @@ -8142,48 +8118,52 @@ local chapter_board_daily_challenge = { 0 }, { - 9, - 1 + 7, + 0 }, { - 9, - 1 + 8, + 0 }, { - 9, - 1 + 7, + 0 }, { - 9, - 1 + 8, + 0 }, { - 9, - 1 + 5, + 4 + }, + { + 0, + 0 + }, + { + 1, + 0 }, { 14, 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, + 7, 0 }, { - 0, - 0 - }, - { - 0, - 0 + 5, + 3 }, { 0, @@ -8193,6 +8173,26 @@ local chapter_board_daily_challenge = { 1, 0 }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 5, + 4 + }, { 1, 0 @@ -8202,7 +8202,87 @@ local chapter_board_daily_challenge = { [42]={ ["board_daily_challenge"]={ { - 1, + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { @@ -8210,163 +8290,83 @@ local chapter_board_daily_challenge = { 0 }, { - 1, - 0 + 5, + 4 }, { - 7, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 + 5, + 4 }, { 1, 0 }, { - 1, - 0 + 5, + 5 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 0, - 3 - }, - { - 9, - 1 - }, - { - 0, - 3 + 5, + 5 }, { 1, 0 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 8, 0 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, 0 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 + 0 }, { 14, 0 }, { - 7, + 0, 0 }, { - 7, + 0, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 1, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 8, 0 }, { @@ -8378,16 +8378,16 @@ local chapter_board_daily_challenge = { 0 }, { - 13, - 5 + 1, + 0 }, { - 13, - 1 + 1, + 0 }, { - 13, - 2 + 1, + 0 }, { 1, @@ -8401,10 +8401,6 @@ local chapter_board_daily_challenge = { }, [43]={ ["board_daily_challenge"]={ - { - 1, - 0 - }, { 1, 0 @@ -8413,40 +8409,20 @@ local chapter_board_daily_challenge = { 0, 2 }, - { - 0, - 5 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 5, - 2 - }, { 0, 2 }, { 0, - 5 + 3 }, { - 5, + 0, + 4 + }, + { + 0, 4 }, { @@ -8458,27 +8434,23 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 1, 0 }, - { - 5, - 3 - }, { 0, 2 }, { - 0, - 5 + 9, + 1 }, { - 5, + 0, 4 }, { - 0, + 1, 0 }, { @@ -8486,29 +8458,49 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 1, 0 }, { - 5, + 0, + 2 + }, + { + 9, + 1 + }, + { + 0, 3 }, { - 5, + 9, 1 }, { - 5, + 0, + 4 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 9, 1 }, - { - 5, - 5 - }, - { - 0, - 0 - }, { 8, 0 @@ -8518,23 +8510,7 @@ local chapter_board_daily_challenge = { 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, + 7, 0 }, { @@ -8542,7 +8518,7 @@ local chapter_board_daily_challenge = { 0 }, { - 1, + 7, 0 }, { @@ -8557,28 +8533,24 @@ local chapter_board_daily_challenge = { 8, 0 }, + { + 7, + 0 + }, { 8, 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, + 7, 0 }, { @@ -8586,72 +8558,76 @@ local chapter_board_daily_challenge = { 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, 0 } } }, [44]={ ["board_daily_challenge"]={ - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, { 1, 0 }, { 0, - 4 + 1 }, { 0, - 3 + 1 }, { 0, - 4 + 1 }, { 0, - 3 + 1 }, { - 7, - 0 + 0, + 1 }, { - 8, - 0 + 0, + 1 }, { 1, @@ -8678,8 +8654,56 @@ local chapter_board_daily_challenge = { 0 }, { - 5, - 4 + 7, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 }, { 1, @@ -8690,24 +8714,24 @@ local chapter_board_daily_challenge = { 0 }, { - 8, + 0, 0 }, { - 7, + 0, 0 }, { - 8, + 0, 0 }, { - 7, + 0, 0 }, { - 5, - 3 + 0, + 0 }, { 0, @@ -8718,52 +8742,48 @@ local chapter_board_daily_challenge = { 0 }, { - 7, - 0 + 9, + 1 }, { - 8, - 0 + 9, + 1 }, { - 7, - 0 + 9, + 1 }, { - 8, - 0 + 9, + 1 }, { - 5, - 4 - }, - { - 0, - 0 - }, - { - 1, - 0 + 9, + 1 }, { 14, 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { - 5, - 3 + 0, + 0 + }, + { + 0, + 0 }, { 0, @@ -8773,26 +8793,6 @@ local chapter_board_daily_challenge = { 1, 0 }, - { - 1, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 5, - 4 - }, { 1, 0 @@ -8802,87 +8802,7 @@ local chapter_board_daily_challenge = { [45]={ ["board_daily_challenge"]={ { - 7, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 1, 0 }, { @@ -8890,83 +8810,163 @@ local chapter_board_daily_challenge = { 0 }, { - 5, - 4 + 1, + 0 }, { - 5, - 4 + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 }, { 1, 0 }, { - 5, - 5 + 1, + 0 }, { - 5, - 5 + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 3 + }, + { + 9, + 1 + }, + { + 0, + 3 }, { 1, 0 }, { - 8, + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { 0, - 0 + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 }, { 14, 0 }, { - 0, + 7, 0 }, { - 0, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 1, 0 }, { - 8, + 7, 0 }, { - 8, + 7, 0 }, { - 8, + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { @@ -8978,16 +8978,16 @@ local chapter_board_daily_challenge = { 0 }, { - 1, - 0 + 13, + 5 }, { - 1, - 0 + 13, + 1 }, { - 1, - 0 + 13, + 2 }, { 1, @@ -9001,6 +9001,10 @@ local chapter_board_daily_challenge = { }, [46]={ ["board_daily_challenge"]={ + { + 1, + 0 + }, { 1, 0 @@ -9009,86 +9013,138 @@ local chapter_board_daily_challenge = { 0, 2 }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, { 0, 2 }, { 0, + 5 + }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 5, 3 }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, 2 }, { - 9, - 1 + 0, + 5 }, { - 0, + 5, 4 }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 0, - 2 + 0 }, { - 9, - 1 + 1, + 0 }, { - 0, + 8, + 0 + }, + { + 5, 3 }, { - 9, + 5, 1 }, + { + 5, + 1 + }, + { + 5, + 5 + }, { 0, - 4 + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 8, + 0 }, { 1, 0 }, - { - 7, - 0 - }, { 8, 0 @@ -9097,34 +9153,6 @@ local chapter_board_daily_challenge = { 8, 0 }, - { - 9, - 1 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, { 8, 0 @@ -9134,23 +9162,23 @@ local chapter_board_daily_challenge = { 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, + 1, 0 }, { @@ -9158,76 +9186,72 @@ local chapter_board_daily_challenge = { 0 }, { - 7, + 1, 0 }, { - 8, + 1, 0 }, { - 7, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 8, - 0 - }, - { - 7, - 0 - }, - { - 8, + 1, 0 } } }, [47]={ ["board_daily_challenge"]={ + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, { 1, 0 }, { 0, - 1 + 4 }, { 0, - 1 + 3 }, { 0, - 1 + 4 }, { 0, - 1 + 3 }, { - 0, - 1 + 7, + 0 }, { - 0, - 1 + 8, + 0 }, { 1, @@ -9253,85 +9277,37 @@ local chapter_board_daily_challenge = { 7, 0 }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, { 7, 0 }, { - 1, + 8, 0 }, { - 0, + 7, 0 }, { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 9, - 1 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 - }, - { - 0, - 0 + 5, + 3 }, { 0, @@ -9342,48 +9318,52 @@ local chapter_board_daily_challenge = { 0 }, { - 9, - 1 + 7, + 0 }, { - 9, - 1 + 8, + 0 }, { - 9, - 1 + 7, + 0 }, { - 9, - 1 + 8, + 0 }, { - 9, - 1 + 5, + 4 + }, + { + 0, + 0 + }, + { + 1, + 0 }, { 14, 0 }, { - 1, + 7, 0 }, { - 1, + 8, 0 }, { - 1, + 7, 0 }, { - 0, - 0 - }, - { - 0, - 0 + 5, + 3 }, { 0, @@ -9393,6 +9373,26 @@ local chapter_board_daily_challenge = { 1, 0 }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 5, + 4 + }, { 1, 0 @@ -9402,7 +9402,87 @@ local chapter_board_daily_challenge = { [48]={ ["board_daily_challenge"]={ { - 1, + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, 0 }, { @@ -9410,163 +9490,83 @@ local chapter_board_daily_challenge = { 0 }, { - 1, - 0 + 5, + 4 }, { - 7, - 0 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 + 5, + 4 }, { 1, 0 }, { - 1, - 0 + 5, + 5 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 0, - 3 - }, - { - 9, - 1 - }, - { - 0, - 3 + 5, + 5 }, { 1, 0 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 8, 0 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, 0 }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 3 + 0 }, { 14, 0 }, { - 7, + 0, 0 }, { - 7, + 0, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 1, + 8, 0 }, { - 7, + 8, 0 }, { - 7, + 8, 0 }, { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 7, + 8, 0 }, { @@ -9578,16 +9578,16 @@ local chapter_board_daily_challenge = { 0 }, { - 13, - 5 + 1, + 0 }, { - 13, - 1 + 1, + 0 }, { - 13, - 2 + 1, + 0 }, { 1, @@ -9600,6 +9600,606 @@ local chapter_board_daily_challenge = { } }, [49]={ + ["board_daily_challenge"]={ + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 9, + 1 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 9, + 1 + }, + { + 0, + 3 + }, + { + 9, + 1 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 9, + 1 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 14, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + } + } + }, + [50]={ + ["board_daily_challenge"]={ + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 14, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + } + }, + [51]={ + ["board_daily_challenge"]={ + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 3 + }, + { + 9, + 1 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 14, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 13, + 5 + }, + { + 13, + 1 + }, + { + 13, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + } + }, + [52]={ ["board_daily_challenge"]={ { 1, @@ -9799,7 +10399,7 @@ local chapter_board_daily_challenge = { } } }, - [50]={ + [53]={ ["board_daily_challenge"]={ { 0, @@ -9999,7 +10599,1207 @@ local chapter_board_daily_challenge = { } } }, - [51]={ + [54]={ + ["board_daily_challenge"]={ + { + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 1, + 0 + }, + { + 5, + 4 + }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 5, + 5 + }, + { + 5, + 5 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 14, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + } + }, + [55]={ + ["board_daily_challenge"]={ + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 9, + 1 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 9, + 1 + }, + { + 0, + 3 + }, + { + 9, + 1 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 9, + 1 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 14, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + } + } + }, + [56]={ + ["board_daily_challenge"]={ + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 9, + 1 + }, + { + 14, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + } + }, + [57]={ + ["board_daily_challenge"]={ + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 3 + }, + { + 9, + 1 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 14, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 13, + 5 + }, + { + 13, + 1 + }, + { + 13, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + } + }, + [58]={ + ["board_daily_challenge"]={ + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 5, + 2 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 5, + 3 + }, + { + 0, + 2 + }, + { + 0, + 5 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 5, + 3 + }, + { + 5, + 1 + }, + { + 5, + 1 + }, + { + 5, + 5 + }, + { + 0, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 0, + 0 + }, + { + 8, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 8, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 14, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + } + } + }, + [59]={ + ["board_daily_challenge"]={ + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 7, + 0 + }, + { + 5, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 5, + 3 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 5, + 4 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 14, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 5, + 3 + }, + { + 0, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 8, + 0 + }, + { + 7, + 0 + }, + { + 8, + 0 + }, + { + 5, + 4 + }, + { + 1, + 0 + } + } + }, + [60]={ ["board_daily_challenge"]={ { 7, @@ -10201,6 +12001,6 @@ local chapter_board_daily_challenge = { } } local config = { -data=chapter_board_daily_challenge,count=51 +data=chapter_board_daily_challenge,count=60 } return config \ No newline at end of file diff --git a/lua/app/config/chapter_daily_challenge.lua b/lua/app/config/chapter_daily_challenge.lua index 360dd62a..755e6777 100644 --- a/lua/app/config/chapter_daily_challenge.lua +++ b/lua/app/config/chapter_daily_challenge.lua @@ -1,10 +1,10 @@ local chapter_daily_challenge = { [1]={ - ["max_chapter"]=11, - ["icon"]="chapter_4", - ["scene"]="bg_4", - ["block_icon"]="battle_hinder_4", - ["chess_board"]="chessboard_4", + ["max_chapter"]=2, + ["icon"]="chapter_1", + ["scene"]="bg_1", + ["block_icon"]="battle_hinder_1", + ["chess_board"]="chessboard_1", ["chapter_board_daily_challenge"]={ 1, 2, @@ -209,32 +209,32 @@ local chapter_daily_challenge = { } }, [2]={ - ["max_chapter"]=15, - ["icon"]="chapter_5", - ["scene"]="bg_5", - ["block_icon"]="battle_hinder_5", - ["chess_board"]="chessboard_5", + ["max_chapter"]=5, + ["icon"]="chapter_2", + ["scene"]="bg_2", + ["block_icon"]="battle_hinder_2", + ["chess_board"]="chessboard_2", ["chapter_board_daily_challenge"]={ 4, 5, 6 }, ["monster"]={ - 20102, - 20202, - 20302, - 20402, - 20502, - 20602, - 20702, - 20802, - 20902, - 21002, - 21102, - 21202, - 21302, - 21402, - 21502 + 11602, + 11702, + 11802, + 11902, + 12002, + 12102, + 12202, + 12302, + 12402, + 12502, + 12602, + 12702, + 12802, + 12902, + 13002 }, ["wave_reward"]={ { @@ -418,32 +418,32 @@ local chapter_daily_challenge = { } }, [3]={ - ["max_chapter"]=19, - ["icon"]="chapter_4", - ["scene"]="bg_4", - ["block_icon"]="battle_hinder_6", - ["chess_board"]="chessboard_4", + ["max_chapter"]=8, + ["icon"]="chapter_3", + ["scene"]="bg_3", + ["block_icon"]="battle_hinder_3", + ["chess_board"]="chessboard_3", ["chapter_board_daily_challenge"]={ 7, 8, 9 }, ["monster"]={ - 30102, - 30202, - 30302, - 30402, - 30502, - 30602, - 30702, - 30802, - 30902, - 31002, - 31102, - 31202, - 31302, - 31402, - 31502 + 13102, + 13202, + 13302, + 13402, + 13502, + 13602, + 13702, + 13802, + 13902, + 14002, + 14102, + 14202, + 14302, + 14402, + 14502 }, ["wave_reward"]={ { @@ -627,32 +627,32 @@ local chapter_daily_challenge = { } }, [4]={ - ["max_chapter"]=23, - ["icon"]="chapter_5", - ["scene"]="bg_5", - ["block_icon"]="battle_hinder_7", - ["chess_board"]="chessboard_5", + ["max_chapter"]=11, + ["icon"]="chapter_4", + ["scene"]="bg_4", + ["block_icon"]="battle_hinder_4", + ["chess_board"]="chessboard_4", ["chapter_board_daily_challenge"]={ 10, 11, 12 }, ["monster"]={ - 40102, - 40202, - 40302, - 40402, - 40502, - 40602, - 40702, - 40802, - 40902, - 41002, - 41102, - 41202, - 41302, - 41402, - 41502 + 14602, + 14702, + 14802, + 14902, + 15002, + 15102, + 15202, + 15302, + 15402, + 15502, + 15602, + 15702, + 15802, + 15902, + 16002 }, ["wave_reward"]={ { @@ -836,32 +836,32 @@ local chapter_daily_challenge = { } }, [5]={ - ["max_chapter"]=27, - ["icon"]="chapter_4", - ["scene"]="bg_4", - ["block_icon"]="battle_hinder_4", - ["chess_board"]="chessboard_4", + ["max_chapter"]=15, + ["icon"]="chapter_5", + ["scene"]="bg_5", + ["block_icon"]="battle_hinder_5", + ["chess_board"]="chessboard_5", ["chapter_board_daily_challenge"]={ 13, 14, 15 }, ["monster"]={ - 50102, - 50202, - 50302, - 50402, - 50502, - 50602, - 50702, - 50802, - 50902, - 51002, - 51102, - 51202, - 51302, - 51402, - 51502 + 16102, + 16202, + 16302, + 16402, + 16502, + 16602, + 16702, + 16802, + 16902, + 17002, + 17102, + 17202, + 17302, + 17402, + 17502 }, ["wave_reward"]={ { @@ -1045,32 +1045,32 @@ local chapter_daily_challenge = { } }, [6]={ - ["max_chapter"]=32, - ["icon"]="chapter_5", - ["scene"]="bg_5", - ["block_icon"]="battle_hinder_5", - ["chess_board"]="chessboard_5", + ["max_chapter"]=19, + ["icon"]="chapter_1", + ["scene"]="bg_1", + ["block_icon"]="battle_hinder_6", + ["chess_board"]="chessboard_6", ["chapter_board_daily_challenge"]={ 16, 17, 18 }, ["monster"]={ - 60102, - 60202, - 60302, - 60402, - 60502, - 60602, - 60702, - 60802, - 60902, - 61002, - 61102, - 61202, - 61302, - 61402, - 61502 + 17602, + 17702, + 17802, + 17902, + 18002, + 18102, + 18202, + 18302, + 18402, + 18502, + 18602, + 18702, + 18802, + 18902, + 19002 }, ["wave_reward"]={ { @@ -1254,32 +1254,32 @@ local chapter_daily_challenge = { } }, [7]={ - ["max_chapter"]=42, - ["icon"]="chapter_4", - ["scene"]="bg_4", - ["block_icon"]="battle_hinder_6", - ["chess_board"]="chessboard_4", + ["max_chapter"]=23, + ["icon"]="chapter_2", + ["scene"]="bg_2", + ["block_icon"]="battle_hinder_7", + ["chess_board"]="chessboard_7", ["chapter_board_daily_challenge"]={ 19, 20, 21 }, ["monster"]={ - 70102, - 70202, - 70302, - 70402, - 70502, - 70602, - 70702, - 70802, - 70902, - 71002, - 71102, - 71202, - 71302, - 71402, - 71502 + 19102, + 19202, + 19302, + 19402, + 19502, + 19602, + 19702, + 19802, + 19902, + 20002, + 20102, + 20202, + 20302, + 20402, + 20502 }, ["wave_reward"]={ { @@ -1463,32 +1463,32 @@ local chapter_daily_challenge = { } }, [8]={ - ["max_chapter"]=47, - ["icon"]="chapter_5", - ["scene"]="bg_5", - ["block_icon"]="battle_hinder_7", - ["chess_board"]="chessboard_5", + ["max_chapter"]=27, + ["icon"]="chapter_3", + ["scene"]="bg_3", + ["block_icon"]="battle_hinder_3", + ["chess_board"]="chessboard_3", ["chapter_board_daily_challenge"]={ 22, 23, 24 }, ["monster"]={ - 80102, - 80202, - 80302, - 80402, - 80502, - 80602, - 80702, - 80802, - 80902, - 81002, - 81102, - 81202, - 81302, - 81402, - 81502 + 20602, + 20702, + 20802, + 20902, + 21002, + 21102, + 21202, + 21302, + 21402, + 21502, + 21602, + 21702, + 21802, + 21902, + 22002 }, ["wave_reward"]={ { @@ -1672,7 +1672,7 @@ local chapter_daily_challenge = { } }, [9]={ - ["max_chapter"]=52, + ["max_chapter"]=32, ["icon"]="chapter_4", ["scene"]="bg_4", ["block_icon"]="battle_hinder_4", @@ -1683,21 +1683,21 @@ local chapter_daily_challenge = { 27 }, ["monster"]={ - 90102, - 90202, - 90302, - 90402, - 90502, - 90602, - 90702, - 90802, - 90902, - 91002, - 91102, - 91202, - 91302, - 91402, - 91502 + 22102, + 22202, + 22302, + 22402, + 22502, + 22602, + 22702, + 22802, + 22902, + 23002, + 23102, + 23202, + 23302, + 23402, + 23502 }, ["wave_reward"]={ { @@ -1881,7 +1881,7 @@ local chapter_daily_challenge = { } }, [10]={ - ["max_chapter"]=67, + ["max_chapter"]=37, ["icon"]="chapter_5", ["scene"]="bg_5", ["block_icon"]="battle_hinder_5", @@ -1892,21 +1892,21 @@ local chapter_daily_challenge = { 30 }, ["monster"]={ - 100102, - 100202, - 100302, - 100402, - 100502, - 100602, - 100702, - 100802, - 100902, - 101002, - 101102, - 101202, - 101302, - 101402, - 101502 + 23602, + 23702, + 23802, + 23902, + 24002, + 24102, + 24202, + 24302, + 24402, + 24502, + 24602, + 24702, + 24802, + 24902, + 25002 }, ["wave_reward"]={ { @@ -2090,32 +2090,32 @@ local chapter_daily_challenge = { } }, [11]={ - ["max_chapter"]=37, - ["icon"]="chapter_4", - ["scene"]="bg_4", - ["block_icon"]="battle_hinder_6", - ["chess_board"]="chessboard_4", + ["max_chapter"]=42, + ["icon"]="chapter_1", + ["scene"]="bg_1", + ["block_icon"]="battle_hinder_1", + ["chess_board"]="chessboard_1", ["chapter_board_daily_challenge"]={ 31, 32, 33 }, ["monster"]={ - 110102, - 110202, - 110302, - 110402, - 110502, - 110602, - 110702, - 110802, - 110902, - 111002, - 111102, - 111202, - 111302, - 111402, - 111502 + 25102, + 25202, + 25302, + 25402, + 25502, + 25602, + 25702, + 25802, + 25902, + 26002, + 26102, + 26202, + 26302, + 26402, + 26502 }, ["wave_reward"]={ { @@ -2299,32 +2299,32 @@ local chapter_daily_challenge = { } }, [12]={ - ["max_chapter"]=62, - ["icon"]="chapter_5", - ["scene"]="bg_5", - ["block_icon"]="battle_hinder_7", - ["chess_board"]="chessboard_5", + ["max_chapter"]=47, + ["icon"]="chapter_2", + ["scene"]="bg_2", + ["block_icon"]="battle_hinder_2", + ["chess_board"]="chessboard_2", ["chapter_board_daily_challenge"]={ 34, 35, 36 }, ["monster"]={ - 120102, - 120202, - 120302, - 120402, - 120502, - 120602, - 120702, - 120802, - 120902, - 121002, - 121102, - 121202, - 121302, - 121402, - 121502 + 26602, + 26702, + 26802, + 26902, + 27002, + 27102, + 27202, + 27302, + 27402, + 27502, + 27602, + 27702, + 27802, + 27902, + 28002 }, ["wave_reward"]={ { @@ -2508,32 +2508,32 @@ local chapter_daily_challenge = { } }, [13]={ - ["max_chapter"]=72, - ["icon"]="chapter_4", - ["scene"]="bg_4", - ["block_icon"]="battle_hinder_4", - ["chess_board"]="chessboard_4", + ["max_chapter"]=52, + ["icon"]="chapter_3", + ["scene"]="bg_3", + ["block_icon"]="battle_hinder_3", + ["chess_board"]="chessboard_3", ["chapter_board_daily_challenge"]={ 37, 38, 39 }, ["monster"]={ - 130102, - 130202, - 130302, - 130402, - 130502, - 130602, - 130702, - 130802, - 130902, - 131002, - 131102, - 131202, - 131302, - 131402, - 131502 + 28102, + 28202, + 28302, + 28402, + 28502, + 28602, + 28702, + 28802, + 28902, + 29002, + 29102, + 29202, + 29302, + 29402, + 29502 }, ["wave_reward"]={ { @@ -2717,32 +2717,32 @@ local chapter_daily_challenge = { } }, [14]={ - ["max_chapter"]=77, - ["icon"]="chapter_5", - ["scene"]="bg_5", - ["block_icon"]="battle_hinder_5", - ["chess_board"]="chessboard_5", + ["max_chapter"]=57, + ["icon"]="chapter_4", + ["scene"]="bg_4", + ["block_icon"]="battle_hinder_4", + ["chess_board"]="chessboard_4", ["chapter_board_daily_challenge"]={ 40, 41, 42 }, ["monster"]={ - 140102, - 140202, - 140302, - 140402, - 140502, - 140602, - 140702, - 140802, - 140902, - 141002, - 141102, - 141202, - 141302, - 141402, - 141502 + 29602, + 29702, + 29802, + 29902, + 30002, + 30102, + 30202, + 30302, + 30402, + 30502, + 30602, + 30702, + 30802, + 30902, + 31002 }, ["wave_reward"]={ { @@ -2926,32 +2926,32 @@ local chapter_daily_challenge = { } }, [15]={ - ["max_chapter"]=82, - ["icon"]="chapter_4", - ["scene"]="bg_4", - ["block_icon"]="battle_hinder_6", - ["chess_board"]="chessboard_4", + ["max_chapter"]=62, + ["icon"]="chapter_5", + ["scene"]="bg_5", + ["block_icon"]="battle_hinder_5", + ["chess_board"]="chessboard_5", ["chapter_board_daily_challenge"]={ 43, 44, 45 }, ["monster"]={ - 150102, - 150202, - 150302, - 150402, - 150502, - 150602, - 150702, - 150802, - 150902, - 151002, - 151102, - 151202, - 151302, - 151402, - 151502 + 31102, + 31202, + 31302, + 31402, + 31502, + 31602, + 31702, + 31802, + 31902, + 32002, + 32102, + 32202, + 32302, + 32402, + 32502 }, ["wave_reward"]={ { @@ -3135,32 +3135,868 @@ local chapter_daily_challenge = { } }, [16]={ - ["max_chapter"]=87, - ["icon"]="chapter_5", - ["scene"]="bg_5", - ["block_icon"]="battle_hinder_7", - ["chess_board"]="chessboard_5", + ["max_chapter"]=67, + ["icon"]="chapter_1", + ["scene"]="bg_1", + ["block_icon"]="battle_hinder_1", + ["chess_board"]="chessboard_1", ["chapter_board_daily_challenge"]={ 46, 47, 48 }, ["monster"]={ - 160102, - 160202, - 160302, - 160402, - 160502, - 160602, - 160702, - 160802, - 160902, - 161002, - 161102, - 161202, - 161302, - 161402, - 161502 + 32602, + 32702, + 32802, + 32902, + 33002, + 33102, + 33202, + 33302, + 33402, + 33502, + 33602, + 33702, + 33802, + 33902, + 34002 + }, + ["wave_reward"]={ + { + ["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"]=19, + ["id_for_nothing"]="VwE=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + ["begin_buff_id"]={ + { + 1, + 8 + }, + { + 1, + 9 + }, + { + 1, + 10 + }, + { + 1, + 11 + }, + { + 1, + 12 + }, + { + 1, + 13 + }, + { + 2, + 8 + }, + { + 2, + 9 + }, + { + 2, + 10 + }, + { + 2, + 11 + }, + { + 2, + 12 + }, + { + 2, + 13 + }, + { + 3, + 8 + }, + { + 3, + 9 + }, + { + 3, + 10 + }, + { + 3, + 11 + }, + { + 3, + 12 + }, + { + 3, + 13 + }, + { + 4, + 8 + }, + { + 4, + 9 + }, + { + 4, + 10 + }, + { + 4, + 11 + }, + { + 4, + 12 + }, + { + 4, + 13 + }, + { + 5, + 8 + }, + { + 5, + 9 + }, + { + 5, + 10 + }, + { + 5, + 11 + }, + { + 5, + 12 + }, + { + 5, + 13 + }, + { + 6, + 8 + }, + { + 6, + 9 + }, + { + 6, + 10 + }, + { + 6, + 12 + }, + { + 6, + 13 + }, + { + 7, + 8 + }, + { + 7, + 9 + }, + { + 7, + 10 + }, + { + 7, + 12 + }, + { + 7, + 13 + } + } + }, + [17]={ + ["max_chapter"]=72, + ["icon"]="chapter_2", + ["scene"]="bg_2", + ["block_icon"]="battle_hinder_2", + ["chess_board"]="chessboard_2", + ["chapter_board_daily_challenge"]={ + 49, + 50, + 51 + }, + ["monster"]={ + 34102, + 34202, + 34302, + 34402, + 34502, + 34602, + 34702, + 34802, + 34902, + 35002, + 35102, + 35202, + 35302, + 35402, + 35502 + }, + ["wave_reward"]={ + { + ["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"]=19, + ["id_for_nothing"]="VwE=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + ["begin_buff_id"]={ + { + 1, + 8 + }, + { + 1, + 9 + }, + { + 1, + 10 + }, + { + 1, + 11 + }, + { + 1, + 12 + }, + { + 1, + 13 + }, + { + 2, + 8 + }, + { + 2, + 9 + }, + { + 2, + 10 + }, + { + 2, + 11 + }, + { + 2, + 12 + }, + { + 2, + 13 + }, + { + 3, + 8 + }, + { + 3, + 9 + }, + { + 3, + 10 + }, + { + 3, + 11 + }, + { + 3, + 12 + }, + { + 3, + 13 + }, + { + 4, + 8 + }, + { + 4, + 9 + }, + { + 4, + 10 + }, + { + 4, + 11 + }, + { + 4, + 12 + }, + { + 4, + 13 + }, + { + 5, + 8 + }, + { + 5, + 9 + }, + { + 5, + 10 + }, + { + 5, + 11 + }, + { + 5, + 12 + }, + { + 5, + 13 + }, + { + 6, + 8 + }, + { + 6, + 9 + }, + { + 6, + 10 + }, + { + 6, + 12 + }, + { + 6, + 13 + }, + { + 7, + 8 + }, + { + 7, + 9 + }, + { + 7, + 10 + }, + { + 7, + 12 + }, + { + 7, + 13 + } + } + }, + [18]={ + ["max_chapter"]=77, + ["icon"]="chapter_3", + ["scene"]="bg_3", + ["block_icon"]="battle_hinder_3", + ["chess_board"]="chessboard_3", + ["chapter_board_daily_challenge"]={ + 52, + 53, + 54 + }, + ["monster"]={ + 35602, + 35702, + 35802, + 35902, + 36002, + 36102, + 36202, + 36302, + 36402, + 36502, + 36602, + 36702, + 36802, + 36902, + 37002 + }, + ["wave_reward"]={ + { + ["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"]=19, + ["id_for_nothing"]="VwE=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + ["begin_buff_id"]={ + { + 1, + 8 + }, + { + 1, + 9 + }, + { + 1, + 10 + }, + { + 1, + 11 + }, + { + 1, + 12 + }, + { + 1, + 13 + }, + { + 2, + 8 + }, + { + 2, + 9 + }, + { + 2, + 10 + }, + { + 2, + 11 + }, + { + 2, + 12 + }, + { + 2, + 13 + }, + { + 3, + 8 + }, + { + 3, + 9 + }, + { + 3, + 10 + }, + { + 3, + 11 + }, + { + 3, + 12 + }, + { + 3, + 13 + }, + { + 4, + 8 + }, + { + 4, + 9 + }, + { + 4, + 10 + }, + { + 4, + 11 + }, + { + 4, + 12 + }, + { + 4, + 13 + }, + { + 5, + 8 + }, + { + 5, + 9 + }, + { + 5, + 10 + }, + { + 5, + 11 + }, + { + 5, + 12 + }, + { + 5, + 13 + }, + { + 6, + 8 + }, + { + 6, + 9 + }, + { + 6, + 10 + }, + { + 6, + 12 + }, + { + 6, + 13 + }, + { + 7, + 8 + }, + { + 7, + 9 + }, + { + 7, + 10 + }, + { + 7, + 12 + }, + { + 7, + 13 + } + } + }, + [19]={ + ["max_chapter"]=82, + ["icon"]="chapter_4", + ["scene"]="bg_4", + ["block_icon"]="battle_hinder_4", + ["chess_board"]="chessboard_4", + ["chapter_board_daily_challenge"]={ + 55, + 56, + 57 + }, + ["monster"]={ + 37102, + 37202, + 37302, + 37402, + 37502, + 37602, + 37702, + 37802, + 37902, + 38002, + 38102, + 38202, + 38302, + 38402, + 38502 + }, + ["wave_reward"]={ + { + ["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"]=19, + ["id_for_nothing"]="VwE=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + ["begin_buff_id"]={ + { + 1, + 8 + }, + { + 1, + 9 + }, + { + 1, + 10 + }, + { + 1, + 11 + }, + { + 1, + 12 + }, + { + 1, + 13 + }, + { + 2, + 8 + }, + { + 2, + 9 + }, + { + 2, + 10 + }, + { + 2, + 11 + }, + { + 2, + 12 + }, + { + 2, + 13 + }, + { + 3, + 8 + }, + { + 3, + 9 + }, + { + 3, + 10 + }, + { + 3, + 11 + }, + { + 3, + 12 + }, + { + 3, + 13 + }, + { + 4, + 8 + }, + { + 4, + 9 + }, + { + 4, + 10 + }, + { + 4, + 11 + }, + { + 4, + 12 + }, + { + 4, + 13 + }, + { + 5, + 8 + }, + { + 5, + 9 + }, + { + 5, + 10 + }, + { + 5, + 11 + }, + { + 5, + 12 + }, + { + 5, + 13 + }, + { + 6, + 8 + }, + { + 6, + 9 + }, + { + 6, + 10 + }, + { + 6, + 12 + }, + { + 6, + 13 + }, + { + 7, + 8 + }, + { + 7, + 9 + }, + { + 7, + 10 + }, + { + 7, + 12 + }, + { + 7, + 13 + } + } + }, + [20]={ + ["max_chapter"]=87, + ["icon"]="chapter_5", + ["scene"]="bg_5", + ["block_icon"]="battle_hinder_5", + ["chess_board"]="chessboard_5", + ["chapter_board_daily_challenge"]={ + 58, + 59, + 60 + }, + ["monster"]={ + 38602, + 38702, + 38802, + 38902, + 39002, + 39102, + 39202, + 39302, + 39402, + 39502, + 39602, + 39702, + 39802, + 39902, + 40002 }, ["wave_reward"]={ { @@ -3345,6 +4181,6 @@ local chapter_daily_challenge = { } } local config = { -data=chapter_daily_challenge,count=16 +data=chapter_daily_challenge,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/monster_daily_challenge.lua b/lua/app/config/monster_daily_challenge.lua index 3f13a721..5fe57809 100644 --- a/lua/app/config/monster_daily_challenge.lua +++ b/lua/app/config/monster_daily_challenge.lua @@ -1,5 +1,592 @@ local monster_daily_challenge = { [10102]={ + ["monster_base"]=10001, + ["hp"]=1500000, + ["atk"]=14400000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20001, + 20002, + 20003 + }, + ["monster_exp"]=11000 + }, + [10202]={ + ["monster_base"]=10002, + ["hp"]=1650000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20004, + 20005, + 20006 + }, + ["monster_exp"]=11000 + }, + [10302]={ + ["monster_base"]=10001, + ["hp"]=1800000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20001, + 20002, + 20003 + }, + ["monster_exp"]=17000 + }, + [10402]={ + ["monster_base"]=10003, + ["hp"]=1950000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20007, + 20008, + 20009 + }, + ["monster_exp"]=15000 + }, + [10502]={ + ["monster_base"]=413001, + ["is_boss"]=1, + ["hp"]=3150000, + ["atk"]=43200000, + ["atk_times"]=2, + ["hurt_skill"]={ + 40012, + 40013, + 40014, + 40015 + }, + ["skill"]={ + 40016 + }, + ["monster_exp"]=12000 + }, + [10602]={ + ["monster_base"]=10002, + ["hp"]=1650000, + ["atk"]=19800000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20004, + 20005, + 20006 + }, + ["monster_exp"]=14000 + }, + [10702]={ + ["monster_base"]=10001, + ["hp"]=1800000, + ["atk"]=19800000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20001, + 20002, + 20003 + }, + ["monster_exp"]=12000 + }, + [10802]={ + ["monster_base"]=10003, + ["hp"]=1950000, + ["atk"]=21600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20007, + 20008, + 20009 + }, + ["monster_exp"]=13000 + }, + [10902]={ + ["monster_base"]=10002, + ["hp"]=2100000, + ["atk"]=21600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20004, + 20005, + 20006 + }, + ["monster_exp"]=16000 + }, + [11002]={ + ["monster_base"]=20001, + ["is_boss"]=1, + ["hp"]=3375000, + ["atk"]=57600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20058, + 20059, + 20060 + }, + ["skill"]={ + 20061 + }, + ["passive_skill"]={ + 20062 + }, + ["monster_exp"]=14000 + }, + [11102]={ + ["monster_base"]=10001, + ["hp"]=1800000, + ["atk"]=23400000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20001, + 20002, + 20003 + }, + ["monster_exp"]=15000 + }, + [11202]={ + ["monster_base"]=10003, + ["hp"]=1950000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20007, + 20008, + 20009 + }, + ["monster_exp"]=18000 + }, + [11302]={ + ["monster_base"]=10002, + ["hp"]=2100000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20004, + 20005, + 20006 + }, + ["monster_exp"]=18000 + }, + [11402]={ + ["monster_base"]=10003, + ["hp"]=2250000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20007, + 20008, + 20009 + }, + ["monster_exp"]=22000 + }, + [11502]={ + ["monster_base"]=453001, + ["is_boss"]=2, + ["hp"]=4158000, + ["atk"]=144000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 40007, + 40008, + 40009, + 40010 + }, + ["skill"]={ + 40011 + }, + ["monster_exp"]=4000 + }, + [11602]={ + ["monster_base"]=10004, + ["hp"]=1500000, + ["atk"]=14400000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20010, + 20011, + 20012 + }, + ["monster_exp"]=11000 + }, + [11702]={ + ["monster_base"]=10001, + ["hp"]=1650000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20001, + 20002, + 20003 + }, + ["monster_exp"]=11000 + }, + [11802]={ + ["monster_base"]=10005, + ["hp"]=1800000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20013, + 20014, + 20015 + }, + ["monster_exp"]=17000 + }, + [11902]={ + ["monster_base"]=10002, + ["hp"]=1950000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20004, + 20005, + 20006 + }, + ["monster_exp"]=15000 + }, + [12002]={ + ["monster_base"]=20001, + ["is_boss"]=1, + ["hp"]=3150000, + ["atk"]=43200000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20058, + 20059, + 20060 + }, + ["skill"]={ + 20061 + }, + ["passive_skill"]={ + 20062 + }, + ["monster_exp"]=12000 + }, + [12102]={ + ["monster_base"]=10002, + ["hp"]=1650000, + ["atk"]=19800000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20004, + 20005, + 20006 + }, + ["monster_exp"]=14000 + }, + [12202]={ + ["monster_base"]=10001, + ["hp"]=1800000, + ["atk"]=19800000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20001, + 20002, + 20003 + }, + ["monster_exp"]=12000 + }, + [12302]={ + ["monster_base"]=10004, + ["hp"]=1950000, + ["atk"]=21600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20010, + 20011, + 20012 + }, + ["monster_exp"]=13000 + }, + [12402]={ + ["monster_base"]=10005, + ["hp"]=2100000, + ["atk"]=21600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20013, + 20014, + 20015 + }, + ["monster_exp"]=16000 + }, + [12502]={ + ["monster_base"]=20002, + ["is_boss"]=1, + ["hp"]=3375000, + ["atk"]=57600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20063, + 20064, + 20065 + }, + ["skill"]={ + 20066 + }, + ["monster_exp"]=14000 + }, + [12602]={ + ["monster_base"]=10004, + ["hp"]=1800000, + ["atk"]=23400000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20010, + 20011, + 20012 + }, + ["monster_exp"]=15000 + }, + [12702]={ + ["monster_base"]=10001, + ["hp"]=1950000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20001, + 20002, + 20003 + }, + ["monster_exp"]=18000 + }, + [12802]={ + ["monster_base"]=10005, + ["hp"]=2100000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20013, + 20014, + 20015 + }, + ["monster_exp"]=18000 + }, + [12902]={ + ["monster_base"]=10002, + ["hp"]=2250000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20004, + 20005, + 20006 + }, + ["monster_exp"]=22000 + }, + [13002]={ + ["monster_base"]=20003, + ["is_boss"]=2, + ["hp"]=4158000, + ["atk"]=144000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20067, + 20068, + 20069 + }, + ["skill"]={ + 20070 + }, + ["monster_exp"]=4000 + }, + [13102]={ + ["monster_base"]=10005, + ["hp"]=1824000, + ["atk"]=14400000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20013, + 20014, + 20015 + }, + ["monster_exp"]=11000 + }, + [13202]={ + ["monster_base"]=10007, + ["hp"]=1976000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20019, + 20020, + 20021 + }, + ["monster_exp"]=11000 + }, + [13302]={ + ["monster_base"]=10004, + ["hp"]=2128000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20010, + 20011, + 20012 + }, + ["monster_exp"]=17000 + }, + [13402]={ + ["monster_base"]=10006, + ["hp"]=2280000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20016, + 20017, + 20018 + }, + ["monster_exp"]=15000 + }, + [13502]={ + ["monster_base"]=20004, + ["is_boss"]=1, + ["hp"]=2280000, + ["atk"]=43200000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20071, + 20072, + 20073 + }, + ["skill"]={ + 20074 + }, + ["monster_exp"]=12000 + }, + [13602]={ + ["monster_base"]=10006, + ["hp"]=1520000, + ["atk"]=19800000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20016, + 20017, + 20018 + }, + ["monster_exp"]=14000 + }, + [13702]={ + ["monster_base"]=10004, + ["hp"]=1672000, + ["atk"]=19800000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20010, + 20011, + 20012 + }, + ["monster_exp"]=12000 + }, + [13802]={ + ["monster_base"]=10007, + ["hp"]=1824000, + ["atk"]=21600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20019, + 20020, + 20021 + }, + ["monster_exp"]=13000 + }, + [13902]={ + ["monster_base"]=10008, + ["hp"]=1976000, + ["atk"]=21600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20022, + 20023, + 20024 + }, + ["monster_exp"]=16000 + }, + [14002]={ + ["monster_base"]=20001, + ["is_boss"]=1, + ["hp"]=2128000, + ["atk"]=57600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20058, + 20059, + 20060 + }, + ["skill"]={ + 20061 + }, + ["passive_skill"]={ + 20062 + }, + ["monster_exp"]=14000 + }, + [14102]={ + ["monster_base"]=10007, + ["hp"]=1672000, + ["atk"]=23400000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20019, + 20020, + 20021 + }, + ["monster_exp"]=15000 + }, + [14202]={ + ["monster_base"]=10004, + ["hp"]=1824000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20010, + 20011, + 20012 + }, + ["monster_exp"]=18000 + }, + [14302]={ + ["monster_base"]=10006, + ["hp"]=1976000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20016, + 20017, + 20018 + }, + ["monster_exp"]=18000 + }, + [14402]={ + ["monster_base"]=10005, + ["hp"]=2128000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20013, + 20014, + 20015 + }, + ["monster_exp"]=22000 + }, + [14502]={ + ["monster_base"]=20003, + ["is_boss"]=2, + ["hp"]=2736000, + ["atk"]=144000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20067, + 20068, + 20069 + }, + ["skill"]={ + 20070 + }, + ["monster_exp"]=4000 + }, + [14602]={ ["monster_base"]=10011, ["hp"]=1500000, ["atk"]=14400000, @@ -11,7 +598,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [10202]={ + [14702]={ ["monster_base"]=10007, ["hp"]=1650000, ["atk"]=18000000, @@ -23,7 +610,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [10302]={ + [14802]={ ["monster_base"]=10010, ["hp"]=1800000, ["atk"]=18000000, @@ -35,7 +622,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=17000 }, - [10402]={ + [14902]={ ["monster_base"]=10004, ["hp"]=1950000, ["atk"]=18000000, @@ -47,7 +634,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [10502]={ + [15002]={ ["monster_base"]=20004, ["is_boss"]=1, ["hp"]=3150000, @@ -63,7 +650,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [10602]={ + [15102]={ ["monster_base"]=10007, ["hp"]=1650000, ["atk"]=19800000, @@ -75,7 +662,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [10702]={ + [15202]={ ["monster_base"]=10009, ["hp"]=1800000, ["atk"]=19800000, @@ -87,7 +674,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [10802]={ + [15302]={ ["monster_base"]=10004, ["hp"]=1950000, ["atk"]=21600000, @@ -99,7 +686,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=13000 }, - [10902]={ + [15402]={ ["monster_base"]=10010, ["hp"]=2100000, ["atk"]=21600000, @@ -111,7 +698,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=16000 }, - [11002]={ + [15502]={ ["monster_base"]=20005, ["is_boss"]=1, ["hp"]=3375000, @@ -127,7 +714,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [11102]={ + [15602]={ ["monster_base"]=10010, ["hp"]=1800000, ["atk"]=23400000, @@ -139,7 +726,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [11202]={ + [15702]={ ["monster_base"]=10007, ["hp"]=1950000, ["atk"]=27000000, @@ -151,7 +738,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [11302]={ + [15802]={ ["monster_base"]=10011, ["hp"]=2100000, ["atk"]=27000000, @@ -163,7 +750,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [11402]={ + [15902]={ ["monster_base"]=10009, ["hp"]=2250000, ["atk"]=27000000, @@ -175,7 +762,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=22000 }, - [11502]={ + [16002]={ ["monster_base"]=30001, ["is_boss"]=2, ["hp"]=4158000, @@ -196,7 +783,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=4000 }, - [20102]={ + [16102]={ ["monster_base"]=10012, ["hp"]=1500000, ["atk"]=14400000, @@ -208,7 +795,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [20202]={ + [16202]={ ["monster_base"]=10007, ["hp"]=1650000, ["atk"]=18000000, @@ -220,7 +807,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [20302]={ + [16302]={ ["monster_base"]=10013, ["hp"]=1800000, ["atk"]=18000000, @@ -232,7 +819,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=17000 }, - [20402]={ + [16402]={ ["monster_base"]=10009, ["hp"]=1950000, ["atk"]=18000000, @@ -244,7 +831,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [20502]={ + [16502]={ ["monster_base"]=20005, ["is_boss"]=1, ["hp"]=3150000, @@ -260,7 +847,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [20602]={ + [16602]={ ["monster_base"]=10009, ["hp"]=1650000, ["atk"]=19800000, @@ -272,7 +859,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [20702]={ + [16702]={ ["monster_base"]=10012, ["hp"]=1800000, ["atk"]=19800000, @@ -284,7 +871,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [20802]={ + [16802]={ ["monster_base"]=10007, ["hp"]=1950000, ["atk"]=21600000, @@ -296,7 +883,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=13000 }, - [20902]={ + [16902]={ ["monster_base"]=10013, ["hp"]=2100000, ["atk"]=21600000, @@ -308,7 +895,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=16000 }, - [21002]={ + [17002]={ ["monster_base"]=20006, ["is_boss"]=1, ["hp"]=3375000, @@ -324,7 +911,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [21102]={ + [17102]={ ["monster_base"]=10013, ["hp"]=1800000, ["atk"]=23400000, @@ -336,7 +923,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [21202]={ + [17202]={ ["monster_base"]=10007, ["hp"]=1950000, ["atk"]=27000000, @@ -348,7 +935,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [21302]={ + [17302]={ ["monster_base"]=10012, ["hp"]=2100000, ["atk"]=27000000, @@ -360,7 +947,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [21402]={ + [17402]={ ["monster_base"]=10009, ["hp"]=2250000, ["atk"]=27000000, @@ -372,7 +959,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=22000 }, - [21502]={ + [17502]={ ["monster_base"]=30002, ["is_boss"]=2, ["hp"]=4158000, @@ -393,7 +980,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=4000 }, - [30102]={ + [17602]={ ["monster_base"]=10014, ["hp"]=1500000, ["atk"]=14400000, @@ -405,7 +992,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [30202]={ + [17702]={ ["monster_base"]=10010, ["hp"]=1650000, ["atk"]=18000000, @@ -417,7 +1004,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [30302]={ + [17802]={ ["monster_base"]=10012, ["hp"]=1800000, ["atk"]=18000000, @@ -429,7 +1016,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=17000 }, - [30402]={ + [17902]={ ["monster_base"]=10013, ["hp"]=1950000, ["atk"]=18000000, @@ -441,7 +1028,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [30502]={ + [18002]={ ["monster_base"]=20005, ["is_boss"]=1, ["hp"]=3150000, @@ -457,7 +1044,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [30602]={ + [18102]={ ["monster_base"]=10012, ["hp"]=1650000, ["atk"]=19800000, @@ -469,7 +1056,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [30702]={ + [18202]={ ["monster_base"]=10010, ["hp"]=1800000, ["atk"]=19800000, @@ -481,7 +1068,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [30802]={ + [18302]={ ["monster_base"]=10014, ["hp"]=1950000, ["atk"]=21600000, @@ -493,7 +1080,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=13000 }, - [30902]={ + [18402]={ ["monster_base"]=10013, ["hp"]=2100000, ["atk"]=21600000, @@ -505,7 +1092,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=16000 }, - [31002]={ + [18502]={ ["monster_base"]=20006, ["is_boss"]=1, ["hp"]=3375000, @@ -521,7 +1108,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [31102]={ + [18602]={ ["monster_base"]=10013, ["hp"]=1800000, ["atk"]=23400000, @@ -533,7 +1120,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [31202]={ + [18702]={ ["monster_base"]=10010, ["hp"]=1950000, ["atk"]=27000000, @@ -545,7 +1132,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [31302]={ + [18802]={ ["monster_base"]=10012, ["hp"]=2100000, ["atk"]=27000000, @@ -557,7 +1144,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [31402]={ + [18902]={ ["monster_base"]=10014, ["hp"]=2250000, ["atk"]=27000000, @@ -569,7 +1156,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=22000 }, - [31502]={ + [19002]={ ["monster_base"]=30003, ["is_boss"]=2, ["hp"]=4158000, @@ -589,7 +1176,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=4000 }, - [40102]={ + [19102]={ ["monster_base"]=10016, ["hp"]=1500000, ["atk"]=14400000, @@ -601,7 +1188,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [40202]={ + [19202]={ ["monster_base"]=10006, ["hp"]=1650000, ["atk"]=18000000, @@ -613,7 +1200,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [40302]={ + [19302]={ ["monster_base"]=10013, ["hp"]=1800000, ["atk"]=18000000, @@ -625,7 +1212,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=17000 }, - [40402]={ + [19402]={ ["monster_base"]=10015, ["hp"]=1950000, ["atk"]=18000000, @@ -637,7 +1224,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [40502]={ + [19502]={ ["monster_base"]=20005, ["is_boss"]=1, ["hp"]=3150000, @@ -653,7 +1240,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [40602]={ + [19602]={ ["monster_base"]=10013, ["hp"]=1650000, ["atk"]=19800000, @@ -665,7 +1252,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [40702]={ + [19702]={ ["monster_base"]=10007, ["hp"]=1800000, ["atk"]=19800000, @@ -677,7 +1264,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [40802]={ + [19802]={ ["monster_base"]=10015, ["hp"]=1950000, ["atk"]=21600000, @@ -689,7 +1276,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=13000 }, - [40902]={ + [19902]={ ["monster_base"]=10006, ["hp"]=2100000, ["atk"]=21600000, @@ -701,7 +1288,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=16000 }, - [41002]={ + [20002]={ ["monster_base"]=20007, ["is_boss"]=1, ["hp"]=3375000, @@ -717,7 +1304,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [41102]={ + [20102]={ ["monster_base"]=10007, ["hp"]=1800000, ["atk"]=23400000, @@ -729,7 +1316,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [41202]={ + [20202]={ ["monster_base"]=10016, ["hp"]=1950000, ["atk"]=27000000, @@ -741,7 +1328,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [41302]={ + [20302]={ ["monster_base"]=10006, ["hp"]=2100000, ["atk"]=27000000, @@ -753,7 +1340,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [41402]={ + [20402]={ ["monster_base"]=10015, ["hp"]=2250000, ["atk"]=27000000, @@ -765,7 +1352,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=22000 }, - [41502]={ + [20502]={ ["monster_base"]=30004, ["is_boss"]=2, ["hp"]=4158000, @@ -786,7 +1373,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=4000 }, - [50102]={ + [20602]={ ["monster_base"]=10017, ["hp"]=1500000, ["atk"]=14400000, @@ -798,7 +1385,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [50202]={ + [20702]={ ["monster_base"]=10015, ["hp"]=1650000, ["atk"]=18000000, @@ -810,7 +1397,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [50302]={ + [20802]={ ["monster_base"]=10018, ["hp"]=1800000, ["atk"]=18000000, @@ -822,7 +1409,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=17000 }, - [50402]={ + [20902]={ ["monster_base"]=10019, ["hp"]=1950000, ["atk"]=18000000, @@ -834,7 +1421,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [50502]={ + [21002]={ ["monster_base"]=20007, ["is_boss"]=1, ["hp"]=3150000, @@ -850,7 +1437,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [50602]={ + [21102]={ ["monster_base"]=10018, ["hp"]=1650000, ["atk"]=19800000, @@ -862,7 +1449,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [50702]={ + [21202]={ ["monster_base"]=10016, ["hp"]=1800000, ["atk"]=19800000, @@ -874,7 +1461,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [50802]={ + [21302]={ ["monster_base"]=10019, ["hp"]=1950000, ["atk"]=21600000, @@ -886,7 +1473,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=13000 }, - [50902]={ + [21402]={ ["monster_base"]=10015, ["hp"]=2100000, ["atk"]=21600000, @@ -898,7 +1485,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=16000 }, - [51002]={ + [21502]={ ["monster_base"]=20008, ["is_boss"]=1, ["hp"]=3375000, @@ -914,7 +1501,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [51102]={ + [21602]={ ["monster_base"]=10016, ["hp"]=1800000, ["atk"]=23400000, @@ -926,7 +1513,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [51202]={ + [21702]={ ["monster_base"]=10017, ["hp"]=1950000, ["atk"]=27000000, @@ -938,7 +1525,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [51302]={ + [21802]={ ["monster_base"]=10015, ["hp"]=2100000, ["atk"]=27000000, @@ -950,7 +1537,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [51402]={ + [21902]={ ["monster_base"]=10019, ["hp"]=2250000, ["atk"]=27000000, @@ -962,7 +1549,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=22000 }, - [51502]={ + [22002]={ ["monster_base"]=30006, ["is_boss"]=2, ["hp"]=4158000, @@ -983,7 +1570,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=4000 }, - [60102]={ + [22102]={ ["monster_base"]=10014, ["hp"]=1500000, ["atk"]=14400000, @@ -995,7 +1582,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [60202]={ + [22202]={ ["monster_base"]=10019, ["hp"]=1650000, ["atk"]=18000000, @@ -1007,7 +1594,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [60302]={ + [22302]={ ["monster_base"]=10017, ["hp"]=1800000, ["atk"]=18000000, @@ -1019,7 +1606,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=17000 }, - [60402]={ + [22402]={ ["monster_base"]=10013, ["hp"]=1950000, ["atk"]=18000000, @@ -1031,7 +1618,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [60502]={ + [22502]={ ["monster_base"]=20008, ["is_boss"]=1, ["hp"]=3150000, @@ -1047,7 +1634,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [60602]={ + [22602]={ ["monster_base"]=10013, ["hp"]=1650000, ["atk"]=19800000, @@ -1059,7 +1646,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [60702]={ + [22702]={ ["monster_base"]=10017, ["hp"]=1800000, ["atk"]=19800000, @@ -1071,7 +1658,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [60802]={ + [22802]={ ["monster_base"]=10014, ["hp"]=1950000, ["atk"]=21600000, @@ -1083,7 +1670,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=13000 }, - [60902]={ + [22902]={ ["monster_base"]=10019, ["hp"]=2100000, ["atk"]=21600000, @@ -1095,7 +1682,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=16000 }, - [61002]={ + [23002]={ ["monster_base"]=20007, ["is_boss"]=1, ["hp"]=3375000, @@ -1111,7 +1698,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [61102]={ + [23102]={ ["monster_base"]=10019, ["hp"]=1800000, ["atk"]=23400000, @@ -1123,7 +1710,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [61202]={ + [23202]={ ["monster_base"]=10013, ["hp"]=1950000, ["atk"]=27000000, @@ -1135,7 +1722,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [61302]={ + [23302]={ ["monster_base"]=10017, ["hp"]=2100000, ["atk"]=27000000, @@ -1147,7 +1734,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [61402]={ + [23402]={ ["monster_base"]=10014, ["hp"]=2250000, ["atk"]=27000000, @@ -1159,7 +1746,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=22000 }, - [61502]={ + [23502]={ ["monster_base"]=30007, ["is_boss"]=2, ["hp"]=4158000, @@ -1180,798 +1767,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=4000 }, - [70102]={ - ["monster_base"]=10004, - ["hp"]=1500000, - ["atk"]=14400000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20010, - 20011, - 20012 - }, - ["monster_exp"]=11000 - }, - [70202]={ - ["monster_base"]=10002, - ["hp"]=1650000, - ["atk"]=18000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20004, - 20005, - 20006 - }, - ["monster_exp"]=11000 - }, - [70302]={ - ["monster_base"]=10007, - ["hp"]=1800000, - ["atk"]=18000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20019, - 20020, - 20021 - }, - ["monster_exp"]=17000 - }, - [70402]={ - ["monster_base"]=10005, - ["hp"]=1950000, - ["atk"]=18000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20013, - 20014, - 20015 - }, - ["monster_exp"]=15000 - }, - [70502]={ - ["monster_base"]=20001, - ["is_boss"]=1, - ["hp"]=3150000, - ["atk"]=43200000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20058, - 20059, - 20060 - }, - ["skill"]={ - 20061 - }, - ["passive_skill"]={ - 20062 - }, - ["monster_exp"]=12000 - }, - [70602]={ - ["monster_base"]=10005, - ["hp"]=1650000, - ["atk"]=19800000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20013, - 20014, - 20015 - }, - ["monster_exp"]=14000 - }, - [70702]={ - ["monster_base"]=10007, - ["hp"]=1800000, - ["atk"]=19800000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20019, - 20020, - 20021 - }, - ["monster_exp"]=12000 - }, - [70802]={ - ["monster_base"]=10004, - ["hp"]=1950000, - ["atk"]=21600000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20010, - 20011, - 20012 - }, - ["monster_exp"]=13000 - }, - [70902]={ - ["monster_base"]=10002, - ["hp"]=2100000, - ["atk"]=21600000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20004, - 20005, - 20006 - }, - ["monster_exp"]=16000 - }, - [71002]={ - ["monster_base"]=20003, - ["is_boss"]=1, - ["hp"]=3375000, - ["atk"]=57600000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20067, - 20068, - 20069 - }, - ["skill"]={ - 20070 - }, - ["monster_exp"]=14000 - }, - [71102]={ - ["monster_base"]=10002, - ["hp"]=1800000, - ["atk"]=23400000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20004, - 20005, - 20006 - }, - ["monster_exp"]=15000 - }, - [71202]={ - ["monster_base"]=10005, - ["hp"]=1950000, - ["atk"]=27000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20013, - 20014, - 20015 - }, - ["monster_exp"]=18000 - }, - [71302]={ - ["monster_base"]=10007, - ["hp"]=2100000, - ["atk"]=27000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20019, - 20020, - 20021 - }, - ["monster_exp"]=18000 - }, - [71402]={ - ["monster_base"]=10004, - ["hp"]=2250000, - ["atk"]=27000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20010, - 20011, - 20012 - }, - ["monster_exp"]=22000 - }, - [71502]={ - ["monster_base"]=30009, - ["is_boss"]=2, - ["hp"]=4158000, - ["atk"]=144000000, - ["atk_times"]=3, - ["hurt_skill"]={ - 20130, - 20131, - 20132 - }, - ["skill"]={ - 20133, - 20134 - }, - ["passive_skill"]={ - 10002, - 10013 - }, - ["monster_exp"]=4000 - }, - [80102]={ - ["monster_base"]=10002, - ["hp"]=1500000, - ["atk"]=14400000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20004, - 20005, - 20006 - }, - ["monster_exp"]=11000 - }, - [80202]={ - ["monster_base"]=10003, - ["hp"]=1650000, - ["atk"]=18000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20007, - 20008, - 20009 - }, - ["monster_exp"]=11000 - }, - [80302]={ - ["monster_base"]=10004, - ["hp"]=1800000, - ["atk"]=18000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20010, - 20011, - 20012 - }, - ["monster_exp"]=17000 - }, - [80402]={ - ["monster_base"]=10001, - ["hp"]=1950000, - ["atk"]=18000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20001, - 20002, - 20003 - }, - ["monster_exp"]=15000 - }, - [80502]={ - ["monster_base"]=20007, - ["is_boss"]=1, - ["hp"]=3150000, - ["atk"]=43200000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20083, - 20084, - 20085 - }, - ["skill"]={ - 20086 - }, - ["monster_exp"]=12000 - }, - [80602]={ - ["monster_base"]=10001, - ["hp"]=1650000, - ["atk"]=19800000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20001, - 20002, - 20003 - }, - ["monster_exp"]=14000 - }, - [80702]={ - ["monster_base"]=10005, - ["hp"]=1800000, - ["atk"]=19800000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20013, - 20014, - 20015 - }, - ["monster_exp"]=12000 - }, - [80802]={ - ["monster_base"]=10002, - ["hp"]=1950000, - ["atk"]=21600000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20004, - 20005, - 20006 - }, - ["monster_exp"]=13000 - }, - [80902]={ - ["monster_base"]=10003, - ["hp"]=2100000, - ["atk"]=21600000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20007, - 20008, - 20009 - }, - ["monster_exp"]=16000 - }, - [81002]={ - ["monster_base"]=20008, - ["is_boss"]=1, - ["hp"]=3375000, - ["atk"]=57600000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20087, - 20088, - 20089 - }, - ["skill"]={ - 20090 - }, - ["monster_exp"]=14000 - }, - [81102]={ - ["monster_base"]=10003, - ["hp"]=1800000, - ["atk"]=23400000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20007, - 20008, - 20009 - }, - ["monster_exp"]=15000 - }, - [81202]={ - ["monster_base"]=10004, - ["hp"]=1950000, - ["atk"]=27000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20010, - 20011, - 20012 - }, - ["monster_exp"]=18000 - }, - [81302]={ - ["monster_base"]=10002, - ["hp"]=2100000, - ["atk"]=27000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20004, - 20005, - 20006 - }, - ["monster_exp"]=18000 - }, - [81402]={ - ["monster_base"]=10001, - ["hp"]=2250000, - ["atk"]=27000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20001, - 20002, - 20003 - }, - ["monster_exp"]=22000 - }, - [81502]={ - ["monster_base"]=30008, - ["is_boss"]=2, - ["hp"]=4158000, - ["atk"]=144000000, - ["atk_times"]=3, - ["hurt_skill"]={ - 20125, - 20126, - 20127 - }, - ["skill"]={ - 20128, - 20129 - }, - ["passive_skill"]={ - 10001, - 10013 - }, - ["monster_exp"]=4000 - }, - [90102]={ - ["monster_base"]=10007, - ["hp"]=1500000, - ["atk"]=14400000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20019, - 20020, - 20021 - }, - ["monster_exp"]=11000 - }, - [90202]={ - ["monster_base"]=10006, - ["hp"]=1650000, - ["atk"]=18000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20016, - 20017, - 20018 - }, - ["monster_exp"]=11000 - }, - [90302]={ - ["monster_base"]=10014, - ["hp"]=1800000, - ["atk"]=18000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20040, - 20041, - 20042 - }, - ["monster_exp"]=17000 - }, - [90402]={ - ["monster_base"]=10008, - ["hp"]=1950000, - ["atk"]=18000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20022, - 20023, - 20024 - }, - ["monster_exp"]=15000 - }, - [90502]={ - ["monster_base"]=20006, - ["is_boss"]=1, - ["hp"]=3150000, - ["atk"]=43200000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20079, - 20080, - 20081 - }, - ["skill"]={ - 20082 - }, - ["monster_exp"]=12000 - }, - [90602]={ - ["monster_base"]=10008, - ["hp"]=1650000, - ["atk"]=19800000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20022, - 20023, - 20024 - }, - ["monster_exp"]=14000 - }, - [90702]={ - ["monster_base"]=10019, - ["hp"]=1800000, - ["atk"]=19800000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20055, - 20056, - 20057 - }, - ["monster_exp"]=12000 - }, - [90802]={ - ["monster_base"]=10007, - ["hp"]=1950000, - ["atk"]=21600000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20019, - 20020, - 20021 - }, - ["monster_exp"]=13000 - }, - [90902]={ - ["monster_base"]=10006, - ["hp"]=2100000, - ["atk"]=21600000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20016, - 20017, - 20018 - }, - ["monster_exp"]=16000 - }, - [91002]={ - ["monster_base"]=20008, - ["is_boss"]=1, - ["hp"]=3375000, - ["atk"]=57600000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20087, - 20088, - 20089 - }, - ["skill"]={ - 20090 - }, - ["monster_exp"]=14000 - }, - [91102]={ - ["monster_base"]=10006, - ["hp"]=1800000, - ["atk"]=23400000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20016, - 20017, - 20018 - }, - ["monster_exp"]=15000 - }, - [91202]={ - ["monster_base"]=10014, - ["hp"]=1950000, - ["atk"]=27000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20040, - 20041, - 20042 - }, - ["monster_exp"]=18000 - }, - [91302]={ - ["monster_base"]=10007, - ["hp"]=2100000, - ["atk"]=27000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20019, - 20020, - 20021 - }, - ["monster_exp"]=18000 - }, - [91402]={ - ["monster_base"]=10008, - ["hp"]=2250000, - ["atk"]=27000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20022, - 20023, - 20024 - }, - ["monster_exp"]=22000 - }, - [91502]={ - ["monster_base"]=30010, - ["is_boss"]=2, - ["hp"]=4158000, - ["atk"]=144000000, - ["atk_times"]=3, - ["hurt_skill"]={ - 20135, - 20136, - 20137 - }, - ["skill"]={ - 20138, - 20139 - }, - ["passive_skill"]={ - 10003, - 10013 - }, - ["monster_exp"]=4000 - }, - [100102]={ - ["monster_base"]=10018, - ["hp"]=1500000, - ["atk"]=14400000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20052, - 20053, - 20054 - }, - ["monster_exp"]=11000 - }, - [100202]={ - ["monster_base"]=10010, - ["hp"]=1650000, - ["atk"]=18000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20028, - 20029, - 20030 - }, - ["monster_exp"]=11000 - }, - [100302]={ - ["monster_base"]=10017, - ["hp"]=1800000, - ["atk"]=18000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20049, - 20050, - 20051 - }, - ["monster_exp"]=17000 - }, - [100402]={ - ["monster_base"]=10019, - ["hp"]=1950000, - ["atk"]=18000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20055, - 20056, - 20057 - }, - ["monster_exp"]=15000 - }, - [100502]={ - ["monster_base"]=20007, - ["is_boss"]=1, - ["hp"]=3150000, - ["atk"]=43200000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20083, - 20084, - 20085 - }, - ["skill"]={ - 20086 - }, - ["monster_exp"]=12000 - }, - [100602]={ - ["monster_base"]=10019, - ["hp"]=1650000, - ["atk"]=19800000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20055, - 20056, - 20057 - }, - ["monster_exp"]=14000 - }, - [100702]={ - ["monster_base"]=10016, - ["hp"]=1800000, - ["atk"]=19800000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20046, - 20047, - 20048 - }, - ["monster_exp"]=12000 - }, - [100802]={ - ["monster_base"]=10018, - ["hp"]=1950000, - ["atk"]=21600000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20052, - 20053, - 20054 - }, - ["monster_exp"]=13000 - }, - [100902]={ - ["monster_base"]=10010, - ["hp"]=2100000, - ["atk"]=21600000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20028, - 20029, - 20030 - }, - ["monster_exp"]=16000 - }, - [101002]={ - ["monster_base"]=20002, - ["is_boss"]=1, - ["hp"]=3375000, - ["atk"]=57600000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20063, - 20064, - 20065 - }, - ["skill"]={ - 20066 - }, - ["monster_exp"]=14000 - }, - [101102]={ - ["monster_base"]=10010, - ["hp"]=1800000, - ["atk"]=23400000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20028, - 20029, - 20030 - }, - ["monster_exp"]=15000 - }, - [101202]={ - ["monster_base"]=10017, - ["hp"]=1950000, - ["atk"]=27000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20049, - 20050, - 20051 - }, - ["monster_exp"]=18000 - }, - [101302]={ - ["monster_base"]=10018, - ["hp"]=2100000, - ["atk"]=27000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20052, - 20053, - 20054 - }, - ["monster_exp"]=18000 - }, - [101402]={ - ["monster_base"]=10019, - ["hp"]=2250000, - ["atk"]=27000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20055, - 20056, - 20057 - }, - ["monster_exp"]=22000 - }, - [101502]={ - ["monster_base"]=30006, - ["is_boss"]=2, - ["hp"]=4158000, - ["atk"]=144000000, - ["atk_times"]=3, - ["hurt_skill"]={ - 20115, - 20116, - 20117 - }, - ["skill"]={ - 20118, - 20119 - }, - ["passive_skill"]={ - 10004, - 10013 - }, - ["monster_exp"]=4000 - }, - [110102]={ + [23602]={ ["monster_base"]=10011, ["hp"]=1500000, ["atk"]=14400000, @@ -1983,7 +1779,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [110202]={ + [23702]={ ["monster_base"]=10009, ["hp"]=1650000, ["atk"]=18000000, @@ -1995,7 +1791,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [110302]={ + [23802]={ ["monster_base"]=10006, ["hp"]=1800000, ["atk"]=18000000, @@ -2007,7 +1803,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=17000 }, - [110402]={ + [23902]={ ["monster_base"]=10010, ["hp"]=1950000, ["atk"]=18000000, @@ -2019,7 +1815,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [110502]={ + [24002]={ ["monster_base"]=20008, ["is_boss"]=1, ["hp"]=3150000, @@ -2035,7 +1831,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [110602]={ + [24102]={ ["monster_base"]=10010, ["hp"]=1650000, ["atk"]=19800000, @@ -2047,7 +1843,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [110702]={ + [24202]={ ["monster_base"]=10015, ["hp"]=1800000, ["atk"]=19800000, @@ -2059,7 +1855,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [110802]={ + [24302]={ ["monster_base"]=10011, ["hp"]=1950000, ["atk"]=21600000, @@ -2071,7 +1867,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=13000 }, - [110902]={ + [24402]={ ["monster_base"]=10009, ["hp"]=2100000, ["atk"]=21600000, @@ -2083,7 +1879,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=16000 }, - [111002]={ + [24502]={ ["monster_base"]=20005, ["is_boss"]=1, ["hp"]=3375000, @@ -2099,7 +1895,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [111102]={ + [24602]={ ["monster_base"]=10009, ["hp"]=1800000, ["atk"]=23400000, @@ -2111,7 +1907,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [111202]={ + [24702]={ ["monster_base"]=10006, ["hp"]=1950000, ["atk"]=27000000, @@ -2123,7 +1919,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [111302]={ + [24802]={ ["monster_base"]=10011, ["hp"]=2100000, ["atk"]=27000000, @@ -2135,7 +1931,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [111402]={ + [24902]={ ["monster_base"]=10010, ["hp"]=2250000, ["atk"]=27000000, @@ -2147,7 +1943,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=22000 }, - [111502]={ + [25002]={ ["monster_base"]=30001, ["is_boss"]=2, ["hp"]=4158000, @@ -2168,119 +1964,319 @@ local monster_daily_challenge = { }, ["monster_exp"]=4000 }, - [120102]={ - ["monster_base"]=10013, + [25102]={ + ["monster_base"]=10004, ["hp"]=1500000, ["atk"]=14400000, ["atk_times"]=2, ["hurt_skill"]={ - 20037, - 20038, - 20039 + 20010, + 20011, + 20012 }, ["monster_exp"]=11000 }, - [120202]={ - ["monster_base"]=10012, + [25202]={ + ["monster_base"]=10002, ["hp"]=1650000, ["atk"]=18000000, ["atk_times"]=2, ["hurt_skill"]={ - 20034, - 20035, - 20036 + 20004, + 20005, + 20006 }, ["monster_exp"]=11000 }, - [120302]={ - ["monster_base"]=10009, + [25302]={ + ["monster_base"]=10007, ["hp"]=1800000, ["atk"]=18000000, ["atk_times"]=2, ["hurt_skill"]={ - 20025, - 20026, - 20027 + 20019, + 20020, + 20021 }, ["monster_exp"]=17000 }, - [120402]={ - ["monster_base"]=10014, + [25402]={ + ["monster_base"]=10005, ["hp"]=1950000, ["atk"]=18000000, ["atk_times"]=2, ["hurt_skill"]={ - 20040, - 20041, - 20042 + 20013, + 20014, + 20015 }, ["monster_exp"]=15000 }, - [120502]={ - ["monster_base"]=20005, + [25502]={ + ["monster_base"]=20001, ["is_boss"]=1, ["hp"]=3150000, ["atk"]=43200000, ["atk_times"]=2, ["hurt_skill"]={ - 20075, - 20076, - 20077 + 20058, + 20059, + 20060 }, ["skill"]={ - 20078 + 20061 + }, + ["passive_skill"]={ + 20062 }, ["monster_exp"]=12000 }, - [120602]={ - ["monster_base"]=10014, + [25602]={ + ["monster_base"]=10005, ["hp"]=1650000, ["atk"]=19800000, ["atk_times"]=2, ["hurt_skill"]={ - 20040, - 20041, - 20042 + 20013, + 20014, + 20015 }, ["monster_exp"]=14000 }, - [120702]={ - ["monster_base"]=10017, + [25702]={ + ["monster_base"]=10007, ["hp"]=1800000, ["atk"]=19800000, ["atk_times"]=2, ["hurt_skill"]={ - 20049, - 20050, - 20051 + 20019, + 20020, + 20021 }, ["monster_exp"]=12000 }, - [120802]={ - ["monster_base"]=10013, + [25802]={ + ["monster_base"]=10004, ["hp"]=1950000, ["atk"]=21600000, ["atk_times"]=2, ["hurt_skill"]={ - 20037, - 20038, - 20039 + 20010, + 20011, + 20012 }, ["monster_exp"]=13000 }, - [120902]={ - ["monster_base"]=10012, + [25902]={ + ["monster_base"]=10002, ["hp"]=2100000, ["atk"]=21600000, ["atk_times"]=2, ["hurt_skill"]={ - 20034, - 20035, - 20036 + 20004, + 20005, + 20006 }, ["monster_exp"]=16000 }, - [121002]={ + [26002]={ + ["monster_base"]=20003, + ["is_boss"]=1, + ["hp"]=3375000, + ["atk"]=57600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20067, + 20068, + 20069 + }, + ["skill"]={ + 20070 + }, + ["monster_exp"]=14000 + }, + [26102]={ + ["monster_base"]=10002, + ["hp"]=1800000, + ["atk"]=23400000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20004, + 20005, + 20006 + }, + ["monster_exp"]=15000 + }, + [26202]={ + ["monster_base"]=10005, + ["hp"]=1950000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20013, + 20014, + 20015 + }, + ["monster_exp"]=18000 + }, + [26302]={ + ["monster_base"]=10007, + ["hp"]=2100000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20019, + 20020, + 20021 + }, + ["monster_exp"]=18000 + }, + [26402]={ + ["monster_base"]=10004, + ["hp"]=2250000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20010, + 20011, + 20012 + }, + ["monster_exp"]=22000 + }, + [26502]={ + ["monster_base"]=30009, + ["is_boss"]=2, + ["hp"]=4158000, + ["atk"]=144000000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20130, + 20131, + 20132 + }, + ["skill"]={ + 20133, + 20134 + }, + ["passive_skill"]={ + 10002, + 10013 + }, + ["monster_exp"]=4000 + }, + [26602]={ + ["monster_base"]=10002, + ["hp"]=1500000, + ["atk"]=14400000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20004, + 20005, + 20006 + }, + ["monster_exp"]=11000 + }, + [26702]={ + ["monster_base"]=10003, + ["hp"]=1650000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20007, + 20008, + 20009 + }, + ["monster_exp"]=11000 + }, + [26802]={ + ["monster_base"]=10004, + ["hp"]=1800000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20010, + 20011, + 20012 + }, + ["monster_exp"]=17000 + }, + [26902]={ + ["monster_base"]=10001, + ["hp"]=1950000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20001, + 20002, + 20003 + }, + ["monster_exp"]=15000 + }, + [27002]={ + ["monster_base"]=20007, + ["is_boss"]=1, + ["hp"]=3150000, + ["atk"]=43200000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20083, + 20084, + 20085 + }, + ["skill"]={ + 20086 + }, + ["monster_exp"]=12000 + }, + [27102]={ + ["monster_base"]=10001, + ["hp"]=1650000, + ["atk"]=19800000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20001, + 20002, + 20003 + }, + ["monster_exp"]=14000 + }, + [27202]={ + ["monster_base"]=10005, + ["hp"]=1800000, + ["atk"]=19800000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20013, + 20014, + 20015 + }, + ["monster_exp"]=12000 + }, + [27302]={ + ["monster_base"]=10002, + ["hp"]=1950000, + ["atk"]=21600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20004, + 20005, + 20006 + }, + ["monster_exp"]=13000 + }, + [27402]={ + ["monster_base"]=10003, + ["hp"]=2100000, + ["atk"]=21600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20007, + 20008, + 20009 + }, + ["monster_exp"]=16000 + }, + [27502]={ ["monster_base"]=20008, ["is_boss"]=1, ["hp"]=3375000, @@ -2296,88 +2292,88 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [121102]={ - ["monster_base"]=10012, + [27602]={ + ["monster_base"]=10003, ["hp"]=1800000, ["atk"]=23400000, ["atk_times"]=2, ["hurt_skill"]={ - 20034, - 20035, - 20036 + 20007, + 20008, + 20009 }, ["monster_exp"]=15000 }, - [121202]={ - ["monster_base"]=10009, + [27702]={ + ["monster_base"]=10004, ["hp"]=1950000, ["atk"]=27000000, ["atk_times"]=2, ["hurt_skill"]={ - 20025, - 20026, - 20027 + 20010, + 20011, + 20012 }, ["monster_exp"]=18000 }, - [121302]={ - ["monster_base"]=10013, + [27802]={ + ["monster_base"]=10002, ["hp"]=2100000, ["atk"]=27000000, ["atk_times"]=2, ["hurt_skill"]={ - 20037, - 20038, - 20039 + 20004, + 20005, + 20006 }, ["monster_exp"]=18000 }, - [121402]={ - ["monster_base"]=10014, + [27902]={ + ["monster_base"]=10001, ["hp"]=2250000, ["atk"]=27000000, ["atk_times"]=2, ["hurt_skill"]={ - 20040, - 20041, - 20042 + 20001, + 20002, + 20003 }, ["monster_exp"]=22000 }, - [121502]={ - ["monster_base"]=30002, + [28002]={ + ["monster_base"]=30008, ["is_boss"]=2, ["hp"]=4158000, ["atk"]=144000000, ["atk_times"]=3, ["hurt_skill"]={ - 20096, - 20097, - 20098 + 20125, + 20126, + 20127 }, ["skill"]={ - 20099, - 20100 + 20128, + 20129 }, ["passive_skill"]={ - 10004, + 10001, 10013 }, ["monster_exp"]=4000 }, - [130102]={ - ["monster_base"]=10008, + [28102]={ + ["monster_base"]=10007, ["hp"]=1500000, ["atk"]=14400000, ["atk_times"]=2, ["hurt_skill"]={ - 20022, - 20023, - 20024 + 20019, + 20020, + 20021 }, ["monster_exp"]=11000 }, - [130202]={ + [28202]={ ["monster_base"]=10006, ["hp"]=1650000, ["atk"]=18000000, @@ -2389,83 +2385,83 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [130302]={ - ["monster_base"]=10009, + [28302]={ + ["monster_base"]=10014, ["hp"]=1800000, ["atk"]=18000000, ["atk_times"]=2, ["hurt_skill"]={ - 20025, - 20026, - 20027 + 20040, + 20041, + 20042 }, ["monster_exp"]=17000 }, - [130402]={ - ["monster_base"]=10007, - ["hp"]=1950000, - ["atk"]=18000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20019, - 20020, - 20021 - }, - ["monster_exp"]=15000 - }, - [130502]={ - ["monster_base"]=20005, - ["is_boss"]=1, - ["hp"]=3150000, - ["atk"]=43200000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20075, - 20076, - 20077 - }, - ["skill"]={ - 20078 - }, - ["monster_exp"]=12000 - }, - [130602]={ - ["monster_base"]=10007, - ["hp"]=1650000, - ["atk"]=19800000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20019, - 20020, - 20021 - }, - ["monster_exp"]=14000 - }, - [130702]={ - ["monster_base"]=10004, - ["hp"]=1800000, - ["atk"]=19800000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20010, - 20011, - 20012 - }, - ["monster_exp"]=12000 - }, - [130802]={ + [28402]={ ["monster_base"]=10008, ["hp"]=1950000, - ["atk"]=21600000, + ["atk"]=18000000, ["atk_times"]=2, ["hurt_skill"]={ 20022, 20023, 20024 }, + ["monster_exp"]=15000 + }, + [28502]={ + ["monster_base"]=20006, + ["is_boss"]=1, + ["hp"]=3150000, + ["atk"]=43200000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20079, + 20080, + 20081 + }, + ["skill"]={ + 20082 + }, + ["monster_exp"]=12000 + }, + [28602]={ + ["monster_base"]=10008, + ["hp"]=1650000, + ["atk"]=19800000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20022, + 20023, + 20024 + }, + ["monster_exp"]=14000 + }, + [28702]={ + ["monster_base"]=10019, + ["hp"]=1800000, + ["atk"]=19800000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20055, + 20056, + 20057 + }, + ["monster_exp"]=12000 + }, + [28802]={ + ["monster_base"]=10007, + ["hp"]=1950000, + ["atk"]=21600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20019, + 20020, + 20021 + }, ["monster_exp"]=13000 }, - [130902]={ + [28902]={ ["monster_base"]=10006, ["hp"]=2100000, ["atk"]=21600000, @@ -2477,23 +2473,23 @@ local monster_daily_challenge = { }, ["monster_exp"]=16000 }, - [131002]={ - ["monster_base"]=20006, + [29002]={ + ["monster_base"]=20008, ["is_boss"]=1, ["hp"]=3375000, ["atk"]=57600000, ["atk_times"]=2, ["hurt_skill"]={ - 20079, - 20080, - 20081 + 20087, + 20088, + 20089 }, ["skill"]={ - 20082 + 20090 }, ["monster_exp"]=14000 }, - [131102]={ + [29102]={ ["monster_base"]=10006, ["hp"]=1800000, ["atk"]=23400000, @@ -2505,33 +2501,21 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [131202]={ - ["monster_base"]=10009, + [29202]={ + ["monster_base"]=10014, ["hp"]=1950000, ["atk"]=27000000, ["atk_times"]=2, ["hurt_skill"]={ - 20025, - 20026, - 20027 + 20040, + 20041, + 20042 }, ["monster_exp"]=18000 }, - [131302]={ - ["monster_base"]=10008, - ["hp"]=2100000, - ["atk"]=27000000, - ["atk_times"]=2, - ["hurt_skill"]={ - 20022, - 20023, - 20024 - }, - ["monster_exp"]=18000 - }, - [131402]={ + [29302]={ ["monster_base"]=10007, - ["hp"]=2250000, + ["hp"]=2100000, ["atk"]=27000000, ["atk_times"]=2, ["hurt_skill"]={ @@ -2539,9 +2523,21 @@ local monster_daily_challenge = { 20020, 20021 }, + ["monster_exp"]=18000 + }, + [29402]={ + ["monster_base"]=10008, + ["hp"]=2250000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20022, + 20023, + 20024 + }, ["monster_exp"]=22000 }, - [131502]={ + [29502]={ ["monster_base"]=30010, ["is_boss"]=2, ["hp"]=4158000, @@ -2562,7 +2558,798 @@ local monster_daily_challenge = { }, ["monster_exp"]=4000 }, - [140102]={ + [29602]={ + ["monster_base"]=10010, + ["hp"]=4444000, + ["atk"]=1971200000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20028, + 20029, + 20030 + }, + ["monster_exp"]=9000 + }, + [29702]={ + ["monster_base"]=10018, + ["hp"]=4848000, + ["atk"]=1971200000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20052, + 20053, + 20054 + }, + ["monster_exp"]=10000 + }, + [29802]={ + ["monster_base"]=10011, + ["hp"]=5252000, + ["atk"]=2150400000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20031, + 20032, + 20033 + }, + ["monster_exp"]=11000 + }, + [29902]={ + ["monster_base"]=10009, + ["hp"]=5656000, + ["atk"]=2150400000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20025, + 20026, + 20027 + }, + ["monster_exp"]=12000 + }, + [30002]={ + ["monster_base"]=20005, + ["is_boss"]=1, + ["hp"]=6060000, + ["atk"]=2867200000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20075, + 20076, + 20077 + }, + ["skill"]={ + 20078 + }, + ["monster_exp"]=12000 + }, + [30102]={ + ["monster_base"]=10010, + ["hp"]=3950000, + ["atk"]=1363200000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20028, + 20029, + 20030 + }, + ["monster_exp"]=11000 + }, + [30202]={ + ["monster_base"]=10018, + ["hp"]=4345000, + ["atk"]=1704000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20052, + 20053, + 20054 + }, + ["monster_exp"]=11000 + }, + [30302]={ + ["monster_base"]=10011, + ["hp"]=4740000, + ["atk"]=1704000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20031, + 20032, + 20033 + }, + ["monster_exp"]=17000 + }, + [30402]={ + ["monster_base"]=10009, + ["hp"]=5135000, + ["atk"]=1704000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20025, + 20026, + 20027 + }, + ["monster_exp"]=19000 + }, + [30502]={ + ["monster_base"]=20001, + ["is_boss"]=1, + ["hp"]=5530000, + ["atk"]=2044800000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20058, + 20059, + 20060 + }, + ["skill"]={ + 20061 + }, + ["passive_skill"]={ + 20062 + }, + ["monster_exp"]=18000 + }, + [30602]={ + ["monster_base"]=10009, + ["hp"]=4848000, + ["atk"]=2329600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20025, + 20026, + 20027 + }, + ["monster_exp"]=16000 + }, + [30702]={ + ["monster_base"]=10016, + ["hp"]=5252000, + ["atk"]=2688000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20046, + 20047, + 20048 + }, + ["monster_exp"]=18000 + }, + [30802]={ + ["monster_base"]=10011, + ["hp"]=5656000, + ["atk"]=2688000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20031, + 20032, + 20033 + }, + ["monster_exp"]=21000 + }, + [30902]={ + ["monster_base"]=10010, + ["hp"]=6060000, + ["atk"]=2688000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20028, + 20029, + 20030 + }, + ["monster_exp"]=22000 + }, + [31002]={ + ["monster_base"]=30001, + ["is_boss"]=2, + ["hp"]=7272000, + ["atk"]=3584000000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20091, + 20092, + 20093 + }, + ["skill"]={ + 20094, + 20095 + }, + ["passive_skill"]={ + 10002, + 10013 + }, + ["monster_exp"]=24000 + }, + [31102]={ + ["monster_base"]=10013, + ["hp"]=1500000, + ["atk"]=14400000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20037, + 20038, + 20039 + }, + ["monster_exp"]=11000 + }, + [31202]={ + ["monster_base"]=10012, + ["hp"]=1650000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20034, + 20035, + 20036 + }, + ["monster_exp"]=11000 + }, + [31302]={ + ["monster_base"]=10009, + ["hp"]=1800000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20025, + 20026, + 20027 + }, + ["monster_exp"]=17000 + }, + [31402]={ + ["monster_base"]=10014, + ["hp"]=1950000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20040, + 20041, + 20042 + }, + ["monster_exp"]=15000 + }, + [31502]={ + ["monster_base"]=20005, + ["is_boss"]=1, + ["hp"]=3150000, + ["atk"]=43200000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20075, + 20076, + 20077 + }, + ["skill"]={ + 20078 + }, + ["monster_exp"]=12000 + }, + [31602]={ + ["monster_base"]=10014, + ["hp"]=1650000, + ["atk"]=19800000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20040, + 20041, + 20042 + }, + ["monster_exp"]=14000 + }, + [31702]={ + ["monster_base"]=10017, + ["hp"]=1800000, + ["atk"]=19800000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20049, + 20050, + 20051 + }, + ["monster_exp"]=12000 + }, + [31802]={ + ["monster_base"]=10013, + ["hp"]=1950000, + ["atk"]=21600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20037, + 20038, + 20039 + }, + ["monster_exp"]=13000 + }, + [31902]={ + ["monster_base"]=10012, + ["hp"]=2100000, + ["atk"]=21600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20034, + 20035, + 20036 + }, + ["monster_exp"]=16000 + }, + [32002]={ + ["monster_base"]=20008, + ["is_boss"]=1, + ["hp"]=3375000, + ["atk"]=57600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20087, + 20088, + 20089 + }, + ["skill"]={ + 20090 + }, + ["monster_exp"]=14000 + }, + [32102]={ + ["monster_base"]=10012, + ["hp"]=1800000, + ["atk"]=23400000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20034, + 20035, + 20036 + }, + ["monster_exp"]=15000 + }, + [32202]={ + ["monster_base"]=10009, + ["hp"]=1950000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20025, + 20026, + 20027 + }, + ["monster_exp"]=18000 + }, + [32302]={ + ["monster_base"]=10013, + ["hp"]=2100000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20037, + 20038, + 20039 + }, + ["monster_exp"]=18000 + }, + [32402]={ + ["monster_base"]=10014, + ["hp"]=2250000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20040, + 20041, + 20042 + }, + ["monster_exp"]=22000 + }, + [32502]={ + ["monster_base"]=30002, + ["is_boss"]=2, + ["hp"]=4158000, + ["atk"]=144000000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20096, + 20097, + 20098 + }, + ["skill"]={ + 20099, + 20100 + }, + ["passive_skill"]={ + 10004, + 10013 + }, + ["monster_exp"]=4000 + }, + [32602]={ + ["monster_base"]=10018, + ["hp"]=1500000, + ["atk"]=14400000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20052, + 20053, + 20054 + }, + ["monster_exp"]=11000 + }, + [32702]={ + ["monster_base"]=10010, + ["hp"]=1650000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20028, + 20029, + 20030 + }, + ["monster_exp"]=11000 + }, + [32802]={ + ["monster_base"]=10017, + ["hp"]=1800000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20049, + 20050, + 20051 + }, + ["monster_exp"]=17000 + }, + [32902]={ + ["monster_base"]=10019, + ["hp"]=1950000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20055, + 20056, + 20057 + }, + ["monster_exp"]=15000 + }, + [33002]={ + ["monster_base"]=20007, + ["is_boss"]=1, + ["hp"]=3150000, + ["atk"]=43200000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20083, + 20084, + 20085 + }, + ["skill"]={ + 20086 + }, + ["monster_exp"]=12000 + }, + [33102]={ + ["monster_base"]=10019, + ["hp"]=1650000, + ["atk"]=19800000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20055, + 20056, + 20057 + }, + ["monster_exp"]=14000 + }, + [33202]={ + ["monster_base"]=10016, + ["hp"]=1800000, + ["atk"]=19800000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20046, + 20047, + 20048 + }, + ["monster_exp"]=12000 + }, + [33302]={ + ["monster_base"]=10018, + ["hp"]=1950000, + ["atk"]=21600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20052, + 20053, + 20054 + }, + ["monster_exp"]=13000 + }, + [33402]={ + ["monster_base"]=10010, + ["hp"]=2100000, + ["atk"]=21600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20028, + 20029, + 20030 + }, + ["monster_exp"]=16000 + }, + [33502]={ + ["monster_base"]=20002, + ["is_boss"]=1, + ["hp"]=3375000, + ["atk"]=57600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20063, + 20064, + 20065 + }, + ["skill"]={ + 20066 + }, + ["monster_exp"]=14000 + }, + [33602]={ + ["monster_base"]=10010, + ["hp"]=1800000, + ["atk"]=23400000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20028, + 20029, + 20030 + }, + ["monster_exp"]=15000 + }, + [33702]={ + ["monster_base"]=10017, + ["hp"]=1950000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20049, + 20050, + 20051 + }, + ["monster_exp"]=18000 + }, + [33802]={ + ["monster_base"]=10018, + ["hp"]=2100000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20052, + 20053, + 20054 + }, + ["monster_exp"]=18000 + }, + [33902]={ + ["monster_base"]=10019, + ["hp"]=2250000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20055, + 20056, + 20057 + }, + ["monster_exp"]=22000 + }, + [34002]={ + ["monster_base"]=30006, + ["is_boss"]=2, + ["hp"]=4158000, + ["atk"]=144000000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20115, + 20116, + 20117 + }, + ["skill"]={ + 20118, + 20119 + }, + ["passive_skill"]={ + 10004, + 10013 + }, + ["monster_exp"]=4000 + }, + [34102]={ + ["monster_base"]=10008, + ["hp"]=1500000, + ["atk"]=14400000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20022, + 20023, + 20024 + }, + ["monster_exp"]=11000 + }, + [34202]={ + ["monster_base"]=10006, + ["hp"]=1650000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20016, + 20017, + 20018 + }, + ["monster_exp"]=11000 + }, + [34302]={ + ["monster_base"]=10009, + ["hp"]=1800000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20025, + 20026, + 20027 + }, + ["monster_exp"]=17000 + }, + [34402]={ + ["monster_base"]=10007, + ["hp"]=1950000, + ["atk"]=18000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20019, + 20020, + 20021 + }, + ["monster_exp"]=15000 + }, + [34502]={ + ["monster_base"]=20005, + ["is_boss"]=1, + ["hp"]=3150000, + ["atk"]=43200000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20075, + 20076, + 20077 + }, + ["skill"]={ + 20078 + }, + ["monster_exp"]=12000 + }, + [34602]={ + ["monster_base"]=10007, + ["hp"]=1650000, + ["atk"]=19800000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20019, + 20020, + 20021 + }, + ["monster_exp"]=14000 + }, + [34702]={ + ["monster_base"]=10004, + ["hp"]=1800000, + ["atk"]=19800000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20010, + 20011, + 20012 + }, + ["monster_exp"]=12000 + }, + [34802]={ + ["monster_base"]=10008, + ["hp"]=1950000, + ["atk"]=21600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20022, + 20023, + 20024 + }, + ["monster_exp"]=13000 + }, + [34902]={ + ["monster_base"]=10006, + ["hp"]=2100000, + ["atk"]=21600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20016, + 20017, + 20018 + }, + ["monster_exp"]=16000 + }, + [35002]={ + ["monster_base"]=20006, + ["is_boss"]=1, + ["hp"]=3375000, + ["atk"]=57600000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20079, + 20080, + 20081 + }, + ["skill"]={ + 20082 + }, + ["monster_exp"]=14000 + }, + [35102]={ + ["monster_base"]=10006, + ["hp"]=1800000, + ["atk"]=23400000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20016, + 20017, + 20018 + }, + ["monster_exp"]=15000 + }, + [35202]={ + ["monster_base"]=10009, + ["hp"]=1950000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20025, + 20026, + 20027 + }, + ["monster_exp"]=18000 + }, + [35302]={ + ["monster_base"]=10008, + ["hp"]=2100000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20022, + 20023, + 20024 + }, + ["monster_exp"]=18000 + }, + [35402]={ + ["monster_base"]=10007, + ["hp"]=2250000, + ["atk"]=27000000, + ["atk_times"]=2, + ["hurt_skill"]={ + 20019, + 20020, + 20021 + }, + ["monster_exp"]=22000 + }, + [35502]={ + ["monster_base"]=30010, + ["is_boss"]=2, + ["hp"]=4158000, + ["atk"]=144000000, + ["atk_times"]=3, + ["hurt_skill"]={ + 20135, + 20136, + 20137 + }, + ["skill"]={ + 20138, + 20139 + }, + ["passive_skill"]={ + 10003, + 10013 + }, + ["monster_exp"]=4000 + }, + [35602]={ ["monster_base"]=10015, ["hp"]=1500000, ["atk"]=14400000, @@ -2574,7 +3361,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [140202]={ + [35702]={ ["monster_base"]=10018, ["hp"]=1650000, ["atk"]=18000000, @@ -2586,7 +3373,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [140302]={ + [35802]={ ["monster_base"]=10007, ["hp"]=1800000, ["atk"]=18000000, @@ -2598,7 +3385,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=17000 }, - [140402]={ + [35902]={ ["monster_base"]=10016, ["hp"]=1950000, ["atk"]=18000000, @@ -2610,7 +3397,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [140502]={ + [36002]={ ["monster_base"]=20006, ["is_boss"]=1, ["hp"]=3150000, @@ -2626,7 +3413,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [140602]={ + [36102]={ ["monster_base"]=10016, ["hp"]=1650000, ["atk"]=19800000, @@ -2638,7 +3425,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [140702]={ + [36202]={ ["monster_base"]=10011, ["hp"]=1800000, ["atk"]=19800000, @@ -2650,7 +3437,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [140802]={ + [36302]={ ["monster_base"]=10015, ["hp"]=1950000, ["atk"]=21600000, @@ -2662,7 +3449,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=13000 }, - [140902]={ + [36402]={ ["monster_base"]=10018, ["hp"]=2100000, ["atk"]=21600000, @@ -2674,7 +3461,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=16000 }, - [141002]={ + [36502]={ ["monster_base"]=20007, ["is_boss"]=1, ["hp"]=3375000, @@ -2690,7 +3477,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [141102]={ + [36602]={ ["monster_base"]=10018, ["hp"]=1800000, ["atk"]=23400000, @@ -2702,7 +3489,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [141202]={ + [36702]={ ["monster_base"]=10007, ["hp"]=1950000, ["atk"]=27000000, @@ -2714,7 +3501,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [141302]={ + [36802]={ ["monster_base"]=10015, ["hp"]=2100000, ["atk"]=27000000, @@ -2726,7 +3513,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [141402]={ + [36902]={ ["monster_base"]=10016, ["hp"]=2250000, ["atk"]=27000000, @@ -2738,7 +3525,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=22000 }, - [141502]={ + [37002]={ ["monster_base"]=30005, ["is_boss"]=2, ["hp"]=4158000, @@ -2759,7 +3546,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=4000 }, - [150102]={ + [37102]={ ["monster_base"]=10014, ["hp"]=1500000, ["atk"]=14400000, @@ -2771,7 +3558,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [150202]={ + [37202]={ ["monster_base"]=10012, ["hp"]=1650000, ["atk"]=18000000, @@ -2783,7 +3570,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [150302]={ + [37302]={ ["monster_base"]=10009, ["hp"]=1800000, ["atk"]=18000000, @@ -2795,7 +3582,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=17000 }, - [150402]={ + [37402]={ ["monster_base"]=10013, ["hp"]=1950000, ["atk"]=18000000, @@ -2807,7 +3594,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [150502]={ + [37502]={ ["monster_base"]=20007, ["is_boss"]=1, ["hp"]=3150000, @@ -2823,7 +3610,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [150602]={ + [37602]={ ["monster_base"]=10013, ["hp"]=1650000, ["atk"]=19800000, @@ -2835,7 +3622,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [150702]={ + [37702]={ ["monster_base"]=10011, ["hp"]=1800000, ["atk"]=19800000, @@ -2847,7 +3634,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [150802]={ + [37802]={ ["monster_base"]=10014, ["hp"]=1950000, ["atk"]=21600000, @@ -2859,7 +3646,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=13000 }, - [150902]={ + [37902]={ ["monster_base"]=10012, ["hp"]=2100000, ["atk"]=21600000, @@ -2871,7 +3658,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=16000 }, - [151002]={ + [38002]={ ["monster_base"]=20008, ["is_boss"]=1, ["hp"]=3375000, @@ -2887,7 +3674,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [151102]={ + [38102]={ ["monster_base"]=10012, ["hp"]=1800000, ["atk"]=23400000, @@ -2899,7 +3686,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [151202]={ + [38202]={ ["monster_base"]=10009, ["hp"]=1950000, ["atk"]=27000000, @@ -2911,7 +3698,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [151302]={ + [38302]={ ["monster_base"]=10014, ["hp"]=2100000, ["atk"]=27000000, @@ -2923,7 +3710,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [151402]={ + [38402]={ ["monster_base"]=10013, ["hp"]=2250000, ["atk"]=27000000, @@ -2935,7 +3722,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=22000 }, - [151502]={ + [38502]={ ["monster_base"]=30004, ["is_boss"]=2, ["hp"]=4158000, @@ -2956,7 +3743,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=4000 }, - [160102]={ + [38602]={ ["monster_base"]=10001, ["hp"]=1500000, ["atk"]=14400000, @@ -2968,7 +3755,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [160202]={ + [38702]={ ["monster_base"]=10002, ["hp"]=1650000, ["atk"]=18000000, @@ -2980,7 +3767,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=11000 }, - [160302]={ + [38802]={ ["monster_base"]=10010, ["hp"]=1800000, ["atk"]=18000000, @@ -2992,7 +3779,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=17000 }, - [160402]={ + [38902]={ ["monster_base"]=10003, ["hp"]=1950000, ["atk"]=18000000, @@ -3004,7 +3791,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [160502]={ + [39002]={ ["monster_base"]=20006, ["is_boss"]=1, ["hp"]=3150000, @@ -3020,7 +3807,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [160602]={ + [39102]={ ["monster_base"]=10003, ["hp"]=1650000, ["atk"]=19800000, @@ -3032,7 +3819,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [160702]={ + [39202]={ ["monster_base"]=10005, ["hp"]=1800000, ["atk"]=19800000, @@ -3044,7 +3831,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=12000 }, - [160802]={ + [39302]={ ["monster_base"]=10001, ["hp"]=1950000, ["atk"]=21600000, @@ -3056,7 +3843,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=13000 }, - [160902]={ + [39402]={ ["monster_base"]=10002, ["hp"]=2100000, ["atk"]=21600000, @@ -3068,7 +3855,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=16000 }, - [161002]={ + [39502]={ ["monster_base"]=20008, ["is_boss"]=1, ["hp"]=3375000, @@ -3084,7 +3871,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=14000 }, - [161102]={ + [39602]={ ["monster_base"]=10002, ["hp"]=1800000, ["atk"]=23400000, @@ -3096,7 +3883,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=15000 }, - [161202]={ + [39702]={ ["monster_base"]=10010, ["hp"]=1950000, ["atk"]=27000000, @@ -3108,7 +3895,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [161302]={ + [39802]={ ["monster_base"]=10001, ["hp"]=2100000, ["atk"]=27000000, @@ -3120,7 +3907,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=18000 }, - [161402]={ + [39902]={ ["monster_base"]=10003, ["hp"]=2250000, ["atk"]=27000000, @@ -3132,7 +3919,7 @@ local monster_daily_challenge = { }, ["monster_exp"]=22000 }, - [161502]={ + [40002]={ ["monster_base"]=30003, ["is_boss"]=2, ["hp"]=4158000, @@ -3154,6 +3941,6 @@ local monster_daily_challenge = { } } local config = { -data=monster_daily_challenge,count=240 +data=monster_daily_challenge,count=300 } return config \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index d872bd19..6a6ebe05 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -9566,7 +9566,7 @@ local skill = { 5, 3 }, - ["battle_icon"]="45002", + ["battle_icon"]="m30001_1", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -9605,7 +9605,7 @@ local skill = { ["skill_type_parameter"]={ 12500 }, - ["battle_icon"]="53001", + ["battle_icon"]="m30001_2", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -9710,7 +9710,7 @@ local skill = { 9, 3 }, - ["battle_icon"]="45002", + ["battle_icon"]="m30002_1", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -9746,7 +9746,7 @@ local skill = { ["skill_type_parameter"]={ 1 }, - ["battle_icon"]="53001", + ["battle_icon"]="m30002_2", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -9861,7 +9861,7 @@ local skill = { } }, [20104]={ - ["battle_icon"]="45002", + ["battle_icon"]="m30003_1", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ From 2ec6c8c95088ca36f6e57b86a7019e4d85e8e817 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Mon, 15 Sep 2025 10:53:37 +0800 Subject: [PATCH 05/11] fix bug --- lua/app/module/item/item_const.lua | 2 +- lua/app/ui/hero/hero_detail_ui.lua | 4 +++- lua/app/ui/summon/summon_unlock_ui.lua | 5 +++++ lua/app/userdata/chapter/chapter_data.lua | 9 +++++---- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lua/app/module/item/item_const.lua b/lua/app/module/item/item_const.lua index 583bf7f3..52b17924 100644 --- a/lua/app/module/item/item_const.lua +++ b/lua/app/module/item/item_const.lua @@ -10,7 +10,7 @@ ItemConst.ITEM_ID_BOX_LV_1 = 8 ItemConst.ITEM_ID_BOX_LV_2 = 9 ItemConst.ITEM_ID_BOX_LV_3 = 10 ItemConst.ITEM_ID_BOX_LV_4 = 11 -ItemConst.ITEM_ID_EXP = 12 +ItemConst.ITEM_ID_EXP = 4 ItemConst.ITEM_ID_BOX_KEY_LV_1 = 13 ItemConst.ITEM_ID_BOX_KEY_LV_2 = 14 ItemConst.ITEM_ID_BOX_KEY_LV_3 = 15 diff --git a/lua/app/ui/hero/hero_detail_ui.lua b/lua/app/ui/hero/hero_detail_ui.lua index c4bc9076..d7a21bc0 100644 --- a/lua/app/ui/hero/hero_detail_ui.lua +++ b/lua/app/ui/hero/hero_detail_ui.lua @@ -32,7 +32,9 @@ end function HeroDetailUI:onLoadRootComplete() local uiMap = self.root:genAllChildren() - + self.root:addClickListener(function() + self:closeUI() + end) uiMap["hero_detail_ui.common.close_btn"]:addClickListener(function() self:closeUI() end) diff --git a/lua/app/ui/summon/summon_unlock_ui.lua b/lua/app/ui/summon/summon_unlock_ui.lua index 9a67e264..a348548e 100755 --- a/lua/app/ui/summon/summon_unlock_ui.lua +++ b/lua/app/ui/summon/summon_unlock_ui.lua @@ -36,6 +36,7 @@ function SummonUnlockUI:onLoadRootComplete() self.matchImg = uiMap["summon_unlock_ui.match_tx.match_img"] self.qltBg = uiMap["summon_unlock_ui.qlt_bg"] self.qltBgTx = uiMap["summon_unlock_ui.qlt_bg.qlt_tx"] + self.uiSpine = uiMap["summon_unlock_ui.ui_spine_obj"] uiMap["summon_unlock_ui.title_bg.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_3)) uiMap["summon_unlock_ui.continue_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_TO_CONTINUE)) @@ -57,8 +58,12 @@ end function SummonUnlockUI:loadHero() local cfg = DataManager.HeroData:getHeroConfig(self.heroId) + local qlt = cfg.qlt - 1 SpineManager:loadHeroAsync(cfg.model_id, self.heroNode, function(spineObject) spineObject:playAnimation("idle", true) + self.uiSpine:playAnimComplete("open0" .. qlt, false, true, function() + self.uiSpine:playAnim("idle0" .. qlt, true, true) + end) end) end diff --git a/lua/app/userdata/chapter/chapter_data.lua b/lua/app/userdata/chapter/chapter_data.lua index 112091c5..8803a848 100644 --- a/lua/app/userdata/chapter/chapter_data.lua +++ b/lua/app/userdata/chapter/chapter_data.lua @@ -162,9 +162,10 @@ function ChapterData:getChapterBoxCanGet() end function ChapterData:calcChapterBoxCanGet() - for chapterId = 1, self.data.maxChapterId do + local maxChapterId = self:getNextChapter(self.data.maxChapterId) + for chapterId = 1, maxChapterId do for ii = 1, 3 do - local canGet = not self:getChapterBoxRewardGot(chapterId, ii) + local canGet = self:boxCanGet(chapterId, ii) if canGet then self.boxCanGetState = true return @@ -180,7 +181,7 @@ function ChapterData:getChapterBoxCanGetInfo() for chapterId = 1, maxChapterId do local boxes = {} for i = 1, 3 do - local canGet = not self:getChapterBoxRewardGot(chapterId, i) and self:boxCanGet(chapterId, i) + local canGet = self:boxCanGet(chapterId, i) if canGet then table.insert(boxes, i) end @@ -346,7 +347,7 @@ function ChapterData:openBox() for chapterId = 1, maxChapterId do self.data.chapterInfo[chapterId] = self.data.chapterInfo[chapterId] or {total_count = 0, index = {}, mystery_box_idx = {}} for i = 1, 3 do - local canGet = not self:getChapterBoxRewardGot(chapterId, i) and self:boxCanGet(chapterId, i) + local canGet = self:boxCanGet(chapterId, i) if canGet then self.data.chapterInfo[chapterId].index[i] = i end From e5e23cc06c4a6bd1af8b8999448e9209f617200b Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Mon, 15 Sep 2025 11:41:23 +0800 Subject: [PATCH 06/11] fix bug --- lua/app/module/arena/arena_manager.lua | 6 +++++- lua/app/ui/arena/arena_ui.lua | 6 ++++++ lua/app/ui/player/player_level_up_ui.lua | 3 ++- lua/app/userdata/arena/arena_data.lua | 6 +++++- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/lua/app/module/arena/arena_manager.lua b/lua/app/module/arena/arena_manager.lua index 64595b3f..9399ebaf 100644 --- a/lua/app/module/arena/arena_manager.lua +++ b/lua/app/module/arena/arena_manager.lua @@ -108,7 +108,11 @@ function ArenaManager:rspChallenge(result) atkFormation = atkFormation, defFormation = defFormation } - ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.ARENA, params) + ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.ARENA, params, function () + UIManager:closeAllUI() + ModuleManager.MaincityManager:showMainCityUI() + self:showArenaUI() + end) --bi上报 LocalData:recordTodayArenaBattle() diff --git a/lua/app/ui/arena/arena_ui.lua b/lua/app/ui/arena/arena_ui.lua index 19d29ef6..51fb1514 100644 --- a/lua/app/ui/arena/arena_ui.lua +++ b/lua/app/ui/arena/arena_ui.lua @@ -281,6 +281,12 @@ function ArenaUI:refreshFightBtn() self.fightCost:setActive(false) self.countTxNum:setActive(false) self.fightBtn:setActive(true) + + if DataManager.ArenaData:hasTicket() then + self.fightBtn:addRedPoint(120, 40, 1) + else + self.fightBtn:removeRedPoint() + end end return ArenaUI \ No newline at end of file diff --git a/lua/app/ui/player/player_level_up_ui.lua b/lua/app/ui/player/player_level_up_ui.lua index 4f92f202..fadffd55 100644 --- a/lua/app/ui/player/player_level_up_ui.lua +++ b/lua/app/ui/player/player_level_up_ui.lua @@ -12,7 +12,8 @@ function PlayerLevelUpUI:ctor(params) params = params or GConst.EMPTY_TABLE self.fromLevel = params.fromLevel - self.rewards = params.rewards or GConst.EMPTY_TABLE + self.rewards = {} + GFunc.mergeRewards2(params.rewards or GConst.EMPTY_TABLE, self.rewards, true) end function PlayerLevelUpUI:onLoadRootComplete() diff --git a/lua/app/userdata/arena/arena_data.lua b/lua/app/userdata/arena/arena_data.lua index ab089a75..aa45b11d 100644 --- a/lua/app/userdata/arena/arena_data.lua +++ b/lua/app/userdata/arena/arena_data.lua @@ -464,7 +464,11 @@ function ArenaData:hasEntranceRedDot() if not self:isOpen() then return false end - return DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_ARENA_TICKET) > 0 or self:hasSeasonReward() or self:hasGradingRewardRedDot() + return self:hasSeasonReward() or self:hasGradingRewardRedDot() or self:hasTicket() +end + +function ArenaData:hasTicket() + return DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_ARENA_TICKET) > 0 end -- 广告宝箱 ---------------------------------------------------------------------- From e1d389b02d323fc2bc8bd032f72856d68745db39 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Mon, 15 Sep 2025 17:20:14 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E6=8C=91=E6=88=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/daily_challenge_level.lua | 77 ----- lua/app/config/hero.lua | 2 +- .../localization_global_const.lua | 7 + lua/app/config/skill.lua | 40 +-- lua/app/config/strings/cn/global.lua | 7 + lua/app/global/global_const.lua | 10 +- .../battle_controller_daily_challenge.lua | 3 +- .../daily_challenge_manager.lua | 14 + lua/app/proto/proto_msg_type.lua | 6 + .../ui/daily_challenge/daily_challenge_ui.lua | 76 +++++ lua/app/userdata/arena/arena_data.lua | 6 + .../daily_challenge/daily_challenge_data.lua | 318 ++++++++++-------- 12 files changed, 311 insertions(+), 255 deletions(-) diff --git a/lua/app/config/daily_challenge_level.lua b/lua/app/config/daily_challenge_level.lua index ff95fd52..88b24ec9 100644 --- a/lua/app/config/daily_challenge_level.lua +++ b/lua/app/config/daily_challenge_level.lua @@ -1,11 +1,6 @@ local daily_challenge_level = { [1]={ ["max_chapter"]=11, - ["round_map"]={ - 1, - 2, - 3 - }, ["wave_reward"]={ { ["type"]=1, @@ -95,13 +90,6 @@ local daily_challenge_level = { }, [2]={ ["max_chapter"]=19, - ["round_map"]={ - 1, - 2, - 3, - 4, - 5 - }, ["wave_reward"]={ { ["type"]=1, @@ -191,15 +179,6 @@ local daily_challenge_level = { }, [3]={ ["max_chapter"]=27, - ["round_map"]={ - 1, - 2, - 3, - 4, - 5, - 6, - 7 - }, ["wave_reward"]={ { ["type"]=1, @@ -289,17 +268,6 @@ local daily_challenge_level = { }, [4]={ ["max_chapter"]=37, - ["round_map"]={ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9 - }, ["wave_reward"]={ { ["type"]=1, @@ -389,19 +357,6 @@ local daily_challenge_level = { }, [5]={ ["max_chapter"]=47, - ["round_map"]={ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - }, ["wave_reward"]={ { ["type"]=1, @@ -491,21 +446,6 @@ local daily_challenge_level = { }, [6]={ ["max_chapter"]=62, - ["round_map"]={ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13 - }, ["wave_reward"]={ { ["type"]=1, @@ -595,23 +535,6 @@ local daily_challenge_level = { }, [7]={ ["max_chapter"]=77, - ["round_map"]={ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15 - }, ["wave_reward"]={ { ["type"]=1, diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index 23ce5f78..d009f986 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -4354,7 +4354,7 @@ local hero = { 1100, 1200 }, - ["model_id"]="p23001", + ["model_id"]="p25001", ["icon"]="25001", ["item_id"]=25001, ["level_id"]=10, diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 91fc5b66..7c8f02b7 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -681,6 +681,13 @@ local LocalizationGlobalConst = HERO_DESC_22 = "HERO_DESC_22", HERO_DESC_23 = "HERO_DESC_23", BAG_DESC_1 = "BAG_DESC_1", + DAILY_CHALLENGE_DESC_2 = "DAILY_CHALLENGE_DESC_2", + DAILY_CHALLENGE_DESC_3 = "DAILY_CHALLENGE_DESC_3", + DAILY_CHALLENGE_DESC_4 = "DAILY_CHALLENGE_DESC_4", + DAILY_CHALLENGE_DESC_5 = "DAILY_CHALLENGE_DESC_5", + DAILY_CHALLENGE_DESC_6 = "DAILY_CHALLENGE_DESC_6", + DAILY_CHALLENGE_DESC_7 = "DAILY_CHALLENGE_DESC_7", + DAILY_CHALLENGE_DESC_8 = "DAILY_CHALLENGE_DESC_8", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 6a6ebe05..623e6f57 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -2361,15 +2361,11 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound_hit"]={ - 1000001 - }, ["name_act"]="attack01", ["name_hit"]={ "suffer01" }, - ["fx_self"]=300018, - ["fx_self_mirror"]=400018 + ["fx_self_mirror"]=100000 }, [2500111]={ ["position"]=2, @@ -2390,15 +2386,11 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound_hit"]={ - 1000002 - }, ["name_act"]="attack02", ["name_hit"]={ "suffer02" }, - ["fx_self"]=300019, - ["fx_self_mirror"]=400019 + ["fx_self_mirror"]=100000 }, [2500112]={ ["position"]=2, @@ -2419,15 +2411,11 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound_hit"]={ - 1000003 - }, ["name_act"]="attack03", ["name_hit"]={ "suffer01" }, - ["fx_self"]=300020, - ["fx_self_mirror"]=400020 + ["fx_self_mirror"]=100000 }, [2500113]={ ["position"]=2, @@ -2448,15 +2436,11 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound_hit"]={ - 1000004 - }, ["name_act"]="attack04", ["name_hit"]={ "suffer02" }, - ["fx_self"]=300021, - ["fx_self_mirror"]=400021 + ["fx_self_mirror"]=100000 }, [2500120]={ ["energy"]=10, @@ -2489,6 +2473,12 @@ local skill = { ["ratio"]=10000, ["round"]=0 }, + { + ["type"]="hurt_yellow", + ["num"]=20000, + ["ratio"]=10000, + ["round"]=0 + }, { ["type"]="hurt_yellow", ["num"]=20000, @@ -2501,7 +2491,8 @@ local skill = { 1, 2, 3, - 4 + 4, + 5 }, ["skill_position"]={ 1, @@ -2509,22 +2500,21 @@ local skill = { }, ["shake_time"]=200, ["shake_type"]=5, - ["sound"]=12001200, ["sound_delay"]=0.0, ["name_act"]="skill01", ["name_hit"]={ "suffer01", "suffer01", - "suffer02", + "suffer03", + "suffer03", "suffer03" }, - ["fx_self"]=300022, ["bullet_time"]={ 1167, 3000, 300 }, - ["fx_self_mirror"]=400022 + ["fx_self_mirror"]=100000 }, [2500121]={ ["position"]=2, diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 14ee3613..756ea278 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -681,6 +681,13 @@ local localization_global = ["HERO_DESC_22"] = "去升星", ["HERO_DESC_23"] = "技能等级:{0}", ["BAG_DESC_1"] = "背包", + ["DAILY_CHALLENGE_DESC_2"] = "提升难度", + ["DAILY_CHALLENGE_DESC_3"] = "通关主线{0}-{1}({2})", + ["DAILY_CHALLENGE_DESC_4"] = "难度提升将提升未领取的任务奖励和通关奖励，是否确定？", + ["DAILY_CHALLENGE_DESC_5"] = "降低难度后，未领取的任务奖励和通关奖励将降低，是否确定？", + ["DAILY_CHALLENGE_DESC_6"] = "请先领取已达成的任务奖励", + ["DAILY_CHALLENGE_DESC_7"] = "降低难度", + ["DAILY_CHALLENGE_DESC_8"] = "已达成", } return localization_global \ No newline at end of file diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index 78e30a0d..3122fc02 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -330,11 +330,11 @@ GConst.MESSAGE_BOX_SHOW_TODAY = { GConst.QUALITY_TYPE = { [1] = "#D1D1D1", - [2] = "#A3FF94", - [3] = "#4DFFF5", - [4] = "#FA79FF", - [5] = "#F3A345", - [6] = "#F34545", + [2] = "#5BFF5F", + [3] = "#4ADBFF", + [4] = "#DF70FF", + [5] = "#FF9B59", + [6] = "#FF5D5D", } GConst.QUALITY_COLOR = { diff --git a/lua/app/module/battle/controller/battle_controller_daily_challenge.lua b/lua/app/module/battle/controller/battle_controller_daily_challenge.lua index 66d27258..5a7c3f50 100644 --- a/lua/app/module/battle/controller/battle_controller_daily_challenge.lua +++ b/lua/app/module/battle/controller/battle_controller_daily_challenge.lua @@ -12,7 +12,8 @@ function BattleControllerDailyChallenge:getChapterConfig() end function BattleControllerDailyChallenge:getChapterId() - return DataManager.DailyChallengeData:getChapterDailyId() + -- return DataManager.DailyChallengeData:getChapterDailyId() + return DataManager.DailyChallengeData:getDiffLv() end function BattleControllerDailyChallenge:getBuffs() diff --git a/lua/app/module/daily_challenge/daily_challenge_manager.lua b/lua/app/module/daily_challenge/daily_challenge_manager.lua index 5a5878b2..bfd081d2 100644 --- a/lua/app/module/daily_challenge/daily_challenge_manager.lua +++ b/lua/app/module/daily_challenge/daily_challenge_manager.lua @@ -234,4 +234,18 @@ function DailyChallengeManager:getCurTaskProgress(battleController) return taskCurProgress end +-- 修改难度 +function DailyChallengeManager:onChapterDailyChallengeLevelReq(level) + local parmas = { + level = level, + } + self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterDailyChallengeLevelReq, parmas, {}, self.onChapterDailyChallengeLevelRsp) +end + +function DailyChallengeManager:onChapterDailyChallengeLevelRsp(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + DataManager.DailyChallengeData:setDiffLv(result.reqData.level) + end +end + return DailyChallengeManager \ No newline at end of file diff --git a/lua/app/proto/proto_msg_type.lua b/lua/app/proto/proto_msg_type.lua index 84e496ed..fb97c91f 100644 --- a/lua/app/proto/proto_msg_type.lua +++ b/lua/app/proto/proto_msg_type.lua @@ -113,6 +113,8 @@ local ProtoMsgType = { [2017338205] = "BossRushSettlementRsp", [2018011867] = "TournWaveRankReq", [2018013700] = "TournWaveRankRsp", + [2055679641] = "ChapterDailyChallengeLevelReq", + [2055681474] = "ChapterDailyChallengeLevelRsp", [2060508030] = "ChangeAvatarFrameReq", [2060509863] = "ChangeAvatarFrameRsp", [2095612947] = "ChangeNameReq", @@ -412,6 +414,8 @@ local ProtoMsgType = { BossRushSettlementRsp = 2017338205, TournWaveRankReq = 2018011867, TournWaveRankRsp = 2018013700, + ChapterDailyChallengeLevelReq = 2055679641, + ChapterDailyChallengeLevelRsp = 2055681474, ChangeAvatarFrameReq = 2060508030, ChangeAvatarFrameRsp = 2060509863, ChangeNameReq = 2095612947, @@ -711,6 +715,8 @@ local ProtoMsgType = { BossRushSettlementRsp = "BossRushSettlementRsp", TournWaveRankReq = "TournWaveRankReq", TournWaveRankRsp = "TournWaveRankRsp", + ChapterDailyChallengeLevelReq = "ChapterDailyChallengeLevelReq", + ChapterDailyChallengeLevelRsp = "ChapterDailyChallengeLevelRsp", ChangeAvatarFrameReq = "ChangeAvatarFrameReq", ChangeAvatarFrameRsp = "ChangeAvatarFrameRsp", ChangeNameReq = "ChangeNameReq", diff --git a/lua/app/ui/daily_challenge/daily_challenge_ui.lua b/lua/app/ui/daily_challenge/daily_challenge_ui.lua index b4732471..ab77d907 100644 --- a/lua/app/ui/daily_challenge/daily_challenge_ui.lua +++ b/lua/app/ui/daily_challenge/daily_challenge_ui.lua @@ -32,6 +32,8 @@ function DailyChallengeUI:onLoadRootComplete() end) uiMap["daily_challenge_ui.title.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE)) uiMap["daily_challenge_ui.record_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.CHAPTER_DESC_1, DataManager.DailyChallengeData:getMaxWave())) + uiMap["daily_challenge_ui.up_diff_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_2)) + uiMap["daily_challenge_ui.down_diff_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_7)) self.tasks = GFunc.getTable() table.insert(self.tasks, uiMap["daily_challenge_ui.task.icon_task1"]) @@ -57,9 +59,60 @@ function DailyChallengeUI:onLoadRootComplete() self.countTxNum = uiMap["daily_challenge_ui.fight_btn.tx_count"] -- 按钮文本 self.txFight = uiMap["daily_challenge_ui.fight_btn.tx_desc"] + + self.upDiffBtn = uiMap["daily_challenge_ui.up_diff_btn"] + self.upDiffBtnDescTx = uiMap["daily_challenge_ui.up_diff_btn.desc_tx"] + self.downDiffBtn = uiMap["daily_challenge_ui.down_diff_btn"] self.fightBtn:addClickListener(function () ModuleManager.DailyChallengeManager:startChallenge() end) + self.upDiffBtn:addClickListener(function () + if DataManager.DailyChallengeData:canGetReward() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_6)) + return + end + local diffChapter = DataManager.DailyChallengeData:getDiffLv() + local maxChapter = DataManager.DailyChallengeData:getMaxDiffLv() + if diffChapter == maxChapter then + return + else + local cfg = DataManager.DailyChallengeData:getDifficultyCfg(diffChapter + 1) + local chapterId = DataManager.ChapterData:getMaxChapterId() + if cfg.max_chapter <= chapterId then + local params = { + content = I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_4), + boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, + okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK), + cancelText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CANCEL), + okFunc = function() + ModuleManager.DailyChallengeManager:onChapterDailyChallengeLevelReq(diffChapter + 1) + end, + } + GFunc.showMessageBox(params) + end + end + end) + self.downDiffBtn:addClickListener(function () + if DataManager.DailyChallengeData:canGetReward() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_6)) + return + end + local diffChapter = DataManager.DailyChallengeData:getDiffLv() + if diffChapter == 1 then + return + else + local params = { + content = I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_5), + boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, + okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK), + cancelText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CANCEL), + okFunc = function() + ModuleManager.DailyChallengeManager:onChapterDailyChallengeLevelReq(diffChapter - 1) + end, + } + GFunc.showMessageBox(params) + end + end) self:bind(DataManager.DailyChallengeData, "isDirty", function() self:onRefresh() @@ -78,6 +131,7 @@ function DailyChallengeUI:onRefresh() self:refreshBoss() self:updateTime() self:refreshFightBtn() + self:refreshDiffBtn() if DataManager.DailyChallengeData:getIsPopTask() then ModuleManager.DailyChallengeManager:showBattleTaskUI() @@ -180,4 +234,26 @@ function DailyChallengeUI:refreshFightBtn() end end +function DailyChallengeUI:refreshDiffBtn() + local diffChapter = DataManager.DailyChallengeData:getDiffLv() + local maxChapter = DataManager.DailyChallengeData:getMaxDiffLv() + if diffChapter == maxChapter then + self.upDiffBtn:setActive(false) + else + self.upDiffBtn:setActive(true) + local cfg = DataManager.DailyChallengeData:getDifficultyCfg(diffChapter + 1) + local chapterId = DataManager.ChapterData:getMaxChapterId() + local chapterPage = DataManager.ChapterData:getChapterPage(diffChapter + 1) + local chapterStage = DataManager.ChapterData:getChapterStage(diffChapter + 1) + local str + if cfg.max_chapter <= chapterId then + str = I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_3, chapterPage, chapterStage, "" .. I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_8) .. "") + else + str = I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_3, chapterPage, chapterStage, "" .. I18N:getGlobalText(I18N.GlobalConst.CHAPTER_WAVE_REAWRD_1) .. "") + end + self.upDiffBtnDescTx:setText(str) + end + self.downDiffBtn:setActive(diffChapter > 1) +end + return DailyChallengeUI \ No newline at end of file diff --git a/lua/app/userdata/arena/arena_data.lua b/lua/app/userdata/arena/arena_data.lua index aa45b11d..7b578edd 100644 --- a/lua/app/userdata/arena/arena_data.lua +++ b/lua/app/userdata/arena/arena_data.lua @@ -10,6 +10,7 @@ function ArenaData:clear() self.lastArenaGiftId = nil self.curArenaGiftId = nil self.giftExpireAt = nil + self.inited = nil end function ArenaData:init(data) @@ -39,6 +40,8 @@ function ArenaData:init(data) DataManager.FormationData:initArena(data.attack_array_heroes, data.defend_array_heroes) DataManager.PlayerData:initArena(data.today_ticket_buy_count, data.today_ticket_ad_count) + self.inited = true + -- 未找到相应赛季数据 if not self:hasServerData() then GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_30)) @@ -461,6 +464,9 @@ end -- 是否有入口红点 function ArenaData:hasEntranceRedDot() + if not self.inited then + return false + end if not self:isOpen() then return false end diff --git a/lua/app/userdata/daily_challenge/daily_challenge_data.lua b/lua/app/userdata/daily_challenge/daily_challenge_data.lua index c9c9fae5..27b33d68 100644 --- a/lua/app/userdata/daily_challenge/daily_challenge_data.lua +++ b/lua/app/userdata/daily_challenge/daily_challenge_data.lua @@ -1,5 +1,6 @@ local DailyChallengeData = class("DailyChallengeData", BaseData) local TASK_CFG = ConfigManager:getConfig("task_daily_challenge") +local CHAPTER_DAILY_CHALLENGE_CFG = ConfigManager:getConfig("chapter_daily_challenge") local PER_TASK = {[6] = true} local FIXED_HERO_TASK = {} local MATCH_TYPE_TASK = {[4] = true, [6] = true} @@ -10,80 +11,81 @@ function DailyChallengeData:ctor() end function DailyChallengeData:init(data) - if EDITOR_MODE then - Logger.logHighlight("每日挑战 更新数据...") - Logger.printTable(data) - end - data = data or GConst.EMPTY_TABLE - self.maxWave = data.max_wave or 0 - self.fixedChapterId = data.today_fixed_chapter_id or 1 - self.chapterDailyId = data.rand_chapter_daily_id or 1 - self.tasks = data.tasks or GConst.EMPTY_TABLE - self.buffIds = data.buff_id or GConst.EMPTY_TABLE - self.totalFightCount = data.total_challenge_count or 0 - self.todayFightCount = data.today_challenge_count or 0 - self.initDay = Time:getBeginningOfServerToday() - self.popTaskTime = LocalData:getChallengeTaskPopTime() - self:setDirty() + if EDITOR_MODE then + Logger.logHighlight("每日挑战 更新数据...") + Logger.printTable(data) + end + data = data or GConst.EMPTY_TABLE + self.maxWave = data.max_wave or 0 + self.fixedChapterId = data.today_fixed_chapter_id or 1 + self.chapterDailyId = data.rand_chapter_daily_id or 1 + self.tasks = data.tasks or GConst.EMPTY_TABLE + self.buffIds = data.buff_id or GConst.EMPTY_TABLE + self.totalFightCount = data.total_challenge_count or 0 + self.todayFightCount = data.today_challenge_count or 0 + self.initDay = Time:getBeginningOfServerToday() + self.popTaskTime = LocalData:getChallengeTaskPopTime() + self.diffLv = data.level or 1 + self:setDirty() end function DailyChallengeData:onGetedTaskReward(idx) - if self.tasks[idx] then - self.tasks[idx].claimed = true - self:setDirty() - end + if self.tasks[idx] then + self.tasks[idx].claimed = true + self:setDirty() + end end function DailyChallengeData:clear() end function DailyChallengeData:isOpen() - if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.DAILY_CHALLENGE, true) then - return false - end - return true + if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.DAILY_CHALLENGE, true) then + return false + end + return true end function DailyChallengeData:setDirty() - self.data.isDirty = not self.data.isDirty + self.data.isDirty = not self.data.isDirty end -- 是否满足挑战条件 function DailyChallengeData:isMeetChallenge() - return self:isOpen() and self:isEnoughChallengeTime() and self:isEnoughHp() + return self:isOpen() and self:isEnoughChallengeTime() and self:isEnoughHp() end -- 次数是否足够 function DailyChallengeData:isEnoughChallengeTime() - return self:getTodayRemainLimitCount() > 0 + return self:getTodayRemainLimitCount() > 0 end -- 获取挑战次数消耗 function DailyChallengeData:getChallengeTimeCost() - return GFunc.getConstIntValue("daily_challenge_limit") + return GFunc.getConstIntValue("daily_challenge_limit") end -- 体力是否足够 function DailyChallengeData:isEnoughHp() - local const = self:getChallengeHpCost() - local constNum = nil - if const then - constNum = GFunc.getRewardNum(const) - else - constNum = 0 - end - return constNum <= DataManager.BagData.ItemData:getVit() + local const = self:getChallengeHpCost() + local constNum = nil + if const then + constNum = GFunc.getRewardNum(const) + else + constNum = 0 + end + return constNum <= DataManager.BagData.ItemData:getVit() end -- 获取挑战体力消耗 function DailyChallengeData:getChallengeHpCost() - return GFunc.getConstReward("daily_challenge_cost") - + return GFunc.getConstReward("daily_challenge_cost") + end -- 获取今日挑战场景配置 function DailyChallengeData:getMapConfig() - return ConfigManager:getConfig("chapter_daily_challenge")[self:getChapterDailyId()] + return ConfigManager:getConfig("chapter_daily_challenge")[self:getChapterDailyId()] end function DailyChallengeData:getTaskCfg() @@ -95,173 +97,173 @@ end -- 获取今日通关次数 function DailyChallengeData:getTodayPassNum() - return self.todayFightCount + return self.todayFightCount end -- 获取今日最高记录（最大通过波次） function DailyChallengeData:getMaxWave() - return self.maxWave + return self.maxWave end -- 获取今日增益、负面buff function DailyChallengeData:getTodayBuffIds() - return self.buffIds + return self.buffIds end -- 获取buff描述 function DailyChallengeData:getBuffDesc(buffId) - return I18N:getText("buff_daily_challenge", buffId, "desc") + return I18N:getText("buff_daily_challenge", buffId, "desc") end -- 获取最终boss配置信息 function DailyChallengeData:getFinalBossInfo() - if not self:isOpen() then - return - end - local mapCfg = self:getMapConfig() - if not mapCfg then - return - end - return ConfigManager:getConfig("monster")[mapCfg.monster[#mapCfg.monster]] + if not self:isOpen() then + return + end + local mapCfg = self:getMapConfig() + if not mapCfg then + return + end + return ConfigManager:getConfig("monster")[mapCfg.monster[#mapCfg.monster]] end -- 任务是否完成 function DailyChallengeData:isTaskFinish(index) - if not self:isOpen() then - return false - end - local cfg = self:getTaskCfgInfo(self.tasks[index].task_id) - if not cfg then - return false - end + if not self:isOpen() then + return false + end + local cfg = self:getTaskCfgInfo(self.tasks[index].task_id) + if not cfg then + return false + end - return cfg.param <= self.tasks[index].progress + return cfg.param <= self.tasks[index].progress end function DailyChallengeData:getTasks() - return self.tasks + return self.tasks end function DailyChallengeData:getTaskById(taskId) - for index, taskInfo in ipairs(self.tasks) do - if taskInfo.task_id == taskId then - return taskInfo - end - end + for index, taskInfo in ipairs(self.tasks) do + if taskInfo.task_id == taskId then + return taskInfo + end + end - return + return end -- 任务奖励是否可领取 function DailyChallengeData:canClaimTask(index) - if not self:isOpen() then - return false - end - if not self.tasks[index] then - return false - end - if self.tasks[index].claimed then - return false - end + if not self:isOpen() then + return false + end + if not self.tasks[index] then + return false + end + if self.tasks[index].claimed then + return false + end - return self:isTaskFinish(index) + return self:isTaskFinish(index) end function DailyChallengeData:getTaskProgresss(index) - if not self:isOpen() then - return 0 - end - if not self.tasks[index] then - return 0 - end - return self.tasks[index].progress + if not self:isOpen() then + return 0 + end + if not self.tasks[index] then + return 0 + end + return self.tasks[index].progress end function DailyChallengeData:getTaskCfgInfo(taskId) - return TASK_CFG[taskId] + return TASK_CFG[taskId] end function DailyChallengeData:getTaskTotalNumber(taskId) - if self:getTaskCfgInfo(taskId) then - return self:getTaskCfgInfo(taskId).param - else - return 1 -- 容错，防止报错 - end + if self:getTaskCfgInfo(taskId) then + return self:getTaskCfgInfo(taskId).param + else + return 1 -- 容错，防止报错 + end end function DailyChallengeData:getTaskRewards(taskId) - if self:getTaskCfgInfo(taskId) then - return self:getTaskCfgInfo(taskId).reward - end - return nil + if self:getTaskCfgInfo(taskId) then + return self:getTaskCfgInfo(taskId).reward + end + return nil end function DailyChallengeData:getTaskDesc(taskId, needProgress, customProgress) - local desc = GConst.EMPTY_STRING - if not I18N:getConfig("task_daily_challenge")[taskId] then - return desc - end - local taskNum = self:getTaskTotalNumber(taskId) - if PER_TASK[taskId] then - taskNum = taskNum * 100 // GConst.BattleConst.DEFAULT_FACTOR - end - local taskInfo = self:getTaskById(taskId) - if not taskInfo then - return desc - end + local desc = GConst.EMPTY_STRING + if not I18N:getConfig("task_daily_challenge")[taskId] then + return desc + end + local taskNum = self:getTaskTotalNumber(taskId) + if PER_TASK[taskId] then + taskNum = taskNum * 100 // GConst.BattleConst.DEFAULT_FACTOR + end + local taskInfo = self:getTaskById(taskId) + if not taskInfo then + return desc + end - local conditionStr - if FIXED_HERO_TASK[taskId] then -- 具体英雄 - conditionStr = ModuleManager.HeroManager:getHeroName(taskInfo.param, true) - elseif MATCH_TYPE_TASK[taskId] then -- 颜色英雄 - conditionStr = ModuleManager.HeroManager:getMatchTypeName(taskInfo.param, true) - end + local conditionStr + if FIXED_HERO_TASK[taskId] then -- 具体英雄 + conditionStr = ModuleManager.HeroManager:getHeroName(taskInfo.param, true) + elseif MATCH_TYPE_TASK[taskId] then -- 颜色英雄 + conditionStr = ModuleManager.HeroManager:getMatchTypeName(taskInfo.param, true) + end - if conditionStr then - desc = I18N:getText("task_daily_challenge", taskId, "desc", conditionStr, taskNum) - else - desc = I18N:getText("task_daily_challenge", taskId, "desc", taskNum) - end + if conditionStr then + desc = I18N:getText("task_daily_challenge", taskId, "desc", conditionStr, taskNum) + else + desc = I18N:getText("task_daily_challenge", taskId, "desc", taskNum) + end - if needProgress and NEED_PROGRESS_TASK[taskId] then - local progress = customProgress or taskInfo.progress - if PER_TASK[taskId] then - progress = progress * 100 // GConst.BattleConst.DEFAULT_FACTOR .. "%" - taskNum = taskNum .. "%" - end - local progressStr = string.format("(%s/%s)", progress, taskNum) - desc = desc .. progressStr - end - return desc + if needProgress and NEED_PROGRESS_TASK[taskId] then + local progress = customProgress or taskInfo.progress + if PER_TASK[taskId] then + progress = progress * 100 // GConst.BattleConst.DEFAULT_FACTOR .. "%" + taskNum = taskNum .. "%" + end + local progressStr = string.format("(%s/%s)", progress, taskNum) + desc = desc .. progressStr + end + return desc end function DailyChallengeData:getTodayRemainLimitCount() - local count = self:getChallengeTimeCost() - self.todayFightCount - if count < 0 then - count = 0 - end - return count + local count = self:getChallengeTimeCost() - self.todayFightCount + if count < 0 then + count = 0 + end + return count end -- 处理主动退出的情况 function DailyChallengeData:onFightCountReduce() - self.todayFightCount = self.todayFightCount + 1 + self.todayFightCount = self.todayFightCount + 1 end function DailyChallengeData:getFixedChapterId() - return self.fixedChapterId + return self.fixedChapterId end function DailyChallengeData:getChapterDailyId() - return self.chapterDailyId + return self.chapterDailyId end function DailyChallengeData:setFixedChapterId(id) - self.fixedChapterId = id + self.fixedChapterId = id end function DailyChallengeData:getTotalFightCount() - return self.totalFightCount + return self.totalFightCount end function DailyChallengeData:getIfCanReset() @@ -285,14 +287,14 @@ function DailyChallengeData:getIsInReset() end function DailyChallengeData:getIsPopTask() - if not self:isOpen() then - return false - end - return self.popTaskTime < Time:getBeginningOfServerToday() + if not self:isOpen() then + return false + end + return self.popTaskTime < Time:getBeginningOfServerToday() end function DailyChallengeData:markPopTask() - if self.popTaskTime >= Time:getBeginningOfServerToday() then + if self.popTaskTime >= Time:getBeginningOfServerToday() then return end self.popTaskTime = Time:getBeginningOfServerToday() @@ -301,12 +303,36 @@ end --@region 红点 function DailyChallengeData:showRedPoint() - for i = 1, 3 do - if DataManager.DailyChallengeData:canClaimTask(i) then - return true - end - end - return false + return self:canGetReward() +end + +function DailyChallengeData:canGetReward() + for i = 1, 3 do + if DataManager.DailyChallengeData:canClaimTask(i) then + return true + end + end + return false +end + +--@endregion + +--@region 难度 +function DailyChallengeData:setDiffLv(diffLv) + self.diffLv = diffLv + self:setDirty() +end + +function DailyChallengeData:getDiffLv() + return self.diffLv +end + +function DailyChallengeData:getMaxDiffLv() + return #CHAPTER_DAILY_CHALLENGE_CFG +end + +function DailyChallengeData:getDifficultyCfg(id) + return CHAPTER_DAILY_CHALLENGE_CFG[id] end --@endregion return DailyChallengeData \ No newline at end of file From 0e52275cc9aece1415f9e0ffcbf8427e5aafbeb1 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Mon, 15 Sep 2025 20:01:16 +0800 Subject: [PATCH 08/11] fix bug --- lua/app/userdata/summon/summon_data.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lua/app/userdata/summon/summon_data.lua b/lua/app/userdata/summon/summon_data.lua index 67f615ac..a0c7b422 100644 --- a/lua/app/userdata/summon/summon_data.lua +++ b/lua/app/userdata/summon/summon_data.lua @@ -191,7 +191,15 @@ end --@region 红点 function SummonData:hasSummonCostRedPoint() - return self:hasSummonFree(1) or self:hasSummonFree(2) + return self:hasSummonFree(1) or self:hasSummonFree(2) or self:hasSummonCost1() or self:hasSummonCost2() +end + +function SummonData:hasSummonCost1() + return DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_SUMMON_1) > 0 +end + +function SummonData:hasSummonCost2() + return DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_SUMMON_2) > 0 end --@endregion From 1aea0564b5cd1526a9284ed03ae4a233884ac14e Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Mon, 15 Sep 2025 20:31:32 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=8A=BD=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/summon/summon_main_ui.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lua/app/ui/summon/summon_main_ui.lua b/lua/app/ui/summon/summon_main_ui.lua index dd195c68..d44574f6 100755 --- a/lua/app/ui/summon/summon_main_ui.lua +++ b/lua/app/ui/summon/summon_main_ui.lua @@ -87,13 +87,17 @@ function SummonMainUI:onLoadRootComplete() end) end) + self.vfxBg = uiMap["summon_main_ui.node.vfx_c1_chouka_bg_01"] self.vfxs = {} self.vfx01s = {} + self.vfx02s = {} for i = 1, 4 do self.vfxs[i] = uiMap["summon_main_ui.node.vfx_c1_chouka_0" .. i] self.vfx01s[i] = uiMap["summon_main_ui.node.vfx_c1_chouka_0" .. i .. "_1"] + self.vfx02s[i] = uiMap["summon_main_ui.node.vfx_c1_chouka_0" .. i .. "_2"] self.vfxs[i]:setActive(false) self.vfx01s[i]:setActive(false) + self.vfx02s[i]:setActive(false) end uiMap["summon_main_ui.node.btn_info"]:addClickListener(function() @@ -376,6 +380,7 @@ function SummonMainUI:onSummonRsp(result, newHero) for i = 1, 4 do self.vfxs[i]:setActive(false) self.vfx01s[i]:setActive(false) + self.vfx02s[i]:setActive(false) end local id = result.rewards[1].item.id local qlt = DataManager.HeroData:getHeroQlt(id) - 2 @@ -396,6 +401,7 @@ function SummonMainUI:showHero(idx, newHero) for i = 1, 4 do self.vfxs[i]:setActive(false) self.vfx01s[i]:setActive(false) + self.vfx02s[i]:setActive(false) end ModuleManager.SummonManager:showSummonRewardUI({ rewards = self.summonResult, @@ -409,6 +415,7 @@ function SummonMainUI:showHero(idx, newHero) end for i = 1, 4 do self.vfx01s[i]:setActive(false) + self.vfx02s[i]:setActive(false) end local id = self.summonResult[idx].item.id local cfg = DataManager.HeroData:getHeroConfig(id) @@ -418,9 +425,13 @@ function SummonMainUI:showHero(idx, newHero) spineObject:setActive(false) spineObject:playAnimation("idle", true) spineObject:setLocalScale(0.7, 0.7, 0.7) + self.vfxBg:setActive(true) if self.vfx01s[qlt] then self.vfx01s[qlt]:setActive(true) end + if self.vfx02s[qlt] then + self.vfx02s[qlt]:setActive(true) + end self:performWithDelayGlobal(function() spineObject:setActive(true) end, 0.25) From 0e0e36522d82a88e5d8c651db0ccb77bf6231b48 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Tue, 16 Sep 2025 14:59:56 +0800 Subject: [PATCH 10/11] fix bug --- lua/app/module/chapter/chapter_manager.lua | 1 + .../ui/daily_challenge/daily_challenge_ui.lua | 43 ++++++++++--------- lua/app/ui/summon/summon_unlock_ui.lua | 7 +-- lua/app/userdata/chapter/chapter_data.lua | 4 ++ 4 files changed, 32 insertions(+), 23 deletions(-) diff --git a/lua/app/module/chapter/chapter_manager.lua b/lua/app/module/chapter/chapter_manager.lua index 9bfd7f81..30d5d94f 100644 --- a/lua/app/module/chapter/chapter_manager.lua +++ b/lua/app/module/chapter/chapter_manager.lua @@ -128,6 +128,7 @@ function ChapterManager:endFightFinish(result) ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.STAGE, newRewards, reqData.combatReport, mysteryBoxIdx, nil, true) DataManager.ChapterData:fightChapter(reqData.chapter_id, result.max_chapter_id, result.max_wave, reqData.mystery_box_idx) + DataManager.ChapterData:clearChapterBoxState() -- 处理金猪,要在章节更新之后 DataManager.GoldPigData:addGoldPigCount() diff --git a/lua/app/ui/daily_challenge/daily_challenge_ui.lua b/lua/app/ui/daily_challenge/daily_challenge_ui.lua index ab77d907..06404e0c 100644 --- a/lua/app/ui/daily_challenge/daily_challenge_ui.lua +++ b/lua/app/ui/daily_challenge/daily_challenge_ui.lua @@ -1,21 +1,24 @@ local DailyChallengeUI = class("DailyChallengeUI", BaseUI) --- function DailyChallengeUI:getIsOpen() --- return DataManager.DailyChallengeData:isOpen() --- end - --- function DailyChallengeUI:getEntranceName() --- return I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE) --- end - --- function DailyChallengeUI:getShowEntranceRedPoint() --- return DataManager.DailyChallengeData:isMeetChallenge() --- end - function DailyChallengeUI:isFullScreen() return false end +function DailyChallengeUI:getCurrencyParams() + if self.currencyParams == nil then + self.currencyParams = { + itemIds = { + GConst.ItemConst.ITEM_ID_GOLD, + GConst.ItemConst.ITEM_ID_GEM, + GConst.ItemConst.ITEM_ID_VIT + }, + showType = GConst.CURRENCY_TYPE.HORIZONTAL + } + end + return self.currencyParams +end + + function DailyChallengeUI:getPrefabPath() return "assets/prefabs/ui/daily_challenge/daily_challenge_ui.prefab" end @@ -45,8 +48,8 @@ function DailyChallengeUI:onLoadRootComplete() table.insert(self.taskMasks, uiMap["daily_challenge_ui.task.icon_task2.mask"]) table.insert(self.taskMasks, uiMap["daily_challenge_ui.task.icon_task3.mask"]) - self.buffObj = uiMap["daily_challenge_ui.buffs.buff.btn_buff"] - self.debuffObj = uiMap["daily_challenge_ui.buffs.debuff.btn_debuff"] + self.buffBtn = uiMap["daily_challenge_ui.buffs.buff"] + self.debuffBtn = uiMap["daily_challenge_ui.buffs.debuff"] self.bossSpine = uiMap["daily_challenge_ui.spine_node"] self.countdownTx = uiMap["daily_challenge_ui.countdown.time_tx"] @@ -172,12 +175,12 @@ end function DailyChallengeUI:refreshBuff() local buffIds = DataManager.DailyChallengeData:getTodayBuffIds() - self.buffObj:addClickListener(function() - ModuleManager.TipsManager:showDescTips(DataManager.DailyChallengeData:getBuffDesc(buffIds[1]), self.buffObj) + self.buffBtn:addClickListener(function() + ModuleManager.TipsManager:showDescTips(DataManager.DailyChallengeData:getBuffDesc(buffIds[1]), self.buffBtn) end) - self.debuffObj:addClickListener(function() - ModuleManager.TipsManager:showDescTips(DataManager.DailyChallengeData:getBuffDesc(buffIds[2]), self.debuffObj) + self.debuffBtn:addClickListener(function() + ModuleManager.TipsManager:showDescTips(DataManager.DailyChallengeData:getBuffDesc(buffIds[2]), self.debuffBtn) end) end @@ -247,9 +250,9 @@ function DailyChallengeUI:refreshDiffBtn() local chapterStage = DataManager.ChapterData:getChapterStage(diffChapter + 1) local str if cfg.max_chapter <= chapterId then - str = I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_3, chapterPage, chapterStage, "" .. I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_8) .. "") + str = I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_3, chapterPage, chapterStage, "(" .. I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_8) .. ")") else - str = I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_3, chapterPage, chapterStage, "" .. I18N:getGlobalText(I18N.GlobalConst.CHAPTER_WAVE_REAWRD_1) .. "") + str = I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_3, chapterPage, chapterStage, "(" .. I18N:getGlobalText(I18N.GlobalConst.CHAPTER_WAVE_REAWRD_1) .. ")") end self.upDiffBtnDescTx:setText(str) end diff --git a/lua/app/ui/summon/summon_unlock_ui.lua b/lua/app/ui/summon/summon_unlock_ui.lua index a348548e..5e6bffff 100755 --- a/lua/app/ui/summon/summon_unlock_ui.lua +++ b/lua/app/ui/summon/summon_unlock_ui.lua @@ -30,10 +30,10 @@ function SummonUnlockUI:onLoadRootComplete() self:checkUnlockMap() end) - self.heroNode = uiMap["summon_unlock_ui.hero_node"] + self.heroNode = uiMap["summon_unlock_ui.hero_bg.hero_node"] self.nameTx = uiMap["summon_unlock_ui.name_tx"] - self.matchTx = uiMap["summon_unlock_ui.match_tx"] - self.matchImg = uiMap["summon_unlock_ui.match_tx.match_img"] + self.matchTx = uiMap["summon_unlock_ui.match_node.match_tx"] + self.matchImg = uiMap["summon_unlock_ui.match_node.match_tx.match_img"] self.qltBg = uiMap["summon_unlock_ui.qlt_bg"] self.qltBgTx = uiMap["summon_unlock_ui.qlt_bg.qlt_tx"] self.uiSpine = uiMap["summon_unlock_ui.ui_spine_obj"] @@ -48,6 +48,7 @@ function SummonUnlockUI:onRefresh() local heroEntity = DataManager.HeroData:getHeroById(self.heroId) local matchType = heroEntity:getMatchType() local qlt = heroEntity:getQlt() + self.nameTx:setText(heroEntity:getName()) self.matchTx:setText(ModuleManager.HeroManager:getMatchTypeName(matchType)) self.matchImg:setSprite(GConst.ATLAS_PATH.ICON_HERO, ModuleManager.HeroManager:getMatchTypeIcon(matchType)) self.qltBg:setSprite(GFunc.getHeroQltImg(qlt)) diff --git a/lua/app/userdata/chapter/chapter_data.lua b/lua/app/userdata/chapter/chapter_data.lua index 8803a848..dee49b7d 100644 --- a/lua/app/userdata/chapter/chapter_data.lua +++ b/lua/app/userdata/chapter/chapter_data.lua @@ -154,6 +154,10 @@ function ChapterData:getChapterBoxNum(chapterId, index) return 1 end +function ChapterData:clearChapterBoxState() + self.boxCanGetState = nil +end + function ChapterData:getChapterBoxCanGet() if self.boxCanGetState == nil then self:calcChapterBoxCanGet() From 27e83d731fe7e59a1ae21859ff3f41cec0aad90e Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Tue, 16 Sep 2025 16:07:43 +0800 Subject: [PATCH 11/11] config --- lua/app/config/buff.lua | 2 +- lua/app/config/const.lua | 4 +- lua/app/config/func_open.lua | 4 +- lua/app/config/fx.lua | 6 +- .../localization_global_const.lua | 46 + lua/app/config/skill.lua | 205 +- lua/app/config/strings/cn/global.lua | 48 +- lua/app/config/task_achievement.lua | 5811 +++-------------- lua/app/config/task_daily.lua | 41 +- lua/app/config/task_daily_stage.lua | 126 +- 10 files changed, 1211 insertions(+), 5082 deletions(-) diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index 34d81942..a800970a 100644 --- a/lua/app/config/buff.lua +++ b/lua/app/config/buff.lua @@ -276,7 +276,7 @@ local buff = { ["decr"]=1, ["formula"]=3, ["fx_get"]={ - 300027 + 47 } }, [33]={ diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index 884f2b94..aca6280e 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -564,8 +564,8 @@ local const = { ["type_for_nothing"]="Vw==", ["id"]=3, ["id_for_nothing"]="VQ==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=10, + ["num_for_nothing"]="Vwg=" } } }, diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua index 7a5ccc6a..2eff9b03 100644 --- a/lua/app/config/func_open.lua +++ b/lua/app/config/func_open.lua @@ -68,11 +68,11 @@ local func_open = { ["pop_ups"]=1 }, ["arena_open"]={ - ["stage"]=5, + ["stage"]=15, ["icon"]="module_unlock_arena" }, ["act_arena_gift"]={ - ["stage"]=5, + ["stage"]=15, ["pop_ups"]=1 }, ["equip_weapon_open"]={ diff --git a/lua/app/config/fx.lua b/lua/app/config/fx.lua index 744f119e..50e304bc 100644 --- a/lua/app/config/fx.lua +++ b/lua/app/config/fx.lua @@ -199,6 +199,10 @@ local fx = { ["loop"]=1, ["bind"]="root" }, + [47]={ + ["res"]="sfx_buff_huixue_b01", + ["bind"]="root" + }, [100001]={ ["res"]="sfx_c1_m10001_01", ["bind"]="root" @@ -1047,6 +1051,6 @@ local fx = { } } local config = { -data=fx,count=242 +data=fx,count=243 } return config \ No newline at end of file diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 7c8f02b7..f9c70efa 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -688,6 +688,52 @@ local LocalizationGlobalConst = DAILY_CHALLENGE_DESC_6 = "DAILY_CHALLENGE_DESC_6", DAILY_CHALLENGE_DESC_7 = "DAILY_CHALLENGE_DESC_7", DAILY_CHALLENGE_DESC_8 = "DAILY_CHALLENGE_DESC_8", + EQUIP_DESC_30 = "EQUIP_DESC_30", + EQUIP_PARTS_1 = "EQUIP_PARTS_1", + EQUIP_PARTS_2 = "EQUIP_PARTS_2", + EQUIP_PARTS_3 = "EQUIP_PARTS_3", + EQUIP_PARTS_4 = "EQUIP_PARTS_4", + EQUIP_PARTS_5 = "EQUIP_PARTS_5", + EQUIP_PARTS_6 = "EQUIP_PARTS_6", + EQUIP_HERO_DESC_1 = "EQUIP_HERO_DESC_1", + EQUIP_HERO_LV_1 = "EQUIP_HERO_LV_1", + EQUIP_HERO_LV_2 = "EQUIP_HERO_LV_2", + EQUIP_HERO_LV_3 = "EQUIP_HERO_LV_3", + EQUIP_HERO_DESC_2 = "EQUIP_HERO_DESC_2", + EQUIP_HERO_DESC_3 = "EQUIP_HERO_DESC_3", + EQUIP_HERO_DESC_4 = "EQUIP_HERO_DESC_4", + EQUIP_HERO_DESC_5 = "EQUIP_HERO_DESC_5", + EQUIP_HERO_DESC_6 = "EQUIP_HERO_DESC_6", + EQUIP_HERO_DESC_7 = "EQUIP_HERO_DESC_7", + EQUIP_HERO_DESC_8 = "EQUIP_HERO_DESC_8", + EQUIP_HERO_DESC_9 = "EQUIP_HERO_DESC_9", + EQUIP_HERO_DESC_10 = "EQUIP_HERO_DESC_10", + EQUIP_HERO_DESC_11 = "EQUIP_HERO_DESC_11", + EQUIP_HERO_DESC_12 = "EQUIP_HERO_DESC_12", + EQUIP_HERO_DESC_13 = "EQUIP_HERO_DESC_13", + EQUIP_HERO_DESC_14 = "EQUIP_HERO_DESC_14", + EQUIP_HERO_DESC_15 = "EQUIP_HERO_DESC_15", + EQUIP_HERO_DESC_16 = "EQUIP_HERO_DESC_16", + EQUIP_HERO_DESC_17 = "EQUIP_HERO_DESC_17", + EQUIP_HERO_DESC_18 = "EQUIP_HERO_DESC_18", + EQUIP_HERO_DESC_19 = "EQUIP_HERO_DESC_19", + EQUIP_HERO_DESC_20 = "EQUIP_HERO_DESC_20", + EQUIP_HERO_DESC_21 = "EQUIP_HERO_DESC_21", + EQUIP_HERO_DESC_22 = "EQUIP_HERO_DESC_22", + EQUIP_HERO_DESC_23 = "EQUIP_HERO_DESC_23", + EQUIP_HERO_DESC_24 = "EQUIP_HERO_DESC_24", + EQUIP_HERO_DESC_25 = "EQUIP_HERO_DESC_25", + EQUIP_HERO_DESC_26 = "EQUIP_HERO_DESC_26", + EQUIP_HERO_DESC_27 = "EQUIP_HERO_DESC_27", + EQUIP_HERO_DESC_28 = "EQUIP_HERO_DESC_28", + EQUIP_HERO_DESC_29 = "EQUIP_HERO_DESC_29", + EQUIP_HERO_DESC_30 = "EQUIP_HERO_DESC_30", + EQUIP_HERO_DESC_31 = "EQUIP_HERO_DESC_31", + EQUIP_HERO_DESC_32 = "EQUIP_HERO_DESC_32", + EQUIP_HERO_DESC_33 = "EQUIP_HERO_DESC_33", + EQUIP_HERO_DESC_34 = "EQUIP_HERO_DESC_34", + EQUIP_HERO_ACTIVATION_1 = "EQUIP_HERO_ACTIVATION_1", + EQUIP_HERO_ACTIVATION_2 = "EQUIP_HERO_ACTIVATION_2", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 623e6f57..352f3aee 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -2076,8 +2076,7 @@ local skill = { ["name_hit"]={ "suffer01" }, - ["fx_self"]=300018, - ["fx_self_mirror"]=400018 + ["fx_self_mirror"]=100000 }, [2400111]={ ["position"]=2, @@ -2105,8 +2104,7 @@ local skill = { ["name_hit"]={ "suffer01" }, - ["fx_self"]=300019, - ["fx_self_mirror"]=400019 + ["fx_self_mirror"]=100000 }, [2400112]={ ["position"]=2, @@ -2134,8 +2132,7 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=300020, - ["fx_self_mirror"]=400020 + ["fx_self_mirror"]=100000 }, [2400113]={ ["position"]=2, @@ -2163,8 +2160,7 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=300021, - ["fx_self_mirror"]=400021 + ["fx_self_mirror"]=100000 }, [2400120]={ ["energy"]=10, @@ -2199,13 +2195,12 @@ local skill = { ["name_hit"]={ "suffer03" }, - ["fx_self"]=300022, ["bullet_time"]={ 693, 3000, 400 }, - ["fx_self_mirror"]=400022 + ["fx_self_mirror"]=100000 }, [2400121]={ ["position"]=2, @@ -3080,8 +3075,7 @@ local skill = { ["name_hit"]={ "suffer01" }, - ["fx_self"]=300018, - ["fx_self_mirror"]=400018 + ["fx_self_mirror"]=100000 }, [2600111]={ ["position"]=2, @@ -3109,8 +3103,7 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=300019, - ["fx_self_mirror"]=400019 + ["fx_self_mirror"]=100000 }, [2600112]={ ["position"]=2, @@ -3138,8 +3131,7 @@ local skill = { ["name_hit"]={ "suffer01" }, - ["fx_self"]=300020, - ["fx_self_mirror"]=400020 + ["fx_self_mirror"]=100000 }, [2600113]={ ["position"]=2, @@ -3167,8 +3159,7 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=300021, - ["fx_self_mirror"]=400021 + ["fx_self_mirror"]=100000 }, [2600120]={ ["energy"]=10, @@ -3216,13 +3207,12 @@ local skill = { "suffer02", "suffer03" }, - ["fx_self"]=300022, ["bullet_time"]={ 3102, 3000, 400 }, - ["fx_self_mirror"]=400022 + ["fx_self_mirror"]=100000 }, [2600121]={ ["position"]=2, @@ -3858,8 +3848,7 @@ local skill = { ["name_hit"]={ "suffer01" }, - ["fx_self"]=300018, - ["fx_self_mirror"]=400018 + ["fx_self_mirror"]=100000 }, [3500111]={ ["position"]=3, @@ -3887,8 +3876,7 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=300019, - ["fx_self_mirror"]=400019 + ["fx_self_mirror"]=100000 }, [3500112]={ ["position"]=3, @@ -3916,8 +3904,7 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=300020, - ["fx_self_mirror"]=400020 + ["fx_self_mirror"]=100000 }, [3500113]={ ["position"]=3, @@ -3945,8 +3932,7 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=300021, - ["fx_self_mirror"]=400021 + ["fx_self_mirror"]=100000 }, [3500120]={ ["energy"]=10, @@ -4008,13 +3994,12 @@ local skill = { "suffer03", "suffer03" }, - ["fx_self"]=300022, ["bullet_time"]={ 1485, 3000, 300 }, - ["fx_self_mirror"]=400022 + ["fx_self_mirror"]=100000 }, [3500121]={ ["position"]=3, @@ -4810,8 +4795,7 @@ local skill = { ["name_hit"]={ "suffer01" }, - ["fx_self"]=300018, - ["fx_self_mirror"]=400018 + ["fx_self_mirror"]=100000 }, [4400111]={ ["position"]=4, @@ -4839,8 +4823,7 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=300019, - ["fx_self_mirror"]=400019 + ["fx_self_mirror"]=100000 }, [4400112]={ ["position"]=4, @@ -4868,8 +4851,7 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=300020, - ["fx_self_mirror"]=400020 + ["fx_self_mirror"]=100000 }, [4400113]={ ["position"]=4, @@ -4897,8 +4879,7 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=300021, - ["fx_self_mirror"]=400021 + ["fx_self_mirror"]=100000 }, [4400120]={ ["energy"]=10, @@ -4933,13 +4914,12 @@ local skill = { ["name_hit"]={ "suffer03" }, - ["fx_self"]=300022, ["bullet_time"]={ 1000, 3000, 400 }, - ["fx_self_mirror"]=400022 + ["fx_self_mirror"]=100000 }, [4400121]={ ["position"]=4, @@ -5133,9 +5113,7 @@ local skill = { ["name_hit"]={ "suffer01" }, - ["fx_self"]=300001, - ["fx_target"]=300006, - ["fx_self_mirror"]=400001 + ["fx_self_mirror"]=100000 }, [4500111]={ ["position"]=4, @@ -5163,9 +5141,7 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=300002, - ["fx_target"]=300006, - ["fx_self_mirror"]=400002 + ["fx_self_mirror"]=100000 }, [4500112]={ ["position"]=4, @@ -5193,9 +5169,7 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=300003, - ["fx_target"]=300006, - ["fx_self_mirror"]=400003 + ["fx_self_mirror"]=100000 }, [4500113]={ ["position"]=4, @@ -5223,9 +5197,7 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=300004, - ["fx_target"]=300006, - ["fx_self_mirror"]=400004 + ["fx_self_mirror"]=100000 }, [4500120]={ ["buff_id"]={ @@ -5269,14 +5241,12 @@ local skill = { ["name_hit"]={ "suffer03" }, - ["fx_self"]=300005, - ["fx_target"]=300006, ["bullet_time"]={ 2211, 3000, 400 }, - ["fx_self_mirror"]=400005 + ["fx_self_mirror"]=100000 }, [4500121]={ ["position"]=4, @@ -6559,8 +6529,7 @@ local skill = { ["name_hit"]={ "suffer01" }, - ["fx_self"]=300018, - ["fx_self_mirror"]=400018 + ["fx_self_mirror"]=100000 }, [5500211]={ ["position"]=5, @@ -6588,8 +6557,7 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=300019, - ["fx_self_mirror"]=400019 + ["fx_self_mirror"]=100000 }, [5500212]={ ["position"]=5, @@ -6617,8 +6585,7 @@ local skill = { ["name_hit"]={ "suffer01" }, - ["fx_self"]=300020, - ["fx_self_mirror"]=400020 + ["fx_self_mirror"]=100000 }, [5500213]={ ["position"]=5, @@ -6646,8 +6613,7 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=300021, - ["fx_self_mirror"]=400021 + ["fx_self_mirror"]=100000 }, [5500220]={ ["energy"]=10, @@ -6713,13 +6679,12 @@ local skill = { ["name_hit"]={ "suffer03" }, - ["fx_self"]=300022, ["bullet_time"]={ 2244, 3000, 400 }, - ["fx_self_mirror"]=400022 + ["fx_self_mirror"]=100000 }, [5500221]={ ["position"]=5, @@ -8600,6 +8565,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -8622,6 +8589,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -8644,6 +8613,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -8713,6 +8684,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -8735,6 +8708,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -8757,6 +8732,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -8811,6 +8788,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -8833,6 +8812,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -8855,6 +8836,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -8933,6 +8916,8 @@ local skill = { 1, 140 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -8955,6 +8940,8 @@ local skill = { 1, 140 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -8977,6 +8964,8 @@ local skill = { 1, 140 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -9043,6 +9032,8 @@ local skill = { 1, 140 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -9065,6 +9056,8 @@ local skill = { 1, 140 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -9087,6 +9080,8 @@ local skill = { 1, 140 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -9165,6 +9160,8 @@ local skill = { 1, 140 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -9186,6 +9183,8 @@ local skill = { 1, 140 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -9207,6 +9206,8 @@ local skill = { 1, 140 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -9264,6 +9265,8 @@ local skill = { 1, 140 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -9285,6 +9288,8 @@ local skill = { 1, 140 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -9306,6 +9311,8 @@ local skill = { 1, 140 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -9382,6 +9389,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -9403,6 +9412,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -9424,6 +9435,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -9500,6 +9513,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -9522,6 +9537,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -9544,6 +9561,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -9644,6 +9663,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -9666,6 +9687,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -9688,6 +9711,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -9803,6 +9828,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -9824,6 +9851,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -9845,6 +9874,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -9906,6 +9937,8 @@ local skill = { 1, 140 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -9927,6 +9960,8 @@ local skill = { 1, 140 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -9948,6 +9983,8 @@ local skill = { 1, 140 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -9977,6 +10014,8 @@ local skill = { }, ["cd"]=3, ["cd_start"]=0, + ["shake_time"]=200, + ["shake_type"]=5, ["sound"]=30185, ["sound_delay"]=0.0, ["name_act"]="skill01", @@ -10037,6 +10076,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -10058,6 +10099,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -10079,6 +10122,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -10156,6 +10201,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -10177,6 +10224,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -10198,6 +10247,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -10263,6 +10314,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -10284,6 +10337,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -10305,6 +10360,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -10402,6 +10459,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -10423,6 +10482,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -10444,6 +10505,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -10555,6 +10618,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -10576,6 +10641,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -10597,6 +10664,8 @@ local skill = { 2, 0 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -10684,6 +10753,8 @@ local skill = { 1, 140 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -10705,6 +10776,8 @@ local skill = { 1, 140 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -10726,6 +10799,8 @@ local skill = { 1, 140 }, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="attack03", ["name_hit"]={ "suffer01" diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 756ea278..eeeb2b06 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -682,12 +682,58 @@ local localization_global = ["HERO_DESC_23"] = "技能等级:{0}", ["BAG_DESC_1"] = "背包", ["DAILY_CHALLENGE_DESC_2"] = "提升难度", - ["DAILY_CHALLENGE_DESC_3"] = "通关主线{0}-{1}({2})", + ["DAILY_CHALLENGE_DESC_3"] = "通关主线{0}-{1}{2}", ["DAILY_CHALLENGE_DESC_4"] = "难度提升将提升未领取的任务奖励和通关奖励，是否确定？", ["DAILY_CHALLENGE_DESC_5"] = "降低难度后，未领取的任务奖励和通关奖励将降低，是否确定？", ["DAILY_CHALLENGE_DESC_6"] = "请先领取已达成的任务奖励", ["DAILY_CHALLENGE_DESC_7"] = "降低难度", ["DAILY_CHALLENGE_DESC_8"] = "已达成", + ["EQUIP_DESC_30"] = "穿戴", + ["EQUIP_PARTS_1"] = "头盔", + ["EQUIP_PARTS_2"] = "护臂", + ["EQUIP_PARTS_3"] = "胸甲", + ["EQUIP_PARTS_4"] = "裤子", + ["EQUIP_PARTS_5"] = "鞋子", + ["EQUIP_PARTS_6"] = "护手", + ["EQUIP_HERO_DESC_1"] = "没有多余装备", + ["EQUIP_HERO_LV_1"] = "强化共鸣{0}级", + ["EQUIP_HERO_LV_2"] = "品质共鸣{0}级", + ["EQUIP_HERO_LV_3"] = "精炼共鸣{0}级", + ["EQUIP_HERO_DESC_2"] = "一键穿戴", + ["EQUIP_HERO_DESC_3"] = "装备培养", + ["EQUIP_HERO_DESC_4"] = "装备共鸣", + ["EQUIP_HERO_DESC_5"] = "6件装备培养进度相同可激活装备共鸣", + ["EQUIP_HERO_DESC_6"] = "装备共鸣可提供额外属性", + ["EQUIP_HERO_DESC_7"] = "只有上阵英雄才可穿戴装备", + ["EQUIP_HERO_DESC_8"] = "装备详情", + ["EQUIP_HERO_DESC_9"] = "部位", + ["EQUIP_HERO_DESC_10"] = "评分", + ["EQUIP_HERO_DESC_11"] = "基础属性", + ["EQUIP_HERO_DESC_12"] = "附加属性", + ["EQUIP_HERO_DESC_13"] = "替换", + ["EQUIP_HERO_DESC_14"] = "养成", + ["EQUIP_HERO_DESC_15"] = "装备替换", + ["EQUIP_HERO_DESC_16"] = "交换", + ["EQUIP_HERO_DESC_17"] = "没有可穿戴的装备", + ["EQUIP_HERO_DESC_18"] = "装备养成", + ["EQUIP_HERO_DESC_19"] = "强化", + ["EQUIP_HERO_DESC_20"] = "精炼", + ["EQUIP_HERO_DESC_21"] = "取消全选", + ["EQUIP_HERO_DESC_22"] = "强化", + ["EQUIP_HERO_DESC_23"] = "一键强化", + ["EQUIP_HERO_DESC_24"] = "分解装备", + ["EQUIP_HERO_DESC_25"] = "成功率:{0}%(失败等级不变)", + ["EQUIP_HERO_DESC_26"] = "已精炼至满级", + ["EQUIP_HERO_DESC_27"] = "已强化至满级", + ["EQUIP_HERO_DESC_28"] = "分解可得", + ["EQUIP_HERO_DESC_29"] = "一键全选", + ["EQUIP_HERO_DESC_30"] = "分解", + ["EQUIP_HERO_DESC_31"] = "请先选择装备", + ["EQUIP_HERO_DESC_32"] = "没有可以强化的装备", + ["EQUIP_HERO_DESC_33"] = "共鸣激活", + ["EQUIP_HERO_DESC_34"] = "强化至{0}级可继续精炼", + ["EQUIP_HERO_ACTIVATION_1"] = "已激活:强化共鸣Lv{0}", + ["EQUIP_HERO_ACTIVATION_2"] = "已激活:精炼共鸣Lv{0}", } return localization_global \ No newline at end of file diff --git a/lua/app/config/task_achievement.lua b/lua/app/config/task_achievement.lua index cdd5a3ba..05912b24 100644 --- a/lua/app/config/task_achievement.lua +++ b/lua/app/config/task_achievement.lua @@ -2,56 +2,19 @@ local task_achievement = { [1]={ ["type"]=1, ["number"]={ - 1, - 2, - 3, - 4, 5, - 6, - 8, 10, - 12, - 15, - 18, - 21, - 24, - 27, - 30, - 35, + 20, 40, - 45, - 50, 60, - 70, - 80, 90, - 100, - 110, 120, - 130, - 140, 150, - 160, - 170, - 180, - 190, 200, - 210, - 220, - 230, - 240, - 250, 260, - 270, - 280, - 290, - 300, - 310, 320, - 330, - 340, - 350, - 360 + 400, + 500 }, ["reward"]={ { @@ -67,352 +30,56 @@ local task_achievement = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, @@ -459,1193 +126,694 @@ local task_achievement = { [2]={ ["type"]=2, ["number"]={ - 300, - 600, - 1000, - 1500, - 2000, - 2500, - 3000, - 3500, - 4000, - 4500, 5000, - 5500, - 6000, - 6500, - 7000, - 7500, - 8000, - 8500, - 9000, - 9500, - 10000 + 20000, + 50000, + 150000, + 300000, + 600000, + 1000000, + 2000000, + 5000000, + 10000000 }, ["reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" } } }, [3]={ - ["type"]=3, - ["number"]={ - 100, - 1000, - 5000, - 10000, - 20000, - 30000, - 40000, - 50000, - 60000, - 70000, - 80000, - 100000, - 150000, - 200000, - 300000, - 400000, - 500000, - 600000, - 700000, - 800000, - 900000, - 1000000 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [4]={ - ["type"]=4, - ["number"]={ - 5000, - 15000, - 30000, - 40000, - 50000, - 60000, - 70000, - 80000, - 100000, - 150000, - 200000, - 300000, - 400000, - 500000, - 600000, - 700000, - 800000, - 900000, - 1000000 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [5]={ ["type"]=5, ["number"]={ - 500, - 3000, - 5000, - 10000, - 15000, - 20000, - 30000, - 40000, - 50000, - 60000, - 70000, - 80000, - 100000, - 150000, - 200000, - 300000, - 400000, - 500000, - 600000, - 700000, - 800000, - 900000, - 1000000 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [6]={ - ["type"]=47, - ["number"]={ - 1, - 10, - 20, - 30, - 40, - 50, - 60, - 70, - 80, 100, - 150, - 200, - 300, - 400, 500, - 600, - 700, - 800, - 900, - 1000 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [7]={ - ["type"]=9, - ["number"]={ - 1, - 10, - 20, - 30, - 40, - 50, - 60, - 70, - 80, - 100, - 150, - 200, - 300, - 400, - 500, - 600, - 700, - 800, - 900, - 1000 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [8]={ - ["type"]=10, - ["number"]={ - 50, - 150, - 300, - 400, - 500, - 600, - 700, - 800, 1000, - 1500, - 2000, - 3000, - 4000, + 1600, + 2500, + 3500, 5000, - 6000, - 7000, + 6500, 8000, - 9000, 10000 }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + } + }, + [4]={ + ["type"]=47, + ["number"]={ + 20, + 40, + 60, + 90, + 120, + 160, + 200, + 250, + 300, + 360, + 420, + 500, + 600 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + } + }, + [5]={ + ["type"]=14, + ["number"]={ + 200, + 1000, + 3000, + 8000, + 15000, + 30000, + 60000, + 120000, + 200000, + 300000 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + } + }, + [6]={ + ["type"]=17, + ["number"]={ + 1, + 5, + 10, + 20, + 50, + 80, + 120, + 180, + 240, + 320, + 400, + 500 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + } + }, + [7]={ + ["type"]=22, + ["number"]={ + 1, + 2, + 4, + 6, + 10, + 15, + 21, + 30, + 45, + 60, + 80, + 100, + 130, + 160, + 200 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + } + }, + [8]={ + ["type"]=23, + ["number"]={ + 10, + 15, + 20, + 25, + 30, + 35, + 40, + 45, + 50, + 55, + 60, + 65, + 70, + 75, + 80 + }, ["reward"]={ { ["type"]=1, @@ -1660,88 +828,56 @@ local task_achievement = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, @@ -1802,205 +938,160 @@ local task_achievement = { } }, [9]={ - ["type"]=12, + ["type"]=24, ["number"]={ - 50, - 150, - 300, - 400, - 500, - 600, - 700, - 800, - 1000, - 1500, - 2000, - 3000, - 4000, - 5000, - 6000, - 7000, - 8000, - 9000, - 10000 + 2, + 5, + 8, + 11, + 15, + 19, + 23, + 27, + 32, + 37, + 47, + 57, + 67, + 77, + 87 }, ["reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" } } }, [10]={ - ["type"]=13, + ["type"]=43, ["number"]={ - 50, - 150, - 300, - 400, - 500, - 600, - 700, - 800, - 1000, - 1500, - 2000, - 3000, - 4000, - 5000, - 6000, - 7000, - 8000, - 9000, - 10000 + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 }, ["reward"]={ { @@ -2016,128 +1107,56 @@ local task_achievement = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, @@ -2158,26 +1177,18 @@ local task_achievement = { } }, [11]={ - ["type"]=14, + ["type"]=44, ["number"]={ + 1, + 2, + 3, + 4, 5, - 10, - 20, - 40, - 60, - 80, - 100, - 150, - 200, - 250, - 300, - 400, - 500, - 600, - 700, - 800, - 900, - 1000 + 6, + 7, + 8, + 9, + 10 }, ["reward"]={ { @@ -2193,120 +1204,56 @@ local task_achievement = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, @@ -2327,2746 +1274,6 @@ local task_achievement = { } }, [12]={ - ["type"]=15, - ["number"]={ - 10, - 30, - 50, - 100, - 150, - 200, - 300, - 400, - 500, - 600, - 700, - 800, - 1000, - 1500, - 2000, - 3000, - 4000, - 5000, - 6000, - 7000, - 8000, - 9000, - 10000 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [13]={ - ["type"]=16, - ["number"]={ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [14]={ - ["type"]=17, - ["number"]={ - 10, - 30, - 50, - 100, - 150, - 200, - 300, - 400, - 500, - 600, - 700, - 800, - 1000, - 1500, - 2000, - 3000, - 4000, - 5000, - 6000, - 7000, - 8000, - 9000, - 10000 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [15]={ - ["type"]=18, - ["number"]={ - 5, - 10, - 20, - 30, - 40, - 50, - 60, - 70, - 80, - 90, - 100, - 150, - 200, - 300, - 400, - 500, - 600, - 700, - 800, - 900, - 1000 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [16]={ - ["type"]=19, - ["number"]={ - 5, - 10, - 20, - 30, - 40, - 50, - 60, - 70, - 80, - 90, - 100, - 150, - 200, - 300, - 400, - 500, - 600, - 700, - 800, - 900, - 1000 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [17]={ - ["type"]=22, - ["number"]={ - 1, - 3, - 5, - 7, - 10, - 15, - 20, - 30, - 40, - 50, - 60, - 70, - 80, - 100, - 150, - 200, - 300, - 400, - 500, - 600, - 700, - 800, - 900, - 1000 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [18]={ - ["type"]=23, - ["number"]={ - 2, - 4, - 6, - 10, - 15, - 20, - 25, - 30, - 40, - 50, - 60, - 70, - 80, - 90, - 100 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [19]={ - ["type"]=24, - ["number"]={ - 2, - 4, - 6, - 10, - 15, - 20, - 25, - 30, - 40, - 50, - 60, - 70, - 80, - 90, - 100 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [20]={ - ["type"]=25, - ["number"]={ - 2, - 4, - 6, - 10, - 15, - 20, - 25, - 30, - 40, - 50, - 60, - 70, - 80, - 90, - 100 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [21]={ - ["type"]=26, - ["number"]={ - 2, - 4, - 6, - 10, - 15, - 20, - 25, - 30, - 40, - 50, - 60, - 70, - 80, - 90, - 100 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [22]={ - ["type"]=27, - ["number"]={ - 2, - 4, - 6, - 10, - 15, - 20, - 25, - 30, - 40, - 50, - 60, - 70, - 80, - 90, - 100 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [23]={ - ["type"]=43, - ["number"]={ - 2, - 4, - 6, - 10, - 15, - 20, - 25, - 30, - 40, - 50, - 60, - 70, - 80, - 90, - 100 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [24]={ - ["type"]=44, - ["number"]={ - 2, - 4, - 6, - 10, - 15, - 20, - 25, - 30, - 40, - 50, - 60, - 70, - 80, - 90, - 100 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [25]={ - ["type"]=45, - ["number"]={ - 2, - 4, - 6, - 10, - 15, - 20, - 25, - 30, - 40, - 50, - 60, - 70, - 80, - 90, - 100 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [26]={ - ["type"]=46, - ["number"]={ - 2, - 4, - 6, - 10, - 15, - 20, - 25, - 30, - 40, - 50, - 60, - 70, - 80, - 90, - 100 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [27]={ - ["type"]=30, - ["number"]={ - 2, - 4, - 6, - 10, - 15, - 20, - 25, - 30, - 40, - 50, - 60, - 70, - 80, - 90, - 100 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [28]={ ["type"]=31, ["number"]={ 1000, @@ -5095,56 +1302,56 @@ local task_achievement = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, @@ -5172,434 +1379,184 @@ local task_achievement = { } } }, - [29]={ + [13]={ ["type"]=36, ["number"]={ - 2, - 4, + 1, + 3, 6, 10, 15, 20, - 25, 30, 40, - 50, - 60, - 70, - 80, - 90, - 100 + 50 }, ["reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" } } }, - [30]={ - ["type"]=37, - ["number"]={ - 2, - 4, - 6, - 10, - 15, - 20, - 25, - 30, - 40, - 50, - 60, - 70, - 80, - 90, - 100 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, - [31]={ + [14]={ ["type"]=40, ["number"]={ - 2, - 4, + 1, + 3, 6, 10, 15, 20, - 25, 30, 40, - 50, - 60, - 70, - 80, - 90, - 100 + 50 }, ["reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" } } } } local config = { -data=task_achievement,count=31 +data=task_achievement,count=14 } return config \ No newline at end of file diff --git a/lua/app/config/task_daily.lua b/lua/app/config/task_daily.lua index 9af15876..25b53355 100644 --- a/lua/app/config/task_daily.lua +++ b/lua/app/config/task_daily.lua @@ -2,7 +2,7 @@ local task_daily = { [101]={ ["task_type"]=22, ["number"]=1, - ["value"]=20 + ["value"]=10 }, [102]={ ["task_type"]=9, @@ -12,35 +12,52 @@ local task_daily = { [103]={ ["task_type"]=15, ["number"]=10, - ["value"]=20 + ["value"]=10 }, [104]={ - ["task_type"]=18, - ["number"]=5, - ["value"]=20 - }, - [105]={ ["task_type"]=10, ["number"]=1, ["value"]=10 }, - [106]={ + [105]={ ["task_type"]=26, ["number"]=60, - ["value"]=20 + ["value"]=10 }, - [107]={ + [106]={ ["task_type"]=12, ["number"]=5, ["value"]=10 }, - [108]={ + [107]={ ["task_type"]=13, ["number"]=20, ["value"]=10 + }, + [108]={ + ["task_type"]=36, + ["number"]=1, + ["func_open"]="daily_challenge", + ["value"]=10 + }, + [109]={ + ["task_type"]=30, + ["number"]=2, + ["func_open"]="arena_open", + ["value"]=20 + }, + [110]={ + ["task_type"]=1, + ["number"]=3, + ["value"]=20 + }, + [111]={ + ["task_type"]=47, + ["number"]=2, + ["value"]=10 } } local config = { -data=task_daily,count=8 +data=task_daily,count=11 } return config \ No newline at end of file diff --git a/lua/app/config/task_daily_stage.lua b/lua/app/config/task_daily_stage.lua index 744cfc95..e00e5f22 100644 --- a/lua/app/config/task_daily_stage.lua +++ b/lua/app/config/task_daily_stage.lua @@ -1,15 +1,54 @@ local task_daily_stage = { [101]={ - ["point"]=30, + ["point"]=20, ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [102]={ + ["point"]=40, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [103]={ + ["point"]=60, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=600, - ["num_for_nothing"]="UAhc" - }, + ["num"]=500, + ["num_for_nothing"]="Uwhc" + } + } + }, + [104]={ + ["point"]=90, + ["reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -17,69 +56,14 @@ local task_daily_stage = { ["id_for_nothing"]="VA==", ["num"]=20, ["num_for_nothing"]="VAg=" - } - } - }, - [102]={ - ["point"]=50, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=600, - ["num_for_nothing"]="UAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=21, - ["num_for_nothing"]="VAk=" - } - } - }, - [103]={ - ["point"]=80, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=600, - ["num_for_nothing"]="UAhc" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=22, - ["num_for_nothing"]="VAo=" - } - } - }, - [104]={ - ["point"]=100, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=600, - ["num_for_nothing"]="UAhc" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=23, - ["num_for_nothing"]="VAs=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" } } }, @@ -89,18 +73,18 @@ local task_daily_stage = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=600, - ["num_for_nothing"]="UAhc" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=24, - ["num_for_nothing"]="VAw=" + ["id"]=42, + ["id_for_nothing"]="Ugo=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } } }