From fcd79434d1c40a6115a8daafaed31a66e5119f0b Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 26 May 2023 15:44:52 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=B8=83=E5=A4=A9=E4=B9=90=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/activity/seven_day/cell/task_cell.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lua/app/ui/activity/seven_day/cell/task_cell.lua b/lua/app/ui/activity/seven_day/cell/task_cell.lua index 137b8e28..59011440 100644 --- a/lua/app/ui/activity/seven_day/cell/task_cell.lua +++ b/lua/app/ui/activity/seven_day/cell/task_cell.lua @@ -16,7 +16,7 @@ function TaskCell:init() end) self.btnGreyImg = uiMap["task_cell.bg.cliam_btn.grey"] self.mask = uiMap["task_cell.bg.mask"] - uiMap["task_cell.bg.cliam_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM)) + self.cliamBtnTx = uiMap["task_cell.bg.cliam_btn.text"] uiMap["task_cell.bg.mask.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.STR_COMPLETED)) end @@ -41,8 +41,12 @@ function TaskCell:refresh(id) self.sliderTx:setText(count .. "/" .. totalCount) self.btnGreyImg:setVisible(not canClaimTask) - self.mask:setVisible(collected) + if collected then + self.cliamBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_DONE)) + else + self.cliamBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM)) + end end return TaskCell \ No newline at end of file From 77a9039092a72fc708353db1dc39364bd53ffe13 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 26 May 2023 15:46:15 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=A4=9A=E6=AE=B5=E4=BC=A4=E5=AE=B3?= =?UTF-8?q?=E7=9A=84=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/bf/unity/character_spine_object.lua | 13 +- .../battle/component/battle_unit_comp.lua | 120 ++++++++++-------- lua/app/module/battle/team/battle_team.lua | 12 ++ lua/app/ui/idle/component/idle_unit_comp.lua | 17 +-- .../battle/skill/battle_skill_entity.lua | 4 + 5 files changed, 105 insertions(+), 61 deletions(-) diff --git a/lua/app/bf/unity/character_spine_object.lua b/lua/app/bf/unity/character_spine_object.lua index da18aaa6..51084f56 100644 --- a/lua/app/bf/unity/character_spine_object.lua +++ b/lua/app/bf/unity/character_spine_object.lua @@ -202,11 +202,18 @@ function CharacterSpineObject:getAnimationDuration(animationName) return 0 end -function CharacterSpineObject:getAnimationKeyFrameTime(animationName) +function CharacterSpineObject:getAnimationKeyFrameTimes(animationName) + local times = {} if self.characterSpineHelper then - return self.characterSpineHelper:GetAnimationKeyFrameTime(animationName) + local timeList = self.characterSpineHelper:GetAnimationKeyFrameTime(animationName) + local count = timeList.Count + if count > 0 then + for i = 1, count do + table.insert(times, timeList[i - 1]) + end + end end - return 0 + return times end function CharacterSpineObject:addAnimationCompleteCallback(callback) diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 3a1e626a..bbfb8998 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -258,39 +258,40 @@ function BattleUnitComp:getAnimationDuration(aniName) return duration or 0 end -function BattleUnitComp:getAnimationKeyFrameTime(animationName) - local time = self.attackKeyFrameTimeMap[animationName] - if time == nil then - time = self.baseObject:getAnimationKeyFrameTime(animationName) - if time <= 0 then -- 容错处理 - time = 0.3 +function BattleUnitComp:getAnimationKeyFrameTime(animationName, index) + index = index or 1 + local timeList = self.attackKeyFrameTimeMap[animationName] + if timeList == nil then + timeList = self.baseObject:getAnimationKeyFrameTimes(animationName) + if not timeList[1] then + table.insert(timeList, 0.3) end - self.attackKeyFrameTimeMap[animationName] = time + self.attackKeyFrameTimeMap[animationName] = timeList end - return time + return timeList[index] or 0.3 end function BattleUnitComp:getKeyFrameTime(skill, blockIndex, animationName) - self.validEffectIdx[1] = 1 - self.validEffectIdx[2] = 1 if not skill then return 0 end self.currAttackBlockIndex = blockIndex - local time = skill:getEffectBlockTime()[blockIndex] - if not time then - if blockIndex == 1 then - time = self:getAnimationKeyFrameTime(animationName) - else - time = 0 - end - else - local blockList = skill:getEffectBlock() + local time = 0 + local blockList = skill:getEffectBlock() + if blockList[blockIndex] then local beforeIndex = blockIndex - 1 - self.validEffectIdx[1] = blockList[beforeIndex] or 1 + self.validEffectIdx[1] = blockList[beforeIndex] or 0 self.validEffectIdx[2] = blockList[blockIndex] or 1 + time = skill:getEffectBlockTime()[blockIndex] + if not time then + time = self:getAnimationKeyFrameTime(animationName, blockIndex) + end end + -- Logger.logHighlight(animationName .. " blockIndex " .. blockIndex) + -- Logger.printTable(blockList) + + -- Logger.printTable(self.validEffectIdx) return time end @@ -298,12 +299,17 @@ function BattleUnitComp:getIsCentralizedAttack() return self.team:getCentralizedAttack() end +function BattleUnitComp:getIsFinalBlock() + return self.team:getIsFinalBlock() +end + function BattleUnitComp:getCurAttackActionState() return self.curAttackActionState end function BattleUnitComp:beforeAttack(actionState) self.team:setCentralizedAttack(true) + self.team:setIsFinalBlock(false) self.battleController:setIsPauseHpProgress(true) self.curAttackActionState = actionState if actionState == BattleConst.ATTACK_ACTION_STATE.NORMAL then @@ -852,13 +858,16 @@ function BattleUnitComp:updateAssistingAttackState(dt) else if self.currAttackKeyTime > 0 and self.attackTime >= self.currAttackKeyTime then -- 到达关键后使用 local skill = self.unitEntity:getAssistingSkill() + local isFinalBlock = skill and skill:isFinalBlock(self.currAttackBlockIndex) + self:onSkillTakeEffect(skill, isFinalBlock, self.validEffectIdx) + if skill then local attackName = skill:getSkillAttackName() self.currAttackKeyTime = self:getKeyFrameTime(skill, self.currAttackBlockIndex + 1, attackName) else self.currAttackKeyTime = 0 end - self:onSkillTakeEffect(skill, self.currAttackKeyTime <= 0, self.validEffectIdx) + end end end @@ -998,34 +1007,37 @@ function BattleUnitComp:updateSkillAttack(dt) if self.currAttackKeyTime > 0 and self.attackTime >= self.currAttackKeyTime then -- 到达关键后使用 if self.normalSkillCount > 0 then local skill = self.unitEntity:getNormalSkill() + local isFinalBlock = skill and skill:isFinalBlock(self.currAttackBlockIndex) + + if self.normalSkillCount == 1 and self.currActiveSkill == nil and isFinalBlock then -- 最后一次攻击 + self.team:setCentralizedAttack(false) + end + self:onSkillTakeEffect(skill, isFinalBlock, self.validEffectIdx) + if self.normalSkillCount == 1 and self.currActiveSkill == nil and isFinalBlock then -- 最后一次攻击 + self.battleController:setIsPauseHpProgress(false) + end + if skill then local attackName = skill:getSkillAttackName() self.currAttackKeyTime = self:getKeyFrameTime(skill, self.currAttackBlockIndex + 1, attackName) else self.currAttackKeyTime = 0 end - local isFinalBlock = self.currAttackKeyTime <= 0 - - if self.normalSkillCount == 1 and self.currActiveSkill == nil and isFinalBlock then -- 最后一次攻击 - self.team:setCentralizedAttack(false) - end - self:onSkillTakeEffect(skill, self.currAttackKeyTime <= 0, self.validEffectIdx) - if self.normalSkillCount == 1 and self.currActiveSkill == nil and isFinalBlock then -- 最后一次攻击 - self.battleController:setIsPauseHpProgress(false) - end else - local attackName = self.currActiveSkill:getSkillAttackName() - self.currAttackKeyTime = self:getKeyFrameTime(self.currActiveSkill, self.currAttackBlockIndex + 1, attackName) - local isFinalBlock = self.currAttackKeyTime <= 0 + local isFinalBlock = self.currActiveSkill:isFinalBlock(self.currAttackBlockIndex) + local isHaveNextAttack = self:getIsHaveNextAvailableActiveSkill() if not isHaveNextAttack and isFinalBlock then self.team:setCentralizedAttack(false) + self.team:setIsFinalBlock(isFinalBlock) end - self:onSkillTakeEffect(self.currActiveSkill, isFinalBlock, self.validEffectIdx) if not isHaveNextAttack and isFinalBlock then self.battleController:setIsPauseHpProgress(false) end + + local attackName = self.currActiveSkill:getSkillAttackName() + self.currAttackKeyTime = self:getKeyFrameTime(self.currActiveSkill, self.currAttackBlockIndex + 1, attackName) end end end @@ -1220,21 +1232,22 @@ function BattleUnitComp:updateNormalAttack(dt) else if self.currAttackKeyTime > 0 and self.attackTime >= self.currAttackKeyTime then -- 到达关键后使用 local skill = self.unitEntity:getNormalSkill() + local isFinalBlock = skill and skill:isFinalBlock(self.currAttackBlockIndex) or false + if self.normalSkillCount == 1 and isFinalBlock then -- 如果是最后一次攻击，那么敌人受到这次攻击可以开始嗝屁了 + self.team:setCentralizedAttack(false) + self.team:setIsFinalBlock(isFinalBlock) + end + self:onSkillTakeEffect(skill, isFinalBlock, self.validEffectIdx) + if self.normalSkillCount == 1 and isFinalBlock then -- 如果是最后一次攻击，那么可以开始跑血条了 + self.battleController:setIsPauseHpProgress(false) + end + if skill then local attackName = skill:getSkillAttackName() self.currAttackKeyTime = self:getKeyFrameTime(skill, self.currAttackBlockIndex + 1, attackName) else self.currAttackKeyTime = 0 end - - local isFinalBlock = self.currAttackKeyTime <= 0 - if self.normalSkillCount == 1 and isFinalBlock then -- 如果是最后一次攻击，那么敌人受到这次攻击可以开始嗝屁了 - self.team:setCentralizedAttack(false) - end - self:onSkillTakeEffect(skill, isFinalBlock, self.validEffectIdx) - if self.normalSkillCount == 1 and isFinalBlock then -- 如果是最后一次攻击，那么可以开始跑血条了 - self.battleController:setIsPauseHpProgress(false) - end end end end @@ -1296,9 +1309,6 @@ function BattleUnitComp:onSkillTakeEffect(skill, isFinalBlock, validEffectIdx) if #effectList == 0 then return end - if not validEffectIdx then - validEffectIdx = {1, 1} - end local targetType = skill:getTargetType() local target if targetType == 1 then -- 自己 @@ -1317,15 +1327,25 @@ function BattleUnitComp:onSkillTakeEffect(skill, isFinalBlock, validEffectIdx) end local succ = false - for k, effect in ipairs(effectList) do - if k >= validEffectIdx[1] and k <= validEffectIdx[2] then - if self:judgeSkillEffectCondition(skill, k) then + local effectStartIdx = 1 + local effectEndIdx = 1 + if validEffectIdx then + effectStartIdx = validEffectIdx[1] + 1 + effectEndIdx = validEffectIdx[2] + end + for i = effectStartIdx, effectEndIdx do + local effect = effectList[i] + if effect then + if self:judgeSkillEffectCondition(skill, i) then if self:takeEffect(effect, target) then succ = true end end + else + break end end + if succ then if skill:getIsHurtType() then self.team:addCombo() @@ -1565,7 +1585,7 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, d end local hpPercent = self.unitEntity:getHpPercent() self.battleController:refreshHp(self.side, hp, hpPercent) - if atker:getIsCentralizedAttack() then + if not atker:getIsFinalBlock() then if damage < 0 then self:playHurt() end diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index 41ed3e56..96079779 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -531,6 +531,18 @@ function BattleTeam:setCentralizedAttack(centralizedAttack) self.centralizedAttack = centralizedAttack end +function BattleTeam:setIsFinalBlock(isFinalBlock) + Logger.logHighlight(isFinalBlock) + if not self.isFinalBlock and not isFinalBlock then + return + end + self.isFinalBlock = isFinalBlock +end + +function BattleTeam:getIsFinalBlock() + return self.isFinalBlock +end + function BattleTeam:addCombo() if self.side ~= BattleConst.SIDE_ATK then return diff --git a/lua/app/ui/idle/component/idle_unit_comp.lua b/lua/app/ui/idle/component/idle_unit_comp.lua index 2b0624e8..1b7f016a 100644 --- a/lua/app/ui/idle/component/idle_unit_comp.lua +++ b/lua/app/ui/idle/component/idle_unit_comp.lua @@ -275,19 +275,20 @@ function IdleUnitComp:getAnimationDuration(aniName) return duration or 0 end -function IdleUnitComp:getAnimationKeyFrameTime(animationName) +function IdleUnitComp:getAnimationKeyFrameTime(animationName, index) + index = index or 1 if self.attackKeyFrameTimeMap == nil then self.attackKeyFrameTimeMap = {} end - local time = self.attackKeyFrameTimeMap[animationName] - if time == nil then - time = self.baseObject:getAnimationKeyFrameTime(animationName) - if time <= 0 then -- 容错处理 - time = 0.3 + local timeList = self.attackKeyFrameTimeMap[animationName] + if timeList == nil then + local timeList = self.baseObject:getAnimationKeyFrameTimes(animationName) + if not timeList[1] then + table.insert(timeList, 0.3) end - self.attackKeyFrameTimeMap[animationName] = time + self.attackKeyFrameTimeMap[animationName] = timeList end - return time + return timeList[index] or 0.3 end function IdleUnitComp:getNormalSkill(reRandom) diff --git a/lua/app/userdata/battle/skill/battle_skill_entity.lua b/lua/app/userdata/battle/skill/battle_skill_entity.lua index 6a1c93f4..feb962b4 100644 --- a/lua/app/userdata/battle/skill/battle_skill_entity.lua +++ b/lua/app/userdata/battle/skill/battle_skill_entity.lua @@ -195,6 +195,10 @@ function BattleSkillEntity:getEffectBlock() return self.effectBlock end +function BattleSkillEntity:isFinalBlock(index) + return self.effectBlock[index + 1] == nil +end + function BattleSkillEntity:getEffectBlockTime() return self.blockTime end From cff917cac83a7f4651e67878314f8cecf7764bf1 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 26 May 2023 16:32:13 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/global/global_func.lua | 37 +++++++++++----------- lua/app/module/chapter/chapter_manager.lua | 7 +++- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/lua/app/global/global_func.lua b/lua/app/global/global_func.lua index 8610124c..de70e328 100644 --- a/lua/app/global/global_func.lua +++ b/lua/app/global/global_func.lua @@ -650,23 +650,21 @@ function GFunc.addCosts(costs, itemGetType) end -- 奖励排序 结构为后端结构 --- function GFunc.sortRewards(rewards) --- rewards = rewards or {} --- local maxType = 10 --- for i,v in ipairs(rewards) do --- if v.type == GConst.REWARD_TYPE.ITEM then --- rewards[i].sort = (maxType - v.type) * 1000000000 + (1000000000 - v.item.cfg_id) --- elseif v.type == GConst.REWARD_TYPE.EQUIP then --- local cfg = ConfigManager:getConfig("equip")[v.equip.id] --- rewards[i].sort = (maxType - v.type) * 1000000000 + cfg.qlt*100000000 + v.equip.id --- elseif v.type == GConst.REWARD_TYPE.JEWELRY then --- rewards[i].sort = (maxType - v.type) * 1000000000 + (1000000000 - v.jewelry.cfg_id) --- end --- end --- table.sort(rewards, function (a, b) --- return a.sort > b.sort --- end) --- end +function GFunc.sortRewards(rewards) + rewards = rewards or {} + local maxType = 10 + for i,v in ipairs(rewards) do + if v.type == GConst.REWARD_TYPE.ITEM then + rewards[i].sort = (maxType - v.type) * 1000000000 + v.item.id + elseif v.type == GConst.REWARD_TYPE.EQUIP then + local cfg = ConfigManager:getConfig("equip")[v.equip.id] + rewards[i].sort = (maxType - v.type) * 1000000000 + cfg.qlt*100000000 + v.equip.id + end + end + table.sort(rewards, function (a, b) + return a.sort > b.sort + end) +end ---- 奖励展示接口 function GFunc.showRewardBox(rewards, extParams, callback) @@ -683,7 +681,7 @@ function GFunc.showRewardBox(rewards, extParams, callback) ModuleManager.TipsManager:showRewardsBox(params) end -function GFunc.mergeRewards2(rewards, newRewards) +function GFunc.mergeRewards2(rewards, newRewards, needSort) local items = {} for i,v in ipairs(rewards) do if v.type == GConst.REWARD_TYPE.ITEM then @@ -695,6 +693,9 @@ function GFunc.mergeRewards2(rewards, newRewards) for k,v in pairs(items) do table.insert(newRewards, {type = GConst.REWARD_TYPE.ITEM, item = {id = k, count = v}}) end + if needSort then + GFunc.sortRewards(newRewards) + end end -- reward 结构为 type id num 配置中结构 diff --git a/lua/app/module/chapter/chapter_manager.lua b/lua/app/module/chapter/chapter_manager.lua index 6aba1fdb..9c527eac 100644 --- a/lua/app/module/chapter/chapter_manager.lua +++ b/lua/app/module/chapter/chapter_manager.lua @@ -86,8 +86,13 @@ function ChapterManager:endFightFinish(result) end if rewards then - GFunc.mergeRewards2(rewards, newRewards) + local mergeRewards = {} + GFunc.mergeRewards2(rewards, mergeRewards, true) + for _, unit in ipairs(mergeRewards) do + table.insert(newRewards, unit) + end end + ModuleManager.BattleManager:showBattleResultUI(newRewards, reqData.combatReport, mysteryBoxIdx) DataManager.ChapterData:fightChapter(reqData.chapter_id, result.max_chapter_id, result.max_wave, reqData.mystery_box_idx) -- 处理金猪,要在章节更新之后 From 3262bb76332a8df520055d9afadddccc3d267e15 Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 26 May 2023 17:01:16 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=B8=83=E5=A4=A9=E4=B9=90=E7=BA=A2?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/activity/seven_day/seven_day_ui.lua | 1 + lua/app/ui/main_city/main_city_ui.lua | 22 ++++++++++--------- .../activity/seven_day/seven_day_data.lua | 2 ++ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lua/app/ui/activity/seven_day/seven_day_ui.lua b/lua/app/ui/activity/seven_day/seven_day_ui.lua index ff2aeddf..4a670af0 100644 --- a/lua/app/ui/activity/seven_day/seven_day_ui.lua +++ b/lua/app/ui/activity/seven_day/seven_day_ui.lua @@ -192,6 +192,7 @@ function SevenDayUI:updateTime() GFunc.centerImgAndTx(self.timeIcon, self.timeTx, 14) end else + UIManager:closeUnderUI(self) self:closeUI() end end diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index b05b8c17..5229aa6f 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -281,18 +281,20 @@ end function MainCityUI:initLeftRightBtns() self.leftNode = self.uiMap["main_ui.left_node"] self.leftSideBar = self.uiMap["main_ui.left_node.side_bar"] - self.leftArrowNode = self.uiMap["main_ui.left_node.arrow_node"] - self.leftArrowBtn = self.uiMap["main_ui.left_node.arrow_node.arrow"] + self.leftArrowBtn = self.uiMap["main_ui.left_node.arrow_node"] self.leftArrowBtn:addClickListener(function() self:openOrCloseLeftSideBar() end) + self.leftArrowImg = self.uiMap["main_ui.left_node.arrow_node.arrow"] + self.rightNode = self.uiMap["main_ui.right_node"] self.rightSideBar = self.uiMap["main_ui.right_node.side_bar"] - self.rightArrowNode = self.uiMap["main_ui.right_node.arrow_node"] - self.rightArrowBtn = self.uiMap["main_ui.right_node.arrow_node.arrow"] + self.rightArrowBtn = self.uiMap["main_ui.right_node.arrow_node"] self.rightArrowBtn:addClickListener(function() self:openOrCloseRightSideBar() end) + self.rightArrowImg = self.uiMap["main_ui.right_node.arrow_node.arrow"] + self.sideBarCellObject = self.uiMap["main_ui.cache_node.side_bar_cell"] local w, h = self.sideBarCellObject:fastGetSizeDelta() self.sideBarHeight = h @@ -401,8 +403,8 @@ function MainCityUI:refreshLeftBtns() end end self.leftSideBar:setSizeDeltaY(-y) - self.leftArrowNode:setLocalScale(1, isClose and -1 or 1, 1) - self.leftArrowNode:setAnchoredPositionY(self.leftSideBar:fastGetAnchoredPositionY() + y + 20) + self.leftArrowImg:setLocalScale(1, isClose and -1 or 1, 1) + self.leftArrowBtn:setAnchoredPositionY(self.leftSideBar:fastGetAnchoredPositionY() + y + 20) end function MainCityUI:openOrCloseRightSideBar() @@ -466,8 +468,8 @@ function MainCityUI:refreshRightBtns() end end self.rightSideBar:setSizeDeltaY(-y) - self.rightArrowNode:setLocalScale(1, isClose and -1 or 1, 1) - self.rightArrowNode:setAnchoredPositionY(self.rightSideBar:fastGetAnchoredPositionY() + y + 20) + self.rightArrowImg:setLocalScale(1, isClose and -1 or 1, 1) + self.rightArrowBtn:setAnchoredPositionY(self.rightSideBar:fastGetAnchoredPositionY() + y + 20) end function MainCityUI:clearSideBarList(sideBarList) @@ -695,7 +697,7 @@ function MainCityUI:setLeftSideBarArrowRedPoint(isShow) end if isShow then if ModuleManager.MaincityManager:getIsMainCityLeftSideBarClose() then - self.leftArrowBtn:addRedPoint() + self.leftArrowBtn:addRedPoint(19, 10, 0.6) else self.leftArrowBtn:removeRedPoint() end @@ -710,7 +712,7 @@ function MainCityUI:setRightSideBarArrowRedPoint(isShow) end if isShow then if ModuleManager.MaincityManager:getIsMainCityRightSideBarClose() then - self.rightArrowBtn:addRedPoint() + self.rightArrowBtn:addRedPoint(19, 10, 0.6) else self.rightArrowBtn:removeRedPoint() end diff --git a/lua/app/userdata/activity/seven_day/seven_day_data.lua b/lua/app/userdata/activity/seven_day/seven_day_data.lua index 09b072df..724a1408 100644 --- a/lua/app/userdata/activity/seven_day/seven_day_data.lua +++ b/lua/app/userdata/activity/seven_day/seven_day_data.lua @@ -358,10 +358,12 @@ function SevenDayData:initTaskListener() local nowTime = Time:getServerTime() -- 活动结束就不用监听了 if self.endTime < nowTime then + ModuleManager.TaskManager:unRegisterAllModuleTask("SevenDayData") return false end -- 完成了就不用监听了 if self.collectTaskCount >= self:getSevenDayTaskMaxCount() and self.collectStepCount >= self:getSevenDayRewardMaxCount() then + ModuleManager.TaskManager:unRegisterAllModuleTask("SevenDayData") return false end From 8eb1c39cafb6178ca1e706749bb3b846ad65147b Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 26 May 2023 17:13:41 +0800 Subject: [PATCH 05/12] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/idle/component/idle_unit_comp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/ui/idle/component/idle_unit_comp.lua b/lua/app/ui/idle/component/idle_unit_comp.lua index 1b7f016a..9b58e147 100644 --- a/lua/app/ui/idle/component/idle_unit_comp.lua +++ b/lua/app/ui/idle/component/idle_unit_comp.lua @@ -282,7 +282,7 @@ function IdleUnitComp:getAnimationKeyFrameTime(animationName, index) end local timeList = self.attackKeyFrameTimeMap[animationName] if timeList == nil then - local timeList = self.baseObject:getAnimationKeyFrameTimes(animationName) + timeList = self.baseObject:getAnimationKeyFrameTimes(animationName) if not timeList[1] then table.insert(timeList, 0.3) end From 280d6d2c072d3f4721920225c7a2bec6ebcad72f Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 26 May 2023 17:33:29 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=B8=83=E5=A4=A9=E4=B9=90=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/activity/seven_day/seven_day_ui.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/ui/activity/seven_day/seven_day_ui.lua b/lua/app/ui/activity/seven_day/seven_day_ui.lua index 4a670af0..82ca5263 100644 --- a/lua/app/ui/activity/seven_day/seven_day_ui.lua +++ b/lua/app/ui/activity/seven_day/seven_day_ui.lua @@ -144,7 +144,7 @@ function SevenDayUI:refreshStepInfo() local count = DataManager.SevenDayData:getCollectedCount() local totalCount = DataManager.SevenDayData:getTotalCount() self.sevenDayDesc:setText(I18N:getGlobalText(I18N.GlobalConst.SEVEN_DAY_DESC_2, count, totalCount)) - self.sevenDaySliderComp.value = count / totalCount + self.sevenDaySliderComp.value = count / DataManager.SevenDayData:getStepNum(#self.stepObjs) end function SevenDayUI:refreshScrollRect() From 33781e32def11f1e20395f03d3943b08e5034a81 Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 26 May 2023 17:38:07 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E4=B8=83=E5=A4=A9=E4=B9=90=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=90=8E=E8=AF=A5=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/userdata/activity/seven_day/seven_day_data.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lua/app/userdata/activity/seven_day/seven_day_data.lua b/lua/app/userdata/activity/seven_day/seven_day_data.lua index 724a1408..f4f3da05 100644 --- a/lua/app/userdata/activity/seven_day/seven_day_data.lua +++ b/lua/app/userdata/activity/seven_day/seven_day_data.lua @@ -32,6 +32,7 @@ function SevenDayData:init(data) self.actDay = (today - self.openTs) // 86400 + 1 self:calCollectTaskCount() + self:calCollectStepCount() self:initTaskListener() DataManager:registerCrossDayFunc("SevenDayData", function() @@ -87,6 +88,7 @@ function SevenDayData:refreshClaimed(data) for id, b in pairs(data) do self.stepRewards[id] = b end + self:calCollectStepCount() end function SevenDayData:opened() @@ -145,7 +147,9 @@ function SevenDayData:calCollectTaskCount() self.collectTaskCount = self.collectTaskCount + 1 end end +end +function SevenDayData:calCollectStepCount() self.collectStepCount = 0 for id, info in ipairs(self:getSevenDayRewardCfg()) do if self:getStepCollected(id) then From c89eb8ef3f030e2f28c47a9c316edffb1d3c0ca5 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 26 May 2023 18:08:05 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E7=A6=81=E9=94=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/chapter_board.lua | 10 +- lua/app/config/func_open.lua | 36 +++- .../localization_global_const.lua | 1 + lua/app/config/monster_chapter.lua | 4 +- lua/app/config/skill.lua | 2 +- lua/app/config/skill_rogue.lua | 46 +++-- lua/app/config/strings/cn/func_open.lua | 46 +++++ lua/app/config/strings/cn/func_open.lua.meta | 10 + lua/app/config/strings/cn/global.lua | 1 + lua/app/config/strings/cn/monster_base.lua | 194 +++++++++++++++--- .../strings/cn/task_daily_challenge.lua | 2 +- lua/app/config/strings/de/func_open.lua | 36 ++++ lua/app/config/strings/de/func_open.lua.meta | 10 + lua/app/config/strings/de/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/en/func_open.lua | 36 ++++ lua/app/config/strings/en/func_open.lua.meta | 10 + lua/app/config/strings/en/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/fpt.meta | 8 + lua/app/config/strings/fpt/func_open.lua | 36 ++++ lua/app/config/strings/fpt/func_open.lua.meta | 10 + lua/app/config/strings/fr/func_open.lua | 36 ++++ lua/app/config/strings/fr/func_open.lua.meta | 10 + lua/app/config/strings/fr/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/id/func_open.lua | 36 ++++ lua/app/config/strings/id/func_open.lua.meta | 10 + lua/app/config/strings/id/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/ja/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/jp.meta | 8 + lua/app/config/strings/jp/func_open.lua | 36 ++++ lua/app/config/strings/jp/func_open.lua.meta | 10 + lua/app/config/strings/ko/func_open.lua | 36 ++++ lua/app/config/strings/ko/func_open.lua.meta | 10 + lua/app/config/strings/ko/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/pt/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/ru/func_open.lua | 36 ++++ lua/app/config/strings/ru/func_open.lua.meta | 10 + lua/app/config/strings/ru/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/th/func_open.lua | 36 ++++ lua/app/config/strings/th/func_open.lua.meta | 10 + lua/app/config/strings/th/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/vi/func_open.lua | 36 ++++ lua/app/config/strings/vi/func_open.lua.meta | 10 + lua/app/config/strings/vi/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/zh/func_open.lua | 36 ++++ lua/app/config/strings/zh/func_open.lua.meta | 10 + lua/app/config/strings/zh/monster_base.lua | 146 ++++++++++++- lua/app/config/task.lua | 182 ++++++++-------- lua/app/config/task_daily_challenge.lua | 2 +- lua/app/config/tutorial.lua | 11 +- .../battle/controller/battle_controller.lua | 10 +- .../battle/helper/battle_buff_special.lua | 6 + lua/app/module/battle/team/battle_team.lua | 1 - lua/app/userdata/battle/battle_data.lua | 16 ++ 53 files changed, 2494 insertions(+), 214 deletions(-) create mode 100644 lua/app/config/strings/cn/func_open.lua create mode 100644 lua/app/config/strings/cn/func_open.lua.meta create mode 100644 lua/app/config/strings/de/func_open.lua create mode 100644 lua/app/config/strings/de/func_open.lua.meta create mode 100644 lua/app/config/strings/en/func_open.lua create mode 100644 lua/app/config/strings/en/func_open.lua.meta create mode 100644 lua/app/config/strings/fpt.meta create mode 100644 lua/app/config/strings/fpt/func_open.lua create mode 100644 lua/app/config/strings/fpt/func_open.lua.meta create mode 100644 lua/app/config/strings/fr/func_open.lua create mode 100644 lua/app/config/strings/fr/func_open.lua.meta create mode 100644 lua/app/config/strings/id/func_open.lua create mode 100644 lua/app/config/strings/id/func_open.lua.meta create mode 100644 lua/app/config/strings/jp.meta create mode 100644 lua/app/config/strings/jp/func_open.lua create mode 100644 lua/app/config/strings/jp/func_open.lua.meta create mode 100644 lua/app/config/strings/ko/func_open.lua create mode 100644 lua/app/config/strings/ko/func_open.lua.meta create mode 100644 lua/app/config/strings/ru/func_open.lua create mode 100644 lua/app/config/strings/ru/func_open.lua.meta create mode 100644 lua/app/config/strings/th/func_open.lua create mode 100644 lua/app/config/strings/th/func_open.lua.meta create mode 100644 lua/app/config/strings/vi/func_open.lua create mode 100644 lua/app/config/strings/vi/func_open.lua.meta create mode 100644 lua/app/config/strings/zh/func_open.lua create mode 100644 lua/app/config/strings/zh/func_open.lua.meta diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index 5e35d5f3..01561188 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -67,11 +67,11 @@ local chapter_board = { }, { 0, - 4 + 3 }, { 0, - 3 + 4 }, { 0, @@ -103,7 +103,7 @@ local chapter_board = { }, { 0, - 2 + 3 }, { 1, @@ -202,9 +202,9 @@ local chapter_board = { 3, 3, 2, + 2, 3, - 3, - 3, + 2, 3, 3, 3, diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua index 9ebdea82..7549ae23 100644 --- a/lua/app/config/func_open.lua +++ b/lua/app/config/func_open.lua @@ -4,37 +4,51 @@ local func_open = { ["pop_ups"]=1 }, ["bounty_open"]={ - ["stage"]=3 + ["stage"]=3, + ["icon"]="main_bounty" }, ["task"]={ - ["stage"]=3 + ["stage"]=3, + ["icon"]="main_task" }, ["act_level_gift"]={ - ["level"]=5 + ["level"]=5, + ["icon"]="main_act_level_gift" }, ["idle_drop"]={ - ["stage"]=2 + ["stage"]=2, + ["icon"]="main_idle_drop" }, ["act_sevenday"]={ - ["stage"]=2 + ["stage"]=2, + ["icon"]="main_act_sevenday" }, ["mall"]={ - ["stage"]=1 + ["stage"]=1, + ["icon"]="main_mall" }, ["mall_daily"]={ - ["stage"]=5 + ["stage"]=5, + ["icon"]="main_mall_daily" }, ["store_box_open"]={ - ["stage"]=2 + ["stage"]=2, + ["icon"]="main_store_box" }, ["store_box_3_open"]={ - ["stage"]=5 + ["stage"]=5, + ["icon"]="main_store_box_3" }, ["daily_challenge"]={ - ["stage"]=2 + ["stage"]=2, + ["icon"]="main_daily_challenge" + }, + ["act_gift_show_open"]={ + ["stage"]=3, + ["pop_ups"]=1 } } local config = { -data=func_open,count=11 +data=func_open,count=12 } 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 24061061..64a01e7b 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -143,6 +143,7 @@ local LocalizationGlobalConst = DAY_X = "DAY_X", DAY_X_UNLOCK = "DAY_X_UNLOCK", SEVEN_DAY_DESC_2 = "SEVEN_DAY_DESC_2", + FUNC_UNLOCK = "FUNC_UNLOCK", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index a4319153..6576957a 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -13,7 +13,7 @@ local monster_chapter = { }, [201]={ ["monster_base"]=10002, - ["hp"]=5000000, + ["hp"]=6000000, ["atk"]=200000, ["atk_times"]=2, ["hurt_skill"]={ @@ -25,7 +25,7 @@ local monster_chapter = { }, [301]={ ["monster_base"]=10003, - ["hp"]=12000000, + ["hp"]=11000000, ["atk"]=200000, ["atk_times"]=2, ["hurt_skill"]={ diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index f1be0253..145f604d 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -2085,7 +2085,7 @@ local skill = { ["round"]=1 } }, - ["obj"]=2 + ["obj"]=1 }, [3200110]={ ["position"]=3, diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 15a97a36..554587de 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -682,7 +682,7 @@ local skill_rogue = { }, [1200100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=1, @@ -826,7 +826,7 @@ local skill_rogue = { }, [1300100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=1, @@ -957,7 +957,7 @@ local skill_rogue = { }, [1300200]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=1 @@ -1080,7 +1080,7 @@ local skill_rogue = { }, [1400100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=1 @@ -1211,7 +1211,7 @@ local skill_rogue = { }, [2200100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=2, @@ -1351,7 +1351,7 @@ local skill_rogue = { }, [2300100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=2, @@ -1476,7 +1476,7 @@ local skill_rogue = { }, [2300200]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=2, @@ -1629,7 +1629,7 @@ local skill_rogue = { }, [2400100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=2, @@ -1757,7 +1757,7 @@ local skill_rogue = { }, [3200100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=3, @@ -1900,7 +1900,7 @@ local skill_rogue = { }, [3300100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=3, @@ -2036,7 +2036,7 @@ local skill_rogue = { }, [3300200]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=3, @@ -2143,13 +2143,15 @@ local skill_rogue = { ["icon"]="38" }, [3400100]={ - ["weight"]=30000, + ["limit_times"]=1, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=3, ["icon"]="67" }, [3400101]={ + ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, ["type"]=12, @@ -2211,6 +2213,7 @@ local skill_rogue = { [3400104]={ ["unlock"]=3400101, ["cover_unlock"]=3400101, + ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, ["type"]=12, @@ -2227,6 +2230,7 @@ local skill_rogue = { ["icon"]="67" }, [3400105]={ + ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, ["type"]=12, @@ -2245,6 +2249,7 @@ local skill_rogue = { [3400106]={ ["unlock"]=3400106, ["cover_unlock"]=3400106, + ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, ["type"]=12, @@ -2261,6 +2266,7 @@ local skill_rogue = { ["icon"]="67" }, [3400107]={ + ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, ["type"]=14, @@ -2281,7 +2287,7 @@ local skill_rogue = { }, [4200100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=4, @@ -2404,7 +2410,7 @@ local skill_rogue = { }, [4300100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=4, @@ -2532,7 +2538,7 @@ local skill_rogue = { }, [4300300]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["skill_position"]=4, ["icon"]="57" @@ -2662,7 +2668,7 @@ local skill_rogue = { }, [4400100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=4, @@ -2778,7 +2784,7 @@ local skill_rogue = { }, [5200100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=5, @@ -2893,7 +2899,7 @@ local skill_rogue = { }, [5300100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=5, @@ -3024,7 +3030,7 @@ local skill_rogue = { }, [5300200]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=5, @@ -3159,7 +3165,7 @@ local skill_rogue = { }, [5400100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=5, diff --git a/lua/app/config/strings/cn/func_open.lua b/lua/app/config/strings/cn/func_open.lua new file mode 100644 index 00000000..0f49067e --- /dev/null +++ b/lua/app/config/strings/cn/func_open.lua @@ -0,0 +1,46 @@ +local func_open = { + ["bounty"]={ + ["name"]="战令", + ["desc"]="大陆贸易点，可购买多种道具" + }, + ["task"]={ + ["name"]="任务", + ["desc"]="呼朋唤友，集结各方力量" + }, + ["act_level_gift"]={ + ["name"]="成长基金", + ["desc"]="帝国科技，打造理想装备" + }, + ["idle_drop"]={ + ["name"]="挂机", + ["desc"]="快速获取游戏道具" + }, + ["act_sevenday"]={ + ["name"]="七天乐", + ["desc"]="团队作战" + }, + ["mall"]={ + ["name"]="商城", + ["desc"]="玩家对决，为荣誉而战" + }, + ["mall_daily"]={ + ["name"]="商城每日商店", + ["desc"]="突破极限，创新记录" + }, + ["store_box"]={ + ["name"]="商城普通宝箱+精致宝箱", + ["desc"]="战斗速度增加一倍" + }, + ["store_box_3"]={ + ["name"]="商城珍贵宝箱", + ["desc"]="解放双手，策略制胜" + }, + ["daily_challenge"]={ + ["name"]="每日挑战开启章节", + ["desc"]="多方成长，强化英雄" + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/func_open.lua.meta b/lua/app/config/strings/cn/func_open.lua.meta new file mode 100644 index 00000000..5130eca7 --- /dev/null +++ b/lua/app/config/strings/cn/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 919f420c7305f34489c8aaa76289c6cd +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 46da0048..fec94f10 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -143,6 +143,7 @@ local localization_global = ["DAY_X"] = "第{0}天", ["DAY_X_UNLOCK"] = "第{0}天解锁", ["SEVEN_DAY_DESC_2"] = "已完成任务数:{0}/{1}", + ["FUNC_UNLOCK"] = "解锁新功能", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/monster_base.lua b/lua/app/config/strings/cn/monster_base.lua index b483f594..776c83f5 100644 --- a/lua/app/config/strings/cn/monster_base.lua +++ b/lua/app/config/strings/cn/monster_base.lua @@ -29,9 +29,6 @@ local monster_base = { [10010]={ ["name"]="骷髅枪兵" }, - [10011]={ - ["name"]="地灵枪兵" - }, [10012]={ ["name"]="兽人大刀兵（绿）" }, @@ -56,80 +53,221 @@ local monster_base = { [10019]={ ["name"]="兽人盾骨兵（蓝）" }, + [10020]={ + ["name"]="小史莱姆（绿）" + }, + [10021]={ + ["name"]="小史莱姆（黄）" + }, + [10022]={ + ["name"]="小史莱姆（蓝）" + }, + [10023]={ + ["name"]="小史莱姆（红）" + }, + [10024]={ + ["name"]="大史莱姆（绿）" + }, + [10025]={ + ["name"]="大史莱姆（黄）" + }, + [10026]={ + ["name"]="大史莱姆（蓝）" + }, + [10027]={ + ["name"]="大史莱姆（红）" + }, [10028]={ - ["name"]="双斧男(白紫）" + ["name"]="双斧莫西干（紫）" }, [10029]={ - ["name"]="双斧男(黑红）" + ["name"]="双斧莫西干（红）" }, [10030]={ - ["name"]="剑士（白黄）" + ["name"]="黄发剑士" }, [10031]={ - ["name"]="剑士（褐蓝）" + ["name"]="蓝发剑士" }, [10032]={ - ["name"]="女魔法师（蓝）" + ["name"]="女巫师（蓝）" }, [10033]={ - ["name"]="女魔法师（红）" + ["name"]="女巫师（紫）" + }, + [10034]={ + ["name"]="剑盾士兵（黄发）" + }, + [10035]={ + ["name"]="剑盾士兵（蓝发）" + }, + [10036]={ + ["name"]="人类弓箭手（红）" + }, + [10037]={ + ["name"]="人类弓箭手（绿）" + }, + [10038]={ + ["name"]="骷髅弓箭手" }, [10039]={ - ["name"]="盾刀骷髅兵（有帽子）" + ["name"]="盾刀骷髅兵（有头盔）" + }, + [10040]={ + ["name"]="骷髅小法师" + }, + [10041]={ + ["name"]="蓝色蝙蝠恶魔" + }, + [10042]={ + ["name"]="蓝色恶魔野猪" + }, + [10043]={ + ["name"]="紫色独眼蝙蝠" + }, + [10044]={ + ["name"]="蓝色独眼蝙蝠" + }, + [10045]={ + ["name"]="紫色蜘蛛" + }, + [10046]={ + ["name"]="红色蜘蛛" + }, + [10047]={ + ["name"]="红色蜥蜴剑士" + }, + [10048]={ + ["name"]="绿色蜥蜴剑士" + }, + [10049]={ + ["name"]="绿色食人花" + }, + [10050]={ + ["name"]="黑色食人花" + }, + [10051]={ + ["name"]="红色恶魔野猪" + }, + [10052]={ + ["name"]="红色蝙蝠恶魔" + }, + [10053]={ + ["name"]="紫色鬼火" + }, + [10054]={ + ["name"]="青绿鬼火" + }, + [10055]={ + ["name"]="红色幽灵恶魔" + }, + [10056]={ + ["name"]="紫色幽灵恶魔" + }, + [10057]={ + ["name"]="魔都小枪兵（红）" + }, + [10058]={ + ["name"]="魔都小枪兵（紫）" + }, + [10059]={ + ["name"]="紫色食人花" }, [20001]={ - ["name"]="弓箭神射手（黄）" + ["name"]="丛林神射手" }, [20002]={ - ["name"]="丛林弓箭神射手（绿）" + ["name"]="丛林神猎手" }, [20003]={ - ["name"]="巨龙" + ["name"]="王之巨龙" }, [20004]={ - ["name"]="邪恶法师" + ["name"]="精英哥布林" }, [20005]={ - ["name"]="石像巨人守卫" + ["name"]="远古堡垒" }, [20006]={ - ["name"]="巨绿龟" + ["name"]="绿龟刚铠" }, [20007]={ - ["name"]="独眼巨人（蓝）" + ["name"]="狂暴哥布林" }, [20008]={ - ["name"]="石头人" + ["name"]="石巨人" }, [20009]={ - ["name"]="大树精" + ["name"]="树精祭祀" }, [20010]={ - ["name"]="火灵" + ["name"]="火灵守卫" }, [20011]={ - ["name"]="地精首领" + ["name"]="地精魔像" }, [20012]={ ["name"]="骷髅王" }, [20013]={ - ["name"]="小丑" + ["name"]="小丑之王" }, [20014]={ - ["name"]="兽人首领（绿）" + ["name"]="钢盾绿首领" }, [20015]={ - ["name"]="兽人首领（红）" + ["name"]="钢盾红首领" }, [20016]={ - ["name"]="独眼萌娃" + ["name"]="独眼旋风" }, [20017]={ - ["name"]="骷髅恶魔法师（紫衣）" + ["name"]="骷髅法师" }, [20018]={ - ["name"]="骷髅恶魔法师（红衣）" + ["name"]="恶毒法师" + }, + [20019]={ + ["name"]="火灵刀客" + }, + [20020]={ + ["name"]="火灵王" + }, + [20021]={ + ["name"]="卓一德DH" + }, + [20022]={ + ["name"]="雪人铁匠" + }, + [20023]={ + ["name"]="雪人精英" + }, + [20024]={ + ["name"]="飞天魔" + }, + [20025]={ + ["name"]="异变铁匠" + }, + [20026]={ + ["name"]="异变精英" + }, + [20027]={ + ["name"]="红龟霍顿" + }, + [20028]={ + ["name"]="冰巨人" + }, + [20029]={ + ["name"]="地精炎魔像" + }, + [20030]={ + ["name"]="魔神碎片" + }, + [20031]={ + ["name"]="魔神守护者" + }, + [20032]={ + ["name"]="远古魔神" }, [30001]={ ["name"]="洋葱头" @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/task_daily_challenge.lua b/lua/app/config/strings/cn/task_daily_challenge.lua index b83a1db6..6dbc01ad 100644 --- a/lua/app/config/strings/cn/task_daily_challenge.lua +++ b/lua/app/config/strings/cn/task_daily_challenge.lua @@ -15,7 +15,7 @@ local task_daily_challenge = { ["desc"]="通关时{0}英雄释放技能{1}次" }, [6]={ - ["desc"]="{0}回合内击败最终首领" + ["desc"]="10回合内击败最终首领" }, [7]={ ["desc"]="通关时，{0}造成伤害占比超过{1}%" diff --git a/lua/app/config/strings/de/func_open.lua b/lua/app/config/strings/de/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/de/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/de/func_open.lua.meta b/lua/app/config/strings/de/func_open.lua.meta new file mode 100644 index 00000000..efe470e8 --- /dev/null +++ b/lua/app/config/strings/de/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c38dc3ad8ba97d24ca8cba99e679d91f +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/de/monster_base.lua b/lua/app/config/strings/de/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/de/monster_base.lua +++ b/lua/app/config/strings/de/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/func_open.lua b/lua/app/config/strings/en/func_open.lua new file mode 100644 index 00000000..eb782ebc --- /dev/null +++ b/lua/app/config/strings/en/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + ["desc"]="Trading Spot of the continent." + }, + ["task"]={ + ["desc"]="Gather friends to unify strength." + }, + ["act_level_gift"]={ + ["desc"]="Empire technology to craft ideal gear." + }, + ["idle_drop"]={ + ["desc"]="Get game items fast." + }, + ["act_sevenday"]={ + ["desc"]="Team Battle" + }, + ["mall"]={ + ["desc"]="Players duel. Fight for honor." + }, + ["mall_daily"]={ + ["desc"]="Break limit. New record." + }, + ["store_box"]={ + ["desc"]="Battle speed doubles" + }, + ["store_box_3"]={ + ["desc"]="Free up your hands." + }, + ["daily_challenge"]={ + ["desc"]="Multiple growth to strengthen heroes." + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/en/func_open.lua.meta b/lua/app/config/strings/en/func_open.lua.meta new file mode 100644 index 00000000..f04ae92a --- /dev/null +++ b/lua/app/config/strings/en/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9537d27af9092e74793da612150c39f3 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/en/monster_base.lua b/lua/app/config/strings/en/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/en/monster_base.lua +++ b/lua/app/config/strings/en/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fpt.meta b/lua/app/config/strings/fpt.meta new file mode 100644 index 00000000..e0c1d3f6 --- /dev/null +++ b/lua/app/config/strings/fpt.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ceb056f138919414eabb60535cff2463 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/config/strings/fpt/func_open.lua b/lua/app/config/strings/fpt/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/fpt/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/fpt/func_open.lua.meta b/lua/app/config/strings/fpt/func_open.lua.meta new file mode 100644 index 00000000..c13d7e14 --- /dev/null +++ b/lua/app/config/strings/fpt/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e87dea876ebcc164fb7f9c4fc902b3be +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/fr/func_open.lua b/lua/app/config/strings/fr/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/fr/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/func_open.lua.meta b/lua/app/config/strings/fr/func_open.lua.meta new file mode 100644 index 00000000..e979d0c8 --- /dev/null +++ b/lua/app/config/strings/fr/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8b96ecfc420d26a498036ca9042d8980 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/fr/monster_base.lua b/lua/app/config/strings/fr/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/fr/monster_base.lua +++ b/lua/app/config/strings/fr/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/func_open.lua b/lua/app/config/strings/id/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/id/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/id/func_open.lua.meta b/lua/app/config/strings/id/func_open.lua.meta new file mode 100644 index 00000000..4d76fc87 --- /dev/null +++ b/lua/app/config/strings/id/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8d4109a2a72f4094ebc743f6df66cea4 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/id/monster_base.lua b/lua/app/config/strings/id/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/id/monster_base.lua +++ b/lua/app/config/strings/id/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/monster_base.lua b/lua/app/config/strings/ja/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/ja/monster_base.lua +++ b/lua/app/config/strings/ja/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/jp.meta b/lua/app/config/strings/jp.meta new file mode 100644 index 00000000..c2bca076 --- /dev/null +++ b/lua/app/config/strings/jp.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d005351c60b922045b028083e396665d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/config/strings/jp/func_open.lua b/lua/app/config/strings/jp/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/jp/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/jp/func_open.lua.meta b/lua/app/config/strings/jp/func_open.lua.meta new file mode 100644 index 00000000..5362c7ec --- /dev/null +++ b/lua/app/config/strings/jp/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b3fe7a2d96eea784787d55c87964aa2a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ko/func_open.lua b/lua/app/config/strings/ko/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/ko/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/func_open.lua.meta b/lua/app/config/strings/ko/func_open.lua.meta new file mode 100644 index 00000000..d4b9f8b1 --- /dev/null +++ b/lua/app/config/strings/ko/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e1457bf1f0f96a84886cc052c3b10ffa +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ko/monster_base.lua b/lua/app/config/strings/ko/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/ko/monster_base.lua +++ b/lua/app/config/strings/ko/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/monster_base.lua b/lua/app/config/strings/pt/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/pt/monster_base.lua +++ b/lua/app/config/strings/pt/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/func_open.lua b/lua/app/config/strings/ru/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/ru/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/func_open.lua.meta b/lua/app/config/strings/ru/func_open.lua.meta new file mode 100644 index 00000000..2047acff --- /dev/null +++ b/lua/app/config/strings/ru/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 781991512de623142ad273c835fcbc6b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ru/monster_base.lua b/lua/app/config/strings/ru/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/ru/monster_base.lua +++ b/lua/app/config/strings/ru/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/func_open.lua b/lua/app/config/strings/th/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/th/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/th/func_open.lua.meta b/lua/app/config/strings/th/func_open.lua.meta new file mode 100644 index 00000000..34547506 --- /dev/null +++ b/lua/app/config/strings/th/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4113cfd07da50d7478adc8ac79a309ba +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/th/monster_base.lua b/lua/app/config/strings/th/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/th/monster_base.lua +++ b/lua/app/config/strings/th/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/func_open.lua b/lua/app/config/strings/vi/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/vi/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/func_open.lua.meta b/lua/app/config/strings/vi/func_open.lua.meta new file mode 100644 index 00000000..cd273958 --- /dev/null +++ b/lua/app/config/strings/vi/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 454a4766f1fe9f541a9b42c571fdb7f5 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/vi/monster_base.lua b/lua/app/config/strings/vi/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/vi/monster_base.lua +++ b/lua/app/config/strings/vi/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/func_open.lua b/lua/app/config/strings/zh/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/zh/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/func_open.lua.meta b/lua/app/config/strings/zh/func_open.lua.meta new file mode 100644 index 00000000..4884d273 --- /dev/null +++ b/lua/app/config/strings/zh/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 980b12952c08adb42b77de24ba45a5f5 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/zh/monster_base.lua b/lua/app/config/strings/zh/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/zh/monster_base.lua +++ b/lua/app/config/strings/zh/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/task.lua b/lua/app/config/task.lua index f6bb1317..ea39d150 100644 --- a/lua/app/config/task.lua +++ b/lua/app/config/task.lua @@ -12,7 +12,7 @@ local task = { ["num_for_nothing"]="Vw==" } }, - ["icon"]="1" + ["icon"]="10" }, [2]={ ["type"]=20, @@ -27,7 +27,7 @@ local task = { ["num_for_nothing"]="Vw==" } }, - ["icon"]="20" + ["icon"]="8" }, [3]={ ["type"]=21, @@ -42,7 +42,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="21" + ["icon"]="10" }, [4]={ ["type"]=2, @@ -57,7 +57,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="2" + ["icon"]="1" }, [5]={ ["type"]=2, @@ -72,7 +72,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="2" + ["icon"]="1" }, [6]={ ["type"]=2, @@ -87,7 +87,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="2" + ["icon"]="1" }, [7]={ ["type"]=2, @@ -102,7 +102,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="2" + ["icon"]="1" }, [8]={ ["type"]=3, @@ -118,7 +118,7 @@ local task = { } }, ["lock"]=3, - ["icon"]="3" + ["icon"]="1" }, [9]={ ["type"]=3, @@ -134,7 +134,7 @@ local task = { } }, ["lock"]=3, - ["icon"]="3" + ["icon"]="1" }, [10]={ ["type"]=3, @@ -150,7 +150,7 @@ local task = { } }, ["lock"]=3, - ["icon"]="3" + ["icon"]="1" }, [11]={ ["type"]=3, @@ -166,7 +166,7 @@ local task = { } }, ["lock"]=3, - ["icon"]="3" + ["icon"]="1" }, [12]={ ["type"]=4, @@ -181,7 +181,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="4" + ["icon"]="1" }, [13]={ ["type"]=4, @@ -196,7 +196,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="4" + ["icon"]="1" }, [14]={ ["type"]=4, @@ -211,7 +211,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="4" + ["icon"]="1" }, [15]={ ["type"]=4, @@ -226,7 +226,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="4" + ["icon"]="1" }, [16]={ ["type"]=5, @@ -242,7 +242,7 @@ local task = { } }, ["lock"]=3, - ["icon"]="5" + ["icon"]="2" }, [17]={ ["type"]=5, @@ -258,7 +258,7 @@ local task = { } }, ["lock"]=3, - ["icon"]="5" + ["icon"]="2" }, [18]={ ["type"]=5, @@ -274,7 +274,7 @@ local task = { } }, ["lock"]=3, - ["icon"]="5" + ["icon"]="2" }, [19]={ ["type"]=5, @@ -290,7 +290,7 @@ local task = { } }, ["lock"]=3, - ["icon"]="5" + ["icon"]="2" }, [20]={ ["type"]=6, @@ -305,7 +305,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="6" + ["icon"]="3" }, [21]={ ["type"]=6, @@ -320,7 +320,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="6" + ["icon"]="3" }, [22]={ ["type"]=6, @@ -335,7 +335,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="6" + ["icon"]="3" }, [23]={ ["type"]=6, @@ -350,7 +350,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="6" + ["icon"]="3" }, [24]={ ["type"]=7, @@ -366,7 +366,7 @@ local task = { } }, ["lock"]=10, - ["icon"]="7" + ["icon"]="4" }, [25]={ ["type"]=7, @@ -382,7 +382,7 @@ local task = { } }, ["lock"]=10, - ["icon"]="7" + ["icon"]="4" }, [26]={ ["type"]=7, @@ -398,7 +398,7 @@ local task = { } }, ["lock"]=10, - ["icon"]="7" + ["icon"]="4" }, [27]={ ["type"]=7, @@ -414,7 +414,7 @@ local task = { } }, ["lock"]=10, - ["icon"]="7" + ["icon"]="4" }, [28]={ ["type"]=8, @@ -430,7 +430,7 @@ local task = { } }, ["lock"]=5, - ["icon"]="8" + ["icon"]="5" }, [29]={ ["type"]=8, @@ -446,7 +446,7 @@ local task = { } }, ["lock"]=5, - ["icon"]="8" + ["icon"]="5" }, [30]={ ["type"]=8, @@ -461,7 +461,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="8" + ["icon"]="5" }, [31]={ ["type"]=8, @@ -476,7 +476,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="8" + ["icon"]="5" }, [32]={ ["type"]=9, @@ -491,7 +491,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="9" + ["icon"]="6" }, [33]={ ["type"]=9, @@ -506,7 +506,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="9" + ["icon"]="6" }, [34]={ ["type"]=9, @@ -521,7 +521,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="9" + ["icon"]="6" }, [35]={ ["type"]=9, @@ -536,7 +536,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="9" + ["icon"]="6" }, [36]={ ["type"]=10, @@ -552,7 +552,7 @@ local task = { } }, ["lock"]=4, - ["icon"]="10" + ["icon"]="7" }, [37]={ ["type"]=10, @@ -568,7 +568,7 @@ local task = { } }, ["lock"]=4, - ["icon"]="10" + ["icon"]="7" }, [38]={ ["type"]=10, @@ -583,7 +583,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="10" + ["icon"]="7" }, [39]={ ["type"]=10, @@ -598,7 +598,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="10" + ["icon"]="7" }, [40]={ ["type"]=11, @@ -614,7 +614,7 @@ local task = { } }, ["lock"]=5, - ["icon"]="11" + ["icon"]="7" }, [41]={ ["type"]=11, @@ -630,7 +630,7 @@ local task = { } }, ["lock"]=5, - ["icon"]="11" + ["icon"]="7" }, [42]={ ["type"]=11, @@ -646,7 +646,7 @@ local task = { } }, ["lock"]=5, - ["icon"]="11" + ["icon"]="7" }, [43]={ ["type"]=11, @@ -662,7 +662,7 @@ local task = { } }, ["lock"]=5, - ["icon"]="11" + ["icon"]="7" }, [44]={ ["type"]=12, @@ -677,7 +677,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="12" + ["icon"]="9" }, [45]={ ["type"]=12, @@ -692,7 +692,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="12" + ["icon"]="9" }, [46]={ ["type"]=12, @@ -707,7 +707,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="12" + ["icon"]="9" }, [47]={ ["type"]=12, @@ -722,7 +722,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="12" + ["icon"]="9" }, [48]={ ["type"]=13, @@ -737,7 +737,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="13" + ["icon"]="9" }, [49]={ ["type"]=13, @@ -752,7 +752,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="13" + ["icon"]="9" }, [50]={ ["type"]=13, @@ -767,7 +767,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="13" + ["icon"]="9" }, [51]={ ["type"]=13, @@ -782,7 +782,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="13" + ["icon"]="9" }, [52]={ ["type"]=14, @@ -797,7 +797,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="14" + ["icon"]="8" }, [53]={ ["type"]=14, @@ -812,7 +812,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="14" + ["icon"]="8" }, [54]={ ["type"]=14, @@ -827,7 +827,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="14" + ["icon"]="8" }, [55]={ ["type"]=14, @@ -842,7 +842,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="14" + ["icon"]="8" }, [56]={ ["type"]=15, @@ -857,7 +857,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="15" + ["icon"]="8" }, [57]={ ["type"]=15, @@ -872,7 +872,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="15" + ["icon"]="8" }, [58]={ ["type"]=15, @@ -887,7 +887,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="15" + ["icon"]="8" }, [59]={ ["type"]=15, @@ -902,7 +902,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="15" + ["icon"]="8" }, [60]={ ["type"]=16, @@ -917,7 +917,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="16" + ["icon"]="8" }, [61]={ ["type"]=16, @@ -932,7 +932,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="16" + ["icon"]="8" }, [62]={ ["type"]=16, @@ -947,7 +947,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="16" + ["icon"]="8" }, [63]={ ["type"]=16, @@ -962,7 +962,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="16" + ["icon"]="8" }, [64]={ ["type"]=17, @@ -977,7 +977,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="17" + ["icon"]="8" }, [65]={ ["type"]=17, @@ -992,7 +992,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="17" + ["icon"]="8" }, [66]={ ["type"]=17, @@ -1007,7 +1007,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="17" + ["icon"]="8" }, [67]={ ["type"]=17, @@ -1022,7 +1022,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="17" + ["icon"]="8" }, [68]={ ["type"]=18, @@ -1037,7 +1037,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="18" + ["icon"]="8" }, [69]={ ["type"]=18, @@ -1052,7 +1052,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="18" + ["icon"]="8" }, [70]={ ["type"]=18, @@ -1067,7 +1067,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="18" + ["icon"]="8" }, [71]={ ["type"]=18, @@ -1082,7 +1082,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="18" + ["icon"]="8" }, [72]={ ["type"]=19, @@ -1097,7 +1097,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="19" + ["icon"]="9" }, [73]={ ["type"]=19, @@ -1112,7 +1112,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="19" + ["icon"]="9" }, [74]={ ["type"]=19, @@ -1127,7 +1127,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="19" + ["icon"]="9" }, [75]={ ["type"]=19, @@ -1142,7 +1142,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="19" + ["icon"]="9" }, [76]={ ["type"]=2, @@ -1157,7 +1157,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="2" + ["icon"]="1" }, [77]={ ["type"]=3, @@ -1172,7 +1172,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="3" + ["icon"]="2" }, [78]={ ["type"]=5, @@ -1187,7 +1187,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="5" + ["icon"]="2" }, [79]={ ["type"]=6, @@ -1202,7 +1202,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="6" + ["icon"]="3" }, [80]={ ["type"]=7, @@ -1218,7 +1218,7 @@ local task = { } }, ["lock"]=10, - ["icon"]="7" + ["icon"]="4" }, [81]={ ["type"]=8, @@ -1234,7 +1234,7 @@ local task = { } }, ["lock"]=5, - ["icon"]="8" + ["icon"]="5" }, [82]={ ["type"]=9, @@ -1265,7 +1265,7 @@ local task = { } }, ["lock"]=4, - ["icon"]="10" + ["icon"]="7" }, [84]={ ["type"]=11, @@ -1281,7 +1281,7 @@ local task = { } }, ["lock"]=5, - ["icon"]="11" + ["icon"]="7" }, [85]={ ["type"]=12, @@ -1296,7 +1296,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="12" + ["icon"]="9" }, [86]={ ["type"]=13, @@ -1311,7 +1311,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="13" + ["icon"]="9" }, [87]={ ["type"]=14, @@ -1326,7 +1326,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="14" + ["icon"]="8" }, [88]={ ["type"]=15, @@ -1341,7 +1341,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="15" + ["icon"]="8" }, [89]={ ["type"]=16, @@ -1356,7 +1356,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="16" + ["icon"]="8" }, [90]={ ["type"]=17, @@ -1371,7 +1371,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="17" + ["icon"]="8" }, [91]={ ["type"]=18, @@ -1386,7 +1386,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="18" + ["icon"]="8" }, [92]={ ["type"]=19, @@ -1401,7 +1401,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="19" + ["icon"]="9" } } local config = { diff --git a/lua/app/config/task_daily_challenge.lua b/lua/app/config/task_daily_challenge.lua index d8eead79..36c5adba 100644 --- a/lua/app/config/task_daily_challenge.lua +++ b/lua/app/config/task_daily_challenge.lua @@ -112,7 +112,7 @@ local task_daily_challenge = { ["number"]=3 }, [6]={ - ["param"]=10, + ["param"]=1, ["reward"]={ { ["type"]=1, diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua index ecc3eecb..ee367a4b 100644 --- a/lua/app/config/tutorial.lua +++ b/lua/app/config/tutorial.lua @@ -43,8 +43,9 @@ local tutorial = { 13, 14, 24, - 34, - 44 + 33, + 44, + 45 } }, [10040]={ @@ -61,8 +62,7 @@ local tutorial = { 13, 14, 24, - 34, - 44 + 34 } }, [10060]={ @@ -78,8 +78,7 @@ local tutorial = { 13, 14, 24, - 34, - 44 + 34 } }, [20000]={ diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 9db26a45..763dde64 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -156,9 +156,11 @@ function BattleController:onLinkChange() end end - local aniSequence, influenceElementType, lineCount, elementTypeMap, linkElementType = self:calculateCurElimination(true) + if not self.atkTeam:getMainUnit().unitEntity:getActiveSkillLimit() then + local aniSequence, influenceElementType, lineCount, elementTypeMap, linkElementType = self:calculateCurElimination(true) + self.battleUI:refreshSkill(elementTypeMap, count > 0) + end - self.battleUI:refreshSkill(elementTypeMap, count > 0) if mainElementType then self.atkTeam:changeMainUnit(mainElementType) end @@ -910,7 +912,9 @@ function BattleController:onLinkOver() local aniSequence, influenceElementTypeMap, lineCount, elementTypeMap, linkElementType, effectGridMap = self:calculateCurElimination() - self.battleData:addSkillEnergy(elementTypeMap) + if not self.atkTeam:getMainUnit().unitEntity:getActiveSkillLimit() then + self.battleData:addSkillEnergy(elementTypeMap) + end self.battleData:clearGridSequence() self.battleUI:disableUITouch() self.battleUI:eliminationAni(aniSequence, effectGridMap, function() diff --git a/lua/app/module/battle/helper/battle_buff_special.lua b/lua/app/module/battle/helper/battle_buff_special.lua index 64967a97..76db1ebb 100644 --- a/lua/app/module/battle/helper/battle_buff_special.lua +++ b/lua/app/module/battle/helper/battle_buff_special.lua @@ -57,11 +57,17 @@ local function _undeadOff(buffSender, target, buff, buffEffect) end local function _imprisonOn(buffSender, buff, target, buffEffect) + if target.side == GConst.BattleConst.SIDE_ATK then + DataManager.BattleData:lockAllSkillGrid(true) + end target.unitEntity:addActiveSkillLimit(buff:getName()) return 1 end local function _imprisonOff(buffSender, target, buff, buffEffect) + if target.side == GConst.BattleConst.SIDE_ATK then + DataManager.BattleData:lockAllSkillGrid(false) + end target.unitEntity:removeActiveSkillLimit(buff:getName()) return 1 end diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index 96079779..9682aa24 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -532,7 +532,6 @@ function BattleTeam:setCentralizedAttack(centralizedAttack) end function BattleTeam:setIsFinalBlock(isFinalBlock) - Logger.logHighlight(isFinalBlock) if not self.isFinalBlock and not isFinalBlock then return end diff --git a/lua/app/userdata/battle/battle_data.lua b/lua/app/userdata/battle/battle_data.lua index 400ebf0a..3555f1d6 100644 --- a/lua/app/userdata/battle/battle_data.lua +++ b/lua/app/userdata/battle/battle_data.lua @@ -343,6 +343,22 @@ function BattleData:setGridType(posId, gridType) entity:determineIdleStatus() end +function BattleData:lockAllSkillGrid(lock) + if not self.gridEntities then + return + end + + for posId, entity in pairs(self.gridEntities) do + if entity:getSkillId() then + local gridType = GConst.BattleConst.GRID_TYPE.EMPTY + if lock then + gridType = GConst.BattleConst.GRID_TYPE.LOCK + end + self:setGridType(posId, gridType) + end + end +end + function BattleData:getSkillEntities() return self.skillMap end From fc16894571001ab7dd45bc8385c3ec3a20cac4e8 Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 26 May 2023 18:16:57 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E8=8B=B1=E9=9B=84=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/common/cell/hero_cell.lua | 2 ++ lua/app/ui/common/cell/large_hero_cell.lua | 10 ++++++---- lua/app/ui/common/cell/reward_cell.lua | 4 ++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lua/app/ui/common/cell/hero_cell.lua b/lua/app/ui/common/cell/hero_cell.lua index 26115ad3..2b27d96a 100644 --- a/lua/app/ui/common/cell/hero_cell.lua +++ b/lua/app/ui/common/cell/hero_cell.lua @@ -13,6 +13,7 @@ function HeroCell:init() self.unlockTx = uiMap["hero_cell.hero_bg.unlock_tx"] self.lvUpArrow = uiMap["hero_cell.hero_bg.effect_node.ui_spine_obj"] self.fragmenImg = uiMap["hero_cell.hero_bg.progress_bg.fragment_img"] + self.sImg = uiMap["hero_cell.hero_bg.s"] self.isGray = false self.baseObject:addClickListener(function() if self.clickCallback then @@ -91,6 +92,7 @@ function HeroCell:_refresh(heroInfo, isGray) self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO, tostring(heroInfo.icon)) self.matchImg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.HeroConst.MATCH_ICON_NAME[heroInfo.position]) self.check:setVisible(false) + self.sImg:setVisible(heroInfo.qlt >= 4) self:setGray(isGray) end diff --git a/lua/app/ui/common/cell/large_hero_cell.lua b/lua/app/ui/common/cell/large_hero_cell.lua index 2aa5520e..b09895f3 100644 --- a/lua/app/ui/common/cell/large_hero_cell.lua +++ b/lua/app/ui/common/cell/large_hero_cell.lua @@ -4,12 +4,13 @@ local OUT_SCREEN_X = 10000 function LargeHeroCell:init() local uiMap = self.baseObject:genAllChildren() - self.icon = uiMap["hero_cell.hero_bg.icon"] - self.heroBg = uiMap["hero_cell.hero_bg"] - self.check = uiMap["hero_cell.hero_bg.mask"] - self.matchImg = uiMap["hero_cell.hero_bg.match_img"] + self.icon = uiMap["large_hero_cell.hero_bg.icon"] + self.heroBg = uiMap["large_hero_cell.hero_bg"] + self.check = uiMap["large_hero_cell.hero_bg.mask"] + self.matchImg = uiMap["large_hero_cell.hero_bg.match_img"] self.infoBtnDesc = uiMap["large_hero_cell.hero_bg.info_btn.desc"] self.useBtnDesc = uiMap["large_hero_cell.hero_bg.use_btn.desc"] + self.sImg = uiMap["large_hero_cell.hero_bg.s"] self.isGray = false self.useBtnDesc:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_8)) @@ -61,6 +62,7 @@ function LargeHeroCell:_refresh(heroInfo, isGray) self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO, tostring(heroInfo.icon)) self.matchImg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.HeroConst.MATCH_ICON_NAME[heroInfo.position]) self.check:setVisible(false) + self.sImg:setVisible(heroInfo.qlt >= 4) self:setGray(isGray) end diff --git a/lua/app/ui/common/cell/reward_cell.lua b/lua/app/ui/common/cell/reward_cell.lua index 0e334896..f4d90475 100644 --- a/lua/app/ui/common/cell/reward_cell.lua +++ b/lua/app/ui/common/cell/reward_cell.lua @@ -9,6 +9,7 @@ function RewardCell:init() self.numTx = uiMap["reward_cell.item_bg.num"] self.fragment = uiMap["reward_cell.item_bg.fragment"] self.leftUpIcon = uiMap["reward_cell.item_bg.left_up_icon"] + self.sImg = uiMap["reward_cell.item_bg.s"] self.frameAni = uiMap["reward_cell.frame_ani"] self:hideFrameAnimation() self.baseObject:addClickListener(function() @@ -78,14 +79,17 @@ function RewardCell:_refreshItem(info, count) if heroInfo then self.icon:setLocalScale(0.86, 0.86, 0.86) self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO, heroInfo.icon) + self.sImg:setVisible(heroInfo.qlt >= 4) else self.icon:setSprite(GConst.ATLAS_PATH.COMMON, "common_alpha") + self.sImg:setVisible(false) end self.fragment:setVisible(true) else self.icon:setLocalScale(1, 1, 1) self.icon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon) self.fragment:setVisible(false) + self.sImg:setVisible(false) end end From 7cfdc4a2f1338f4d2dac98c5623dbc00c17bad6d Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 26 May 2023 18:47:31 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E5=A5=96=E5=8A=B1=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/bounty/cell/bounty_reward_cell.lua | 9 +++++++++ lua/app/ui/common/cell/reward_cell.lua | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/lua/app/ui/bounty/cell/bounty_reward_cell.lua b/lua/app/ui/bounty/cell/bounty_reward_cell.lua index 858902ec..5a449785 100644 --- a/lua/app/ui/bounty/cell/bounty_reward_cell.lua +++ b/lua/app/ui/bounty/cell/bounty_reward_cell.lua @@ -9,6 +9,8 @@ function BountyRewardCell:init() self.fragment = uiMap["bounty_reward_cell.fragment"] self.light = uiMap["bounty_reward_cell.light"] self.lock = uiMap["bounty_reward_cell.lock"] + self.matchImg = uiMap["bounty_reward_cell.match_img"] + self.sImg = uiMap["bounty_reward_cell.s"] self:hideLight() self.baseObject:addClickListener(function() @@ -52,14 +54,21 @@ function BountyRewardCell:_refreshItem(item) if heroInfo then self.icon:setLocalScale(0.86, 0.86, 0.86) self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO, heroInfo.icon) + self.matchImg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.HeroConst.MATCH_ICON_NAME[heroInfo.position]) + self.matchImg:setVisible(true) + self.sImg:setVisible(heroInfo.qlt >= 4) else self.icon:setSprite(GConst.ATLAS_PATH.COMMON, "common_alpha") + self.matchImg:setVisible(false) + self.sImg:setVisible(false) end self.fragment:setVisible(true) else self.icon:setLocalScale(1, 1, 1) self.icon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon) self.fragment:setVisible(false) + self.matchImg:setVisible(false) + self.sImg:setVisible(false) end end diff --git a/lua/app/ui/common/cell/reward_cell.lua b/lua/app/ui/common/cell/reward_cell.lua index f4d90475..83826aaf 100644 --- a/lua/app/ui/common/cell/reward_cell.lua +++ b/lua/app/ui/common/cell/reward_cell.lua @@ -10,6 +10,7 @@ function RewardCell:init() self.fragment = uiMap["reward_cell.item_bg.fragment"] self.leftUpIcon = uiMap["reward_cell.item_bg.left_up_icon"] self.sImg = uiMap["reward_cell.item_bg.s"] + self.matchImg = uiMap["reward_cell.item_bg.match_img"] self.frameAni = uiMap["reward_cell.frame_ani"] self:hideFrameAnimation() self.baseObject:addClickListener(function() @@ -80,9 +81,12 @@ function RewardCell:_refreshItem(info, count) self.icon:setLocalScale(0.86, 0.86, 0.86) self.icon:setSprite(GConst.ATLAS_PATH.ICON_HERO, heroInfo.icon) self.sImg:setVisible(heroInfo.qlt >= 4) + self.matchImg:setVisible(true) + self.matchImg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.HeroConst.MATCH_ICON_NAME[heroInfo.position]) else self.icon:setSprite(GConst.ATLAS_PATH.COMMON, "common_alpha") self.sImg:setVisible(false) + self.matchImg:setVisible(false) end self.fragment:setVisible(true) else @@ -90,6 +94,7 @@ function RewardCell:_refreshItem(info, count) self.icon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon) self.fragment:setVisible(false) self.sImg:setVisible(false) + self.matchImg:setVisible(false) end end From dc96cf269e193416b70f8a7fbf667fd5d2ed76ee Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 26 May 2023 19:25:41 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BE=A7=E6=A0=87?= =?UTF-8?q?=E6=A0=8F=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/main_city/main_city_ui.lua | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 5229aa6f..a5e20f6c 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -2,6 +2,10 @@ local UIPrefabObject = require "app/bf/unity/uiprefab_object" local MainCityUI = class("MainCityUI", BaseUI) +local SIDE_BAR_BORDER_OFFSET = 12 +local SIDE_BAR_INTERVAL = 14 +local SIDE_BAR_ARROW_INTERVAL = 20 + local BF_UI_HELPER = GConst.TYPEOF_UNITY_CLASS.BF_UI_HELPER local HERO_COMP = "app/ui/hero/hero_comp" local MAIN_COMP = "app/ui/main_city/component/main_comp" @@ -380,14 +384,14 @@ function MainCityUI:refreshLeftBtns() return end self.leftNode:setAnchoredPositionX(0) - local y = - 2 - self.sideBarHeight/2 + local y = -SIDE_BAR_BORDER_OFFSET - self.sideBarHeight/2 if isClose then -- 只显示一个 local first = self.leftBarList[1] first:setAnchoredPositionY(y) first:setVisible(true) first:setActive(true) first:refresh() - y = y - self.sideBarHeight - 2 + y = y - self.sideBarHeight - SIDE_BAR_INTERVAL for i = 2, #self.leftBarList do self.leftBarList[i]:setVisible(false) self.leftBarList[i]:setActive(true) @@ -399,12 +403,14 @@ function MainCityUI:refreshLeftBtns() v:setVisible(true) v:setActive(true) v:refresh() - y = y - self.sideBarHeight - 2 + y = y - self.sideBarHeight - SIDE_BAR_INTERVAL end end + local arrowHeight = self.leftArrowBtn:getRectHeight() + y = y + self.sideBarHeight/2 - SIDE_BAR_ARROW_INTERVAL - arrowHeight self.leftSideBar:setSizeDeltaY(-y) self.leftArrowImg:setLocalScale(1, isClose and -1 or 1, 1) - self.leftArrowBtn:setAnchoredPositionY(self.leftSideBar:fastGetAnchoredPositionY() + y + 20) + self.leftArrowBtn:setAnchoredPositionY(self.leftSideBar:fastGetAnchoredPositionY() + y + arrowHeight/2 + SIDE_BAR_BORDER_OFFSET) end function MainCityUI:openOrCloseRightSideBar() @@ -445,14 +451,14 @@ function MainCityUI:refreshRightBtns() return end self.rightNode:setAnchoredPositionX(0) - local y = -2 - self.sideBarHeight/2 + local y = -SIDE_BAR_BORDER_OFFSET - self.sideBarHeight/2 if isClose then -- 只显示一个 local first = self.rightBarList[1] first:setAnchoredPositionY(y) first:setVisible(true) first:setActive(true) first:refresh() - y = y - self.sideBarHeight - 2 + y = y - self.sideBarHeight - SIDE_BAR_INTERVAL for i = 2, #self.rightBarList do self.rightBarList[i]:setVisible(false) self.rightBarList[i]:setActive(true) @@ -464,12 +470,14 @@ function MainCityUI:refreshRightBtns() v:setVisible(true) v:setActive(true) v:refresh() - y = y - self.sideBarHeight - 2 + y = y - self.sideBarHeight - SIDE_BAR_INTERVAL end end + local arrowHeight = self.rightArrowBtn:getRectHeight() + y = y + self.sideBarHeight / 2 - SIDE_BAR_ARROW_INTERVAL - arrowHeight self.rightSideBar:setSizeDeltaY(-y) self.rightArrowImg:setLocalScale(1, isClose and -1 or 1, 1) - self.rightArrowBtn:setAnchoredPositionY(self.rightSideBar:fastGetAnchoredPositionY() + y + 20) + self.rightArrowBtn:setAnchoredPositionY(self.rightSideBar:fastGetAnchoredPositionY() + y + arrowHeight/2 + SIDE_BAR_BORDER_OFFSET) end function MainCityUI:clearSideBarList(sideBarList) From 905cf03f741b04ba68114ef940c28bfa566df086 Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 26 May 2023 19:44:55 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/chapter.lua | 2826 +++++++---------- lua/app/config/chapter_board.lua | 310 +- lua/app/config/const.lua | 11 +- lua/app/config/hero.lua | 44 +- .../localization_global_const.lua | 1 + lua/app/config/monster_base.lua | 338 +- lua/app/config/monster_chapter.lua | 6 +- lua/app/config/skill.lua | 144 +- lua/app/config/skill_rogue.lua | 51 +- lua/app/config/strings/cn/buff.lua | 2 +- lua/app/config/strings/cn/global.lua | 1 + lua/app/config/strings/cn/item.lua | 40 +- lua/app/config/strings/cn/monster_base.lua | 20 +- lua/app/config/strings/cn/skill.lua | 4 +- lua/app/config/strings/cn/skill_rogue.lua | 50 +- lua/app/config/strings/de/monster_base.lua | 20 +- lua/app/config/strings/en/monster_base.lua | 20 +- lua/app/config/strings/fr/monster_base.lua | 20 +- lua/app/config/strings/id/monster_base.lua | 20 +- lua/app/config/strings/ja/monster_base.lua | 20 +- lua/app/config/strings/ko/monster_base.lua | 20 +- lua/app/config/strings/pt/monster_base.lua | 20 +- lua/app/config/strings/ru/monster_base.lua | 20 +- lua/app/config/strings/th/monster_base.lua | 20 +- lua/app/config/strings/vi/monster_base.lua | 20 +- lua/app/config/strings/zh/monster_base.lua | 20 +- 26 files changed, 1980 insertions(+), 2088 deletions(-) diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index e1b15a17..9bd76357 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -97,22 +97,24 @@ local chapter = { ["id_for_nothing"]="VwpcA2Q=", ["num"]=3, ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } }, - ["idle_exp"]=10, - ["idle_gold"]=10, + ["idle_exp"]=5, + ["idle_gold"]=6, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=55 - }, - { - ["type"]=1, - ["id"]=5, - ["num"]=1, - ["weight"]=5 + ["weight"]=28 } }, ["daily_challenge_difficulty"]={ @@ -168,8 +170,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=6, - ["num_for_nothing"]="UA==" + ["num"]=8, + ["num_for_nothing"]="Xg==" }, { ["type"]=1, @@ -194,8 +196,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=6, - ["num_for_nothing"]="UA==" + ["num"]=8, + ["num_for_nothing"]="Xg==" }, { ["type"]=1, @@ -207,14 +209,6 @@ local chapter = { } }, ["finish_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -236,6 +230,14 @@ local chapter = { ["id_for_nothing"]="VApcA2Q=", ["num"]=5, ["num_for_nothing"]="Uw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_reward_2"]={ @@ -250,26 +252,20 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" } }, - ["idle_exp"]=11, - ["idle_gold"]=11, + ["idle_exp"]=6, + ["idle_gold"]=6, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=55 - }, - { - ["type"]=1, - ["id"]=5, - ["num"]=1, - ["weight"]=5 + ["weight"]=28 } }, ["daily_challenge_difficulty"]={ @@ -312,8 +308,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, @@ -338,8 +334,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, @@ -359,14 +355,6 @@ local chapter = { } }, ["finish_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -386,16 +374,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_reward_2"]={ @@ -404,40 +392,26 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" } }, - ["idle_exp"]=12, - ["idle_gold"]=12, + ["idle_exp"]=6, + ["idle_gold"]=7, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=55 - }, - { - ["type"]=1, - ["id"]=5, - ["num"]=1, - ["weight"]=5 + ["weight"]=28 } }, ["daily_challenge_difficulty"]={ @@ -480,22 +454,48 @@ local chapter = { 4901, 5001 }, + ["mystery_box"]={ + 1, + 3 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, ["wave_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -512,16 +512,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -533,21 +533,13 @@ local chapter = { } }, ["finish_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_num"]={ @@ -561,8 +553,26 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + } + }, + ["box_reward_2"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, @@ -573,72 +583,32 @@ local chapter = { ["num_for_nothing"]="VwhcAw==" } }, - ["box_reward_2"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=25, - ["num_for_nothing"]="VA0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" - } - }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=43001, - ["id_for_nothing"]="UgtcA2Q=", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", ["num"]=3, ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" } }, - ["idle_exp"]=13, - ["idle_gold"]=13, + ["idle_exp"]=7, + ["idle_gold"]=7, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=55 - }, - { - ["type"]=1, - ["id"]=5, - ["num"]=1, - ["weight"]=5 + ["weight"]=28 } }, ["daily_challenge_difficulty"]={ @@ -681,22 +651,48 @@ local chapter = { 6901, 7001 }, + ["mystery_box"]={ + 2, + 3 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, ["wave_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -713,16 +709,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -734,21 +730,13 @@ local chapter = { } }, ["finish_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=30, - ["num_for_nothing"]="VQg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=4000, - ["num_for_nothing"]="UghcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_num"]={ @@ -762,16 +750,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_reward_2"]={ @@ -780,66 +768,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=5, ["num_for_nothing"]="Uw==" - } - }, - ["box_reward_3"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, - ["idle_exp"]=14, - ["idle_gold"]=14, + ["box_reward_3"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["idle_exp"]=7, + ["idle_gold"]=8, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=55 + ["weight"]=28 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=5 + ["weight"]=2 } }, ["daily_challenge_difficulty"]={ @@ -882,22 +854,48 @@ local chapter = { 8901, 9001 }, + ["mystery_box"]={ + 1, + 4 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, ["wave_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -914,16 +912,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -935,21 +933,13 @@ local chapter = { } }, ["finish_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=600, + ["num_for_nothing"]="UAhc" } }, ["box_num"]={ @@ -963,84 +953,68 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" - } - }, - ["box_reward_3"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=23001, - ["id_for_nothing"]="VAtcA2Q=", + ["id"]=4, + ["id_for_nothing"]="Ug==", ["num"]=5, ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["box_reward_3"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=25000, - ["num_for_nothing"]="VA1cA2U=" + ["id"]=43001, + ["id_for_nothing"]="UgtcA2Q=", + ["num"]=5, + ["num_for_nothing"]="Uw==" } }, - ["idle_exp"]=15, - ["idle_gold"]=15, + ["idle_exp"]=8, + ["idle_gold"]=8, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=50 + ["weight"]=25 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=10 + ["weight"]=5 } }, ["daily_challenge_difficulty"]={ @@ -1083,20 +1057,38 @@ local chapter = { 10901, 11001 }, + ["mystery_box"]={ + 2, + 3 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, ["wave_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -1105,8 +1097,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -1123,8 +1115,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -1139,8 +1131,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -1155,18 +1147,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=600, + ["num_for_nothing"]="UAhc" } }, ["box_num"]={ @@ -1180,84 +1172,68 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=75, - ["num_for_nothing"]="UQ0=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=8000, - ["num_for_nothing"]="XghcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", ["num"]=5, ["num_for_nothing"]="Uw==" }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=12000, - ["num_for_nothing"]="VwpcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=16, - ["idle_gold"]=16, + ["idle_exp"]=8, + ["idle_gold"]=9, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=50 + ["weight"]=25 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=10 + ["weight"]=5 } }, ["daily_challenge_difficulty"]={ @@ -1300,20 +1276,38 @@ local chapter = { 12901, 13001 }, + ["mystery_box"]={ + 1, + 4 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, ["wave_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -1322,8 +1316,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -1340,8 +1334,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -1356,8 +1350,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -1372,18 +1366,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=600, + ["num_for_nothing"]="UAhc" } }, ["box_num"]={ @@ -1397,84 +1391,68 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=15000, - ["num_for_nothing"]="Vw1cA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=33001, - ["id_for_nothing"]="VQtcA2Q=", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=40000, - ["num_for_nothing"]="UghcA2U=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" } }, - ["idle_exp"]=17, - ["idle_gold"]=17, + ["idle_exp"]=9, + ["idle_gold"]=9, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=50 + ["weight"]=25 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=10 + ["weight"]=5 } }, ["daily_challenge_difficulty"]={ @@ -1517,20 +1495,38 @@ local chapter = { 14901, 15001 }, + ["mystery_box"]={ + 3, + 4 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, ["wave_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -1539,8 +1535,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -1557,8 +1553,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -1573,8 +1569,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, @@ -1589,18 +1585,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=600, + ["num_for_nothing"]="UAhc" } }, ["box_num"]={ @@ -1614,84 +1610,68 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=150, - ["num_for_nothing"]="Vw1c" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=15000, - ["num_for_nothing"]="Vw1cA2U=" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=25, + ["num_for_nothing"]="VA0=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=50000, - ["num_for_nothing"]="UwhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=18, - ["idle_gold"]=18, + ["idle_exp"]=9, + ["idle_gold"]=10, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=50 + ["weight"]=25 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=10 + ["weight"]=5 } }, ["daily_challenge_difficulty"]={ @@ -1734,20 +1714,38 @@ local chapter = { 16901, 17001 }, + ["mystery_box"]={ + 2, + 3 + }, + ["mystery_box_reward"]={ + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + }, + { + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, ["wave_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -1756,8 +1754,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -1774,8 +1772,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -1790,8 +1788,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -1806,18 +1804,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=600, + ["num_for_nothing"]="UAhc" } }, ["box_num"]={ @@ -1831,84 +1829,68 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=14, + ["id_for_nothing"]="Vww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=19, - ["idle_gold"]=19, + ["idle_exp"]=10, + ["idle_gold"]=10, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=50 + ["weight"]=25 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=10 + ["weight"]=5 } }, ["daily_challenge_difficulty"]={ @@ -1983,14 +1965,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -1999,8 +1973,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -2017,8 +1991,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -2033,8 +2007,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -2049,18 +2023,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=700, + ["num_for_nothing"]="UQhc" } }, ["box_num"]={ @@ -2074,16 +2048,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -2092,66 +2066,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=20, - ["idle_gold"]=20, + ["idle_exp"]=10, + ["idle_gold"]=11, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=45 + ["weight"]=23 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=15 + ["weight"]=7 } }, ["daily_challenge_difficulty"]={ @@ -2226,14 +2184,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -2242,8 +2192,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -2260,8 +2210,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -2276,8 +2226,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -2292,18 +2242,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=700, + ["num_for_nothing"]="UQhc" } }, ["box_num"]={ @@ -2317,16 +2267,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -2335,66 +2285,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=21, - ["idle_gold"]=21, + ["idle_exp"]=12, + ["idle_gold"]=11, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=45 + ["weight"]=23 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=15 + ["weight"]=7 } }, ["daily_challenge_difficulty"]={ @@ -2469,14 +2403,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -2485,8 +2411,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -2503,8 +2429,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -2519,8 +2445,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -2535,18 +2461,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=700, + ["num_for_nothing"]="UQhc" } }, ["box_num"]={ @@ -2560,16 +2486,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -2578,66 +2504,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=22, - ["idle_gold"]=22, + ["idle_exp"]=12, + ["idle_gold"]=12, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=45 + ["weight"]=23 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=15 + ["weight"]=7 } }, ["daily_challenge_difficulty"]={ @@ -2712,14 +2622,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -2728,8 +2630,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -2746,8 +2648,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -2762,8 +2664,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -2778,18 +2680,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=700, + ["num_for_nothing"]="UQhc" } }, ["box_num"]={ @@ -2803,16 +2705,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -2821,66 +2723,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=23, - ["idle_gold"]=23, + ["idle_exp"]=14, + ["idle_gold"]=12, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=45 + ["weight"]=23 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=15 + ["weight"]=7 } }, ["daily_challenge_difficulty"]={ @@ -2955,14 +2841,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -2971,8 +2849,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -2989,8 +2867,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -3005,8 +2883,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -3021,18 +2899,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=700, + ["num_for_nothing"]="UQhc" } }, ["box_num"]={ @@ -3046,16 +2924,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -3064,66 +2942,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=24, - ["idle_gold"]=24, + ["idle_exp"]=14, + ["idle_gold"]=13, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=45 + ["weight"]=23 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=15 + ["weight"]=7 } }, ["daily_challenge_difficulty"]={ @@ -3198,14 +3060,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3214,8 +3068,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -3232,8 +3086,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -3248,8 +3102,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -3264,18 +3118,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=800, + ["num_for_nothing"]="Xghc" } }, ["box_num"]={ @@ -3289,16 +3143,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -3307,66 +3161,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=27, - ["idle_gold"]=26, + ["idle_exp"]=16, + ["idle_gold"]=13, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=40 + ["weight"]=20 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=20 + ["weight"]=10 } }, ["daily_challenge_difficulty"]={ @@ -3441,14 +3279,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3457,8 +3287,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -3475,8 +3305,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -3491,8 +3321,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -3507,18 +3337,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=800, + ["num_for_nothing"]="Xghc" } }, ["box_num"]={ @@ -3532,16 +3362,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -3550,66 +3380,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=30, - ["idle_gold"]=28, + ["idle_exp"]=16, + ["idle_gold"]=14, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=40 + ["weight"]=20 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=20 + ["weight"]=10 } }, ["daily_challenge_difficulty"]={ @@ -3684,14 +3498,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3700,8 +3506,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -3718,8 +3524,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -3734,8 +3540,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -3750,18 +3556,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=800, + ["num_for_nothing"]="Xghc" } }, ["box_num"]={ @@ -3775,16 +3581,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -3793,66 +3599,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=33, - ["idle_gold"]=30, + ["idle_exp"]=18, + ["idle_gold"]=14, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=40 + ["weight"]=20 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=20 + ["weight"]=10 } }, ["daily_challenge_difficulty"]={ @@ -3927,14 +3717,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3943,8 +3725,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -3961,8 +3743,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -3977,8 +3759,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -3993,18 +3775,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=800, + ["num_for_nothing"]="Xghc" } }, ["box_num"]={ @@ -4018,16 +3800,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -4036,66 +3818,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=36, - ["idle_gold"]=32, + ["idle_exp"]=18, + ["idle_gold"]=15, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=40 + ["weight"]=20 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=20 + ["weight"]=10 } }, ["daily_challenge_difficulty"]={ @@ -4170,14 +3936,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -4186,8 +3944,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -4204,8 +3962,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -4220,8 +3978,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, @@ -4236,18 +3994,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=800, + ["num_for_nothing"]="Xghc" } }, ["box_num"]={ @@ -4261,16 +4019,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ @@ -4279,66 +4037,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=14, + ["id_for_nothing"]="Vww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=39, - ["idle_gold"]=34, + ["idle_exp"]=20, + ["idle_gold"]=15, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=40 + ["weight"]=20 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=20 + ["weight"]=10 } }, ["daily_challenge_difficulty"]={ @@ -4390,10 +4132,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -4413,14 +4155,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -4429,8 +4163,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -4447,8 +4181,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -4463,8 +4197,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -4479,18 +4213,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=900, + ["num_for_nothing"]="Xwhc" } }, ["box_num"]={ @@ -4504,16 +4238,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -4522,66 +4256,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=42, - ["idle_gold"]=36, + ["idle_exp"]=20, + ["idle_gold"]=16, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=35 + ["weight"]=18 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=25 + ["weight"]=12 } }, ["daily_challenge_difficulty"]={ @@ -4633,10 +4351,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -4656,14 +4374,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -4672,8 +4382,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -4690,8 +4400,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -4706,8 +4416,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -4722,18 +4432,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=900, + ["num_for_nothing"]="Xwhc" } }, ["box_num"]={ @@ -4747,16 +4457,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -4765,66 +4475,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=45, - ["idle_gold"]=38, + ["idle_exp"]=22, + ["idle_gold"]=16, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=35 + ["weight"]=18 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=25 + ["weight"]=12 } }, ["daily_challenge_difficulty"]={ @@ -4876,10 +4570,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -4899,14 +4593,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -4915,8 +4601,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -4933,8 +4619,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -4949,8 +4635,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -4965,18 +4651,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=900, + ["num_for_nothing"]="Xwhc" } }, ["box_num"]={ @@ -4990,16 +4676,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -5008,66 +4694,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=48, - ["idle_gold"]=40, + ["idle_exp"]=22, + ["idle_gold"]=17, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=35 + ["weight"]=18 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=25 + ["weight"]=12 } }, ["daily_challenge_difficulty"]={ @@ -5119,10 +4789,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -5142,14 +4812,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -5158,8 +4820,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -5176,8 +4838,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -5192,8 +4854,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -5208,18 +4870,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=900, + ["num_for_nothing"]="Xwhc" } }, ["box_num"]={ @@ -5233,16 +4895,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -5251,66 +4913,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=51, - ["idle_gold"]=42, + ["idle_exp"]=24, + ["idle_gold"]=17, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=35 + ["weight"]=18 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=25 + ["weight"]=12 } }, ["daily_challenge_difficulty"]={ @@ -5362,10 +5008,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -5385,14 +5031,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -5401,8 +5039,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -5419,8 +5057,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -5435,8 +5073,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -5451,18 +5089,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=900, + ["num_for_nothing"]="Xwhc" } }, ["box_num"]={ @@ -5476,16 +5114,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -5494,66 +5132,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=54, - ["idle_gold"]=44, + ["idle_exp"]=24, + ["idle_gold"]=18, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=35 + ["weight"]=18 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=25 + ["weight"]=12 } }, ["daily_challenge_difficulty"]={ @@ -5605,10 +5227,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -5628,14 +5250,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -5644,8 +5258,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -5662,8 +5276,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -5678,8 +5292,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -5694,18 +5308,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_num"]={ @@ -5719,16 +5333,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -5737,66 +5351,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=57, - ["idle_gold"]=46, + ["idle_exp"]=26, + ["idle_gold"]=18, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=30 + ["weight"]=15 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=30 + ["weight"]=15 } }, ["daily_challenge_difficulty"]={ @@ -5848,10 +5446,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -5871,14 +5469,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -5887,8 +5477,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -5905,8 +5495,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -5921,8 +5511,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -5937,18 +5527,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_num"]={ @@ -5962,16 +5552,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -5980,66 +5570,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=60, - ["idle_gold"]=48, + ["idle_exp"]=26, + ["idle_gold"]=19, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=30 + ["weight"]=15 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=30 + ["weight"]=15 } }, ["daily_challenge_difficulty"]={ @@ -6091,10 +5665,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -6114,14 +5688,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -6130,8 +5696,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -6148,8 +5714,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -6164,8 +5730,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -6180,18 +5746,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_num"]={ @@ -6205,16 +5771,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -6223,66 +5789,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=63, - ["idle_gold"]=50, + ["idle_exp"]=28, + ["idle_gold"]=19, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=30 + ["weight"]=15 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=30 + ["weight"]=15 } }, ["daily_challenge_difficulty"]={ @@ -6334,10 +5884,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -6357,14 +5907,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -6373,8 +5915,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -6391,8 +5933,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -6407,8 +5949,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -6423,18 +5965,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_num"]={ @@ -6448,16 +5990,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -6466,66 +6008,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=66, - ["idle_gold"]=52, + ["idle_exp"]=28, + ["idle_gold"]=20, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=30 + ["weight"]=15 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=30 + ["weight"]=15 } }, ["daily_challenge_difficulty"]={ @@ -6576,10 +6102,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, { @@ -6599,14 +6125,6 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -6615,8 +6133,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -6633,8 +6151,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, @@ -6649,8 +6167,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=35, + ["num_for_nothing"]="VQ0=" }, { ["type"]=1, @@ -6665,18 +6183,18 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_num"]={ @@ -6690,16 +6208,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_2"]={ @@ -6708,66 +6226,50 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=15, - ["num_for_nothing"]="Vw0=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["id"]=14, + ["id_for_nothing"]="Vww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, - ["idle_exp"]=69, - ["idle_gold"]=54, + ["idle_exp"]=30, + ["idle_gold"]=20, ["idle_drop"]={ { ["type"]=1, ["id"]=4, ["num"]=1, - ["weight"]=30 + ["weight"]=15 }, { ["type"]=1, ["id"]=5, ["num"]=1, - ["weight"]=30 + ["weight"]=15 } }, ["daily_challenge_difficulty"]={ diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index 01561188..ca0dcc85 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -626,35 +626,7 @@ local chapter_board = { }, { 0, - 1 - }, - { - 0, - 2 - }, - { - 0, - 1 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 0, - 2 + 3 }, { 0, @@ -676,6 +648,34 @@ local chapter_board = { 1, 0 }, + { + 3, + 0 + }, + { + 0, + 1 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 3, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 2, 0 @@ -686,7 +686,7 @@ local chapter_board = { }, { 0, - 2 + 5 }, { 3, @@ -700,106 +700,106 @@ local chapter_board = { 1, 0 }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 0, + 5 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 2, + 0 + }, + { + 0, + 5 + }, + { + 2, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 14, 0 }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 14, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 3, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 3, - 0 - }, { 1, 0 @@ -873,7 +873,7 @@ local chapter_board = { 0 }, { - 14, + 3, 0 }, { @@ -897,11 +897,11 @@ local chapter_board = { 0 }, { - 14, + 3, 0 }, { - 3, + 2, 0 }, { @@ -925,7 +925,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -933,7 +933,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -949,7 +949,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -957,7 +957,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -981,7 +981,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -1026,7 +1026,7 @@ local chapter_board = { }, { 0, - 1 + 5 }, { 0, @@ -1034,7 +1034,7 @@ local chapter_board = { }, { 0, - 1 + 5 }, { 1, @@ -1082,15 +1082,15 @@ local chapter_board = { }, { 0, - 1 + 5 }, { 2, - 0 + 3 }, { 0, - 1 + 5 }, { 2, @@ -1108,6 +1108,10 @@ local chapter_board = { 3, 0 }, + { + 2, + 0 + }, { 3, 0 @@ -1120,6 +1124,10 @@ local chapter_board = { 3, 0 }, + { + 2, + 0 + }, { 3, 0 @@ -1128,6 +1136,10 @@ local chapter_board = { 2, 0 }, + { + 3, + 0 + }, { 14, 0 @@ -1137,25 +1149,13 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { 3, 0 }, - { - 3, - 0 - }, - { - 3, - 0 - }, - { - 14, - 0 - }, { 1, 0 @@ -1165,7 +1165,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -1173,7 +1173,7 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { @@ -1197,7 +1197,7 @@ local chapter_board = { 0 }, { - 14, + 2, 0 }, { diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index 4a3e0215..0368c592 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -105,13 +105,13 @@ local const = { ["value"]=57600 }, ["idle_exp_drop_time"]={ - ["value"]=1200 + ["value"]=600 }, ["idle_gold_drop_time"]={ - ["value"]=1200 + ["value"]=600 }, ["idle_item_drop_time"]={ - ["value"]=1200 + ["value"]=600 }, ["idle_drop_fast_times_1"]={ ["value"]=2 @@ -188,9 +188,12 @@ local const = { }, ["act_sevenday_time"]={ ["value"]=7 + }, + ["model_daily_challenge"]={ + ["value"]=8000 } } local config = { -data=const,count=40 +data=const,count=41 } return config \ No newline at end of file diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index 41d8d6a9..5cb6d0b6 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -53,7 +53,7 @@ local hero = { 5490000 }, ["model_id"]="p0005", - ["icon"]="5", + ["icon"]="1", ["item_id"]=12001, ["unlock_chapter"]=1 }, @@ -111,7 +111,7 @@ local hero = { 5490000 }, ["model_id"]="p0014", - ["icon"]="5", + ["icon"]="6", ["item_id"]=13001, ["unlock_chapter"]=3, ["is_show"]=1 @@ -170,7 +170,7 @@ local hero = { 5490000 }, ["model_id"]="p0009", - ["icon"]="5", + ["icon"]="11", ["item_id"]=13002, ["unlock_chapter"]=3, ["is_show"]=1 @@ -229,7 +229,7 @@ local hero = { 5490000 }, ["model_id"]="p0011", - ["icon"]="5", + ["icon"]="16", ["item_id"]=14001, ["unlock_chapter"]=3, ["is_show"]=1 @@ -346,7 +346,7 @@ local hero = { 5490000 }, ["model_id"]="p0010", - ["icon"]="5", + ["icon"]="12", ["item_id"]=23001, ["unlock_chapter"]=3, ["is_show"]=1 @@ -405,7 +405,7 @@ local hero = { 5490000 }, ["model_id"]="p0012", - ["icon"]="5", + ["icon"]="7", ["item_id"]=23002, ["unlock_chapter"]=3, ["is_show"]=1 @@ -464,7 +464,7 @@ local hero = { 5490000 }, ["model_id"]="p0007", - ["icon"]="7", + ["icon"]="17", ["item_id"]=24001, ["unlock_chapter"]=3, ["is_show"]=1 @@ -523,7 +523,7 @@ local hero = { 5490000 }, ["model_id"]="p0001", - ["icon"]="1", + ["icon"]="3", ["item_id"]=32001, ["unlock_chapter"]=1 }, @@ -581,7 +581,7 @@ local hero = { 5490000 }, ["model_id"]="p0006", - ["icon"]="6", + ["icon"]="8", ["item_id"]=33001, ["unlock_chapter"]=3, ["is_show"]=1 @@ -639,8 +639,8 @@ local hero = { 4920000, 5490000 }, - ["model_id"]="p0006", - ["icon"]="6", + ["model_id"]="p0020", + ["icon"]="13", ["item_id"]=33002, ["unlock_chapter"]=3, ["is_show"]=1 @@ -698,8 +698,8 @@ local hero = { 4920000, 5490000 }, - ["model_id"]="p0006", - ["icon"]="6", + ["model_id"]="p0016", + ["icon"]="18", ["item_id"]=34001, ["unlock_chapter"]=3, ["is_show"]=1 @@ -758,7 +758,7 @@ local hero = { 5490000 }, ["model_id"]="p0003", - ["icon"]="3", + ["icon"]="4", ["item_id"]=42001, ["unlock_chapter"]=1 }, @@ -815,8 +815,8 @@ local hero = { 4920000, 5490000 }, - ["model_id"]="p0003", - ["icon"]="3", + ["model_id"]="p0022", + ["icon"]="9", ["item_id"]=43001, ["unlock_chapter"]=3, ["is_show"]=1 @@ -875,7 +875,7 @@ local hero = { 5490000 }, ["model_id"]="p0003", - ["icon"]="3", + ["icon"]="14", ["item_id"]=43002, ["unlock_chapter"]=3, ["is_show"]=1 @@ -934,7 +934,7 @@ local hero = { 5490000 }, ["model_id"]="p0008", - ["icon"]="8", + ["icon"]="19", ["item_id"]=44001, ["unlock_chapter"]=3, ["is_show"]=1 @@ -993,7 +993,7 @@ local hero = { 5490000 }, ["model_id"]="p0004", - ["icon"]="4", + ["icon"]="5", ["item_id"]=52001, ["unlock_chapter"]=1 }, @@ -1051,7 +1051,7 @@ local hero = { 5490000 }, ["model_id"]="p0015", - ["icon"]="4", + ["icon"]="10", ["item_id"]=53001, ["unlock_chapter"]=3, ["is_show"]=1 @@ -1110,7 +1110,7 @@ local hero = { 5490000 }, ["model_id"]="p0004", - ["icon"]="4", + ["icon"]="15", ["item_id"]=53002, ["unlock_chapter"]=3, ["is_show"]=1 @@ -1169,7 +1169,7 @@ local hero = { 5490000 }, ["model_id"]="p0004", - ["icon"]="4", + ["icon"]="20", ["item_id"]=54001, ["unlock_chapter"]=3, ["is_show"]=1 diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 64a01e7b..30f40594 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -144,6 +144,7 @@ local LocalizationGlobalConst = DAY_X_UNLOCK = "DAY_X_UNLOCK", SEVEN_DAY_DESC_2 = "SEVEN_DAY_DESC_2", FUNC_UNLOCK = "FUNC_UNLOCK", + MAIN_BTN_3 = "MAIN_BTN_3", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/monster_base.lua b/lua/app/config/monster_base.lua index 11862c10..75649dc4 100644 --- a/lua/app/config/monster_base.lua +++ b/lua/app/config/monster_base.lua @@ -1,414 +1,546 @@ local monster_base = { [10001]={ ["model_id"]="m10001", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10002]={ ["model_id"]="m10002", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10003]={ ["model_id"]="m10003", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10004]={ ["model_id"]="m10004", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10005]={ ["model_id"]="m10005", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10006]={ ["model_id"]="m10006", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10007]={ ["model_id"]="m10007", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10008]={ ["model_id"]="m10008", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10009]={ ["model_id"]="m10009", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10010]={ ["model_id"]="m10010", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10012]={ ["model_id"]="m10012", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10013]={ ["model_id"]="m10013", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10014]={ ["model_id"]="m10014", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10015]={ ["model_id"]="m10015", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10016]={ ["model_id"]="m10016", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10017]={ ["model_id"]="m10017", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10018]={ ["model_id"]="m10018", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10019]={ ["model_id"]="m10019", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10020]={ ["model_id"]="m10020", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10021]={ ["model_id"]="m10021", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10022]={ ["model_id"]="m10022", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10023]={ ["model_id"]="m10023", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10024]={ ["model_id"]="m10024", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10025]={ ["model_id"]="m10025", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10026]={ ["model_id"]="m10026", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10027]={ ["model_id"]="m10027", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10028]={ ["model_id"]="m10028", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10029]={ ["model_id"]="m10029", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10030]={ ["model_id"]="m10030", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10031]={ ["model_id"]="m10031", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10032]={ ["model_id"]="m10032", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10033]={ ["model_id"]="m10033", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10034]={ ["model_id"]="m10034", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10035]={ ["model_id"]="m10035", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10036]={ ["model_id"]="m10036", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10037]={ ["model_id"]="m10037", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10038]={ ["model_id"]="m10038", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10039]={ ["model_id"]="m10039", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10040]={ ["model_id"]="m10040", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10041]={ ["model_id"]="m10041", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10042]={ ["model_id"]="m10042", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10043]={ ["model_id"]="m10043", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10044]={ ["model_id"]="m10044", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10045]={ ["model_id"]="m10045", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10046]={ ["model_id"]="m10046", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10047]={ ["model_id"]="m10047", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10048]={ ["model_id"]="m10048", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10049]={ ["model_id"]="m10049", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10050]={ ["model_id"]="m10050", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10051]={ ["model_id"]="m10051", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10052]={ ["model_id"]="m10052", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10053]={ ["model_id"]="m10053", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10054]={ ["model_id"]="m10054", - ["body"]=3 + ["body"]=3, + ["model_ui"]=1.0 }, [10055]={ ["model_id"]="m10055", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10056]={ ["model_id"]="m10056", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10057]={ ["model_id"]="m10057", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10058]={ ["model_id"]="m10058", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [10059]={ ["model_id"]="m10059", - ["body"]=2 + ["body"]=2, + ["model_ui"]=1.0 }, [20001]={ ["model_id"]="m20001", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20002]={ ["model_id"]="m20002", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20003]={ ["model_id"]="m20003", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20004]={ ["model_id"]="m20004", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20005]={ ["model_id"]="m20005", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20006]={ ["model_id"]="m20006", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20007]={ ["model_id"]="m20007", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20008]={ ["model_id"]="m20008", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20009]={ ["model_id"]="m20009", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20010]={ ["model_id"]="m20010", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20011]={ ["model_id"]="m20011", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20012]={ ["model_id"]="m20012", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20013]={ ["model_id"]="m20013", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20014]={ ["model_id"]="m20014", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20015]={ ["model_id"]="m20015", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20016]={ ["model_id"]="m20016", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20017]={ ["model_id"]="m20017", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20018]={ ["model_id"]="m20018", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20019]={ ["model_id"]="m20019", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20020]={ ["model_id"]="m20020", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20021]={ ["model_id"]="m20021", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20022]={ ["model_id"]="m20022", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20023]={ ["model_id"]="m20023", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20024]={ ["model_id"]="m20024", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20025]={ ["model_id"]="m20025", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20026]={ ["model_id"]="m20026", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20027]={ ["model_id"]="m20027", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20028]={ ["model_id"]="m20028", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20029]={ ["model_id"]="m20029", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20030]={ ["model_id"]="m20030", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20031]={ ["model_id"]="m20031", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [20032]={ ["model_id"]="m20032", - ["body"]=1 + ["body"]=1, + ["model_ui"]=1.0 }, [30001]={ ["model_id"]="p0001", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30002]={ ["model_id"]="p0002", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30003]={ ["model_id"]="p0003", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30004]={ ["model_id"]="p0004", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30005]={ ["model_id"]="p0005", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30006]={ ["model_id"]="p0006", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30007]={ ["model_id"]="p0007", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30008]={ ["model_id"]="p0008", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30009]={ ["model_id"]="p0009", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30010]={ ["model_id"]="p0010", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 }, [30011]={ ["model_id"]="p0011", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 + }, + [30012]={ + ["model_id"]="p0012", + ["body"]=2, + ["model_ui"]=1.0 }, [30014]={ ["model_id"]="p0014", - ["body"]=1 + ["body"]=2, + ["model_ui"]=1.0 + }, + [30015]={ + ["model_id"]="p0015", + ["body"]=2, + ["model_ui"]=1.0 + }, + [30016]={ + ["model_id"]="p0016", + ["body"]=2, + ["model_ui"]=1.0 + }, + [30017]={ + ["model_id"]="p0017", + ["body"]=2, + ["model_ui"]=1.0 + }, + [30020]={ + ["model_id"]="p0020", + ["body"]=2, + ["model_ui"]=1.0 + }, + [30022]={ + ["model_id"]="p0022", + ["body"]=2, + ["model_ui"]=1.0 } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index 6576957a..e2019c6c 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -1142,7 +1142,7 @@ local monster_chapter = { ["monster_exp"]=17000 }, [9001]={ - ["monster_base"]=30003, + ["monster_base"]=30022, ["is_boss"]=2, ["hp"]=108900000, ["atk"]=1070000, @@ -1909,7 +1909,7 @@ local monster_chapter = { ["monster_exp"]=17000 }, [15001]={ - ["monster_base"]=30006, + ["monster_base"]=30012, ["is_boss"]=2, ["hp"]=145500000, ["atk"]=1480000, @@ -5328,7 +5328,7 @@ local monster_chapter = { ["monster_exp"]=17000 }, [41001]={ - ["monster_base"]=30005, + ["monster_base"]=30015, ["is_boss"]=2, ["hp"]=195000000, ["atk"]=2000000, diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 145f604d..863abfc9 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -184,7 +184,7 @@ local skill = { ["range"]=2 } }, - ["battle_icon"]="5", + ["battle_icon"]="1", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -200,7 +200,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]=1200120, - ["name_act"]="attack04", + ["name_act"]="skill01", ["fx_self"]=300020, ["fx_target"]=2, ["fx_target_delay"]=900 @@ -366,7 +366,7 @@ local skill = { ["link"]=1, ["position"]=1, ["method"]=1, - ["battle_icon"]="5", + ["battle_icon"]="6", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -459,7 +459,7 @@ local skill = { ["link"]=1, ["position"]=1, ["method"]=1, - ["battle_icon"]="5", + ["battle_icon"]="6", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -525,7 +525,7 @@ local skill = { ["type"]="normal_attack_add", ["num"]=2, ["ratio"]=10000, - ["round"]=2 + ["round"]=3 } }, ["obj"]=1 @@ -662,7 +662,7 @@ local skill = { ["range"]=2 } }, - ["battle_icon"]="5", + ["battle_icon"]="11", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -774,7 +774,7 @@ local skill = { ["range"]=2 } }, - ["battle_icon"]="5", + ["battle_icon"]="11", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -951,7 +951,7 @@ local skill = { ["range"]=1 } }, - ["battle_icon"]="5", + ["battle_icon"]="16", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -1185,11 +1185,7 @@ local skill = { ["energy"]=10, ["link"]=1, ["position"]=2, - ["method"]=2, - ["skill_type"]=4, - ["boardrange"]={ - - }, + ["method"]=1, ["battle_icon"]="2", ["effect_type"]=1, ["trigger"]=1, @@ -1263,6 +1259,56 @@ local skill = { ["obj"]=1, ["skill_position"]=2 }, + [2200123]={ + ["energy"]=10, + ["link"]=1, + ["position"]=2, + ["method"]=2, + ["skill_type"]=4, + ["boardrange"]={ + { + ["type"]=1, + ["range"]=1 + }, + { + ["type"]=2, + ["range"]=1 + }, + { + ["type"]=3, + ["range"]=1 + }, + { + ["type"]=4, + ["range"]=1 + } + }, + ["battle_icon"]="2", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_yellow", + ["num"]=40000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]=2, + ["shake_time"]=200, + ["shake_type"]=5, + ["sound_hit"]=2200120, + ["name_act"]="skill01", + ["fx_self"]=300008, + ["fx_target"]=4, + ["fx_target_delay"]=1100, + ["bullet_time"]={ + 1100, + 3000, + 400 + } + }, [2300110]={ ["position"]=2, ["effect_type"]=1, @@ -1357,7 +1403,7 @@ local skill = { ["position"]=2, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="2", + ["battle_icon"]="12", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -1433,7 +1479,7 @@ local skill = { ["position"]=2, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="2", + ["battle_icon"]="12", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -1676,7 +1722,7 @@ local skill = { ["boardrange"]={ }, - ["battle_icon"]="2", + ["battle_icon"]="7", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -1897,7 +1943,7 @@ local skill = { ["boardrange"]={ }, - ["battle_icon"]="7", + ["battle_icon"]="17", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -2004,7 +2050,7 @@ local skill = { ["boardrange"]={ }, - ["battle_icon"]="7", + ["battle_icon"]="17", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -2043,7 +2089,7 @@ local skill = { ["boardrange"]={ }, - ["battle_icon"]="7", + ["battle_icon"]="17", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -2184,7 +2230,7 @@ local skill = { ["boardrange"]={ }, - ["battle_icon"]="1", + ["battle_icon"]="3", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -2372,7 +2418,7 @@ local skill = { ["boardrange"]={ }, - ["battle_icon"]="6", + ["battle_icon"]="8", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -2426,7 +2472,7 @@ local skill = { ["type"]="skill_hurt_add", ["num"]=1500, ["ratio"]=10000, - ["round"]=2 + ["round"]=3 } }, ["obj"]=1 @@ -2440,7 +2486,7 @@ local skill = { ["type"]="skill_hurt_add", ["num"]=1500, ["ratio"]=10000, - ["round"]=3 + ["round"]=4 } }, ["obj"]=1 @@ -2530,7 +2576,7 @@ local skill = { ["link"]=1, ["position"]=3, ["method"]=1, - ["battle_icon"]="6", + ["battle_icon"]="13", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -2583,7 +2629,7 @@ local skill = { ["link"]=1, ["position"]=3, ["method"]=1, - ["battle_icon"]="6", + ["battle_icon"]="13", ["buff_condition"]={ { { @@ -2646,7 +2692,7 @@ local skill = { ["link"]=1, ["position"]=3, ["method"]=1, - ["battle_icon"]="6", + ["battle_icon"]="13", ["buff_condition"]={ { { @@ -2789,7 +2835,7 @@ local skill = { ["link"]=1, ["position"]=3, ["method"]=2, - ["battle_icon"]="6", + ["battle_icon"]="18", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -2972,7 +3018,7 @@ local skill = { ["range"]=3 } }, - ["battle_icon"]="3", + ["battle_icon"]="4", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -3156,7 +3202,7 @@ local skill = { ["boardrange"]={ }, - ["battle_icon"]="8", + ["battle_icon"]="9", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -3347,7 +3393,7 @@ local skill = { ["boardrange"]={ }, - ["battle_icon"]="8", + ["battle_icon"]="14", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -3554,7 +3600,7 @@ local skill = { ["range"]=3 } }, - ["battle_icon"]="8", + ["battle_icon"]="19", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -3732,7 +3778,7 @@ local skill = { ["position"]=5, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="4", + ["battle_icon"]="5", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -3755,7 +3801,7 @@ local skill = { ["position"]=5, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="4", + ["battle_icon"]="5", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -3778,7 +3824,7 @@ local skill = { ["position"]=5, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="4", + ["battle_icon"]="5", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -3881,7 +3927,7 @@ local skill = { ["position"]=5, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="8", + ["battle_icon"]="10", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -4094,7 +4140,7 @@ local skill = { ["position"]=5, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="8", + ["battle_icon"]="13", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -4289,7 +4335,7 @@ local skill = { ["position"]=5, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="8", + ["battle_icon"]="20", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -4334,7 +4380,7 @@ local skill = { ["position"]=5, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="8", + ["battle_icon"]="20", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -4613,7 +4659,7 @@ local skill = { ["obj"]=1, ["skill_position"]=2, ["cd"]=2, - ["cd_start"]=1, + ["cd_start"]=0, ["sound_hit"]=3300120, ["name_act"]="skill01", ["fx_self"]=200011 @@ -4632,7 +4678,7 @@ local skill = { ["obj"]=2, ["skill_position"]=1, ["cd"]=2, - ["cd_start"]=2, + ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]=10082, @@ -4664,7 +4710,7 @@ local skill = { ["obj"]=2, ["skill_position"]=1, ["cd"]=3, - ["cd_start"]=2, + ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]=10082, @@ -4705,7 +4751,7 @@ local skill = { }, ["skill_position"]=1, ["cd"]=2, - ["cd_start"]=2, + ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]=10082, @@ -4737,7 +4783,7 @@ local skill = { ["obj"]=2, ["skill_position"]=1, ["cd"]=3, - ["cd_start"]=2, + ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]=10082, @@ -4769,7 +4815,7 @@ local skill = { ["obj"]=2, ["skill_position"]=1, ["cd"]=3, - ["cd_start"]=2, + ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]=10082, @@ -4801,7 +4847,7 @@ local skill = { ["obj"]=2, ["skill_position"]=2, ["cd"]=3, - ["cd_start"]=1, + ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]=4200120, @@ -4827,7 +4873,7 @@ local skill = { ["obj"]=1, ["skill_position"]=2, ["cd"]=3, - ["cd_start"]=1 + ["cd_start"]=0 }, [10023]={ ["skill_type"]=3, @@ -4848,7 +4894,7 @@ local skill = { ["obj"]=2, ["skill_position"]=1, ["cd"]=2, - ["cd_start"]=2, + ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]=10082, @@ -5351,7 +5397,7 @@ local skill = { }, ["obj"]=1, ["cd"]=3, - ["cd_start"]=2, + ["cd_start"]=0, ["sound_hit"]=3300120, ["name_act"]="skill01", ["fx_self"]=300025 @@ -11482,6 +11528,6 @@ local skill = { } } local config = { -data=skill,count=551 +data=skill,count=552 } return config \ No newline at end of file diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 554587de..03c8234e 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -737,6 +737,7 @@ local skill_rogue = { ["round"]=1 } }, + ["obj"]=3, ["icon"]="44" }, [1200104]={ @@ -782,7 +783,7 @@ local skill_rogue = { ["round"]=1 } }, - ["obj"]=1, + ["obj"]=3, ["icon"]="45" }, [1200106]={ @@ -821,7 +822,7 @@ local skill_rogue = { ["round"]=1 } }, - ["obj"]=1, + ["obj"]=3, ["icon"]="45" }, [1300100]={ @@ -913,7 +914,7 @@ local skill_rogue = { ["round"]=1 } }, - ["obj"]=8, + ["obj"]=3, ["icon"]="45" }, [1300106]={ @@ -935,7 +936,7 @@ local skill_rogue = { ["round"]=1 } }, - ["obj"]=8, + ["obj"]=3, ["icon"]="45" }, [1300107]={ @@ -1233,26 +1234,11 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, - ["type"]=2, - ["skill_position"]=2, - ["boardrange"]={ - { - ["type"]=1, - ["range"]=1 - }, - { - ["type"]=2, - ["range"]=1 - }, - { - ["type"]=3, - ["range"]=1 - }, - { - ["type"]=4, - ["range"]=1 - } + ["type"]=1, + ["parameter"]={ + 2200123 }, + ["skill_position"]=2, ["icon"]="34" }, [2200103]={ @@ -1307,6 +1293,7 @@ local skill_rogue = { ["icon"]="36" }, [2200106]={ + ["unlock"]=2200102, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -1752,7 +1739,7 @@ local skill_rogue = { ["round"]=1 } }, - ["obj"]=2, + ["obj"]=4, ["icon"]="51" }, [3200100]={ @@ -1890,12 +1877,12 @@ local skill_rogue = { ["effect"]={ { ["type"]="block", - ["num"]=1000, + ["num"]=5000, ["ratio"]=10000, ["round"]=2 } }, - ["obj"]=8, + ["obj"]=5, ["icon"]="33" }, [3300100]={ @@ -1975,7 +1962,7 @@ local skill_rogue = { ["round"]=1 } }, - ["obj"]=8, + ["obj"]=5, ["icon"]="47" }, [3300105]={ @@ -2011,7 +1998,7 @@ local skill_rogue = { ["round"]=1 } }, - ["obj"]=8, + ["obj"]=5, ["icon"]="47" }, [3300107]={ @@ -2031,7 +2018,7 @@ local skill_rogue = { ["round"]=1 } }, - ["obj"]=8, + ["obj"]=5, ["icon"]="48" }, [3300200]={ @@ -2056,7 +2043,7 @@ local skill_rogue = { ["round"]=1 } }, - ["obj"]=1, + ["obj"]=5, ["icon"]="38" }, [3300202]={ @@ -3197,6 +3184,7 @@ local skill_rogue = { ["round"]=1 } }, + ["obj"]=7, ["icon"]="44" }, [5400103]={ @@ -3213,6 +3201,7 @@ local skill_rogue = { ["round"]=1 } }, + ["obj"]=7, ["icon"]="42" }, [5400104]={ @@ -3257,6 +3246,7 @@ local skill_rogue = { ["round"]=1 } }, + ["obj"]=7, ["icon"]="58" }, [5400107]={ @@ -3273,6 +3263,7 @@ local skill_rogue = { ["round"]=1 } }, + ["obj"]=7, ["icon"]="66" } } diff --git a/lua/app/config/strings/cn/buff.lua b/lua/app/config/strings/cn/buff.lua index d36bcecf..cff0dd8f 100644 --- a/lua/app/config/strings/cn/buff.lua +++ b/lua/app/config/strings/cn/buff.lua @@ -60,7 +60,7 @@ local buff = { ["name"]="poison" }, [52]={ - ["desc"]="禁锢：本回合只可使用普攻。", + ["desc"]="禁锢：本回合只可使用普攻，且技能进度不会增长。", ["name"]="imprison" }, [53]={ diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index fec94f10..308306ae 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -144,6 +144,7 @@ local localization_global = ["DAY_X_UNLOCK"] = "第{0}天解锁", ["SEVEN_DAY_DESC_2"] = "已完成任务数:{0}/{1}", ["FUNC_UNLOCK"] = "解锁新功能", + ["MAIN_BTN_3"] = "商城", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index c958ee00..1c5c20a8 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -77,83 +77,83 @@ local item = { }, [12001]={ ["name"]="舞娘碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="舞娘碎片，凑齐可激活或升级。" }, [13001]={ ["name"]="克劳德碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="克劳德碎片，凑齐可激活或升级。" }, [13002]={ ["name"]="火旺碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="火旺碎片，凑齐可激活或升级。" }, [14001]={ ["name"]="亚历山大碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="亚历山大碎片，凑齐可激活或升级。" }, [22001]={ ["name"]="刀妹碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="刀妹碎片，凑齐可激活或升级。" }, [23001]={ ["name"]="野蛮人碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="野蛮人碎片，凑齐可激活或升级。" }, [23002]={ ["name"]="二丫碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="二丫碎片，凑齐可激活或升级。" }, [24001]={ ["name"]="巨剑魔童碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="巨剑魔童碎片，凑齐可激活或升级。" }, [32001]={ ["name"]="洋葱头碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="洋葱头碎片，凑齐可激活或升级。" }, [33001]={ ["name"]="小鹿碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="小鹿碎片，凑齐可激活或升级。" }, [33002]={ ["name"]="森林狼碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="森林狼碎片，凑齐可激活或升级。" }, [34001]={ ["name"]="木兰碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="木兰碎片，凑齐可激活或升级。" }, [42001]={ ["name"]="冰心碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="冰心碎片，凑齐可激活或升级。" }, [43001]={ ["name"]="冰女碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="冰女碎片，凑齐可激活或升级。" }, [43002]={ ["name"]="鸦姐碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="鸦姐碎片，凑齐可激活或升级。" }, [44001]={ ["name"]="寒冰妖姬碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="寒冰妖姬碎片，凑齐可激活或升级。" }, [52001]={ ["name"]="忍者伦碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="忍者伦碎片，凑齐可激活或升级。" }, [53001]={ ["name"]="魔女琪琪碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="魔女琪琪碎片，凑齐可激活或升级。" }, [53002]={ ["name"]="灵魂猎手碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="灵魂猎手碎片，凑齐可激活或升级。" }, [54001]={ ["name"]="蝴蝶碎片", - ["desc"]="凑齐可激活或升级。" + ["desc"]="蝴蝶碎片，凑齐可激活或升级。" } } local config = { diff --git a/lua/app/config/strings/cn/monster_base.lua b/lua/app/config/strings/cn/monster_base.lua index 776c83f5..e6b7458c 100644 --- a/lua/app/config/strings/cn/monster_base.lua +++ b/lua/app/config/strings/cn/monster_base.lua @@ -302,11 +302,29 @@ local monster_base = { [30011]={ ["name"]="亚历山大" }, + [30012]={ + ["name"]="二丫" + }, [30014]={ ["name"]="克劳德" + }, + [30015]={ + ["name"]="魔女琪琪" + }, + [30016]={ + ["name"]="木兰" + }, + [30017]={ + ["name"]="雷神" + }, + [30020]={ + ["name"]="森林狼" + }, + [30022]={ + ["name"]="冰女" } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/skill.lua b/lua/app/config/strings/cn/skill.lua index 5e2d05f1..d16415e5 100644 --- a/lua/app/config/strings/cn/skill.lua +++ b/lua/app/config/strings/cn/skill.lua @@ -33,13 +33,13 @@ local skill = { ["desc"]="森林狼：使用后本次伤害提升，并造成多次技能伤害。" }, [3400120]={ - ["desc"]="流星追月：使用后本次伤害提升，并一次巨量技能伤害。" + ["desc"]="流星追月：使用后本次伤害提升，并造成一次巨量技能伤害。" }, [4200120]={ ["desc"]="元素链接：随机消除3个元素，并造成一次技能伤害。" }, [4300120]={ - ["desc"]="冰女：额外造成一次技能伤害，附加冰霜效果，1回合。" + ["desc"]="霜冻冰晶：额外造成一次技能伤害，附加冰霜效果，1回合。" }, [4300220]={ ["desc"]="鸦姐：额外造成一次技能伤害，附加腐败效果，1回合。" diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index 5f9fb26f..3bdc51a6 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -372,31 +372,31 @@ local skill_rogue = { ["desc"]="急速治疗链接超过5个元素，回血效果提升。" }, [3300200]={ - ["desc"]="解锁森林狼技能：使用后本次伤害提升，并造成多次技能伤害。" + ["desc"]="解锁狼袭瞬杀：使用后本次伤害提升，并造成多次技能伤害。" }, [3300201]={ - ["desc"]="森林狼技能有50%概率附加易伤效果，2回合。" + ["desc"]="狼袭瞬杀有50%概率附加易伤效果，2回合。" }, [3300202]={ - ["desc"]="森林狼技能使用时本次普攻伤害提升15%。" + ["desc"]="狼袭瞬杀使用时本次普攻伤害提升15%。" }, [3300203]={ - ["desc"]="森林狼技能伤害提升。" + ["desc"]="狼袭瞬杀伤害提升。" }, [3300204]={ - ["desc"]="森林狼技能对中毒敌人有50%概率附加中毒效果，2回合。" + ["desc"]="狼袭瞬杀对中毒敌人有50%概率附加中毒效果，2回合。" }, [3300205]={ - ["desc"]="森林狼技能附加的中毒效果，伤害提升。" + ["desc"]="狼袭瞬杀附加的中毒效果，伤害提升。" }, [3300206]={ - ["desc"]="森林狼技能攻击提升15%。" + ["desc"]="森林狼攻击提升15%。" }, [3300207]={ - ["desc"]="森林狼技能对中毒敌人有100%概率附加中毒效果，2回合。" + ["desc"]="狼袭瞬杀对中毒敌人有100%概率附加中毒效果，2回合。" }, [3400100]={ - ["desc"]="解锁流星追月：使用后本次伤害提升，并一次巨量技能伤害。" + ["desc"]="解锁流星追月：使用后本次伤害提升，并造成一次巨量技能伤害。" }, [3400101]={ ["desc"]="流星追月可附加易伤效果，2回合。" @@ -444,28 +444,28 @@ local skill_rogue = { ["desc"]="元素链接附加冻结效果概率提升到40%。" }, [4300100]={ - ["desc"]="解锁冰女技能：额外造成一次技能伤害，附加冰霜效果，1回合。" + ["desc"]="解锁霜冻冰晶：额外造成一次技能伤害，附加冰霜效果，1回合。" }, [4300101]={ - ["desc"]="冰女技能沿＋方向可额外消除4格。" + ["desc"]="霜冻冰晶沿＋方向可额外消除4格。" }, [4300102]={ - ["desc"]="冰女技能对灼烧敌人的伤害增加50%。" + ["desc"]="霜冻冰晶对灼烧敌人的伤害增加50%。" }, [4300103]={ - ["desc"]="冰女技能附加的冰霜效果，回合数+1。" + ["desc"]="霜冻冰晶附加的冰霜效果，回合数+1。" }, [4300104]={ - ["desc"]="冰女技能伤害提升。" + ["desc"]="霜冻冰晶伤害提升。" }, [4300105]={ - ["desc"]="冰女技能对冰霜敌人有50%概率附加冻结效果，1回合。" + ["desc"]="霜冻冰晶对冰霜敌人有50%概率附加冻结效果，1回合。" }, [4300106]={ - ["desc"]="冰女技能后为团队附加冰盾效果，2回合。" + ["desc"]="霜冻冰晶后为团队附加冰盾效果，2回合。" }, [4300107]={ - ["desc"]="冰女技能附加的冰盾，可反伤400%。" + ["desc"]="霜冻冰晶附加的冰盾，可反伤400%。" }, [4300300]={ ["desc"]="解锁鸦姐技能：额外造成一次技能伤害，附加腐败效果，1回合。" @@ -540,28 +540,28 @@ local skill_rogue = { ["desc"]="护盾术附加的护盾，反伤效果翻倍。" }, [5300100]={ - ["desc"]="解锁魔女琪琪技能：额外造成一次大量技能伤害。" + ["desc"]="解锁魔法扫帚：额外造成一次大量技能伤害。" }, [5300101]={ - ["desc"]="魔女琪琪技能可附加中毒效果，2回合。" + ["desc"]="魔法扫帚可附加中毒效果，2回合。" }, [5300102]={ - ["desc"]="魔女琪琪技能使用时本次普攻伤害提升15%。" + ["desc"]="魔法扫帚使用时本次普攻伤害提升15%。" }, [5300103]={ - ["desc"]="魔女琪琪技能可附加昏睡效果，2回合。" + ["desc"]="魔法扫帚可附加昏睡效果，2回合。" }, [5300104]={ - ["desc"]="魔女琪琪技能附加的中毒效果，伤害提升。" + ["desc"]="魔法扫帚附加的中毒效果，伤害提升。" }, [5300105]={ - ["desc"]="魔女琪琪技能使用后随机增加一种技能的能量2点。" + ["desc"]="魔法扫帚使用后随机增加一种技能的能量2点。" }, [5300106]={ - ["desc"]="魔女琪琪技能使用后随机增加一种技能的能量2点。" + ["desc"]="魔法扫帚使用后随机增加一种技能的能量2点。" }, [5300107]={ - ["desc"]="魔女琪琪技能有15%概率为团队附加不死效果，1回合。" + ["desc"]="魔法扫帚有15%概率为团队附加不死效果，1回合。" }, [5300200]={ ["desc"]="解锁灵魂猎手技能：额外造成一次大量技能伤害。" diff --git a/lua/app/config/strings/de/monster_base.lua b/lua/app/config/strings/de/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/de/monster_base.lua +++ b/lua/app/config/strings/de/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/monster_base.lua b/lua/app/config/strings/en/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/en/monster_base.lua +++ b/lua/app/config/strings/en/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/monster_base.lua b/lua/app/config/strings/fr/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/fr/monster_base.lua +++ b/lua/app/config/strings/fr/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/monster_base.lua b/lua/app/config/strings/id/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/id/monster_base.lua +++ b/lua/app/config/strings/id/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/monster_base.lua b/lua/app/config/strings/ja/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/ja/monster_base.lua +++ b/lua/app/config/strings/ja/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/monster_base.lua b/lua/app/config/strings/ko/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/ko/monster_base.lua +++ b/lua/app/config/strings/ko/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/monster_base.lua b/lua/app/config/strings/pt/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/pt/monster_base.lua +++ b/lua/app/config/strings/pt/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/monster_base.lua b/lua/app/config/strings/ru/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/ru/monster_base.lua +++ b/lua/app/config/strings/ru/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/monster_base.lua b/lua/app/config/strings/th/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/th/monster_base.lua +++ b/lua/app/config/strings/th/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/monster_base.lua b/lua/app/config/strings/vi/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/vi/monster_base.lua +++ b/lua/app/config/strings/vi/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/monster_base.lua b/lua/app/config/strings/zh/monster_base.lua index 748e7028..a6020910 100644 --- a/lua/app/config/strings/zh/monster_base.lua +++ b/lua/app/config/strings/zh/monster_base.lua @@ -301,12 +301,30 @@ local monster_base = { }, [30011]={ + }, + [30012]={ + }, [30014]={ + }, + [30015]={ + + }, + [30016]={ + + }, + [30017]={ + + }, + [30020]={ + + }, + [30022]={ + } } local config = { -data=monster_base,count=102 +data=monster_base,count=108 } return config \ No newline at end of file