From af1dc5b82f23e5272e5c07d0732e4b9afb34331d Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Thu, 21 Sep 2023 14:49:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/act_gift.lua | 192 ++++++++++++++++++------------------ 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua index 7e130db1..7c4a7b16 100644 --- a/lua/app/config/act_gift.lua +++ b/lua/app/config/act_gift.lua @@ -1785,7 +1785,7 @@ local act_gift = { 40, 60 }, - ["recharge_id"]=8, + ["recharge_id"]=10, ["reward"]={ { ["type"]=1, @@ -1808,8 +1808,8 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=1003, ["id_for_nothing"]="VwhcAA==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" } }, ["time_type"]=1, @@ -1823,7 +1823,7 @@ local act_gift = { 60, 80 }, - ["recharge_id"]=8, + ["recharge_id"]=10, ["reward"]={ { ["type"]=1, @@ -1846,8 +1846,8 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=1003, ["id_for_nothing"]="VwhcAA==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" } }, ["time_type"]=1, @@ -1861,7 +1861,7 @@ local act_gift = { 80, 100 }, - ["recharge_id"]=12, + ["recharge_id"]=13, ["reward"]={ { ["type"]=1, @@ -1876,24 +1876,24 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=1002, ["id_for_nothing"]="VwhcAQ==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=80, + ["num_for_nothing"]="Xgg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1003, ["id_for_nothing"]="VwhcAA==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=80, + ["num_for_nothing"]="Xgg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1004, ["id_for_nothing"]="VwhcBw==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=80, + ["num_for_nothing"]="Xgg=" } }, ["time_type"]=1, @@ -1907,7 +1907,7 @@ local act_gift = { 100, 120 }, - ["recharge_id"]=12, + ["recharge_id"]=13, ["reward"]={ { ["type"]=1, @@ -1922,24 +1922,24 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=1002, ["id_for_nothing"]="VwhcAQ==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=80, + ["num_for_nothing"]="Xgg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1003, ["id_for_nothing"]="VwhcAA==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=80, + ["num_for_nothing"]="Xgg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1004, ["id_for_nothing"]="VwhcBw==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=80, + ["num_for_nothing"]="Xgg=" } }, ["time_type"]=1, @@ -1953,7 +1953,7 @@ local act_gift = { 120, 140 }, - ["recharge_id"]=13, + ["recharge_id"]=15, ["reward"]={ { ["type"]=1, @@ -1968,24 +1968,24 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=1003, ["id_for_nothing"]="VwhcAA==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1004, ["id_for_nothing"]="VwhcBw==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1005, ["id_for_nothing"]="VwhcBg==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" } }, ["time_type"]=1, @@ -1999,7 +1999,7 @@ local act_gift = { 140, 160 }, - ["recharge_id"]=13, + ["recharge_id"]=15, ["reward"]={ { ["type"]=1, @@ -2014,24 +2014,24 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=1003, ["id_for_nothing"]="VwhcAA==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1004, ["id_for_nothing"]="VwhcBw==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1005, ["id_for_nothing"]="VwhcBg==", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" } }, ["time_type"]=1, @@ -2045,7 +2045,7 @@ local act_gift = { 160, 180 }, - ["recharge_id"]=15, + ["recharge_id"]=17, ["reward"]={ { ["type"]=1, @@ -2060,24 +2060,24 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=1004, ["id_for_nothing"]="VwhcBw==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=120, + ["num_for_nothing"]="Vwpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1005, ["id_for_nothing"]="VwhcBg==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=120, + ["num_for_nothing"]="Vwpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1006, ["id_for_nothing"]="VwhcBQ==", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=120, + ["num_for_nothing"]="Vwpc" } }, ["time_type"]=1, @@ -2091,7 +2091,7 @@ local act_gift = { 180, 200 }, - ["recharge_id"]=15, + ["recharge_id"]=17, ["reward"]={ { ["type"]=1, @@ -2106,24 +2106,24 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=1004, ["id_for_nothing"]="VwhcBw==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=120, + ["num_for_nothing"]="Vwpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1005, ["id_for_nothing"]="VwhcBg==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=120, + ["num_for_nothing"]="Vwpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1006, ["id_for_nothing"]="VwhcBQ==", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=120, + ["num_for_nothing"]="Vwpc" } }, ["time_type"]=1, @@ -2213,7 +2213,7 @@ local act_gift = { 40, 60 }, - ["recharge_id"]=12, + ["recharge_id"]=13, ["reward"]={ { ["type"]=1, @@ -2236,8 +2236,8 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=40, ["id_for_nothing"]="Ugg=", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" } }, ["time_type"]=1, @@ -2251,7 +2251,7 @@ local act_gift = { 60, 80 }, - ["recharge_id"]=12, + ["recharge_id"]=13, ["reward"]={ { ["type"]=1, @@ -2274,8 +2274,8 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=40, ["id_for_nothing"]="Ugg=", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" } }, ["time_type"]=1, @@ -2289,7 +2289,7 @@ local act_gift = { 80, 100 }, - ["recharge_id"]=14, + ["recharge_id"]=15, ["reward"]={ { ["type"]=1, @@ -2304,24 +2304,24 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=39, ["id_for_nothing"]="VQE=", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=80, + ["num_for_nothing"]="Xgg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=40, ["id_for_nothing"]="Ugg=", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=80, + ["num_for_nothing"]="Xgg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=41, ["id_for_nothing"]="Ugk=", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=80, + ["num_for_nothing"]="Xgg=" } }, ["time_type"]=1, @@ -2335,7 +2335,7 @@ local act_gift = { 100, 120 }, - ["recharge_id"]=14, + ["recharge_id"]=15, ["reward"]={ { ["type"]=1, @@ -2350,24 +2350,24 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=39, ["id_for_nothing"]="VQE=", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=80, + ["num_for_nothing"]="Xgg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=40, ["id_for_nothing"]="Ugg=", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=80, + ["num_for_nothing"]="Xgg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=41, ["id_for_nothing"]="Ugk=", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=80, + ["num_for_nothing"]="Xgg=" } }, ["time_type"]=1, @@ -2381,7 +2381,7 @@ local act_gift = { 120, 140 }, - ["recharge_id"]=15, + ["recharge_id"]=16, ["reward"]={ { ["type"]=1, @@ -2396,24 +2396,24 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=40, ["id_for_nothing"]="Ugg=", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=41, ["id_for_nothing"]="Ugk=", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=42, ["id_for_nothing"]="Ugo=", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" } }, ["time_type"]=1, @@ -2427,7 +2427,7 @@ local act_gift = { 140, 160 }, - ["recharge_id"]=15, + ["recharge_id"]=16, ["reward"]={ { ["type"]=1, @@ -2442,24 +2442,24 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=40, ["id_for_nothing"]="Ugg=", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=41, ["id_for_nothing"]="Ugk=", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=42, ["id_for_nothing"]="Ugo=", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" } }, ["time_type"]=1, @@ -2473,7 +2473,7 @@ local act_gift = { 160, 180 }, - ["recharge_id"]=17, + ["recharge_id"]=18, ["reward"]={ { ["type"]=1, @@ -2488,24 +2488,24 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=41, ["id_for_nothing"]="Ugk=", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=120, + ["num_for_nothing"]="Vwpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=42, ["id_for_nothing"]="Ugo=", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=120, + ["num_for_nothing"]="Vwpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=43, ["id_for_nothing"]="Ugs=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=120, + ["num_for_nothing"]="Vwpc" } }, ["time_type"]=1, @@ -2519,7 +2519,7 @@ local act_gift = { 180, 200 }, - ["recharge_id"]=17, + ["recharge_id"]=18, ["reward"]={ { ["type"]=1, @@ -2534,24 +2534,24 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=41, ["id_for_nothing"]="Ugk=", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=120, + ["num_for_nothing"]="Vwpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=42, ["id_for_nothing"]="Ugo=", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=120, + ["num_for_nothing"]="Vwpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=43, ["id_for_nothing"]="Ugs=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=120, + ["num_for_nothing"]="Vwpc" } }, ["time_type"]=1, From a74b0d6f56f92287a514172f52e931391f72fef0 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 22 Sep 2023 09:46:10 +0800 Subject: [PATCH 2/5] =?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 --- .../battle/controller/battle_controller_dungeon_rune.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua index ab46ab0f..190f7556 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua @@ -454,8 +454,9 @@ function BattleControllerDungeonRune:getRuneTaskNumByType(taskInfo) elseif taskType == GConst.DungeonRuneConst.TASK_TYPE.BREAK_GRID_TYPE then return self.totalBreakedGridType[taskParams1] or 0 elseif taskType == GConst.DungeonRuneConst.TASK_TYPE.KILL_MONSTER then - return self.taskProgress[GConst.BattleConst.BATTLE_TASK_FIELD.KILL_NORMAL_MONSTER] + return self.taskProgress[GConst.BattleConst.BATTLE_TASK_FIELD.KILL_NORMAL_MONSTER] or 0 end + return 0 end function BattleControllerDungeonRune:getRuneTaskAllOver() From 0d79e85452d68ffa3baf88ac1915e750dd2e9f33 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 22 Sep 2023 09:58:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/battle/controller/battle_controller_dungeon_rune.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua index 190f7556..9a33d84b 100644 --- a/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua +++ b/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua @@ -152,6 +152,7 @@ function BattleControllerDungeonRune:enterRoundBegin() -- 完成任务 local taskOver = self:getRuneTaskAllOver() if taskOver and not self.isBossChapter then + self.needWaitingBoardOver = nil self.victory = true self:postWaveOver(false) self:battleEnd() From c43baaddb4ee1fd73a5a9a93ca6fdd0101a72490 Mon Sep 17 00:00:00 2001 From: Fang Date: Mon, 25 Sep 2023 18:27:21 +0800 Subject: [PATCH 4/5] bug fix --- lua/app/userdata/arena/arena_data.lua | 4 ++++ lua/app/userdata/hero/hero_data.lua | 16 ++++++++++------ lua/app/userdata/hero/hero_entity.lua | 11 +++++++++-- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/lua/app/userdata/arena/arena_data.lua b/lua/app/userdata/arena/arena_data.lua index 1eb4c4b6..96031dc7 100644 --- a/lua/app/userdata/arena/arena_data.lua +++ b/lua/app/userdata/arena/arena_data.lua @@ -211,6 +211,10 @@ function ArenaData:getGradingIdFromScore(score, isLastSeason) if isLastSeason then cfg = self:getRankCfg(self.season - 1) end + if cfg == nil then + -- 活动没开特殊处理 + cfg = self:getRankCfg(1) + end local ids = table.keys(cfg) table.sort(ids) diff --git a/lua/app/userdata/hero/hero_data.lua b/lua/app/userdata/hero/hero_data.lua index a1140b9c..44edc5e0 100644 --- a/lua/app/userdata/hero/hero_data.lua +++ b/lua/app/userdata/hero/hero_data.lua @@ -98,12 +98,16 @@ function HeroData:updateSelfHeroEquipsAndRunes(entity) Logger.logHighlight("更新英雄属性:" .. entity:getCfgId()) end - entity:setEquips(GConst.EquipConst.PART_TYPE.WEAPON, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.WEAPON)) - entity:setEquips(GConst.EquipConst.PART_TYPE.HAT, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.HAT)) - entity:setEquips(GConst.EquipConst.PART_TYPE.CLOTHES, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.CLOTHES)) - entity:setEquips(GConst.EquipConst.PART_TYPE.BELT, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.BELT)) - entity:setEquips(GConst.EquipConst.PART_TYPE.HANDGUARD, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.HANDGUARD)) - entity:setRunes(DataManager.RunesData:getRunes(entity:getCfgId())) + entity:setEquips(GConst.EquipConst.PART_TYPE.WEAPON, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.WEAPON), true) + entity:setEquips(GConst.EquipConst.PART_TYPE.HAT, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.HAT), true) + entity:setEquips(GConst.EquipConst.PART_TYPE.CLOTHES, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.CLOTHES), true) + entity:setEquips(GConst.EquipConst.PART_TYPE.BELT, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.BELT), true) + entity:setEquips(GConst.EquipConst.PART_TYPE.HANDGUARD, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.HANDGUARD), true) + entity:setRunes(DataManager.RunesData:getRunes(entity:getCfgId()), true) + + -- 手动调用更新数据 + entity:onEquipAttrChange() + entity:onRunesAttrChange() end function HeroData:getEntity(heroStruct) diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index deb5bcd9..94a19ffd 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -594,12 +594,15 @@ function HeroEntity:getTotalBaseAtk() end -- {partType = EquipEntity} -function HeroEntity:setEquips(partType, equipEntities) +function HeroEntity:setEquips(partType, equipEntities, notNowUpdate) if self.equipEntities == nil then self.equipEntities = {} end self.equipEntities[partType] = equipEntities + if notNowUpdate then + return + end self:getTotalAttrValue() -- 防止报错 self:onEquipAttrChange() end @@ -621,8 +624,12 @@ function HeroEntity:getSkins() return self.unlockSkins end -function HeroEntity:setRunes(runesEntity) +function HeroEntity:setRunes(runesEntity, notNowUpdate) self.runesEntity = runesEntity + + if notNowUpdate then + return + end self:getTotalAttrValue() -- 防止报错 self:onRunesAttrChange() end From 262aaba8b9d1717a43042865bc9841778b896076 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 25 Sep 2023 19:46:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/activity_pvp_robot.lua | 20 ++++++++++---------- lua/app/config/const.lua | 18 +----------------- lua/app/config/skill.lua | 13 +++++++------ lua/app/config/skill_rogue.lua | 3 --- lua/app/config/strings/cn/skill_rogue.lua | 2 +- lua/app/config/strings/en/skill_rogue.lua | 4 ++-- lua/app/config/strings/es/skill_rogue.lua | 4 ++-- lua/app/config/strings/id/skill_rogue.lua | 4 ++-- lua/app/config/strings/ja/skill_rogue.lua | 4 ++-- lua/app/config/strings/ko/chapter.lua | 2 +- lua/app/config/strings/ko/skill_rogue.lua | 4 ++-- lua/app/config/strings/pt/skill_rogue.lua | 4 ++-- lua/app/config/strings/th/skill_rogue.lua | 4 ++-- lua/app/config/strings/vi/skill_rogue.lua | 4 ++-- lua/app/config/strings/zh/skill_rogue.lua | 4 ++-- 15 files changed, 38 insertions(+), 56 deletions(-) diff --git a/lua/app/config/activity_pvp_robot.lua b/lua/app/config/activity_pvp_robot.lua index 3b639845..a49548de 100644 --- a/lua/app/config/activity_pvp_robot.lua +++ b/lua/app/config/activity_pvp_robot.lua @@ -12,7 +12,7 @@ local activity_pvp_robot = { 6 }, { - 24004, + 22004, 6 }, { @@ -20,7 +20,7 @@ local activity_pvp_robot = { 6 }, { - 44002, + 42002, 6 }, { @@ -42,15 +42,15 @@ local activity_pvp_robot = { 6 }, { - 24002, + 22002, 6 }, { - 34001, + 32001, 6 }, { - 44004, + 42004, 6 }, { @@ -68,7 +68,7 @@ local activity_pvp_robot = { ["avatar_frame"]=1000, ["hero_id"]={ { - 14002, + 12002, 6 }, { @@ -76,7 +76,7 @@ local activity_pvp_robot = { 6 }, { - 34001, + 32001, 6 }, { @@ -102,7 +102,7 @@ local activity_pvp_robot = { 6 }, { - 24003, + 22003, 6 }, { @@ -132,7 +132,7 @@ local activity_pvp_robot = { 6 }, { - 24002, + 23002, 6 }, { @@ -140,7 +140,7 @@ local activity_pvp_robot = { 6 }, { - 44001, + 42001, 6 }, { diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index 99cbd95c..9a97996f 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -507,25 +507,9 @@ local const = { ["num"]=10, ["num_for_nothing"]="Vwg=" } - }, - ["activity_skin_fight_id_1"]={ - ["value"]=4104 - }, - ["activity_skin_fight_id_2"]={ - ["value"]=4204 - }, - ["activity_skin_fight_reward"]={ - ["reward"]={ - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" - } } } local config = { -data=const,count=105 +data=const,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index fcf5854f..5ba2a4bd 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -3854,7 +3854,6 @@ local skill = { }, [2400421]={ ["position"]=2, - ["combo_position"]=1, ["effect_type"]=2, ["trigger"]=5, ["effect"]={ @@ -3893,6 +3892,7 @@ local skill = { 2 } }, + ["combo_position"]=2, ["effect_type"]=2, ["trigger"]=5, ["effect"]={ @@ -5553,7 +5553,7 @@ local skill = { { { ["type"]="state", - ["attr"]="vulnerable", + ["attr"]="frozen", ["op"]=">", ["v"]=0, ["side"]=2 @@ -5566,14 +5566,15 @@ local skill = { 1 } }, + ["combo_position"]=3, ["effect_type"]=2, ["trigger"]=5, ["effect"]={ { - ["type"]="bleed", - ["num"]=3500, - ["ratio"]=1000, - ["round"]=2 + ["type"]="hurt_green", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=0 } }, ["obj"]=2 diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 66e44502..0a6541e0 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -3358,9 +3358,6 @@ local skill_rogue = { ["icon"]="244" }, [3400303]={ - ["buff_id"]={ - "bleed" - }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index c6903b2c..0e2f6d72 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -789,7 +789,7 @@ local skill_rogue = { ["desc"]="绝命啃咬消除的元素提供技能能量*2。" }, [3400303]={ - ["desc"]="Combo:忍者菲尔普攻易伤敌人有10%概率附加流血效果，2回合。" + ["desc"]="Combo:忍者菲尔普攻对冻结敌人额外增伤。" }, [3400304]={ ["desc"]="绝命啃咬使用时本次普攻伤害提升。" diff --git a/lua/app/config/strings/en/skill_rogue.lua b/lua/app/config/strings/en/skill_rogue.lua index ebe621d8..46f3708c 100644 --- a/lua/app/config/strings/en/skill_rogue.lua +++ b/lua/app/config/strings/en/skill_rogue.lua @@ -789,7 +789,7 @@ local skill_rogue = { ["desc"]="Skill energy provided by Elements cleared by Lethal Bite *2." }, [3400303]={ - ["desc"]="Combo: Ninja Phil's normal attacks on Vulnerable have a 10% of chance to inflict Bleed for 2 turns." + ["desc"]="Combo: Ninja Phil's normal attacks deal increased damage to Frozen enemies." }, [3400304]={ ["desc"]="When Lethal Bite is used, normal attack damage increases for this turn." @@ -894,7 +894,7 @@ local skill_rogue = { ["desc"]="Take This can inflict Bleed for 2 turns." }, [2400406]={ - ["desc"]="Combo: Lee's normal attacks deal increased damage to Cold and Bleeding enemies." + ["desc"]="Combo: Lee's normal attacks deal increased damage to Cold and Burn enemies." }, [2400407]={ ["desc"]="The chance of Stun inflicted by Take This increases to 10% for +1 turn." diff --git a/lua/app/config/strings/es/skill_rogue.lua b/lua/app/config/strings/es/skill_rogue.lua index 041321a6..573c0a59 100644 --- a/lua/app/config/strings/es/skill_rogue.lua +++ b/lua/app/config/strings/es/skill_rogue.lua @@ -789,7 +789,7 @@ local skill_rogue = { ["desc"]="Energía de habilidad ofrecida por elementos eliminados por Mordedura Fatal *2." }, [3400303]={ - ["desc"]="Combo: el ATQ común de Ninja Phil a enemigos vulnerables tiene un 10% de chance de aplicar Sangrado durante 2 rondas." + ["desc"]="Combo: el ATQ común de Ninja Phil aumenta el daño extra a enemigos Congelado." }, [3400304]={ ["desc"]="Al usar Mordedura Fatal, el daño de este ataque común aumenta." @@ -894,7 +894,7 @@ local skill_rogue = { ["desc"]="Ah-dah puede aplicar Sangrado durante 2 rondas." }, [2400406]={ - ["desc"]="Combo: ataque común de Lee causa daño adicional a los enemigos con Escarcha y Sangrados." + ["desc"]="Combo: ataque común de Lee causa daño adicional a los enemigos con Escarcha y Quemadura." }, [2400407]={ ["desc"]="Aumenta el chance de Vértigo aplicado por Ah-dah a 10% durante +1 ronda." diff --git a/lua/app/config/strings/id/skill_rogue.lua b/lua/app/config/strings/id/skill_rogue.lua index 40bc5d41..b57974f9 100644 --- a/lua/app/config/strings/id/skill_rogue.lua +++ b/lua/app/config/strings/id/skill_rogue.lua @@ -789,7 +789,7 @@ local skill_rogue = { ["desc"]="Energi skill yang diberikan oleh elemen dan dibersihkan Gigitan Maut *2." }, [3400303]={ - ["desc"]="Combo: ATK Normal Ninja Phil pada Rentan memiliki 10% peluang untuk memberikan Berdarah selama 2 giliran." + ["desc"]="Combo: ATK Normal Ninja Phil memberikan peningkatan DMG pada musuh yang Freeze." }, [3400304]={ ["desc"]="DMG ATK normal akan meningkat pada giliran ini saat Gigitan Maut digunakan." @@ -894,7 +894,7 @@ local skill_rogue = { ["desc"]="Ah, bertarung! menyebabkan berdarah selama 2 giliran." }, [2400406]={ - ["desc"]="Combo: ATK normal Lee memberikan peningkatan DMG pada musuh Freeze dan Bleed." + ["desc"]="Combo: ATK normal Lee memberikan peningkatan DMG pada musuh Freeze dan Scorch." }, [2400407]={ ["desc"]="Peluang Stun yang ditimbulkan Ah, bertarung! meningkat menjadi 10% selama +1 putaran." diff --git a/lua/app/config/strings/ja/skill_rogue.lua b/lua/app/config/strings/ja/skill_rogue.lua index 0842c978..26f75f03 100644 --- a/lua/app/config/strings/ja/skill_rogue.lua +++ b/lua/app/config/strings/ja/skill_rogue.lua @@ -789,7 +789,7 @@ local skill_rogue = { ["desc"]="「リーサルバイト」が消す元素のスキルエネルギー*2。" }, [3400303]={ - ["desc"]="ヒット:「忍者フィルの通常攻撃」は10%の確率で被ダメージアップ状態の敵に2ターン出血効果を付与する。" + ["desc"]="ヒット:「忍者フィルの通常攻撃」は凍結状態の敵に与えるダメージが増加する。" }, [3400304]={ ["desc"]="「リーサルバイト」を発動すると、今回の通常攻撃のダメージがアップ。" @@ -894,7 +894,7 @@ local skill_rogue = { ["desc"]="「喰らえ！」は敵に2ターン出血効果を付与できる。" }, [2400406]={ - ["desc"]="ヒット:李の通常攻撃は凍傷と出血状態の敵にダメージが50%アップ。" + ["desc"]="ヒット:李の通常攻撃は凍傷と⽕傷状態の敵にダメージが50%アップ。" }, [2400407]={ ["desc"]="「喰らえ！」のスタン効果の確率は10%に増加し、ターン数が+1。" diff --git a/lua/app/config/strings/ko/chapter.lua b/lua/app/config/strings/ko/chapter.lua index 7ec95c8b..a7e5a0b3 100644 --- a/lua/app/config/strings/ko/chapter.lua +++ b/lua/app/config/strings/ko/chapter.lua @@ -81,7 +81,7 @@ local chapter = { ["name"]="27. 악마의 도시 동쪽 거리" }, [28]={ - ["name"]="29. 악마의 도시 센터" + ["name"]="28. 악마의 도시 센터" }, [29]={ ["name"]="29. 악마의 도시 진입로" diff --git a/lua/app/config/strings/ko/skill_rogue.lua b/lua/app/config/strings/ko/skill_rogue.lua index 801c96e6..3165e7db 100644 --- a/lua/app/config/strings/ko/skill_rogue.lua +++ b/lua/app/config/strings/ko/skill_rogue.lua @@ -789,7 +789,7 @@ local skill_rogue = { ["desc"]="필사적인 물기로 소멸한 원소가 제공하는 스킬 에너지 2배" }, [3400303]={ - ["desc"]="Combo: 닌자 필이 부상 상태인 적에게 일반 공격을 가하면 2턴 동안 10% 확률로 출혈 효과를 부여합니다." + ["desc"]="Combo: 닌자 필이 의 일반 공격이 동결 효과의 적에게 추가 피해를 입힙니다." }, [3400304]={ ["desc"]="필사적인 물기를 사용하면 이번 턴의 일반 공격 대미지가 증가합니다." @@ -894,7 +894,7 @@ local skill_rogue = { ["desc"]="아뵤! 2턴 동안 출혈효과를 부여합니다." }, [2400406]={ - ["desc"]="Combo: 리의 일반 공격은 서리 또는 출혈 상태인 적에게 추가 피해를 입힙니다." + ["desc"]="Combo: 리의 일반 공격은 서리 또는 버닝 효과 상태인 적에게 추가 피해를 입힙니다." }, [2400407]={ ["desc"]="아뵤! 가 기절 효과를 부여할 확률이 10%로 증가하며 턴 횟수 +1" diff --git a/lua/app/config/strings/pt/skill_rogue.lua b/lua/app/config/strings/pt/skill_rogue.lua index af7cb057..124508df 100644 --- a/lua/app/config/strings/pt/skill_rogue.lua +++ b/lua/app/config/strings/pt/skill_rogue.lua @@ -789,7 +789,7 @@ local skill_rogue = { ["desc"]="Os elementos eliminados pela Mordida Desesperada fornecem energia de habilidade*2." }, [3400303]={ - ["desc"]="Combo: o ataque básico de Ninja Phill tem 10% de chance de infligir sangramento por 2 turnos a inimigos vulneráveis." + ["desc"]="Combo: o ataque básico de Ninja Phill serve para aumentar o dano extra a inimigos Congelado." }, [3400304]={ ["desc"]="O dano deste ataque básico aumenta quando Mordida Desesperada é usada." @@ -894,7 +894,7 @@ local skill_rogue = { ["desc"]="Ah-dah! pode sangrar o alvo por 2 rodadas." }, [2400406]={ - ["desc"]="Combo: o ataque básico de Lee causa dano extra aos inimigos gélidos e sangrentos." + ["desc"]="Combo: o ataque básico de Lee causa dano extra aos inimigos Gélidos e Conflagração." }, [2400407]={ ["desc"]="Aumenta a 10% a chance de acionamento do atordoamento de Ah-dah! com +1 rodada de duração." diff --git a/lua/app/config/strings/th/skill_rogue.lua b/lua/app/config/strings/th/skill_rogue.lua index 82514674..b2684448 100644 --- a/lua/app/config/strings/th/skill_rogue.lua +++ b/lua/app/config/strings/th/skill_rogue.lua @@ -789,7 +789,7 @@ local skill_rogue = { ["desc"]="ธาตุที่กำจัดโดยขย้ำดับชีพเสนอพลังงานสกิล*2" }, [3400303]={ - ["desc"]="Combo: การโจมตีทั่วไปของนินจาฟิลโดนศัตรูอ่อนแอจะมีโอกาส 10% เพิ่มเอฟเฟกต์เลือดไหล 2 รอบ" + ["desc"]="Combo: การโจมตีทั่วไปของนินจาฟิลสร้างดาเมจเพิ่มเติมให้กับศัตรูแช่แข็ง" }, [3400304]={ ["desc"]="เมื่อใช้ขย้ำดับชีพ เพิ่มดาเมจโจมตีทั่วไปครั้งนี้" @@ -894,7 +894,7 @@ local skill_rogue = { ["desc"]="อ่า ต้า! จะเพิ่มเอฟเฟกต์เลือดไหล 2 รอบ" }, [2400406]={ - ["desc"]="คอมโบ: การโจมตีทั่วไปของหลี่จะสร้างดาเมจเพิ่มเติมให้กับศัตรูฟรอสต์และเลือดไหล" + ["desc"]="คอมโบ: การโจมตีทั่วไปของหลี่จะสร้างดาเมจเพิ่มเติมให้กับศัตรูฟรอสต์และเผาไหม้" }, [2400407]={ ["desc"]="โอกาสเอฟเฟกต์มึนงงที่เพิ่มโดยอ่า ต้า!เพิ่มขึ้นถึง10% จำนวนรอบ+1" diff --git a/lua/app/config/strings/vi/skill_rogue.lua b/lua/app/config/strings/vi/skill_rogue.lua index 0f5389b5..1bdcb7b2 100644 --- a/lua/app/config/strings/vi/skill_rogue.lua +++ b/lua/app/config/strings/vi/skill_rogue.lua @@ -789,7 +789,7 @@ local skill_rogue = { ["desc"]="Cung cấp Năng Lượng Kỹ Năng*2 nguyên tố do Gặm Cắn Chí Mạng xua tan." }, [3400303]={ - ["desc"]="Combo: Ninja Phil đánh thường kẻ địch Trọng Thương có 10% kèm Mất Máu, 2 hiệp." + ["desc"]="Combo: Ninja Phil đánh thường gây thêm sát thương lên kẻ địch Đóng Băng." }, [3400304]={ ["desc"]="Khi dùng Gặm Cắn Chí Mạng tăng sát thương đánh thường lần này." @@ -894,7 +894,7 @@ local skill_rogue = { ["desc"]="Đánh Nào! kèm hiệu quả Mất Máu, 2 hiệp." }, [2400406]={ - ["desc"]="Combo: Lee đánh thường gây thêm ST lên kẻ địch Băng Sương và Mất Máu." + ["desc"]="Combo: Lee đánh thường gây thêm ST lên kẻ địch Băng Sương và Thiêu Đốt." }, [2400407]={ ["desc"]="Đánh Nào! kèm hiệu quả Choáng, TL tăng đến 10%, số hiệp +1." diff --git a/lua/app/config/strings/zh/skill_rogue.lua b/lua/app/config/strings/zh/skill_rogue.lua index 2fcd926b..c8e1e836 100644 --- a/lua/app/config/strings/zh/skill_rogue.lua +++ b/lua/app/config/strings/zh/skill_rogue.lua @@ -789,7 +789,7 @@ local skill_rogue = { ["desc"]="絕命啃咬消除的元素提供技能能量*2。" }, [3400303]={ - ["desc"]="Combo:忍者菲爾普攻易傷敵人有10%機率附帶流血效果，2回合。" + ["desc"]="Combo:忍者菲爾普攻對凍結敵人額外增傷。" }, [3400304]={ ["desc"]="絕命啃咬使用時本次普攻傷害提高。" @@ -894,7 +894,7 @@ local skill_rogue = { ["desc"]="啊，打！可附帶流血效果，2回合。" }, [2400406]={ - ["desc"]="Combo:李普攻對冰霜和流血敵人額外增傷。" + ["desc"]="Combo:李普攻對冰霜和灼燒敵人額外增傷。" }, [2400407]={ ["desc"]="啊，打！附帶的暈眩效果機率提高至10%，回合數+1。"