From c950bc52bed4b2e46548e86fc4b6515e20eb8d80 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 8 Aug 2023 16:55:43 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/dungeon/dungeon_manager.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lua/app/module/dungeon/dungeon_manager.lua b/lua/app/module/dungeon/dungeon_manager.lua index b04c91d7..8e9134ca 100644 --- a/lua/app/module/dungeon/dungeon_manager.lua +++ b/lua/app/module/dungeon/dungeon_manager.lua @@ -191,7 +191,9 @@ function DungeonManager:respEndChallengeShards(result) if result.err_code == GConst.ERROR_STR.SUCCESS then local passId = DataManager.DungeonData:getPassedMaxId(ModuleManager.MODULE_KEY.DUNGEON_SHARDS) DataManager.DungeonData:initDungeonShards(result.shards_challenge) - ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS, result.rewards, result.reqData and result.reqData.combatReport or {}) + local newRewards = {} + GFunc.mergeRewards2(result.rewards, newRewards, true) + ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS, newRewards, result.reqData and result.reqData.combatReport or {}, nil, nil, true) if passId ~= DataManager.DungeonData:getPassedMaxId(ModuleManager.MODULE_KEY.DUNGEON_SHARDS) then local data = {} From 189d421c2bdc57b601b749e18f518dbafa40f8a6 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 8 Aug 2023 17:49:03 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E5=8F=8D=E4=BC=A4bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/component/battle_unit_comp.lua | 5 +++-- lua/app/module/battle/team/battle_team.lua | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index da811716..7015b257 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1743,8 +1743,9 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, d team:checkPassiveEvent(BattleConst.PASSIVE_EVENT.ON_DEAD_WITH_BLEED) end - if self.actionOverCallback then -- 被反击时死亡 - self:onAttackOver() + if self.actionOverCallback then -- 被反伤时死亡 + self.actionOverCallback = nil + self.battleController:enterNextTeamAction() end self.battleController:resetTimeSpeed(true) diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index e84a217b..f75f0a95 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -597,6 +597,10 @@ function BattleTeam:setIsFinalBlock(isFinalBlock) end function BattleTeam:getIsFinalBlock() + if self.isFinalBlock == nil then + return true + end + return self.isFinalBlock end From a33851f519e051b00b1c692e69c87b5ba9073095 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 8 Aug 2023 18:10:25 +0800 Subject: [PATCH 03/13] =?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/dungeon_armor/dungeon_armor_main_ui.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/app/ui/dungeon_armor/dungeon_armor_main_ui.lua b/lua/app/ui/dungeon_armor/dungeon_armor_main_ui.lua index 7c2fccd0..95de7634 100644 --- a/lua/app/ui/dungeon_armor/dungeon_armor_main_ui.lua +++ b/lua/app/ui/dungeon_armor/dungeon_armor_main_ui.lua @@ -93,6 +93,8 @@ function DungeonArmorMainUI:_addListeners() if not params or not params.id then return end + self.bg1:setAnchoredPositionY(-1) + self.bg2:setAnchoredPositionY(-1) self.targetId = params.id self:refreshScrollrect() From c6de387e8586f7971526f0cc2c2958ea873a5100 Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 9 Aug 2023 09:52:28 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E6=9D=90=E6=96=99=E6=9C=AC=E6=89=AB?= =?UTF-8?q?=E8=8D=A1=E5=90=8E=E6=AC=A1=E6=95=B0=E5=88=B7=E6=96=B0=E4=B8=8D?= =?UTF-8?q?=E5=8F=8A=E6=97=B6fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/dungeon/dungeon_difficulty_ui.lua | 22 ++++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua index 8e7f7b39..c4cf5ed4 100644 --- a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua +++ b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua @@ -61,15 +61,6 @@ function DungeonDifficultyUI:onLoadRootComplete() local cost = DataManager.DungeonData:getChallengeHpCost(self.module) self.txStartCost:setText(GFunc.getRewardNum(cost)) self.txSweepCost:setText(GFunc.getRewardNum(cost)) - - local time = DataManager.DungeonData:getRemainTimes(self.module) - local timeStr = nil - if time <= 0 then - timeStr = "" .. time .. "" - else - timeStr = time - end - self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, timeStr)) self.txFrist:setText(I18N:getGlobalText(I18N.GlobalConst.FIRST_PASS)) self.rewardTx:setText(I18N:getGlobalText(I18N.GlobalConst.REWARD_DESC)) self.txLock:setText(I18N:getGlobalText(I18N.GlobalConst.PASS_REQUIRE)) @@ -115,6 +106,9 @@ function DungeonDifficultyUI:onLoadRootComplete() self:addEventListener(EventManager.CUSTOM_EVENT.DUNGEON_CHALLENGE, function() self:closeUI() end) + self:addEventListener(EventManager.CUSTOM_EVENT.DUNGEON_SWEEP, function() + self:refreshDifficulty() + end) end function DungeonDifficultyUI:refreshDifficulty() @@ -153,6 +147,16 @@ function DungeonDifficultyUI:refreshDifficulty() self.rewardFirst:refreshItemById(id, firstNum) self.rewardPass:refreshItemById(id, passNum) self.rewardFirst:getBaseObject():setActive((not self:isCanSweepId()) and firstNum) + + -- 次数 + local time = DataManager.DungeonData:getRemainTimes(self.module) + local timeStr = nil + if time <= 0 then + timeStr = "" .. time .. "" + else + timeStr = time + end + self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, timeStr)) end -- 是否是可扫荡关卡 From a81f9de4689611802afd266efce7073b59b77939 Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 9 Aug 2023 10:19:42 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E8=A3=85=E5=A4=87=E5=89=AF=E6=9C=AC?= =?UTF-8?q?=E6=89=AB=E8=8D=A1=E8=A7=A6=E5=8F=91=E7=A4=BC=E5=8C=85=E6=9C=AA?= =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E5=BC=B9=E5=87=BAfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/common/common_manager.lua | 3 ++- lua/app/module/dungeon_armor/dungeon_armor_manager.lua | 2 +- lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua | 2 +- lua/app/ui/common/mop_up_ui.lua | 8 ++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lua/app/module/common/common_manager.lua b/lua/app/module/common/common_manager.lua index 674bcbb9..7db46857 100644 --- a/lua/app/module/common/common_manager.lua +++ b/lua/app/module/common/common_manager.lua @@ -1,7 +1,8 @@ local CommonManager = class("CommonManager", BaseModule) -function CommonManager:showMopUpUI(rewards, remainCount, callback, customtitleTx, target) +function CommonManager:showMopUpUI(actType, rewards, remainCount, callback, customtitleTx, target) local params = { + actType = actType, customtitleTx = customtitleTx, rewards = rewards, remainCount = remainCount, diff --git a/lua/app/module/dungeon_armor/dungeon_armor_manager.lua b/lua/app/module/dungeon_armor/dungeon_armor_manager.lua index 5fb31485..8849842c 100644 --- a/lua/app/module/dungeon_armor/dungeon_armor_manager.lua +++ b/lua/app/module/dungeon_armor/dungeon_armor_manager.lua @@ -150,7 +150,7 @@ function DungeonArmorManager:rspSweep(result) -- 合并奖励 local newRewards = {} GFunc.mergeRewards2(result.rewards, newRewards) - ModuleManager.CommonManager:showMopUpUI(newRewards, remainCount, function() + ModuleManager.CommonManager:showMopUpUI(ModuleManager.MODULE_KEY.DUNGEON_ARMOR, newRewards, remainCount, function() if result.reqData then self:reqSweep(result.reqData.chapter_armor_id, result.reqData.target) end diff --git a/lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua b/lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua index a75c9e49..a66c3e3b 100644 --- a/lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua +++ b/lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua @@ -150,7 +150,7 @@ function DungeonWeaponManager:rspSweep(result) -- 合并奖励 local newRewards = {} GFunc.mergeRewards2(result.rewards, newRewards) - ModuleManager.CommonManager:showMopUpUI(newRewards, remainCount, function() + ModuleManager.CommonManager:showMopUpUI(ModuleManager.MODULE_KEY.DUNGEON_WEAPON, newRewards, remainCount, function() self:reqSweep(result.reqData.chapter_weapon_id, result.reqData.target) end, nil, result.reqData.target) DataManager.DungeonData:setDirty() diff --git a/lua/app/ui/common/mop_up_ui.lua b/lua/app/ui/common/mop_up_ui.lua index ce3511ef..4a7649de 100644 --- a/lua/app/ui/common/mop_up_ui.lua +++ b/lua/app/ui/common/mop_up_ui.lua @@ -20,6 +20,7 @@ function MopUpUI:onClose() end function MopUpUI:ctor(params) + self.actType = params.actType self.customtitleTx = params.customtitleTx self.rewards = params.rewards self.remainCount = params.remainCount @@ -32,6 +33,13 @@ end function MopUpUI:onLoadRootComplete() self:_display() self:_addListeners() + + -- 检查礼包弹出 + if self.actType == ModuleManager.MODULE_KEY.DUNGEON_WEAPON then + DataManager.ShopData:checkPopGift(PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT) + elseif self.actType == ModuleManager.MODULE_KEY.DUNGEON_ARMOR then + DataManager.ShopData:checkPopGift(PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT) + end end function MopUpUI:_display() From c7c6d5829cb5aa5cdb86848bafe7e3add34fb0c6 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 9 Aug 2023 10:26:20 +0800 Subject: [PATCH 06/13] =?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/dungeon_armor/dungeon_armor_main_ui.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/app/ui/dungeon_armor/dungeon_armor_main_ui.lua b/lua/app/ui/dungeon_armor/dungeon_armor_main_ui.lua index 95de7634..de964c9b 100644 --- a/lua/app/ui/dungeon_armor/dungeon_armor_main_ui.lua +++ b/lua/app/ui/dungeon_armor/dungeon_armor_main_ui.lua @@ -55,6 +55,7 @@ function DungeonArmorMainUI:_display() uiMap["dungeon_armor_main_ui.banner.btn_formation.tx_ok"]:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_4)) self.bg1 = uiMap["dungeon_armor_main_ui.scrollrect.viewport.content.bg_1"] self.bg2 = uiMap["dungeon_armor_main_ui.scrollrect.viewport.content.bg_2"] + self.bgNames = table.clearOrCreate(self.bgNames) self.bg1:setAnchoredPositionY(-1) self.bg2:setAnchoredPositionY(-1) self.btnFund = uiMap["dungeon_armor_main_ui.btn_fund"] @@ -93,6 +94,7 @@ function DungeonArmorMainUI:_addListeners() if not params or not params.id then return end + self.bgNames = table.clearOrCreate(self.bgNames) self.bg1:setAnchoredPositionY(-1) self.bg2:setAnchoredPositionY(-1) self.targetId = params.id From 92a147c14c6639e9e85c663a6883ede4b9d8015f Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 9 Aug 2023 10:57:58 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E8=A3=85=E5=A4=87=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E5=BC=B9=E5=87=BAfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/userdata/shop/shop_data.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/app/userdata/shop/shop_data.lua b/lua/app/userdata/shop/shop_data.lua index ade52d52..816fef43 100644 --- a/lua/app/userdata/shop/shop_data.lua +++ b/lua/app/userdata/shop/shop_data.lua @@ -844,10 +844,11 @@ function ShopData:initGift(giftType, gift, isInit) end local tempId = self.gifts[giftType] and self.gifts[giftType].id or 0 + local tempTrigerTime = self.gifts[giftType] and self.gifts[giftType].triggerTime or 0 self.gifts[giftType] = giftStruct if not isInit and self:hasGift(giftType) then - if tempId == self.gifts[giftType].id then + if tempId == self.gifts[giftType].id and tempTrigerTime == self.gifts[giftType].triggerTime then if EDITOR_MODE then Logger.logHighlight("重复礼包数据，不处理弹窗:" .. tempId) end From 996f3deeee1a125dda6f3248eaba8efee956d91c Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 9 Aug 2023 16:21:12 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/local_data.lua | 3 +++ lua/app/module/battle/controller/battle_base_controller.lua | 4 ++++ lua/app/module/battle/helper/battle_snapshot_helper.lua | 3 +++ 3 files changed, 10 insertions(+) diff --git a/lua/app/common/local_data.lua b/lua/app/common/local_data.lua index 7b6da257..0ed517ac 100644 --- a/lua/app/common/local_data.lua +++ b/lua/app/common/local_data.lua @@ -435,7 +435,9 @@ function LocalData:saveBattleSnapshot(snapshot) if EDITOR_MODE then Logger.logHighlight(json.encode(snapshot)) end + print("Snapshot: " .. json.encode(snapshot)) self:setString(LocalData:getRoleKey(LOCAL_DATA_KEY.BATTLE_SNAPSHOT), json.encode(snapshot)) + LocalData:save() end function LocalData:getBattleSnapshot() @@ -443,6 +445,7 @@ function LocalData:getBattleSnapshot() if EDITOR_MODE then Logger.logHighlight(dealedSnapshot) end + print("Snapshot: " .. dealedSnapshot) return json.decode(dealedSnapshot) end diff --git a/lua/app/module/battle/controller/battle_base_controller.lua b/lua/app/module/battle/controller/battle_base_controller.lua index ee39b0c5..f414d36c 100644 --- a/lua/app/module/battle/controller/battle_base_controller.lua +++ b/lua/app/module/battle/controller/battle_base_controller.lua @@ -480,6 +480,10 @@ function BattleBaseController:init(params, snapshot) self.delayEffectTextList = {} self.delayEffectTextCount = 0 self.time = 0 + print("Snapshot: -----------------------------------------") + if snapshot then + print("Snapshot: " .. snapshot.battleType) + end if snapshot then -- 处理战斗快照 self:dealSnapshotBattleBaseInfo(snapshot) self.battleData:init(params, snapshot.battledataShopInfo) diff --git a/lua/app/module/battle/helper/battle_snapshot_helper.lua b/lua/app/module/battle/helper/battle_snapshot_helper.lua index 3d86918e..d3cc49de 100644 --- a/lua/app/module/battle/helper/battle_snapshot_helper.lua +++ b/lua/app/module/battle/helper/battle_snapshot_helper.lua @@ -117,12 +117,15 @@ function BattleSnapshotHelper:snapshotBattleInfo(battleBaseController) end function BattleSnapshotHelper:dealSnapshotBattleBaseInfo(battleBaseController, snapInfo) + print("Snapshot: dealSnapshotBattleBaseInfo") if not snapInfo then return end + print("Snapshot: snapInfo") if not NEED_SAVE_SNAPSHOT_BATTLE_TYPE[snapInfo.battleType] then return end + print("Snapshot: NEED_SAVE_SNAPSHOT_BATTLE_TYPE") local atkFormation = snapInfo.params.atkFormation snapInfo.params.atkFormation = {} From e8ad813399d377c11daa8c90b9ab1e3e4ee0fc2d Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 9 Aug 2023 16:50:39 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/local_data.lua | 2 -- lua/app/module/battle/controller/battle_base_controller.lua | 4 ---- lua/app/module/battle/helper/battle_snapshot_helper.lua | 4 +--- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/lua/app/common/local_data.lua b/lua/app/common/local_data.lua index 0ed517ac..20b88380 100644 --- a/lua/app/common/local_data.lua +++ b/lua/app/common/local_data.lua @@ -435,7 +435,6 @@ function LocalData:saveBattleSnapshot(snapshot) if EDITOR_MODE then Logger.logHighlight(json.encode(snapshot)) end - print("Snapshot: " .. json.encode(snapshot)) self:setString(LocalData:getRoleKey(LOCAL_DATA_KEY.BATTLE_SNAPSHOT), json.encode(snapshot)) LocalData:save() end @@ -445,7 +444,6 @@ function LocalData:getBattleSnapshot() if EDITOR_MODE then Logger.logHighlight(dealedSnapshot) end - print("Snapshot: " .. dealedSnapshot) return json.decode(dealedSnapshot) end diff --git a/lua/app/module/battle/controller/battle_base_controller.lua b/lua/app/module/battle/controller/battle_base_controller.lua index f414d36c..ee39b0c5 100644 --- a/lua/app/module/battle/controller/battle_base_controller.lua +++ b/lua/app/module/battle/controller/battle_base_controller.lua @@ -480,10 +480,6 @@ function BattleBaseController:init(params, snapshot) self.delayEffectTextList = {} self.delayEffectTextCount = 0 self.time = 0 - print("Snapshot: -----------------------------------------") - if snapshot then - print("Snapshot: " .. snapshot.battleType) - end if snapshot then -- 处理战斗快照 self:dealSnapshotBattleBaseInfo(snapshot) self.battleData:init(params, snapshot.battledataShopInfo) diff --git a/lua/app/module/battle/helper/battle_snapshot_helper.lua b/lua/app/module/battle/helper/battle_snapshot_helper.lua index d3cc49de..ef59f1e0 100644 --- a/lua/app/module/battle/helper/battle_snapshot_helper.lua +++ b/lua/app/module/battle/helper/battle_snapshot_helper.lua @@ -117,15 +117,13 @@ function BattleSnapshotHelper:snapshotBattleInfo(battleBaseController) end function BattleSnapshotHelper:dealSnapshotBattleBaseInfo(battleBaseController, snapInfo) - print("Snapshot: dealSnapshotBattleBaseInfo") if not snapInfo then return end - print("Snapshot: snapInfo") + if not NEED_SAVE_SNAPSHOT_BATTLE_TYPE[snapInfo.battleType] then return end - print("Snapshot: NEED_SAVE_SNAPSHOT_BATTLE_TYPE") local atkFormation = snapInfo.params.atkFormation snapInfo.params.atkFormation = {} From 1ecb11124dca4f6038f0bedbb1fc5d635fe9d166 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 9 Aug 2023 17:18:14 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/shop/shop_manager.lua | 4 ++-- lua/app/userdata/dungeon/dungeon_data.lua | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lua/app/module/shop/shop_manager.lua b/lua/app/module/shop/shop_manager.lua index 401f029c..b10d54ab 100644 --- a/lua/app/module/shop/shop_manager.lua +++ b/lua/app/module/shop/shop_manager.lua @@ -54,9 +54,9 @@ function ShopManager:showGiftPopUI(actType, actId, onlySelf, showType) elseif actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ShopConst.INTRODUCT_GIFT_ID then UIManager:showUI("app/ui/shop/introduct_pop_ui", {showType = showType}) elseif actType == PayManager.PURCHARSE_TYPE.CHAPTER_GIFT then - UIManager:showUI("app/ui/shop/gift_pop_chapter_ui", {type = actType, id = actId, onlySelf = onlySelf}) + UIManager:showUI("app/ui/shop/gift_pop_chapter_ui", {type = actType, id = actId, onlySelf = onlySelf, showType = showType}) elseif actType == PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW then - UIManager:showUI("app/ui/shop/gift_pop_grow_up_ui", {type = actType, id = actId, onlySelf = onlySelf}) + UIManager:showUI("app/ui/shop/gift_pop_grow_up_ui", {type = actType, id = actId, onlySelf = onlySelf, showType = showType}) else UIManager:showUI("app/ui/shop/gift_pop_ui", {type = actType, id = actId, onlySelf = onlySelf, showType = showType}) end diff --git a/lua/app/userdata/dungeon/dungeon_data.lua b/lua/app/userdata/dungeon/dungeon_data.lua index 7d78169b..fe5888b1 100644 --- a/lua/app/userdata/dungeon/dungeon_data.lua +++ b/lua/app/userdata/dungeon/dungeon_data.lua @@ -486,7 +486,6 @@ function DungeonData:getDungeonBIStr() end str = str .. string.gsub(moduleKey, "_open", "") .. ":" .. entity:getPassedMaxId() end - Logger.logHighlight(str) return str end From 0e71260aad67b8966d667f548fb63e437eb53994 Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 9 Aug 2023 17:25:38 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E6=9B=B4=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/arena_bounty_level.lua | 184 +++---- lua/app/config/arena_rank.lua | 576 ++++++++++---------- lua/app/config/avatar_frame.lua | 4 +- lua/app/config/chapter.lua | 70 +-- lua/app/config/chapter_board.lua | 580 ++++++++++----------- lua/app/config/grid_type.lua | 68 +-- lua/app/config/item.lua | 8 +- lua/app/config/monster_chapter.lua | 4 +- lua/app/config/monster_daily_challenge.lua | 4 +- lua/app/config/monster_dungeon_armor.lua | 12 +- lua/app/config/strings/cn/avatar.lua | 2 +- lua/app/config/strings/cn/avatar_frame.lua | 4 +- lua/app/config/strings/cn/skill_rogue.lua | 2 +- lua/app/config/strings/en/avatar.lua | 2 +- lua/app/config/strings/en/avatar_frame.lua | 4 +- lua/app/config/strings/en/item.lua | 3 +- lua/app/config/strings/en/skill_rogue.lua | 10 +- lua/app/config/strings/es/avatar.lua | 2 +- lua/app/config/strings/es/avatar_frame.lua | 4 +- lua/app/config/strings/es/item.lua | 3 +- lua/app/config/strings/es/skill_rogue.lua | 10 +- lua/app/config/strings/id/avatar.lua | 2 +- lua/app/config/strings/id/avatar_frame.lua | 4 +- lua/app/config/strings/id/item.lua | 3 +- lua/app/config/strings/id/skill_rogue.lua | 10 +- lua/app/config/strings/ja/avatar.lua | 2 +- lua/app/config/strings/ja/avatar_frame.lua | 4 +- lua/app/config/strings/ja/item.lua | 3 +- lua/app/config/strings/ja/skill_rogue.lua | 10 +- lua/app/config/strings/ko/avatar.lua | 2 +- lua/app/config/strings/ko/avatar_frame.lua | 4 +- lua/app/config/strings/ko/item.lua | 3 +- lua/app/config/strings/ko/skill_rogue.lua | 10 +- lua/app/config/strings/pt/avatar.lua | 2 +- lua/app/config/strings/pt/avatar_frame.lua | 4 +- lua/app/config/strings/pt/item.lua | 3 +- lua/app/config/strings/pt/skill_rogue.lua | 10 +- lua/app/config/strings/th/avatar.lua | 2 +- lua/app/config/strings/th/avatar_frame.lua | 4 +- lua/app/config/strings/th/item.lua | 3 +- lua/app/config/strings/th/skill_rogue.lua | 10 +- lua/app/config/strings/vi/avatar.lua | 2 +- lua/app/config/strings/vi/avatar_frame.lua | 4 +- lua/app/config/strings/vi/item.lua | 3 +- lua/app/config/strings/vi/skill_rogue.lua | 10 +- lua/app/config/strings/zh/avatar.lua | 2 +- lua/app/config/strings/zh/avatar_frame.lua | 4 +- lua/app/config/strings/zh/item.lua | 3 +- lua/app/config/strings/zh/skill_rogue.lua | 10 +- lua/app/config/summon.lua | 64 +-- lua/app/proto/proto_msg_type.lua | 27 +- 51 files changed, 900 insertions(+), 880 deletions(-) diff --git a/lua/app/config/arena_bounty_level.lua b/lua/app/config/arena_bounty_level.lua index 8f17d73b..2b4dd2bf 100644 --- a/lua/app/config/arena_bounty_level.lua +++ b/lua/app/config/arena_bounty_level.lua @@ -1627,8 +1627,8 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, @@ -1687,16 +1687,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [205]={ @@ -1848,16 +1848,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [213]={ @@ -1988,16 +1988,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [220]={ @@ -2049,16 +2049,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [223]={ @@ -2189,8 +2189,8 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, @@ -2250,16 +2250,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [233]={ @@ -2451,16 +2451,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [243]={ @@ -2591,8 +2591,8 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" }, ["reward_pro"]={ ["type"]=1, @@ -2652,16 +2652,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [253]={ @@ -2853,16 +2853,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [263]={ @@ -3054,16 +3054,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [273]={ @@ -3154,16 +3154,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [278]={ @@ -3247,8 +3247,8 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, @@ -3307,16 +3307,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [305]={ @@ -3468,16 +3468,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [313]={ @@ -3608,16 +3608,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [320]={ @@ -3669,16 +3669,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [323]={ @@ -3809,8 +3809,8 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, @@ -3870,16 +3870,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [333]={ @@ -4071,16 +4071,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [343]={ @@ -4211,8 +4211,8 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" }, ["reward_pro"]={ ["type"]=1, @@ -4272,16 +4272,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [353]={ @@ -4473,16 +4473,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [363]={ @@ -4674,16 +4674,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [373]={ @@ -4774,16 +4774,16 @@ local arena_bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } }, [378]={ diff --git a/lua/app/config/arena_rank.lua b/lua/app/config/arena_rank.lua index ce390927..69272005 100644 --- a/lua/app/config/arena_rank.lua +++ b/lua/app/config/arena_rank.lua @@ -31,16 +31,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=200, + ["num_for_nothing"]="VAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -49,16 +49,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=130, + ["num_for_nothing"]="Vwtc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=53, - ["num_for_nothing"]="Uws=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -197,16 +197,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=120, - ["num_for_nothing"]="Vwpc" + ["num"]=240, + ["num_for_nothing"]="VAxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -215,16 +215,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=70, - ["num_for_nothing"]="UQg=" + ["num"]=150, + ["num_for_nothing"]="Vw1c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=53, - ["num_for_nothing"]="Uws=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -363,16 +363,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=140, - ["num_for_nothing"]="Vwxc" + ["num"]=280, + ["num_for_nothing"]="VABc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -381,16 +381,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=90, - ["num_for_nothing"]="Xwg=" + ["num"]=180, + ["num_for_nothing"]="VwBc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=53, - ["num_for_nothing"]="Uws=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -537,16 +537,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=160, - ["num_for_nothing"]="Vw5c" + ["num"]=320, + ["num_for_nothing"]="VQpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -555,16 +555,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=210, + ["num_for_nothing"]="VAlc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -711,16 +711,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=180, - ["num_for_nothing"]="VwBc" + ["num"]=360, + ["num_for_nothing"]="VQ5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -729,16 +729,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=110, - ["num_for_nothing"]="Vwlc" + ["num"]=230, + ["num_for_nothing"]="VAtc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -885,16 +885,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -903,16 +903,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=260, + ["num_for_nothing"]="VA5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -1059,16 +1059,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=220, - ["num_for_nothing"]="VApc" + ["num"]=440, + ["num_for_nothing"]="Ugxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -1077,16 +1077,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=140, - ["num_for_nothing"]="Vwxc" + ["num"]=290, + ["num_for_nothing"]="VAFc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -1233,16 +1233,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=240, - ["num_for_nothing"]="VAxc" + ["num"]=480, + ["num_for_nothing"]="UgBc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -1251,16 +1251,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=150, - ["num_for_nothing"]="Vw1c" + ["num"]=310, + ["num_for_nothing"]="VQlc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -1407,16 +1407,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=260, - ["num_for_nothing"]="VA5c" + ["num"]=520, + ["num_for_nothing"]="Uwpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -1425,16 +1425,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=170, - ["num_for_nothing"]="Vw9c" + ["num"]=340, + ["num_for_nothing"]="VQxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -1581,16 +1581,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=280, - ["num_for_nothing"]="VABc" + ["num"]=560, + ["num_for_nothing"]="Uw5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -1599,16 +1599,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=180, - ["num_for_nothing"]="VwBc" + ["num"]=360, + ["num_for_nothing"]="VQ5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -1755,16 +1755,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=300, - ["num_for_nothing"]="VQhc" + ["num"]=600, + ["num_for_nothing"]="UAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -1773,16 +1773,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=190, - ["num_for_nothing"]="VwFc" + ["num"]=390, + ["num_for_nothing"]="VQFc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -1929,16 +1929,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=320, - ["num_for_nothing"]="VQpc" + ["num"]=640, + ["num_for_nothing"]="UAxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -1947,16 +1947,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=210, - ["num_for_nothing"]="VAlc" + ["num"]=420, + ["num_for_nothing"]="Ugpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -2087,16 +2087,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=200, + ["num_for_nothing"]="VAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -2105,16 +2105,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=130, + ["num_for_nothing"]="Vwtc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=53, - ["num_for_nothing"]="Uws=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -2253,16 +2253,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=120, - ["num_for_nothing"]="Vwpc" + ["num"]=240, + ["num_for_nothing"]="VAxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -2271,16 +2271,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=70, - ["num_for_nothing"]="UQg=" + ["num"]=150, + ["num_for_nothing"]="Vw1c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=53, - ["num_for_nothing"]="Uws=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -2419,16 +2419,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=140, - ["num_for_nothing"]="Vwxc" + ["num"]=280, + ["num_for_nothing"]="VABc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -2437,16 +2437,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=90, - ["num_for_nothing"]="Xwg=" + ["num"]=180, + ["num_for_nothing"]="VwBc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=53, - ["num_for_nothing"]="Uws=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -2593,16 +2593,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=160, - ["num_for_nothing"]="Vw5c" + ["num"]=320, + ["num_for_nothing"]="VQpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -2611,16 +2611,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=210, + ["num_for_nothing"]="VAlc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -2767,16 +2767,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=180, - ["num_for_nothing"]="VwBc" + ["num"]=360, + ["num_for_nothing"]="VQ5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -2785,16 +2785,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=110, - ["num_for_nothing"]="Vwlc" + ["num"]=230, + ["num_for_nothing"]="VAtc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -2941,16 +2941,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -2959,16 +2959,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=260, + ["num_for_nothing"]="VA5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -3115,16 +3115,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=220, - ["num_for_nothing"]="VApc" + ["num"]=440, + ["num_for_nothing"]="Ugxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -3133,16 +3133,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=140, - ["num_for_nothing"]="Vwxc" + ["num"]=290, + ["num_for_nothing"]="VAFc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -3289,16 +3289,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=240, - ["num_for_nothing"]="VAxc" + ["num"]=480, + ["num_for_nothing"]="UgBc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -3307,16 +3307,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=150, - ["num_for_nothing"]="Vw1c" + ["num"]=310, + ["num_for_nothing"]="VQlc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -3463,16 +3463,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=260, - ["num_for_nothing"]="VA5c" + ["num"]=520, + ["num_for_nothing"]="Uwpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -3481,16 +3481,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=170, - ["num_for_nothing"]="Vw9c" + ["num"]=340, + ["num_for_nothing"]="VQxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -3637,16 +3637,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=280, - ["num_for_nothing"]="VABc" + ["num"]=560, + ["num_for_nothing"]="Uw5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -3655,16 +3655,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=180, - ["num_for_nothing"]="VwBc" + ["num"]=360, + ["num_for_nothing"]="VQ5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -3811,16 +3811,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=300, - ["num_for_nothing"]="VQhc" + ["num"]=600, + ["num_for_nothing"]="UAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -3829,16 +3829,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=190, - ["num_for_nothing"]="VwFc" + ["num"]=390, + ["num_for_nothing"]="VQFc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -3985,16 +3985,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=320, - ["num_for_nothing"]="VQpc" + ["num"]=640, + ["num_for_nothing"]="UAxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -4003,16 +4003,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=210, - ["num_for_nothing"]="VAlc" + ["num"]=420, + ["num_for_nothing"]="Ugpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -4141,16 +4141,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=200, + ["num_for_nothing"]="VAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -4159,16 +4159,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=130, + ["num_for_nothing"]="Vwtc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=53, - ["num_for_nothing"]="Uws=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -4305,16 +4305,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=120, - ["num_for_nothing"]="Vwpc" + ["num"]=240, + ["num_for_nothing"]="VAxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -4323,16 +4323,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=70, - ["num_for_nothing"]="UQg=" + ["num"]=150, + ["num_for_nothing"]="Vw1c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=53, - ["num_for_nothing"]="Uws=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -4469,16 +4469,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=140, - ["num_for_nothing"]="Vwxc" + ["num"]=280, + ["num_for_nothing"]="VABc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -4487,16 +4487,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=90, - ["num_for_nothing"]="Xwg=" + ["num"]=180, + ["num_for_nothing"]="VwBc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=53, - ["num_for_nothing"]="Uws=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -4641,16 +4641,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=160, - ["num_for_nothing"]="Vw5c" + ["num"]=320, + ["num_for_nothing"]="VQpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -4659,16 +4659,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=210, + ["num_for_nothing"]="VAlc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -4813,16 +4813,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=180, - ["num_for_nothing"]="VwBc" + ["num"]=360, + ["num_for_nothing"]="VQ5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -4831,16 +4831,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=110, - ["num_for_nothing"]="Vwlc" + ["num"]=230, + ["num_for_nothing"]="VAtc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -4985,16 +4985,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -5003,16 +5003,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=260, + ["num_for_nothing"]="VA5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -5157,16 +5157,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=220, - ["num_for_nothing"]="VApc" + ["num"]=440, + ["num_for_nothing"]="Ugxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=84, - ["num_for_nothing"]="Xgw=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -5175,16 +5175,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=140, - ["num_for_nothing"]="Vwxc" + ["num"]=290, + ["num_for_nothing"]="VAFc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -5329,16 +5329,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=240, - ["num_for_nothing"]="VAxc" + ["num"]=480, + ["num_for_nothing"]="UgBc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -5347,16 +5347,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=150, - ["num_for_nothing"]="Vw1c" + ["num"]=310, + ["num_for_nothing"]="VQlc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -5501,16 +5501,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=260, - ["num_for_nothing"]="VA5c" + ["num"]=520, + ["num_for_nothing"]="Uwpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -5519,16 +5519,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=170, - ["num_for_nothing"]="Vw9c" + ["num"]=340, + ["num_for_nothing"]="VQxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -5673,16 +5673,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=280, - ["num_for_nothing"]="VABc" + ["num"]=560, + ["num_for_nothing"]="Uw5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -5691,16 +5691,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=180, - ["num_for_nothing"]="VwBc" + ["num"]=360, + ["num_for_nothing"]="VQ5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -5845,16 +5845,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=300, - ["num_for_nothing"]="VQhc" + ["num"]=600, + ["num_for_nothing"]="UAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -5863,16 +5863,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=190, - ["num_for_nothing"]="VwFc" + ["num"]=390, + ["num_for_nothing"]="VQFc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ @@ -6017,16 +6017,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=320, - ["num_for_nothing"]="VQpc" + ["num"]=640, + ["num_for_nothing"]="UAxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=88, - ["num_for_nothing"]="XgA=" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["lose_reward"]={ @@ -6035,16 +6035,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=210, - ["num_for_nothing"]="VAlc" + ["num"]=420, + ["num_for_nothing"]="Ugpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=58, - ["num_for_nothing"]="UwA=" + ["num"]=132, + ["num_for_nothing"]="Vwte" } }, ["win_adbox"]={ diff --git a/lua/app/config/avatar_frame.lua b/lua/app/config/avatar_frame.lua index 818a2917..28f485b4 100644 --- a/lua/app/config/avatar_frame.lua +++ b/lua/app/config/avatar_frame.lua @@ -12,12 +12,12 @@ local avatar_frame = { ["item"]=25 }, [26]={ - ["iconId"]="avatar_frame_2", + ["iconId"]="avatar_frame_4", ["item"]=45, ["unlock_show"]=true }, [27]={ - ["iconId"]="avatar_frame_3", + ["iconId"]="avatar_frame_5", ["item"]=46, ["unlock_show"]=true } diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 78680970..f23bd898 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -117,7 +117,7 @@ local chapter = { } }, ["idle_exp"]=5, - ["idle_gold"]=10, + ["idle_gold"]=40, ["idle_drop"]={ { ["type"]=1, @@ -268,7 +268,7 @@ local chapter = { } }, ["idle_exp"]=6, - ["idle_gold"]=10, + ["idle_gold"]=40, ["idle_drop"]={ { ["type"]=1, @@ -414,7 +414,7 @@ local chapter = { } }, ["idle_exp"]=6, - ["idle_gold"]=13, + ["idle_gold"]=43, ["idle_drop"]={ { ["type"]=1, @@ -611,7 +611,7 @@ local chapter = { } }, ["idle_exp"]=7, - ["idle_gold"]=13, + ["idle_gold"]=43, ["idle_drop"]={ { ["type"]=1, @@ -808,7 +808,7 @@ local chapter = { } }, ["idle_exp"]=7, - ["idle_gold"]=19, + ["idle_gold"]=49, ["idle_drop"]={ { ["type"]=1, @@ -1011,7 +1011,7 @@ local chapter = { } }, ["idle_exp"]=8, - ["idle_gold"]=19, + ["idle_gold"]=49, ["idle_drop"]={ { ["type"]=1, @@ -1230,7 +1230,7 @@ local chapter = { } }, ["idle_exp"]=8, - ["idle_gold"]=25, + ["idle_gold"]=55, ["idle_drop"]={ { ["type"]=1, @@ -1449,7 +1449,7 @@ local chapter = { } }, ["idle_exp"]=9, - ["idle_gold"]=25, + ["idle_gold"]=55, ["idle_drop"]={ { ["type"]=1, @@ -1668,7 +1668,7 @@ local chapter = { } }, ["idle_exp"]=9, - ["idle_gold"]=31, + ["idle_gold"]=61, ["idle_drop"]={ { ["type"]=1, @@ -1887,7 +1887,7 @@ local chapter = { } }, ["idle_exp"]=10, - ["idle_gold"]=31, + ["idle_gold"]=61, ["idle_drop"]={ { ["type"]=1, @@ -2106,7 +2106,7 @@ local chapter = { } }, ["idle_exp"]=10, - ["idle_gold"]=37, + ["idle_gold"]=67, ["idle_drop"]={ { ["type"]=1, @@ -2325,7 +2325,7 @@ local chapter = { } }, ["idle_exp"]=12, - ["idle_gold"]=37, + ["idle_gold"]=67, ["idle_drop"]={ { ["type"]=1, @@ -2544,7 +2544,7 @@ local chapter = { } }, ["idle_exp"]=12, - ["idle_gold"]=42, + ["idle_gold"]=72, ["idle_drop"]={ { ["type"]=1, @@ -2763,7 +2763,7 @@ local chapter = { } }, ["idle_exp"]=14, - ["idle_gold"]=42, + ["idle_gold"]=72, ["idle_drop"]={ { ["type"]=1, @@ -2982,7 +2982,7 @@ local chapter = { } }, ["idle_exp"]=14, - ["idle_gold"]=47, + ["idle_gold"]=77, ["idle_drop"]={ { ["type"]=1, @@ -3201,7 +3201,7 @@ local chapter = { } }, ["idle_exp"]=16, - ["idle_gold"]=47, + ["idle_gold"]=77, ["idle_drop"]={ { ["type"]=1, @@ -3420,7 +3420,7 @@ local chapter = { } }, ["idle_exp"]=16, - ["idle_gold"]=48, + ["idle_gold"]=78, ["idle_drop"]={ { ["type"]=1, @@ -3639,7 +3639,7 @@ local chapter = { } }, ["idle_exp"]=18, - ["idle_gold"]=48, + ["idle_gold"]=78, ["idle_drop"]={ { ["type"]=1, @@ -3858,7 +3858,7 @@ local chapter = { } }, ["idle_exp"]=18, - ["idle_gold"]=49, + ["idle_gold"]=79, ["idle_drop"]={ { ["type"]=1, @@ -4077,7 +4077,7 @@ local chapter = { } }, ["idle_exp"]=20, - ["idle_gold"]=49, + ["idle_gold"]=79, ["idle_drop"]={ { ["type"]=1, @@ -4296,7 +4296,7 @@ local chapter = { } }, ["idle_exp"]=20, - ["idle_gold"]=50, + ["idle_gold"]=80, ["idle_drop"]={ { ["type"]=1, @@ -4515,7 +4515,7 @@ local chapter = { } }, ["idle_exp"]=22, - ["idle_gold"]=50, + ["idle_gold"]=80, ["idle_drop"]={ { ["type"]=1, @@ -4734,7 +4734,7 @@ local chapter = { } }, ["idle_exp"]=22, - ["idle_gold"]=51, + ["idle_gold"]=81, ["idle_drop"]={ { ["type"]=1, @@ -4953,7 +4953,7 @@ local chapter = { } }, ["idle_exp"]=24, - ["idle_gold"]=51, + ["idle_gold"]=81, ["idle_drop"]={ { ["type"]=1, @@ -5172,7 +5172,7 @@ local chapter = { } }, ["idle_exp"]=24, - ["idle_gold"]=52, + ["idle_gold"]=82, ["idle_drop"]={ { ["type"]=1, @@ -5391,7 +5391,7 @@ local chapter = { } }, ["idle_exp"]=26, - ["idle_gold"]=52, + ["idle_gold"]=82, ["idle_drop"]={ { ["type"]=1, @@ -5610,7 +5610,7 @@ local chapter = { } }, ["idle_exp"]=26, - ["idle_gold"]=53, + ["idle_gold"]=83, ["idle_drop"]={ { ["type"]=1, @@ -5829,7 +5829,7 @@ local chapter = { } }, ["idle_exp"]=28, - ["idle_gold"]=53, + ["idle_gold"]=83, ["idle_drop"]={ { ["type"]=1, @@ -6048,7 +6048,7 @@ local chapter = { } }, ["idle_exp"]=28, - ["idle_gold"]=54, + ["idle_gold"]=84, ["idle_drop"]={ { ["type"]=1, @@ -6267,7 +6267,7 @@ local chapter = { } }, ["idle_exp"]=30, - ["idle_gold"]=54, + ["idle_gold"]=84, ["idle_drop"]={ { ["type"]=1, @@ -6486,7 +6486,7 @@ local chapter = { } }, ["idle_exp"]=30, - ["idle_gold"]=55, + ["idle_gold"]=85, ["idle_drop"]={ { ["type"]=1, @@ -6705,7 +6705,7 @@ local chapter = { } }, ["idle_exp"]=32, - ["idle_gold"]=55, + ["idle_gold"]=85, ["idle_drop"]={ { ["type"]=1, @@ -6924,7 +6924,7 @@ local chapter = { } }, ["idle_exp"]=32, - ["idle_gold"]=56, + ["idle_gold"]=86, ["idle_drop"]={ { ["type"]=1, @@ -7143,7 +7143,7 @@ local chapter = { } }, ["idle_exp"]=34, - ["idle_gold"]=56, + ["idle_gold"]=86, ["idle_drop"]={ { ["type"]=1, @@ -7361,7 +7361,7 @@ local chapter = { } }, ["idle_exp"]=34, - ["idle_gold"]=57, + ["idle_gold"]=87, ["idle_drop"]={ { ["type"]=1, diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index 5d8fc7b3..b8bb4604 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -10391,7 +10391,7 @@ local chapter_board = { [38]={ ["board"]={ { - 7, + 3, 0 }, { @@ -10404,7 +10404,7 @@ local chapter_board = { }, { 0, - 4 + 2 }, { 0, @@ -10415,16 +10415,16 @@ local chapter_board = { 0 }, { - 7, + 3, 0 }, { - 7, + 3, 0 }, { 5, - 1 + 5 }, { 0, @@ -10432,7 +10432,7 @@ local chapter_board = { }, { 0, - 4 + 2 }, { 0, @@ -10440,14 +10440,14 @@ local chapter_board = { }, { 5, - 3 + 1 }, { - 7, + 3, 0 }, { - 7, + 3, 0 }, { @@ -10471,11 +10471,11 @@ local chapter_board = { 0 }, { - 7, + 3, 0 }, { - 7, + 3, 0 }, { @@ -10496,14 +10496,14 @@ local chapter_board = { }, { 5, - 2 + 1 }, { - 7, + 3, 0 }, { - 7, + 3, 0 }, { @@ -10511,33 +10511,17 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { 0, 2 }, - { - 3, - 0 - }, { 2, 0 }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 5, - 3 - }, { 2, 0 @@ -10547,7 +10531,7 @@ local chapter_board = { 0 }, { - 2, + 3, 0 }, { @@ -10555,27 +10539,43 @@ local chapter_board = { 5 }, { - 7, - 0 - }, - { - 7, + 2, 0 }, { 2, 0 }, + { + 2, + 0 + }, + { + 5, + 1 + }, { 3, 0 }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, { 14, 0 }, { - 3, + 2, 0 }, { @@ -10583,13 +10583,13 @@ local chapter_board = { 0 }, { - 7, + 3, 0 } }, ["mystery_box_board"]={ { - 7, + 3, 0 }, { @@ -10602,7 +10602,7 @@ local chapter_board = { }, { 0, - 4 + 2 }, { 0, @@ -10613,16 +10613,16 @@ local chapter_board = { 0 }, { - 7, + 3, 0 }, { - 7, + 3, 0 }, { 5, - 1 + 5 }, { 0, @@ -10630,7 +10630,7 @@ local chapter_board = { }, { 0, - 4 + 2 }, { 0, @@ -10638,14 +10638,14 @@ local chapter_board = { }, { 5, - 3 + 1 }, { - 7, + 3, 0 }, { - 7, + 3, 0 }, { @@ -10669,11 +10669,11 @@ local chapter_board = { 0 }, { - 7, + 3, 0 }, { - 7, + 3, 0 }, { @@ -10694,14 +10694,14 @@ local chapter_board = { }, { 5, - 2 + 1 }, { - 7, + 3, 0 }, { - 7, + 3, 0 }, { @@ -10709,33 +10709,17 @@ local chapter_board = { 0 }, { - 3, + 2, 0 }, { 0, 2 }, - { - 3, - 0 - }, { 2, 0 }, - { - 7, - 0 - }, - { - 7, - 0 - }, - { - 5, - 3 - }, { 2, 0 @@ -10745,7 +10729,7 @@ local chapter_board = { 0 }, { - 2, + 3, 0 }, { @@ -10753,27 +10737,43 @@ local chapter_board = { 5 }, { - 7, - 0 - }, - { - 7, + 2, 0 }, { 2, 0 }, + { + 2, + 0 + }, + { + 5, + 1 + }, { 3, 0 }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, { 17, 0 }, { - 3, + 2, 0 }, { @@ -10781,7 +10781,7 @@ local chapter_board = { 0 }, { - 7, + 3, 0 } } @@ -12038,7 +12038,7 @@ local chapter_board = { }, { 0, - 4 + 3 }, { 2, @@ -12236,7 +12236,7 @@ local chapter_board = { }, { 0, - 4 + 3 }, { 2, @@ -12452,7 +12452,7 @@ local chapter_board = { }, { 0, - 5 + 3 }, { 0, @@ -12588,7 +12588,7 @@ local chapter_board = { }, { 0, - 3 + 5 }, { 0, @@ -12604,7 +12604,7 @@ local chapter_board = { }, { 0, - 2 + 3 }, { 0, @@ -12636,7 +12636,7 @@ local chapter_board = { }, { 0, - 2 + 3 }, { 14, @@ -12783,12 +12783,12 @@ local chapter_board = { [46]={ ["board"]={ { - 1, + 3, 0 }, { 0, - 5 + 3 }, { 2, @@ -12807,16 +12807,16 @@ local chapter_board = { 5 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { 0, - 2 + 4 }, { 2, @@ -12835,123 +12835,123 @@ local chapter_board = { 2 }, { - 1, + 3, 0 }, { - 1, - 0 - }, - { - 0, - 5 - }, - { - 2, + 3, 0 }, { 0, 1 }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, { 2, 0 }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 13, + 3 + }, + { + 13, + 4 + }, + { + 13, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, { 0, 5 }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 2, 0 }, { - 2, + 3, 0 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 13, - 4 - }, - { - 13, - 4 - }, - { - 13, - 5 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 13, - 4 - }, - { - 13, - 4 - }, - { - 13, - 5 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, + 3, 0 }, { @@ -12959,34 +12959,34 @@ local chapter_board = { 0 }, { - 13, - 1 + 0, + 3 }, { - 13, - 1 + 0, + 4 }, { - 13, - 2 + 0, + 5 }, { 14, 0 }, { - 1, + 3, 0 } }, ["mystery_box_board"]={ { - 1, + 3, 0 }, { 0, - 5 + 3 }, { 2, @@ -13005,16 +13005,16 @@ local chapter_board = { 5 }, { - 1, + 3, 0 }, { - 1, + 3, 0 }, { 0, - 2 + 4 }, { 2, @@ -13033,123 +13033,123 @@ local chapter_board = { 2 }, { - 1, + 3, 0 }, { - 1, - 0 - }, - { - 0, - 5 - }, - { - 2, + 3, 0 }, { 0, 1 }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 0, + 1 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, { 2, 0 }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 13, + 3 + }, + { + 13, + 4 + }, + { + 13, + 5 + }, + { + 2, + 0 + }, + { + 3, + 0 + }, + { + 3, + 0 + }, + { + 2, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, { 0, 5 }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 2, 0 }, { - 2, + 3, 0 }, { - 2, - 0 - }, - { - 2, - 0 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 13, - 4 - }, - { - 13, - 4 - }, - { - 13, - 5 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 2, - 0 - }, - { - 13, - 4 - }, - { - 13, - 4 - }, - { - 13, - 5 - }, - { - 2, - 0 - }, - { - 1, - 0 - }, - { - 1, + 3, 0 }, { @@ -13157,23 +13157,23 @@ local chapter_board = { 0 }, { - 13, - 1 + 0, + 3 }, { 17, 0 }, { - 13, - 2 + 0, + 5 }, { 14, 0 }, { - 1, + 3, 0 } } diff --git a/lua/app/config/grid_type.lua b/lua/app/config/grid_type.lua index 0c669518..5a6895df 100644 --- a/lua/app/config/grid_type.lua +++ b/lua/app/config/grid_type.lua @@ -5,8 +5,8 @@ local grid_type = { [1]={ ["icon"]="battle_hinder_1", ["cant_link"]=1, - ["cant_upset"]=1, - ["element_invalid"]=1 + ["element_invalid"]=1, + ["cant_upset"]=1 }, [2]={ ["icon"]="battle_obstacle_stone_2", @@ -17,8 +17,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_za_b01" }, [3]={ @@ -30,8 +30,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_za_b01" }, [4]={ @@ -73,8 +73,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_zhuqiantk_b01" }, [8]={ @@ -86,8 +86,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["effect"]=1, ["effect_sfx"]="sfx_piece_huojian_b01", ["sfx_flow"]=1, @@ -105,8 +105,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["effect"]=1, ["effect_sfx"]="sfx_piece_huojian_b01", ["sfx_flow"]=1, @@ -124,8 +124,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["effect"]=1, ["effect_sfx"]="sfx_piece_huojian_b01", ["sfx_flow"]=1, @@ -143,8 +143,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["effect"]=1, ["effect_sfx"]="sfx_piece_huojian_b01", ["sfx_flow"]=1, @@ -178,8 +178,8 @@ local grid_type = { ["break_stay_element"]=1, ["can_fall"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_guodong_b01", ["effect"]=5, ["effect_sfx"]="sfx_piece_guodong_b02", @@ -197,8 +197,8 @@ local grid_type = { ["bftc_icon"]="battle_obstacle_lamp", ["bftc_time"]=0.4, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_shendeng_b01", ["effect"]=3, ["effect_trigger"]=2 @@ -219,8 +219,8 @@ local grid_type = { ["bftc_icon"]="battle_obstacle_chest_4", ["bftc_time"]=0.3, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_baoxiang_b01", ["effect"]=4, ["effect_trigger"]=2 @@ -238,8 +238,8 @@ local grid_type = { ["spine_change"]="idle1_1", ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, - ["element_invalid"]=1 + ["element_invalid"]=1, + ["cant_upset"]=1 }, [17]={ ["icon"]="battle_obstacle_chest_1", @@ -254,8 +254,8 @@ local grid_type = { ["spine_change"]="idle1", ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, - ["element_invalid"]=1 + ["element_invalid"]=1, + ["cant_upset"]=1 }, [18]={ ["icon"]="battle_obstacle_stump_1", @@ -266,8 +266,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_muzhuang_b01" }, [19]={ @@ -279,8 +279,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_muzhuang_b01" }, [20]={ @@ -292,8 +292,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_muzhuang_b01" }, [21]={ @@ -307,8 +307,8 @@ local grid_type = { ["break_stay_element"]=1, ["can_fall"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_shuipao_b01", ["effect"]=5, ["effect_sfx"]="sfx_piece_shuipao_b02", @@ -325,8 +325,8 @@ local grid_type = { ["break_stay_element"]=1, ["can_fall"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_yuni_b01", ["effect"]=5, ["effect_sfx"]="sfx_piece_yuni_b02", @@ -343,8 +343,8 @@ local grid_type = { ["break_stay_element"]=1, ["can_fall"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_duwu_b01", ["effect"]=5, ["effect_sfx"]="sfx_piece_duwu_b02", @@ -359,8 +359,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_jitang_b01" }, [25]={ @@ -372,8 +372,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_jitang_b01" }, [26]={ @@ -385,8 +385,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_jitang_b01" }, [27]={ @@ -409,8 +409,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_zhongrushi_b01" }, [29]={ @@ -422,8 +422,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_zhongrushi_b01" }, [30]={ @@ -435,8 +435,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_zhongrushi_b01" }, [31]={ @@ -448,8 +448,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_tiexie_b01" }, [32]={ @@ -461,8 +461,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_tiexie_b01" }, [33]={ @@ -474,8 +474,8 @@ local grid_type = { }, ["break_count"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_tiexie_b01" }, [34]={ @@ -489,8 +489,8 @@ local grid_type = { ["break_stay_element"]=1, ["can_fall"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_rongyan_b01", ["effect"]=5, ["effect_sfx"]="sfx_piece_rongyan_b02", @@ -518,8 +518,8 @@ local grid_type = { ["spine_idle"]="idle", ["can_fall"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_rongyan_b01", ["effect"]=6, ["effect_trigger"]=1 @@ -532,8 +532,8 @@ local grid_type = { ["spine_idle"]="idle", ["can_fall"]=1, ["cant_link"]=1, - ["cant_upset"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_duwu_b01", ["effect"]=6, ["effect_trigger"]=1 diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index b18e588a..c5bcd74b 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -267,8 +267,8 @@ local item = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=47, - ["id_for_nothing"]="Ug8=", + ["id"]=6, + ["id_for_nothing"]="UA==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -356,8 +356,8 @@ local item = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=47, - ["id_for_nothing"]="Ug8=", + ["id"]=6, + ["id_for_nothing"]="UA==", ["num"]=2, ["num_for_nothing"]="VA==" }, diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index 3db99c9b..61c27fdb 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -2491,9 +2491,7 @@ local monster_chapter = { 10029 }, ["passive_skill"]={ - 10013, - 10008, - 10011 + 10013 }, ["monster_exp"]=22000 }, diff --git a/lua/app/config/monster_daily_challenge.lua b/lua/app/config/monster_daily_challenge.lua index ae07cdef..25560983 100644 --- a/lua/app/config/monster_daily_challenge.lua +++ b/lua/app/config/monster_daily_challenge.lua @@ -254,9 +254,7 @@ local monster_daily_challenge = { 10029 }, ["passive_skill"]={ - 10013, - 10008, - 10011 + 10013 }, ["monster_exp"]=22000 }, diff --git a/lua/app/config/monster_dungeon_armor.lua b/lua/app/config/monster_dungeon_armor.lua index 0103a741..e0257238 100644 --- a/lua/app/config/monster_dungeon_armor.lua +++ b/lua/app/config/monster_dungeon_armor.lua @@ -1568,9 +1568,7 @@ local monster_dungeon_armor = { 10029 }, ["passive_skill"]={ - 10013, - 10008, - 10011 + 10013 }, ["monster_exp"]=40000 }, @@ -3430,9 +3428,7 @@ local monster_dungeon_armor = { 10029 }, ["passive_skill"]={ - 10013, - 10008, - 10011 + 10013 }, ["monster_exp"]=40000 }, @@ -5046,9 +5042,7 @@ local monster_dungeon_armor = { 10029 }, ["passive_skill"]={ - 10013, - 10008, - 10011 + 10013 }, ["monster_exp"]=40000 }, diff --git a/lua/app/config/strings/cn/avatar.lua b/lua/app/config/strings/cn/avatar.lua index 84839025..db3fafbe 100644 --- a/lua/app/config/strings/cn/avatar.lua +++ b/lua/app/config/strings/cn/avatar.lua @@ -3,7 +3,7 @@ local avatar = { ["desc"]="S1竞技战令头像，愿你像洋葱头勇往直前！" }, [24]={ - ["desc"]="S2竞技战令头像，愿你像洋葱头勇往直前！" + ["desc"]="S2竞技战令头像，刀起刀落胜利就来了。" }, [1001]={ ["desc"]="激活舞女后获得。" diff --git a/lua/app/config/strings/cn/avatar_frame.lua b/lua/app/config/strings/cn/avatar_frame.lua index 3a5ddc02..9f6c5019 100644 --- a/lua/app/config/strings/cn/avatar_frame.lua +++ b/lua/app/config/strings/cn/avatar_frame.lua @@ -9,10 +9,10 @@ local avatar_frame = { ["desc"]="S1竞技场黄金头像，实力的证明。" }, [26]={ - ["desc"]="S2赛季白银头像框" + ["desc"]="S2竞技场白银头像框，力量的证明。" }, [27]={ - ["desc"]="S2赛季黄金头像框" + ["desc"]="S2竞技场黄金头像框，英雄的光辉。" } } local config = { diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index d1454103..21069790 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="幻影剑袭链接4个元素或以上时，本回合暴击提升20%。" }, [2300206]={ - ["desc"]="幻影剑袭链接4个元素或以上时，本回合暴击提升30%。" + ["desc"]="幻影剑袭附加的暴击提升效果增加至30%。" }, [2300207]={ ["desc"]="幻影剑袭使用时本回合对生命值50%以下的敌人暴击伤害提升50%。" diff --git a/lua/app/config/strings/en/avatar.lua b/lua/app/config/strings/en/avatar.lua index 285f05c1..b25eb05e 100644 --- a/lua/app/config/strings/en/avatar.lua +++ b/lua/app/config/strings/en/avatar.lua @@ -3,7 +3,7 @@ local avatar = { ["desc"]="S1 Arena Battle Pass Avatar. May you forge ahead like a brave Onion Head!" }, [24]={ - + ["desc"]="S2 Arena Battle Pass Avatar. Victory comes as blades dance." }, [1001]={ ["desc"]="Obtained after activating Dancer." diff --git a/lua/app/config/strings/en/avatar_frame.lua b/lua/app/config/strings/en/avatar_frame.lua index db78378c..cd268d22 100644 --- a/lua/app/config/strings/en/avatar_frame.lua +++ b/lua/app/config/strings/en/avatar_frame.lua @@ -9,10 +9,10 @@ local avatar_frame = { ["desc"]="S1 Gold Arena Avatar Frame. Proof of your prowess." }, [26]={ - + ["desc"]="S2 Silver Arena Avatar Frame. Proof of your strength." }, [27]={ - + ["desc"]="S2 Gold Arena Avatar Frame, shining with heroic radiance." } } local config = { diff --git a/lua/app/config/strings/en/item.lua b/lua/app/config/strings/en/item.lua index 255e8b2e..3959ce16 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -184,7 +184,8 @@ local item = { ["desc"]="S2 Gold Arena Avatar Frame, shining with heroic radiance." }, [47]={ - + ["name"]="Random Epic Hero", + ["desc"]="Shards obtained in batch will only randomly grant one of the following heroes." }, [1001]={ ["name"]="Dim Meteorite", diff --git a/lua/app/config/strings/en/skill_rogue.lua b/lua/app/config/strings/en/skill_rogue.lua index 13fcd849..da7c1899 100644 --- a/lua/app/config/strings/en/skill_rogue.lua +++ b/lua/app/config/strings/en/skill_rogue.lua @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Combo: Steel Strike deals 1 additional hit of damage to bleeding enemies." }, [1400104]={ - ["desc"]="Steel Strike Stun effect lasts +1 turns." + ["desc"]="Steel Strike has a 50% chance to inflict Stun for 2 turns." }, [1400105]={ ["desc"]="Increase the damage of Burn inflicted by Steel Strike. Lasts +1 turns." @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="When Phantom Blade links to 4 or more elements, critical rate increases by 20% for this turn." }, [2300206]={ - ["desc"]="When Phantom Blade links to 4 or more elements, critical rate increases by 30% for this turn." + ["desc"]="Critical rate of Phantom Blade increases to 30%." }, [2300207]={ ["desc"]="When Phantom Slash is used, critical damage against enemies with below 50% HP increases by 50% for this turn." @@ -537,7 +537,7 @@ local skill_rogue = { ["desc"]="Frostbite Crystal applies ice shield to the team for 2 turns." }, [4300107]={ - ["desc"]="Ice Shield from Frostbite Crystal can reflect 400% of damage." + ["desc"]="Ice Shield from Frostbite Crystal that can reflect massive damage." }, [4300200]={ ["desc"]="Unlock Corrupt Blade: Deal one additional hit of skill damage and inflict Corrupt for 1 turn." @@ -627,7 +627,7 @@ local skill_rogue = { ["desc"]="Shield Art can clear additional 4 grids in the X direction." }, [5200105]={ - ["desc"]="Shield from Shield Art can reflect 200% of damage." + ["desc"]="The shield from Shield Art that can reflect damage." }, [5200106]={ ["desc"]="Ninja Lun's attack increases by 15%." @@ -645,7 +645,7 @@ local skill_rogue = { ["desc"]="When Enchanted Broomstick is used, normal attack damage increases by 15% for this turn." }, [5300103]={ - ["desc"]="Enchanted Broomstick can inflict Drowsy for 2 turns." + ["desc"]="Enchanted Broomstick has a 50% chance to apply Drowsy for 2 turns." }, [5300104]={ ["desc"]="Increase the damage of Poisoned inflicted by Enchanted Broomstick." diff --git a/lua/app/config/strings/es/avatar.lua b/lua/app/config/strings/es/avatar.lua index 004667cd..632d1be8 100644 --- a/lua/app/config/strings/es/avatar.lua +++ b/lua/app/config/strings/es/avatar.lua @@ -3,7 +3,7 @@ local avatar = { ["desc"]="Avatar de Pase de Batalla de Arena S1. Que sigue adelante con valentía como Cebolla!" }, [24]={ - + ["desc"]="Avatar de Pase de Batalla de Arena S2. La victoria llega entre cuchilladas." }, [1001]={ ["desc"]="Se obtiene tras activar Bailarina." diff --git a/lua/app/config/strings/es/avatar_frame.lua b/lua/app/config/strings/es/avatar_frame.lua index 0c842351..82126b48 100644 --- a/lua/app/config/strings/es/avatar_frame.lua +++ b/lua/app/config/strings/es/avatar_frame.lua @@ -9,10 +9,10 @@ local avatar_frame = { ["desc"]="Marco de avatar de oro Temporada S1, prueba de fuerza." }, [26]={ - + ["desc"]="Marco de avatar de plata de Arena S2, prueba de fuerza." }, [27]={ - + ["desc"]="Marco de avatar de oro de Arena S1, gloria del héroe." } } local config = { diff --git a/lua/app/config/strings/es/item.lua b/lua/app/config/strings/es/item.lua index e7060593..2666dc66 100644 --- a/lua/app/config/strings/es/item.lua +++ b/lua/app/config/strings/es/item.lua @@ -184,7 +184,8 @@ local item = { ["desc"]="Marco de avatar de oro de Arena S1, gloria del héroe." }, [47]={ - + ["name"]="Héroe Épico aleatorio", + ["desc"]="Al obtener por lote, solo aparecerá uno de los siguientes héroes" }, [1001]={ ["name"]="Meteorito Opaco", diff --git a/lua/app/config/strings/es/skill_rogue.lua b/lua/app/config/strings/es/skill_rogue.lua index cfc9fa33..a1019fe4 100644 --- a/lua/app/config/strings/es/skill_rogue.lua +++ b/lua/app/config/strings/es/skill_rogue.lua @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Combo: Golpe de Acero causa 1 vez más de daño a los enemigos Sangrados." }, [1400104]={ - ["desc"]="El Vértigo aplicado por Golpe de Acero dura +1 ronda." + ["desc"]="Golpe de Acero tiene 50% de chance de aplicar Vértigo durante 2 rondas." }, [1400105]={ ["desc"]="El aumento de daño por el efecto de quemadura de Golpe de Acero dura +1 ronda." @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="Cuando Espada de Fantasía enlaza 4 o más elementos, el golpe crítico de esta ronda aumenta un 20%." }, [2300206]={ - ["desc"]="Cuando Espada de Fantasía enlaza 4 o más elementos, el golpe crítico de esta ronda aumenta un 30%." + ["desc"]="El efecto de golpe crítico de la espada de fantasía aumenta al 30%." }, [2300207]={ ["desc"]="Al usar Espada de Fantasía, el daño de golpes críticos a los enemigos con HP inferior a 50% aumenta un 50% en esta ronda." @@ -537,7 +537,7 @@ local skill_rogue = { ["desc"]="Al usar Cristal Escarchado, se agrega un escudo de hielo al equipo durante 2 rondas." }, [4300107]={ - ["desc"]="El escudo de hielo aplicado por Cristal Escarchado puede rebotar 400% del daño." + ["desc"]="El escudo de hielo aplicado por Cristal Escarchado puede reflejar daño masivo." }, [4300200]={ ["desc"]="Desbloquea Filo Corrupto: causa un daño de habilidad adicional con efecto de Corrupto durante 1 ronda." @@ -627,7 +627,7 @@ local skill_rogue = { ["desc"]="Hechizo Escudo elimina 4 bloques extras en direcciones de +." }, [5200105]={ - ["desc"]="El escudo apalicado por Hechizo Escudo puede rebotar 200% del daño." + ["desc"]="El escudo aplicado por Hechizo Escudo puede reflejar daño." }, [5200106]={ ["desc"]="Ataque de Ninja Jay aumenta un 15%." @@ -645,7 +645,7 @@ local skill_rogue = { ["desc"]="Al usar Escoba Mágica, el daño de este ataque común aumenta un 15%." }, [5300103]={ - ["desc"]="Escoba Mágica podría aplicar efecto de Dormido durante 2 rondas." + ["desc"]="Escoba Mágica tiene 50% de chance de aplicar Dormido durante 2 rondas." }, [5300104]={ ["desc"]="Aumenta el efecto de Envenenado aplicado por Escoba Mágica." diff --git a/lua/app/config/strings/id/avatar.lua b/lua/app/config/strings/id/avatar.lua index 4a7f6824..2de9688f 100644 --- a/lua/app/config/strings/id/avatar.lua +++ b/lua/app/config/strings/id/avatar.lua @@ -3,7 +3,7 @@ local avatar = { ["desc"]="Avatar battle kompetitif S1. Semoga sukses!" }, [24]={ - + ["desc"]="Avatar Battle Pass Arena S2. Kemenangan datang saat pedang diayunkan." }, [1001]={ ["desc"]="Dapat setelah lolos Dancer" diff --git a/lua/app/config/strings/id/avatar_frame.lua b/lua/app/config/strings/id/avatar_frame.lua index b16be72b..bf1de6b5 100644 --- a/lua/app/config/strings/id/avatar_frame.lua +++ b/lua/app/config/strings/id/avatar_frame.lua @@ -9,10 +9,10 @@ local avatar_frame = { ["desc"]="Bingkai Avatar Emas S1. Bukti kekuatan!" }, [26]={ - + ["desc"]="Bingkai Avatar Silver Arena S2. Bukti Kekuatan." }, [27]={ - + ["desc"]="Bingkai Avatar Emas Arena S2.Pahlawan mulia." } } local config = { diff --git a/lua/app/config/strings/id/item.lua b/lua/app/config/strings/id/item.lua index c6f47c76..546e9d8e 100644 --- a/lua/app/config/strings/id/item.lua +++ b/lua/app/config/strings/id/item.lua @@ -184,7 +184,8 @@ local item = { ["desc"]="Bingkai Avatar Emas Arena S2.Pahlawan mulia." }, [47]={ - + ["name"]="Hero Epik acak", + ["desc"]="Hanya satu dari Hero berikut yang akan muncul secara acak saat dapat dalam jumlah banyak." }, [1001]={ ["name"]="Chondrite", diff --git a/lua/app/config/strings/id/skill_rogue.lua b/lua/app/config/strings/id/skill_rogue.lua index efc916ac..80caa370 100644 --- a/lua/app/config/strings/id/skill_rogue.lua +++ b/lua/app/config/strings/id/skill_rogue.lua @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Combo: Strike Baja memberikan 1 DMG tambahan pada musuh yang berdarah." }, [1400104]={ - ["desc"]="Stun pada Strike Baja, jumlah giliran +1." + ["desc"]="Strike Baja memiliki 50% peluang menambahkan efek Stun selama 2 giliran." }, [1400105]={ ["desc"]="Meningkatkan DMG Scorch yang ditimbulkan Strike Baja. Berlangsung selama +1 giliran." @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="Saat Pedang Phantom menautkan 4 atau lebih banyak elemen, Crit Rate meningkat 20% untuk giliran ini." }, [2300206]={ - ["desc"]="Saat Pedang Phantom menautkan 4 atau lebih banyak elemen, Crit Rate meningkat 30% untuk giliran ini." + ["desc"]="Efek tambahan Crit dari Pedang Phantom meningkat menjadi 30%." }, [2300207]={ ["desc"]="Saat Pedang Phantom digunakan, DMG Crit terhadap musuh dengan HP di bawah 50% akan meningkat 50% pada giliran tersebut." @@ -537,7 +537,7 @@ local skill_rogue = { ["desc"]="Tambahkan efek Kristal Es ke tim selama 2 giliran." }, [4300107]={ - ["desc"]="Kristal Es yang melekat dapat menangkal DMG 400%." + ["desc"]="Perisai Es yang melekat pada Kristal Es dapat menahan sejumlah DMG." }, [4300200]={ ["desc"]="Membuka Tombak Tajam: Menyebabkan satu kali DMG skill tambahan dengan efek DMG selama 1 giliran." @@ -627,7 +627,7 @@ local skill_rogue = { ["desc"]="Seni Perisai dapat menghapus 4 grid tambahan pada arah +." }, [5200105]={ - ["desc"]="Perisai dari Seni Perisai dapat merefleksikan 200% DMG." + ["desc"]="Seni Perisai yang melekat pada Perisai dapat menahan sejumlah DMG." }, [5200106]={ ["desc"]="ATK Ninja Jay meningkat 15%." @@ -645,7 +645,7 @@ local skill_rogue = { ["desc"]="Saat Sapu Ajaib digunakan, DMG ATK Normal meningkat 15% pada giliran ini." }, [5300103]={ - ["desc"]="Sapu Ajaib dapat menimbulkan Kantuk selama 2 giliran." + ["desc"]="Sapu Ajaib memiliki 50% peluang menambahkan efek Kantuk selama 2 giliran." }, [5300104]={ ["desc"]="Efek racun yang melekat pada Sapu Ajaib meningkatkan DMG." diff --git a/lua/app/config/strings/ja/avatar.lua b/lua/app/config/strings/ja/avatar.lua index 9bfd80f3..2a429a31 100644 --- a/lua/app/config/strings/ja/avatar.lua +++ b/lua/app/config/strings/ja/avatar.lua @@ -3,7 +3,7 @@ local avatar = { ["desc"]="S1闘技場戦令アイコン。タマネギのように前に進みますように！" }, [24]={ - + ["desc"]="S2闘技場戦令アイコン。いつの間にか勝利が訪れる。" }, [1001]={ ["desc"]="ダンサーをアクティブ化後獲得できる。" diff --git a/lua/app/config/strings/ja/avatar_frame.lua b/lua/app/config/strings/ja/avatar_frame.lua index 667bc5a8..57c5abb8 100644 --- a/lua/app/config/strings/ja/avatar_frame.lua +++ b/lua/app/config/strings/ja/avatar_frame.lua @@ -9,10 +9,10 @@ local avatar_frame = { ["desc"]="S1闘技場ゴールドフレーム。実力の証。" }, [26]={ - + ["desc"]="S2闘技場シルバーフレーム。実力の証。" }, [27]={ - + ["desc"]="S2闘技場ゴールドフレーム。ヒーローの輝き。" } } local config = { diff --git a/lua/app/config/strings/ja/item.lua b/lua/app/config/strings/ja/item.lua index 1d380036..437b2c2f 100644 --- a/lua/app/config/strings/ja/item.lua +++ b/lua/app/config/strings/ja/item.lua @@ -184,7 +184,8 @@ local item = { ["desc"]="S2闘技場ゴールドフレーム。ヒーローの輝き。" }, [47]={ - + ["name"]="ランダムエピックヒーロー", + ["desc"]="一括獲得の時、以下のいずれかのヒーロー1名をランダムで獲得できる。" }, [1001]={ ["name"]="薄暗い隕石", diff --git a/lua/app/config/strings/ja/skill_rogue.lua b/lua/app/config/strings/ja/skill_rogue.lua index 9ff7c959..416f2bd0 100644 --- a/lua/app/config/strings/ja/skill_rogue.lua +++ b/lua/app/config/strings/ja/skill_rogue.lua @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Combo:「ヘヴィーヒット」は出血状態の敵に追加で1回発動する。" }, [1400104]={ - ["desc"]="「ヘヴィーヒット」が付与するスタン効果のターン数が+1。" + ["desc"]="「ヘヴィーヒット」は50%の確率で敵に2ターンスタン効果を付与する。" }, [1400105]={ ["desc"]="「ヘヴィーヒット」の⽕傷効果のターン数が+1。" @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="「ファントムストライク」は4つ以上の元素と繋がると、このターンのクリティカル率が20%アップ。" }, [2300206]={ - ["desc"]="「ファントムストライク」は4つ以上の元素と繋がった時、このターンのクリティカル率が30%アップ。" + ["desc"]="「ファントムストライク」のクリティカルアップ効果が30%に増加する。" }, [2300207]={ ["desc"]="「ファントムストライク」を発動するターン、HPが50%未満の敵へのクリティカルダメージが50%アップ。" @@ -537,7 +537,7 @@ local skill_rogue = { ["desc"]="「フロストバイトクリスタル」は全員に2ターン氷シールド効果を付与する。" }, [4300107]={ - ["desc"]="「フロストバイトクリスタル」が付与する氷シールドは400%のダメージを反射する。" + ["desc"]="フロストバイトクリスタルの氷シールドは、大量のダメージを反射できる。" }, [4300200]={ ["desc"]="コラプトブレード解放：追加で1ターン腐敗効果付きのスキルを1回発動する。" @@ -627,7 +627,7 @@ local skill_rogue = { ["desc"]="「シールド術」は追加で縦横4マスを消す。" }, [5200105]={ - ["desc"]="「シールド術」のシールドは200%のダメージを反射する。" + ["desc"]="「シールド術」のシールドは、ダメージを反射できる。" }, [5200106]={ ["desc"]="忍者リンの攻撃が15%アップ。" @@ -645,7 +645,7 @@ local skill_rogue = { ["desc"]="「魔法のほうき」を発動するターン、通常攻撃のダメージが15%アップ。" }, [5300103]={ - ["desc"]="「魔法のほうき」は敵に2ターン昏睡効果を付与する。" + ["desc"]="「魔法のほうき」は50%の確率で敵に2ターン昏睡効果を付与する。" }, [5300104]={ ["desc"]="「魔法のほうき」が付与する中毒効果のダメージがアップ。" diff --git a/lua/app/config/strings/ko/avatar.lua b/lua/app/config/strings/ko/avatar.lua index 0fe17b3e..998ff396 100644 --- a/lua/app/config/strings/ko/avatar.lua +++ b/lua/app/config/strings/ko/avatar.lua @@ -3,7 +3,7 @@ local avatar = { ["desc"]="S1 아레나 배틀 패스 아이콘, 양파 헤드처럼 씩씩하게 나아가시길 바랍니다!" }, [24]={ - + ["desc"]="S2 아레나 배틀 패스 아이콘, 휘날리는 칼 속에서 승리를 거머쥡니다." }, [1001]={ ["desc"]="무희을(를) 활성화한 후, 획득할 수 있습니다." diff --git a/lua/app/config/strings/ko/avatar_frame.lua b/lua/app/config/strings/ko/avatar_frame.lua index e9778a28..88909731 100644 --- a/lua/app/config/strings/ko/avatar_frame.lua +++ b/lua/app/config/strings/ko/avatar_frame.lua @@ -9,10 +9,10 @@ local avatar_frame = { ["desc"]="S1 아레나 골드 아이콘 프레임, 검증받은 실력입니다." }, [26]={ - + ["desc"]="S2 아레나 실버 아이콘 프레임, 강인함의 증명입니다." }, [27]={ - + ["desc"]="S2 아레나 골드 아이콘 프레임, 영웅의 눈부신 업적입니다." } } local config = { diff --git a/lua/app/config/strings/ko/item.lua b/lua/app/config/strings/ko/item.lua index 137837ef..fa9ee208 100644 --- a/lua/app/config/strings/ko/item.lua +++ b/lua/app/config/strings/ko/item.lua @@ -184,7 +184,8 @@ local item = { ["desc"]="S2 아레나 골드 아이콘 프레임, 영웅의 눈부신 업적입니다." }, [47]={ - + ["name"]="랜덤의 에픽 영웅", + ["desc"]="일괄 획득 시 다음 영웅 중 한 명만 무작위로 선택됩니다." }, [1001]={ ["name"]="알렌데 운석", diff --git a/lua/app/config/strings/ko/skill_rogue.lua b/lua/app/config/strings/ko/skill_rogue.lua index 0034ad4a..8060e370 100644 --- a/lua/app/config/strings/ko/skill_rogue.lua +++ b/lua/app/config/strings/ko/skill_rogue.lua @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Combo: 강철 스트라이크가 출혈 상태의 적에게 추가로 1번의 대미지를 입힙니다." }, [1400104]={ - ["desc"]="강철 스트라이크가 기절 효과를 부여하는 턴의 횟수 +1" + ["desc"]="강철 스트라이크는 50% 확률로 2턴 동안 기절 효과를 부여합니다." }, [1400105]={ ["desc"]="강철 스트라이크에 버닝 효과가 추가되며 대미지가 상승합니다. 지속되는 턴 횟수+1" @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="팬텀 소드가 4개 또는 그 이상의 원소를 연결할 때 이번 턴의 치명타율이 20% 상승합니다." }, [2300206]={ - ["desc"]="팬텀 소드가 4개 또는 그 이상의 원소를 연결할 때 이번 턴의 치명타율이 30% 상승합니다." + ["desc"]="팬텀 소드가 부여한 치명타율 상승 효과가 30%까지 증가합니다." }, [2300207]={ ["desc"]="팬텀 소드를 사용하면 이번 턴에 HP가 50% 미만인 적에게 주는 치명타 대미지가 50% 상승합니다." @@ -537,7 +537,7 @@ local skill_rogue = { ["desc"]="얼음 크리스탈이 2턴 동안 팀을 위해 얼음 보호막을 부여합니다." }, [4300107]={ - ["desc"]="얼음 크리스탈이 부여한 얼음 보호막이 400% 피해를 반사할 수 있습니다." + ["desc"]="얼음 크리스탈이 부여하는 얼음 보호막은 대량의 피해를 반사할 수 있습니다." }, [4300200]={ ["desc"]="부패의 칼날 잠금 해제: 추가로 한 번의 스킬 피해를 입히며 1턴 동안 부패 효과를 부여합니다." @@ -627,7 +627,7 @@ local skill_rogue = { ["desc"]="보호막 기술이 십자가 방향에서 추가로 4개의 그리드를 소멸할 수 있습니다." }, [5200105]={ - ["desc"]="보호막 기술에서 부여한 보호막은 200% 피해를 반사합니다." + ["desc"]="보호막 기술에서 부여된 보호막은 피해를 반사할 수 있습니다." }, [5200106]={ ["desc"]="닌자 룬의 공격력이 15% 증가합니다." @@ -645,7 +645,7 @@ local skill_rogue = { ["desc"]="마법의 빗자루를 사용하면 이번 턴의 일반 공격의 대미지가 15% 증가합니다." }, [5300103]={ - ["desc"]="마법의 빗자루는 2턴 동안 수면 효과를 부여할 수 있습니다." + ["desc"]="마법의 빗자루는 2턴 동안 50% 확률로 수면 효과를 부여합니다." }, [5300104]={ ["desc"]="마법의 빗자루가 부여한 중독 효과의 대미지가 증가합니다." diff --git a/lua/app/config/strings/pt/avatar.lua b/lua/app/config/strings/pt/avatar.lua index 05104c94..a9a89dac 100644 --- a/lua/app/config/strings/pt/avatar.lua +++ b/lua/app/config/strings/pt/avatar.lua @@ -3,7 +3,7 @@ local avatar = { ["desc"]="Avatar da Ordem de Batalha da S1. Que você tenha a coragem como a Cabeça de Cebola!" }, [24]={ - + ["desc"]="Avatar da Ordem de Batalha da S2, a vitória vem com um movimento da lâmina." }, [1001]={ ["desc"]="Ativar Dançarina para obter." diff --git a/lua/app/config/strings/pt/avatar_frame.lua b/lua/app/config/strings/pt/avatar_frame.lua index c7b20baf..14a6246e 100644 --- a/lua/app/config/strings/pt/avatar_frame.lua +++ b/lua/app/config/strings/pt/avatar_frame.lua @@ -9,10 +9,10 @@ local avatar_frame = { ["desc"]="Moldura de avatar de ouro da Arena S1, uma testemunha do poder." }, [26]={ - + ["desc"]="Moldura de avatar de prata da Arena S2, uma testemunha da força." }, [27]={ - + ["desc"]="Moldura de avatar de ouro da Arena S2, o brilho de um herói." } } local config = { diff --git a/lua/app/config/strings/pt/item.lua b/lua/app/config/strings/pt/item.lua index 9f826efe..1d1865f8 100644 --- a/lua/app/config/strings/pt/item.lua +++ b/lua/app/config/strings/pt/item.lua @@ -184,7 +184,8 @@ local item = { ["desc"]="Moldura de avatar de ouro da Arena S2, o brilho de um herói." }, [47]={ - + ["name"]="Frag. Alea. de Herói Épico", + ["desc"]="Ao obter em lote, virá apenas um dos seguintes heróis, aleatoriamente" }, [1001]={ ["name"]="Ferro Meteórico Opaco", diff --git a/lua/app/config/strings/pt/skill_rogue.lua b/lua/app/config/strings/pt/skill_rogue.lua index 9de56021..0dab3d91 100644 --- a/lua/app/config/strings/pt/skill_rogue.lua +++ b/lua/app/config/strings/pt/skill_rogue.lua @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Combo: O Golpe Metálico causa mais 1 golpe aos inimigos Sangrados." }, [1400104]={ - ["desc"]="A duração do atordoamento causado pelo Golpe de Aço aumenta em +1 turno." + ["desc"]="O Golpe Metálico tem 50% de chance de estontear os inimigos por 2 turnos." }, [1400105]={ ["desc"]="A Conflagração acionada pelo Golpe Metálico tem dano aumentado e dura +1 turno." @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="Ao conectar 4 ou mais elementos com o Golpe da Espada Ilusória, aumenta a chance de acerto crítico em 20% para o turno atual." }, [2300206]={ - ["desc"]="Ao conectar 4 ou mais elementos com o Golpe da Espada Ilusória, aumenta a chance de acerto crítico em 30% para o turno atual." + ["desc"]="Melhora o aumento de acerto crítico da Espada Ilusória para 30%." }, [2300207]={ ["desc"]="No turno de lançamento do Golpe da Espada Ilusória, aumenta o dano de acerto crítico em 50% aos inimigos com 50% ou menos Vida." @@ -537,7 +537,7 @@ local skill_rogue = { ["desc"]="O Cristal Congelado concede efeito de escudo de gelo à equipe por 2 turnos." }, [4300107]={ - ["desc"]="O escudo de gelo concedido pelo Cristal Congelado reflete 400% do dano recebido." + ["desc"]="O escudo de gelo concedido pelo Cristal Congelante reflete boa parte do dano recebido." }, [4300200]={ ["desc"]="Desbloqueie Lâmina da Corrupção: causa dano adicional de habilidade e aplica o efeito de corrupção por 1 turno." @@ -627,7 +627,7 @@ local skill_rogue = { ["desc"]="O Feitiço de Amparo elimina 4 blocos adicionais numa cruz." }, [5200105]={ - ["desc"]="O escudo adicionado pelo Feitiço de Amparo reflete 200% de dano recebido." + ["desc"]="O escudo adicionado pelo Feitiço de Amparo pode refletir dano." }, [5200106]={ ["desc"]="Aumenta o Ataque de Luninja em 15%." @@ -645,7 +645,7 @@ local skill_rogue = { ["desc"]="Ao usar a Vassoura Mágica, o dano do ataque básico aumenta em 15%." }, [5300103]={ - ["desc"]="A Vassoura Mágica pode adicionar um efeito de adormecer, 2 turnos." + ["desc"]="A Vassoura Mágica tem 15% de chance de acionar o efeito Sonolento por 2 turnos." }, [5300104]={ ["desc"]="O efeito de envenenamento adicionado pela Vassoura Mágica, dano aumentado." diff --git a/lua/app/config/strings/th/avatar.lua b/lua/app/config/strings/th/avatar.lua index 713f1c29..4058a8e8 100644 --- a/lua/app/config/strings/th/avatar.lua +++ b/lua/app/config/strings/th/avatar.lua @@ -3,7 +3,7 @@ local avatar = { ["desc"]="อวาตาร์ป้ายรบของอารีน่า S1 ขอให้คุณก้าวไปข้างหน้าอย่างกล้าหาญเหมือนหัวหอม!" }, [24]={ - + ["desc"]="อวตารของป้ายรบอารีน่า S2 ชัยชนะจะมาถึงเมื่อดาบขึ้นและดาบตก" }, [1001]={ ["desc"]="หลังจากการเปิดใช้งานสาวเต้นจะได้รับ" diff --git a/lua/app/config/strings/th/avatar_frame.lua b/lua/app/config/strings/th/avatar_frame.lua index 58eecffc..42a168d4 100644 --- a/lua/app/config/strings/th/avatar_frame.lua +++ b/lua/app/config/strings/th/avatar_frame.lua @@ -9,10 +9,10 @@ local avatar_frame = { ["desc"]="กรอบรูปทองของอารีน่า S1 พิสูจน์ความแข็งแกร่ง" }, [26]={ - + ["desc"]="กรอบรูปเงินของอารีน่า S2 พิสูจน์ของพลังงาน" }, [27]={ - + ["desc"]="กรอบรูปทองของอารีน่า S2 ความรุ่งโรจน์ของฮีโร่" } } local config = { diff --git a/lua/app/config/strings/th/item.lua b/lua/app/config/strings/th/item.lua index 2293f510..3a783ecb 100644 --- a/lua/app/config/strings/th/item.lua +++ b/lua/app/config/strings/th/item.lua @@ -184,7 +184,8 @@ local item = { ["desc"]="กรอบรูปทองของอารีน่า S2 ความรุ่งโรจน์ของฮีโร่" }, [47]={ - + ["name"]="ฮีโร่อีพิทแบบสุ่ม", + ["desc"]="เมื่อรับแบบแบทช์จะสุ่มรับฮีโร่ต่อไปนี้เพียงหนึ่งตัวเท่านั้น" }, [1001]={ ["name"]="อุกกาบาตทื่อ", diff --git a/lua/app/config/strings/th/skill_rogue.lua b/lua/app/config/strings/th/skill_rogue.lua index e9e2f455..0c0b99ce 100644 --- a/lua/app/config/strings/th/skill_rogue.lua +++ b/lua/app/config/strings/th/skill_rogue.lua @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Combo:เหล็กตีหนักจะสร้างดาเมจเพิ่มเติม1ครั้งให้กับศัตรูเลือดไหล" }, [1400104]={ - ["desc"]="เอฟเฟกต์มึงงงที่เพิ่มโดยเหล็กตีหนัก จำนวนรอบ+1" + ["desc"]="เหล็กตีหนักจะมีโอกาส50%เพิ่มเอฟเฟกต์มึงงงเป็น 2 รอบ" }, [1400105]={ ["desc"]="เอฟเฟกต์เผาไหม้ที่เพิ่มโดยเหล็กตีหนัก จำนวนรอบ+1" @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="เมื่อดาบมายาบุกเชื่อมโยงธาตุ4อันหรือขึ้นไป Crit รอบนี้จะเพิ่มขึ้น20%" }, [2300206]={ - ["desc"]="เมื่อดาบมายาบุกเชื่อมโยงธาตุ4อันหรือขึ้นไป Crit รอบนี้จะเพิ่มขึ้น30%" + ["desc"]="เอฟเฟกต์การเพิ่ม Crit ของดาบมายาบุกเพิ่มขึ้นถึง30%" }, [2300207]={ ["desc"]="เมื่อใช้ดาบมายาบุก CritDmgที่สร้างให้กับศัตรูที่มี HP ต่ำกว่า50%จะเพิ่มขึ้น50%" @@ -537,7 +537,7 @@ local skill_rogue = { ["desc"]="ผลึกฟรอสต์จะเพิ่มเอฟเฟกต์โล่น้ำแข็งให้กับทีม 2รอบ" }, [4300107]={ - ["desc"]="โล่น้ำแข็งที่เพิ่มโดยผลึกฟรอสต์ สามารถสะท้อนดาเมจ400%" + ["desc"]="โล่น้ำแข็งที่ที่เพิ่มโดยผลึกฟรอสต์นั้นสามารถสะท้อนดาเมจจำนวนมากได้" }, [4300200]={ ["desc"]="ปลดล็อคดาบทุจริต: สร้างดาเมจสกิลเพิ่มเติม 1 ครั้ง เพิ่มเอฟเฟกต์ทุจริต 1รอบ" @@ -627,7 +627,7 @@ local skill_rogue = { ["desc"]="มนต์โล่สามารถกำจัด4ช่องเพิ่มเติมตามทิศทาง +" }, [5200105]={ - ["desc"]="โล่ที่เพิ่มโดยมนต์โล่ สามารถสะท้อนดาเมจ200%" + ["desc"]="โล่ที่เพิ่มโดยมนต์โล่ สามารถสะท้อนดาเมจได้" }, [5200106]={ ["desc"]="การโจมตีของนินจาเร็นเพิ่มขึ้น15%" @@ -645,7 +645,7 @@ local skill_rogue = { ["desc"]="เมื่อใช้ไม้กวาดวิเศษ ดาเมจของการโจมตีทั่วไปครั้งนี้จะเพิ่มขึ้น15%" }, [5300103]={ - ["desc"]="ไม้กวาดวิเศษสามารถเพิ่มเอฟเฟกต์หลับได้ 2รอบ" + ["desc"]="ไม้กวาดวิเศษจะมีโอกาส50%เพิ่มเอฟเฟกต์อมตะ 2รอบ" }, [5300104]={ ["desc"]="ดาเมจของเอฟเฟกต์ถูกพิษที่เพิ่มโดยไม้กวาดวิเศษเพิ่มขึ้น" diff --git a/lua/app/config/strings/vi/avatar.lua b/lua/app/config/strings/vi/avatar.lua index 2cd7928d..ea55bb98 100644 --- a/lua/app/config/strings/vi/avatar.lua +++ b/lua/app/config/strings/vi/avatar.lua @@ -3,7 +3,7 @@ local avatar = { ["desc"]="Avatar Chiến Lệnh S1, như một Onion gan dạ xông lên!" }, [24]={ - + ["desc"]="Avatar Chiến Lệnh S2, vung đao chiến thắng." }, [1001]={ ["desc"]="Kích hoạt Vũ Cơ nhận được." diff --git a/lua/app/config/strings/vi/avatar_frame.lua b/lua/app/config/strings/vi/avatar_frame.lua index 647b250e..9a7507dc 100644 --- a/lua/app/config/strings/vi/avatar_frame.lua +++ b/lua/app/config/strings/vi/avatar_frame.lua @@ -9,10 +9,10 @@ local avatar_frame = { ["desc"]="Khung Avatar Vàng Đấu Trường S1, biểu tượng thực lực." }, [26]={ - + ["desc"]="Khung Avatar Bạc Đấu Trường S2, biểu tượng sức mạnh." }, [27]={ - + ["desc"]="Khung Avatar Vàng Đấu Trường S2, anh hùng tỏa sáng." } } local config = { diff --git a/lua/app/config/strings/vi/item.lua b/lua/app/config/strings/vi/item.lua index f31b4794..e44ad1ed 100644 --- a/lua/app/config/strings/vi/item.lua +++ b/lua/app/config/strings/vi/item.lua @@ -184,7 +184,8 @@ local item = { ["desc"]="Khung Avatar Vàng Đấu Trường S2, anh hùng tỏa sáng." }, [47]={ - + ["name"]="Anh Hùng Sử Thi N.Nhiên", + ["desc"]="Khi nhận số lượng nhiều chỉ ngẫu nhiên ra 1 trong các Anh Hùng dưới đây." }, [1001]={ ["name"]="Thiên Thạch Ảm Đạm", diff --git a/lua/app/config/strings/vi/skill_rogue.lua b/lua/app/config/strings/vi/skill_rogue.lua index 3e964265..a0620721 100644 --- a/lua/app/config/strings/vi/skill_rogue.lua +++ b/lua/app/config/strings/vi/skill_rogue.lua @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Combo: Trọng Kích Sắt Thép gây thêm 1 lần sát thương lên kẻ địch Mất Máu." }, [1400104]={ - ["desc"]="Trọng Kích Sắt Thép kèm Choáng, số hiệp +1." + ["desc"]="Trọng Kích Sắt Thép có 50% kèm Choáng, 2 hiệp." }, [1400105]={ ["desc"]="Trọng Kích Sắt Thép kèm hiệu ứng Thiêu Đốt, tăng sát thương, số hiệp +1." @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="Ảo Ảnh Kiếm Kích liên kết 4 Nguyên Tố trở lên, hiệp này tăng 20% chí mạng." }, [2300206]={ - ["desc"]="Ảo Ảnh Kiếm Kích liên kết 4 Nguyên Tố trở lên, hiệp này tăng 30% chí mạng." + ["desc"]="Hiệu quả tăng chí mạng của Ảo Ảnh Kiếm Kích tăng đến 30%." }, [2300207]={ ["desc"]="Khi dùng Ảo Ảnh Kiếm Kích trong hiệp này với kẻ địch có HP dưới 50% sẽ tăng 50% sát thương chí mạng." @@ -537,7 +537,7 @@ local skill_rogue = { ["desc"]="Sương Băng Tinh kèm hiệu quả Khiên Băng cho đội, 2 hiệp." }, [4300107]={ - ["desc"]="Sương Băng Tinh kèm Khiên Băng, được phản sát thương 400%." + ["desc"]="Sương Băng Tinh kèm Khiên Băng, có thể phản sát thương." }, [4300200]={ ["desc"]="Mở khóa Đao Sa Đọa: Gây thêm 1 lần sát thương kỹ năng, kèm hiệu quả Sa Đọa, 1 hiệp." @@ -627,7 +627,7 @@ local skill_rogue = { ["desc"]="Thuật Khiên theo hướng ＋ có thể xua tan thêm 4 ô." }, [5200105]={ - ["desc"]="Thuật Khiên kèm Khiên, có thể phản sát thương 200%." + ["desc"]="Thuật Khiên kèm Khiên, có thể phản sát thương." }, [5200106]={ ["desc"]="Ninja Jay tăng 15% Công." @@ -645,7 +645,7 @@ local skill_rogue = { ["desc"]="Khi dùng Chổi Phép, sát thương đánh thường lần này tăng 15%." }, [5300103]={ - ["desc"]="Chổi Phép được kèm hiệu quả Ngủ Say, 2 hiệp." + ["desc"]="Chổi Phép có 50% kèm Ngủ Say, 2 hiệp." }, [5300104]={ ["desc"]="Chổi Phép kèm hiệu quả Trúng Độc, tăng sát thương." diff --git a/lua/app/config/strings/zh/avatar.lua b/lua/app/config/strings/zh/avatar.lua index 87480fbd..7e6b1a40 100644 --- a/lua/app/config/strings/zh/avatar.lua +++ b/lua/app/config/strings/zh/avatar.lua @@ -3,7 +3,7 @@ local avatar = { ["desc"]="S1競技戰令頭像，願你像洋蔥頭勇往直前！" }, [24]={ - + ["desc"]="S2競技戰令頭像，刀起刀落勝利就來了。" }, [1001]={ ["desc"]="啟動舞孃後獲得。" diff --git a/lua/app/config/strings/zh/avatar_frame.lua b/lua/app/config/strings/zh/avatar_frame.lua index 038aa2d5..550322f7 100644 --- a/lua/app/config/strings/zh/avatar_frame.lua +++ b/lua/app/config/strings/zh/avatar_frame.lua @@ -9,10 +9,10 @@ local avatar_frame = { ["desc"]="S1競技場黃金頭像框，實力的證明。" }, [26]={ - + ["desc"]="S2競技場白銀頭像框，力量的證明。" }, [27]={ - + ["desc"]="S2競技場黃金頭像框，英雄的光輝。" } } local config = { diff --git a/lua/app/config/strings/zh/item.lua b/lua/app/config/strings/zh/item.lua index 448b9a99..b411e426 100644 --- a/lua/app/config/strings/zh/item.lua +++ b/lua/app/config/strings/zh/item.lua @@ -184,7 +184,8 @@ local item = { ["desc"]="S2競技場黃金頭像框，英雄的光輝。" }, [47]={ - + ["name"]="隨機史詩英雄", + ["desc"]="批量獲取時只會隨機以下英雄中的一名" }, [1001]={ ["name"]="暗淡隕鐵", diff --git a/lua/app/config/strings/zh/skill_rogue.lua b/lua/app/config/strings/zh/skill_rogue.lua index 986f0f3f..7b097f36 100644 --- a/lua/app/config/strings/zh/skill_rogue.lua +++ b/lua/app/config/strings/zh/skill_rogue.lua @@ -216,7 +216,7 @@ local skill_rogue = { ["desc"]="Combo:鋼鐵重擊對流血敵人額外造成1次傷害。" }, [1400104]={ - ["desc"]="鋼鐵重擊附帶的暈眩，回合數+1。" + ["desc"]="鋼鐵重擊有50%概率附加眩暈效果，2回合。" }, [1400105]={ ["desc"]="鋼鐵重擊附帶的灼燒效果，傷害提高，回合數+1。" @@ -318,7 +318,7 @@ local skill_rogue = { ["desc"]="幻影劍襲連接4個元素或以上時，本回合暴擊提高20%。" }, [2300206]={ - ["desc"]="幻影劍襲連接4個元素或以上時，本回合暴擊提高30%。" + ["desc"]="幻影劍襲附加的暴擊提升效果增加至30%。" }, [2300207]={ ["desc"]="幻影劍襲使用時本回合對生命值50%以下的敵人暴擊傷害提高50%。" @@ -537,7 +537,7 @@ local skill_rogue = { ["desc"]="霜凍冰晶後為團隊賦予冰盾效果，2回合。" }, [4300107]={ - ["desc"]="霜凍冰晶增加的冰盾，可反傷400%。" + ["desc"]="霜凍冰晶附加的冰盾，可反傷大量傷害。" }, [4300200]={ ["desc"]="解鎖腐敗利刃：額外造成一次技能傷害，附帶腐敗效果，1回合。" @@ -627,7 +627,7 @@ local skill_rogue = { ["desc"]="護盾術沿＋方向可額外消除4格。" }, [5200105]={ - ["desc"]="護盾術增加的護盾，可反傷200%。" + ["desc"]="護盾術附加的護盾，可反傷傷害。" }, [5200106]={ ["desc"]="忍者倫攻擊提高15%。" @@ -645,7 +645,7 @@ local skill_rogue = { ["desc"]="魔法掃帚使用時本次普攻傷害提高15%。" }, [5300103]={ - ["desc"]="魔法掃帚可附帶昏睡效果，2回合。" + ["desc"]="魔法掃帚有50%概率附加昏睡效果，2回合。" }, [5300104]={ ["desc"]="魔法掃帚附帶的中毒效果，傷害提高。" diff --git a/lua/app/config/summon.lua b/lua/app/config/summon.lua index 67e310a6..8e1b1e73 100644 --- a/lua/app/config/summon.lua +++ b/lua/app/config/summon.lua @@ -344,8 +344,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=47, ["id_for_nothing"]="Ug8=", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, @@ -378,8 +378,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=47, ["id_for_nothing"]="Ug8=", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["num"]=4, + ["num_for_nothing"]="Ug==" }, { ["type"]=1, @@ -412,8 +412,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=47, ["id_for_nothing"]="Ug8=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, @@ -446,8 +446,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=47, ["id_for_nothing"]="Ug8=", - ["num"]=4, - ["num_for_nothing"]="Ug==" + ["num"]=6, + ["num_for_nothing"]="UA==" }, { ["type"]=1, @@ -480,8 +480,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=47, ["id_for_nothing"]="Ug8=", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=7, + ["num_for_nothing"]="UQ==" }, { ["type"]=1, @@ -533,8 +533,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=47, ["id_for_nothing"]="Ug8=", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, @@ -567,16 +567,16 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=47, ["id_for_nothing"]="Ug8=", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["num"]=4, + ["num_for_nothing"]="Ug==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=20, + ["num_for_nothing"]="VAg=" }, { ["type"]=1, @@ -601,8 +601,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=47, ["id_for_nothing"]="Ug8=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, @@ -635,8 +635,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=47, ["id_for_nothing"]="Ug8=", - ["num"]=4, - ["num_for_nothing"]="Ug==" + ["num"]=6, + ["num_for_nothing"]="UA==" }, { ["type"]=1, @@ -669,8 +669,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=47, ["id_for_nothing"]="Ug8=", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=7, + ["num_for_nothing"]="UQ==" }, { ["type"]=1, @@ -703,8 +703,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=47, ["id_for_nothing"]="Ug8=", - ["num"]=6, - ["num_for_nothing"]="UA==" + ["num"]=8, + ["num_for_nothing"]="Xg==" }, { ["type"]=1, @@ -737,8 +737,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=47, ["id_for_nothing"]="Ug8=", - ["num"]=8, - ["num_for_nothing"]="Xg==" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, @@ -771,8 +771,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=47, ["id_for_nothing"]="Ug8=", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=12, + ["num_for_nothing"]="Vwo=" }, { ["type"]=1, @@ -805,8 +805,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=47, ["id_for_nothing"]="Ug8=", - ["num"]=12, - ["num_for_nothing"]="Vwo=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" }, { ["type"]=1, @@ -839,8 +839,8 @@ local summon = { ["type_for_nothing"]="Vw==", ["id"]=47, ["id_for_nothing"]="Ug8=", - ["num"]=14, - ["num_for_nothing"]="Vww=" + ["num"]=18, + ["num_for_nothing"]="VwA=" }, { ["type"]=1, diff --git a/lua/app/proto/proto_msg_type.lua b/lua/app/proto/proto_msg_type.lua index 97d56410..942b5346 100644 --- a/lua/app/proto/proto_msg_type.lua +++ b/lua/app/proto/proto_msg_type.lua @@ -37,6 +37,8 @@ local ProtoMsgType = { [822918426] = "MatchRsp", [834139466] = "ChapterGoldChallengeStartReq", [834141299] = "ChapterGoldChallengeStartRsp", + [850670891] = "SummerBountyClaimByDiamondReq", + [850672724] = "SummerBountyClaimByDiamondRsp", [904222760] = "ArenaBountyLevelUnlockReq", [904224593] = "ArenaBountyLevelUnlockRsp", [1008447203] = "DeleteReq", @@ -61,7 +63,6 @@ local ProtoMsgType = { [1571186308] = "ChapterShardsChallengeFarmRsp", [1584689751] = "ActPaidResultReq", [1584691584] = "ActPaidResultRsp", - [1635643251] = "RecoveryNtf", [1646412046] = "ChapterDailyChallengeSettlementReq", [1646413879] = "ChapterDailyChallengeSettlementRsp", [1651833678] = "ChapterWeaponChallengeStartReq", @@ -129,6 +130,8 @@ local ProtoMsgType = { [3024280247] = "PVPSeasonRewardRsp", [3038151923] = "TaskDailyRefreshReq", [3038153756] = "TaskDailyRefreshRsp", + [3039097236] = "SummerBountyClaimReq", + [3039099069] = "SummerBountyClaimRsp", [3058879524] = "PVPRankReq", [3058881357] = "PVPRankRsp", [3062745642] = "FundAwardReq", @@ -172,6 +175,8 @@ local ProtoMsgType = { [3663247602] = "MallDailyResetNtf", [3663314292] = "MallDailyResetReq", [3663316125] = "MallDailyResetRsp", + [3739566473] = "SummerDataReq", + [3739568306] = "SummerDataRsp", [3741702491] = "MallDailyOverDayReq", [3741704324] = "MallDailyOverDayRsp", [3757169544] = "BountyRewardReq", @@ -190,6 +195,8 @@ local ProtoMsgType = { [4133059579] = "ChapterGoldChallengeFarmRsp", [4152754481] = "PVPChallengeStartReq", [4152756314] = "PVPChallengeStartRsp", + [4155165814] = "SummerTaskClaimReq", + [4155167647] = "SummerTaskClaimRsp", [4256333947] = "ExistReq", [4256335780] = "ExistRsp", }, @@ -231,6 +238,8 @@ local ProtoMsgType = { MatchRsp = 822918426, ChapterGoldChallengeStartReq = 834139466, ChapterGoldChallengeStartRsp = 834141299, + SummerBountyClaimByDiamondReq = 850670891, + SummerBountyClaimByDiamondRsp = 850672724, ArenaBountyLevelUnlockReq = 904222760, ArenaBountyLevelUnlockRsp = 904224593, DeleteReq = 1008447203, @@ -255,7 +264,6 @@ local ProtoMsgType = { ChapterShardsChallengeFarmRsp = 1571186308, ActPaidResultReq = 1584689751, ActPaidResultRsp = 1584691584, - RecoveryNtf = 1635643251, ChapterDailyChallengeSettlementReq = 1646412046, ChapterDailyChallengeSettlementRsp = 1646413879, ChapterWeaponChallengeStartReq = 1651833678, @@ -323,6 +331,8 @@ local ProtoMsgType = { PVPSeasonRewardRsp = 3024280247, TaskDailyRefreshReq = 3038151923, TaskDailyRefreshRsp = 3038153756, + SummerBountyClaimReq = 3039097236, + SummerBountyClaimRsp = 3039099069, PVPRankReq = 3058879524, PVPRankRsp = 3058881357, FundAwardReq = 3062745642, @@ -366,6 +376,8 @@ local ProtoMsgType = { MallDailyResetNtf = 3663247602, MallDailyResetReq = 3663314292, MallDailyResetRsp = 3663316125, + SummerDataReq = 3739566473, + SummerDataRsp = 3739568306, MallDailyOverDayReq = 3741702491, MallDailyOverDayRsp = 3741704324, BountyRewardReq = 3757169544, @@ -384,6 +396,8 @@ local ProtoMsgType = { ChapterGoldChallengeFarmRsp = 4133059579, PVPChallengeStartReq = 4152754481, PVPChallengeStartRsp = 4152756314, + SummerTaskClaimReq = 4155165814, + SummerTaskClaimRsp = 4155167647, ExistReq = 4256333947, ExistRsp = 4256335780, }, @@ -425,6 +439,8 @@ local ProtoMsgType = { MatchRsp = "MatchRsp", ChapterGoldChallengeStartReq = "ChapterGoldChallengeStartReq", ChapterGoldChallengeStartRsp = "ChapterGoldChallengeStartRsp", + SummerBountyClaimByDiamondReq = "SummerBountyClaimByDiamondReq", + SummerBountyClaimByDiamondRsp = "SummerBountyClaimByDiamondRsp", ArenaBountyLevelUnlockReq = "ArenaBountyLevelUnlockReq", ArenaBountyLevelUnlockRsp = "ArenaBountyLevelUnlockRsp", DeleteReq = "DeleteReq", @@ -449,7 +465,6 @@ local ProtoMsgType = { ChapterShardsChallengeFarmRsp = "ChapterShardsChallengeFarmRsp", ActPaidResultReq = "ActPaidResultReq", ActPaidResultRsp = "ActPaidResultRsp", - RecoveryNtf = "RecoveryNtf", ChapterDailyChallengeSettlementReq = "ChapterDailyChallengeSettlementReq", ChapterDailyChallengeSettlementRsp = "ChapterDailyChallengeSettlementRsp", ChapterWeaponChallengeStartReq = "ChapterWeaponChallengeStartReq", @@ -517,6 +532,8 @@ local ProtoMsgType = { PVPSeasonRewardRsp = "PVPSeasonRewardRsp", TaskDailyRefreshReq = "TaskDailyRefreshReq", TaskDailyRefreshRsp = "TaskDailyRefreshRsp", + SummerBountyClaimReq = "SummerBountyClaimReq", + SummerBountyClaimRsp = "SummerBountyClaimRsp", PVPRankReq = "PVPRankReq", PVPRankRsp = "PVPRankRsp", FundAwardReq = "FundAwardReq", @@ -560,6 +577,8 @@ local ProtoMsgType = { MallDailyResetNtf = "MallDailyResetNtf", MallDailyResetReq = "MallDailyResetReq", MallDailyResetRsp = "MallDailyResetRsp", + SummerDataReq = "SummerDataReq", + SummerDataRsp = "SummerDataRsp", MallDailyOverDayReq = "MallDailyOverDayReq", MallDailyOverDayRsp = "MallDailyOverDayRsp", BountyRewardReq = "BountyRewardReq", @@ -578,6 +597,8 @@ local ProtoMsgType = { ChapterGoldChallengeFarmRsp = "ChapterGoldChallengeFarmRsp", PVPChallengeStartReq = "PVPChallengeStartReq", PVPChallengeStartRsp = "PVPChallengeStartRsp", + SummerTaskClaimReq = "SummerTaskClaimReq", + SummerTaskClaimRsp = "SummerTaskClaimRsp", ExistReq = "ExistReq", ExistRsp = "ExistRsp", }, From efc8aa3dded8d2d63bfa0002380ea40bbd54f543 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 9 Aug 2023 17:32:57 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=BB=B6=E8=BF=9F=E6=8F=90=E9=AB=98?= =?UTF-8?q?=E4=B8=80=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/mail/mail_manager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/module/mail/mail_manager.lua b/lua/app/module/mail/mail_manager.lua index b36a7f6a..b3559049 100644 --- a/lua/app/module/mail/mail_manager.lua +++ b/lua/app/module/mail/mail_manager.lua @@ -149,7 +149,7 @@ function MailManager:needUpdateMail() end self.needUpdateMailSid = self:performWithDelayGlobal(function() self:getMailList(true) - end, math.random(1, 5)) + end, math.random(1, 60)) end return MailManager \ No newline at end of file From 260b299f0820304650deca59b3308720da2c416c Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 9 Aug 2023 17:34:06 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/proto/proto_msg_type.lua | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/lua/app/proto/proto_msg_type.lua b/lua/app/proto/proto_msg_type.lua index 942b5346..97d56410 100644 --- a/lua/app/proto/proto_msg_type.lua +++ b/lua/app/proto/proto_msg_type.lua @@ -37,8 +37,6 @@ local ProtoMsgType = { [822918426] = "MatchRsp", [834139466] = "ChapterGoldChallengeStartReq", [834141299] = "ChapterGoldChallengeStartRsp", - [850670891] = "SummerBountyClaimByDiamondReq", - [850672724] = "SummerBountyClaimByDiamondRsp", [904222760] = "ArenaBountyLevelUnlockReq", [904224593] = "ArenaBountyLevelUnlockRsp", [1008447203] = "DeleteReq", @@ -63,6 +61,7 @@ local ProtoMsgType = { [1571186308] = "ChapterShardsChallengeFarmRsp", [1584689751] = "ActPaidResultReq", [1584691584] = "ActPaidResultRsp", + [1635643251] = "RecoveryNtf", [1646412046] = "ChapterDailyChallengeSettlementReq", [1646413879] = "ChapterDailyChallengeSettlementRsp", [1651833678] = "ChapterWeaponChallengeStartReq", @@ -130,8 +129,6 @@ local ProtoMsgType = { [3024280247] = "PVPSeasonRewardRsp", [3038151923] = "TaskDailyRefreshReq", [3038153756] = "TaskDailyRefreshRsp", - [3039097236] = "SummerBountyClaimReq", - [3039099069] = "SummerBountyClaimRsp", [3058879524] = "PVPRankReq", [3058881357] = "PVPRankRsp", [3062745642] = "FundAwardReq", @@ -175,8 +172,6 @@ local ProtoMsgType = { [3663247602] = "MallDailyResetNtf", [3663314292] = "MallDailyResetReq", [3663316125] = "MallDailyResetRsp", - [3739566473] = "SummerDataReq", - [3739568306] = "SummerDataRsp", [3741702491] = "MallDailyOverDayReq", [3741704324] = "MallDailyOverDayRsp", [3757169544] = "BountyRewardReq", @@ -195,8 +190,6 @@ local ProtoMsgType = { [4133059579] = "ChapterGoldChallengeFarmRsp", [4152754481] = "PVPChallengeStartReq", [4152756314] = "PVPChallengeStartRsp", - [4155165814] = "SummerTaskClaimReq", - [4155167647] = "SummerTaskClaimRsp", [4256333947] = "ExistReq", [4256335780] = "ExistRsp", }, @@ -238,8 +231,6 @@ local ProtoMsgType = { MatchRsp = 822918426, ChapterGoldChallengeStartReq = 834139466, ChapterGoldChallengeStartRsp = 834141299, - SummerBountyClaimByDiamondReq = 850670891, - SummerBountyClaimByDiamondRsp = 850672724, ArenaBountyLevelUnlockReq = 904222760, ArenaBountyLevelUnlockRsp = 904224593, DeleteReq = 1008447203, @@ -264,6 +255,7 @@ local ProtoMsgType = { ChapterShardsChallengeFarmRsp = 1571186308, ActPaidResultReq = 1584689751, ActPaidResultRsp = 1584691584, + RecoveryNtf = 1635643251, ChapterDailyChallengeSettlementReq = 1646412046, ChapterDailyChallengeSettlementRsp = 1646413879, ChapterWeaponChallengeStartReq = 1651833678, @@ -331,8 +323,6 @@ local ProtoMsgType = { PVPSeasonRewardRsp = 3024280247, TaskDailyRefreshReq = 3038151923, TaskDailyRefreshRsp = 3038153756, - SummerBountyClaimReq = 3039097236, - SummerBountyClaimRsp = 3039099069, PVPRankReq = 3058879524, PVPRankRsp = 3058881357, FundAwardReq = 3062745642, @@ -376,8 +366,6 @@ local ProtoMsgType = { MallDailyResetNtf = 3663247602, MallDailyResetReq = 3663314292, MallDailyResetRsp = 3663316125, - SummerDataReq = 3739566473, - SummerDataRsp = 3739568306, MallDailyOverDayReq = 3741702491, MallDailyOverDayRsp = 3741704324, BountyRewardReq = 3757169544, @@ -396,8 +384,6 @@ local ProtoMsgType = { ChapterGoldChallengeFarmRsp = 4133059579, PVPChallengeStartReq = 4152754481, PVPChallengeStartRsp = 4152756314, - SummerTaskClaimReq = 4155165814, - SummerTaskClaimRsp = 4155167647, ExistReq = 4256333947, ExistRsp = 4256335780, }, @@ -439,8 +425,6 @@ local ProtoMsgType = { MatchRsp = "MatchRsp", ChapterGoldChallengeStartReq = "ChapterGoldChallengeStartReq", ChapterGoldChallengeStartRsp = "ChapterGoldChallengeStartRsp", - SummerBountyClaimByDiamondReq = "SummerBountyClaimByDiamondReq", - SummerBountyClaimByDiamondRsp = "SummerBountyClaimByDiamondRsp", ArenaBountyLevelUnlockReq = "ArenaBountyLevelUnlockReq", ArenaBountyLevelUnlockRsp = "ArenaBountyLevelUnlockRsp", DeleteReq = "DeleteReq", @@ -465,6 +449,7 @@ local ProtoMsgType = { ChapterShardsChallengeFarmRsp = "ChapterShardsChallengeFarmRsp", ActPaidResultReq = "ActPaidResultReq", ActPaidResultRsp = "ActPaidResultRsp", + RecoveryNtf = "RecoveryNtf", ChapterDailyChallengeSettlementReq = "ChapterDailyChallengeSettlementReq", ChapterDailyChallengeSettlementRsp = "ChapterDailyChallengeSettlementRsp", ChapterWeaponChallengeStartReq = "ChapterWeaponChallengeStartReq", @@ -532,8 +517,6 @@ local ProtoMsgType = { PVPSeasonRewardRsp = "PVPSeasonRewardRsp", TaskDailyRefreshReq = "TaskDailyRefreshReq", TaskDailyRefreshRsp = "TaskDailyRefreshRsp", - SummerBountyClaimReq = "SummerBountyClaimReq", - SummerBountyClaimRsp = "SummerBountyClaimRsp", PVPRankReq = "PVPRankReq", PVPRankRsp = "PVPRankRsp", FundAwardReq = "FundAwardReq", @@ -577,8 +560,6 @@ local ProtoMsgType = { MallDailyResetNtf = "MallDailyResetNtf", MallDailyResetReq = "MallDailyResetReq", MallDailyResetRsp = "MallDailyResetRsp", - SummerDataReq = "SummerDataReq", - SummerDataRsp = "SummerDataRsp", MallDailyOverDayReq = "MallDailyOverDayReq", MallDailyOverDayRsp = "MallDailyOverDayRsp", BountyRewardReq = "BountyRewardReq", @@ -597,8 +578,6 @@ local ProtoMsgType = { ChapterGoldChallengeFarmRsp = "ChapterGoldChallengeFarmRsp", PVPChallengeStartReq = "PVPChallengeStartReq", PVPChallengeStartRsp = "PVPChallengeStartRsp", - SummerTaskClaimReq = "SummerTaskClaimReq", - SummerTaskClaimRsp = "SummerTaskClaimRsp", ExistReq = "ExistReq", ExistRsp = "ExistRsp", },