From 8316e48633d1815c10f4614276f7a9bd88483ba5 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 19 May 2023 15:15:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battle/component/battle_unit_comp.lua | 2 - .../battle/controller/battle_controller.lua | 162 +---------- .../helper/battle_instructions_helper.lua | 253 ++++++++++++++++++ .../skill/battle_rogue_skill_handle.lua | 100 +++++-- .../skill/battle_board_skill_entity.lua | 105 ++++++-- lua/app/userdata/hero/hero_entity.lua | 6 +- 6 files changed, 420 insertions(+), 208 deletions(-) create mode 100644 lua/app/module/battle/helper/battle_instructions_helper.lua diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index cd934bd3..8297dcb7 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -490,8 +490,6 @@ function BattleUnitComp:changeState(state) self:enterAssistingAttackState() elseif state == UNIT_STATE.DEAD then self:enterDeadState() - elseif state == UNIT_STATE.BORN then - self:enterBornState() elseif state == UNIT_STATE.ENTER_BATTLEFIELD then self:enterEnterBattlefieldState() elseif state == UNIT_STATE.SWITCH_IN then diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index daeff18d..1622ffd6 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -9,6 +9,7 @@ local BattleController = class("BattleController") local BATTLE_BOARD_SKILL_HANDLE = require "app/module/battle/skill/battle_board_skill_handle" local BATTLE_ROGUE_SKILL_HANDLE = require "app/module/battle/skill/battle_rogue_skill_handle" local BATTLE_GRID_EFFECT_HANDLE = require "app/module/battle/skill/battle_grid_effect_handle" +local BATTLE_INSTRUCTIONS_HELPER = require "app/module/battle/helper/battle_instructions_helper" local BattleBuffHandle = require "app/module/battle/helper/battle_buff_handle" local ELIMINATION_TOUCH_EVENT = GConst.ELIMINATION_TOUCH_EVENT @@ -1164,163 +1165,7 @@ function BattleController:onFillBoardOver(isRoundBeginCheck) end function BattleController:generateInstructions(skillEntity, elementType, lineCount, influenceElementTypeMap, elementTypeMap) - local elementTypeCount = 0 - -- local assistingList = nil - ---- 援助 - for element, count in pairs(elementTypeMap) do - -- if element == elementType then - elementTypeCount = elementTypeCount + count - -- else - -- if assistingList == nil then - -- assistingList = {} - -- end - -- local obj = { - -- count = count, - -- skillMatch = element, - -- } - -- table.insert(assistingList, obj) - -- end - end - - ---- 技能 - if skillEntity then - if elementType == skillEntity:getPosition() then - table.insert(self.instructions, { - name = BattleConst.INSTRUCTION_NAME.PLAY_SKILL, - skillMatch = elementType, - count = elementTypeCount, - }) - else - if skillEntity:getEffect() ~= nil then - table.insert(self.instructions, { - name = BattleConst.INSTRUCTION_NAME.PLAY_SKILL, - skillMatch = skillEntity:getPosition(), - count = 0, - }) - end - if elementTypeCount > 0 then - table.insert(self.instructions, { - name = BattleConst.INSTRUCTION_NAME.GENERAL_ATTACK, - skillMatch = elementType, - count = elementTypeCount, - }) - end - end - else - ---- 普攻 - if elementTypeCount > 0 then - table.insert(self.instructions, { - name = BattleConst.INSTRUCTION_NAME.GENERAL_ATTACK, - skillMatch = elementType, - count = elementTypeCount, - }) - end - end - - -- if assistingList then - -- table.insert(self.instructions, { - -- name = BattleConst.INSTRUCTION_NAME.ASSISTING, - -- assistingList = assistingList, - -- }) - -- end - - ---- 加buff - if skillEntity then - local eliminateEffects = skillEntity:getEliminateEffects(self) - if eliminateEffects then - local effectList - for _, buffEntity in ipairs(eliminateEffects) do - if not effectList then - effectList = {} - end - table.insert(effectList, buffEntity) - end - if effectList then - local unit = { - name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR, - effectList = effectList - } - table.insert(self.instructions, unit) - end - end - if skillEntity:getLinkEffects() and elementType then - local effectList - for type, buffEntities in pairs(skillEntity:getLinkEffects()) do - local buffEntity = buffEntities[elementType] - if buffEntity then - if not effectList then - effectList = {} - end - table.insert(effectList, buffEntity) - end - end - if effectList then - local unit = { - name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR, - effectList = effectList - } - table.insert(self.instructions, unit) - end - end - - if skillEntity:getInInfluenceEffects() and influenceElementTypeMap then - for influenceElementType , _ in pairs(influenceElementTypeMap) do - local effectList - for type, buffEntities in pairs(skillEntity:getInInfluenceEffects()) do - local buffEntity = buffEntities[influenceElementType] - if buffEntity then - if not effectList then - effectList = {} - end - table.insert(effectList, buffEntity) - end - end - if effectList then - table.insert(self.instructions, { - name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR, - effectList = effectList - }) - end - end - end - - if skillEntity:getElementCountEffect() and elementType then - local effectList - for type, buffEntities in pairs(skillEntity:getElementCountEffect()) do - local originBuffEntity = buffEntities.origin - local useBuffEntity = buffEntities.use - if not effectList then - effectList = {} - end - local newNum = originBuffEntity:getEffectNum() * lineCount - useBuffEntity:setEffectNum(newNum) - table.insert(effectList, useBuffEntity) - end - if effectList then - table.insert(self.instructions, { - name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR, - effectList = effectList - }) - end - end - - -- - if skillEntity:getSkillAttackBeforeEffects() and elementType then - local effectList - for type, buffEntity in pairs(skillEntity:getSkillAttackBeforeEffects()) do - if not effectList then - effectList = {} - end - table.insert(effectList, buffEntity) - end - if effectList then - table.insert(self.instructions, { - name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR, - effectList = effectList - }) - end - end - end + self.instructions = BATTLE_INSTRUCTIONS_HELPER.generateInstructions(skillEntity, elementType, lineCount, influenceElementTypeMap, elementTypeMap, self) end function BattleController:exeInstructions(callback) @@ -1792,7 +1637,8 @@ function BattleController:getRandomSkillList(getCount, onlyCommonSkill) for _, skillId in ipairs(list) do local skillCfg = cfg[skillId] if skillCfg and (not skillCfg.limit_times or self.battleData:getSkillCount(skillId) < skillCfg.limit_times) then - if not map[skillId] then + + if not map[skillId] and (not skillCfg.unlock or self.battleData:getSkillCount(skillCfg.unlock) > 0) then table.insert(newSkillPool, skillId) table.insert(skillWeight, skillCfg.weight) count = count + 1 diff --git a/lua/app/module/battle/helper/battle_instructions_helper.lua b/lua/app/module/battle/helper/battle_instructions_helper.lua new file mode 100644 index 00000000..3c2eacee --- /dev/null +++ b/lua/app/module/battle/helper/battle_instructions_helper.lua @@ -0,0 +1,253 @@ +local BattleConst = GConst.BattleConst +local BattleInstructionsHelper = {} + +BattleInstructionsHelper._generateAttackInstructions = function(instructions, skillEntity, elementType, elementTypeCount) + if skillEntity then + if elementType == skillEntity:getPosition() then + table.insert(instructions, { + name = BattleConst.INSTRUCTION_NAME.PLAY_SKILL, + skillMatch = elementType, + count = elementTypeCount, + }) + else + if skillEntity:getEffect() ~= nil then + table.insert(instructions, { + name = BattleConst.INSTRUCTION_NAME.PLAY_SKILL, + skillMatch = skillEntity:getPosition(), + count = 0, + }) + end + if elementTypeCount > 0 then + table.insert(instructions, { + name = BattleConst.INSTRUCTION_NAME.GENERAL_ATTACK, + skillMatch = elementType, + count = elementTypeCount, + }) + end + end + else + ---- 普攻 + if elementTypeCount > 0 then + table.insert(instructions, { + name = BattleConst.INSTRUCTION_NAME.GENERAL_ATTACK, + skillMatch = elementType, + count = elementTypeCount, + }) + end + end + + -- if assistingList then + -- table.insert(self.instructions, { + -- name = BattleConst.INSTRUCTION_NAME.ASSISTING, + -- assistingList = assistingList, + -- }) + -- end +end + +local generateEliminateEffects = function(instructions, skillEntity, battleController) + local eliminateEffects = skillEntity:getEliminateEffects(battleController) + if not eliminateEffects then + return + end + local effectList + for _, buffEntity in ipairs(eliminateEffects) do + if not effectList then + effectList = {} + end + table.insert(effectList, buffEntity) + end + if effectList then + local unit = { + name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR, + effectList = effectList + } + table.insert(instructions, unit) + end +end + +local generateLinkEffects = function(instructions, skillEntity, elementType) + if not skillEntity:getLinkEffects() or not elementType then + return + end + + local effectList + for type, buffEntities in pairs(skillEntity:getLinkEffects()) do + local buffEntity = buffEntities[elementType] + if buffEntity then + if not effectList then + effectList = {} + end + table.insert(effectList, buffEntity) + end + end + if effectList then + local unit = { + name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR, + effectList = effectList + } + table.insert(instructions, unit) + end +end + +local generateInfluenceEffects = function(instructions, skillEntity, influenceElementTypeMap) + if not skillEntity:getInInfluenceEffects() or not influenceElementTypeMap then + return + end + for influenceElementType , _ in pairs(influenceElementTypeMap) do + local effectList + for type, buffEntities in pairs(skillEntity:getInInfluenceEffects()) do + local buffEntity = buffEntities[influenceElementType] + if buffEntity then + if not effectList then + effectList = {} + end + table.insert(effectList, buffEntity) + end + end + if effectList then + table.insert(instructions, { + name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR, + effectList = effectList + }) + end + end +end + +local generateElementCountEffect = function(instructions, skillEntity, elementType, lineCount) + if not skillEntity:getElementCountEffect() or not elementType then + return + end + + local effectList + for rogueSkill, list in pairs(skillEntity:getElementCountEffect()) do + for index, buffEntities in pairs(list) do + local originBuffEntity = buffEntities.origin + local useBuffEntity = buffEntities.use + if not effectList then + effectList = {} + end + local newNum = originBuffEntity:getEffectNum() * lineCount + useBuffEntity:setEffectNum(newNum) + table.insert(effectList, useBuffEntity) + end + end + if effectList then + table.insert(instructions, { + name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR, + effectList = effectList + }) + end +end + +local generateSkillAttackBeforeEffects = function(instructions, skillEntity) + if not skillEntity:getSkillAttackBeforeEffects() then + return + end + + local effectList + for rogueSkill, list in pairs(skillEntity:getSkillAttackBeforeEffects()) do + for index, buffEntity in pairs(list) do + if not effectList then + effectList = {} + end + table.insert(effectList, buffEntity) + end + end + if effectList then + table.insert(instructions, { + name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR, + effectList = effectList + }) + end +end + +local generateLinkCountMoreEffects = function(instructions, skillEntity, lineCount) + if not skillEntity:getLinkCountMoreEffects() then + return + end + + local effectList + for rogueSkill, list in pairs(skillEntity:getLinkCountMoreEffects()) do + for index, info in pairs(list) do + if info.paramsCount and info.paramsCount <= lineCount then + if not effectList then + effectList = {} + end + table.insert(effectList, info.buffEntity) + end + end + end + if effectList then + table.insert(instructions, { + name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR, + effectList = effectList + }) + end +end + +local generateLinkCountPowerEffects = function(instructions, skillEntity, lineCount) + if not skillEntity:getLinkCountMoreEffects() then + return + end + + local effectList + for rogueSkill, list in pairs(skillEntity:getLinkCountMoreEffects()) do + for index, info in pairs(list) do + if info.paramsCount and info.paramsCount <= lineCount then + local poser = lineCount // info.paramsCount + for i = 1, poser do + if not effectList then + effectList = {} + end + table.insert(effectList, info.buffEntity) + end + end + end + end + if effectList then + table.insert(instructions, { + name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR, + effectList = effectList + }) + end +end + +BattleInstructionsHelper._generateBuffInstructions = function(instructions, skillEntity, elementType, lineCount, influenceElementTypeMap, battleController) + if skillEntity then + generateEliminateEffects(instructions, skillEntity, battleController) + generateLinkEffects(instructions, skillEntity, elementType) + generateInfluenceEffects(instructions, skillEntity, influenceElementTypeMap) + generateElementCountEffect(instructions, skillEntity, elementType, lineCount) + generateSkillAttackBeforeEffects(instructions, skillEntity) + generateLinkCountMoreEffects(instructions, skillEntity, lineCount) + generateLinkCountPowerEffects(instructions, skillEntity, lineCount) + end +end + +BattleInstructionsHelper.generateInstructions = function(skillEntity, elementType, lineCount, influenceElementTypeMap, elementTypeMap, battleController) + local elementTypeCount = 0 + local instructions = {} + -- local assistingList = nil + ---- 援助 + for element, count in pairs(elementTypeMap) do + -- if element == elementType then + elementTypeCount = elementTypeCount + count + -- else + -- if assistingList == nil then + -- assistingList = {} + -- end + -- local obj = { + -- count = count, + -- skillMatch = element, + -- } + -- table.insert(assistingList, obj) + -- end + end + + -- 攻击 + BattleInstructionsHelper._generateAttackInstructions(instructions, skillEntity, elementType, elementTypeCount) + ---- 加buff + BattleInstructionsHelper._generateBuffInstructions(instructions, skillEntity, elementType, lineCount, influenceElementTypeMap, battleController) +end + +return BattleInstructionsHelper diff --git a/lua/app/module/battle/skill/battle_rogue_skill_handle.lua b/lua/app/module/battle/skill/battle_rogue_skill_handle.lua index c910328a..a4700259 100644 --- a/lua/app/module/battle/skill/battle_rogue_skill_handle.lua +++ b/lua/app/module/battle/skill/battle_rogue_skill_handle.lua @@ -4,7 +4,7 @@ local BattleBuffEntity = require "app/userdata/battle/skill/battle_buff_entity" local BattleRogueSkillHandle = {} -local _changeBaseSkill = function(skillInfo, battleData, battleController) +local _changeBaseSkill = function(skillId, skillInfo, battleData, battleController) local elementType = skillInfo.skill_position if not elementType or not skillInfo.parameter then return @@ -27,7 +27,7 @@ local _changeBaseSkill = function(skillInfo, battleData, battleController) end end -local _addEliminationRange = function(skillInfo, battleData, battleController) +local _addEliminationRange = function(skillId, skillInfo, battleData, battleController) local elementType = skillInfo.skill_position if not elementType or not skillInfo.boardrange then return @@ -39,7 +39,7 @@ local _addEliminationRange = function(skillInfo, battleData, battleController) end end -local _canLinkAnyElement = function(skillInfo, battleData, battleController) +local _canLinkAnyElement = function(skillId, skillInfo, battleData, battleController) local elementType = skillInfo.skill_position if not elementType then return @@ -51,7 +51,7 @@ local _canLinkAnyElement = function(skillInfo, battleData, battleController) end end -local _addLinkAtkp = function(skillInfo, battleData, battleController) +local _addLinkAtkp = function(skillId, skillInfo, battleData, battleController) local elementType = skillInfo.skill_position if not elementType or not skillInfo.effect then return @@ -74,7 +74,7 @@ local _addLinkAtkp = function(skillInfo, battleData, battleController) end end -local _changeElementType = function(skillInfo, battleData, battleController) +local _changeElementType = function(skillId, skillInfo, battleData, battleController) if not skillInfo.boardrange or not skillInfo.parameter then return end @@ -88,7 +88,7 @@ local _changeElementType = function(skillInfo, battleData, battleController) battleController:changeElementType(count, elementType) end -local _addAttr = function(skillInfo, battleData, battleController, value) +local _addAttr = function(skillId, skillInfo, battleData, battleController, value) if not skillInfo.attr then return end @@ -99,7 +99,7 @@ local _addAttr = function(skillInfo, battleData, battleController, value) battleController:addHeroAttr(skillInfo.attr.type, value) end -local _unlockSkill = function(skillInfo, battleData, battleController, value) +local _unlockSkill = function(skillId, skillInfo, battleData, battleController, value) if not skillInfo.skill_position then return end @@ -107,7 +107,7 @@ local _unlockSkill = function(skillInfo, battleData, battleController, value) battleData:unlockSkillEntity(skillInfo.skill_position) end -local _addSkillEffectParams = function(skillInfo, battleData, battleController) +local _addSkillEffectParams = function(skillId, skillInfo, battleData, battleController) local elementType = skillInfo.skill_position if not elementType or not skillInfo.parameter then return @@ -144,7 +144,7 @@ local _addSkillEffectParams = function(skillInfo, battleData, battleController) end end -local _addSkillRound = function(skillInfo, battleData, battleController) +local _addSkillRound = function(skillId, skillInfo, battleData, battleController) local elementType = skillInfo.skill_position if not elementType or not skillInfo.parameter then return @@ -182,7 +182,7 @@ local _addSkillRound = function(skillInfo, battleData, battleController) end end -local _addSkillEffect = function(skillInfo, battleData, battleController) +local _addSkillEffect = function(skillId, skillInfo, battleData, battleController) if not skillInfo.effect then return end @@ -222,7 +222,7 @@ local _addSkillEffect = function(skillInfo, battleData, battleController) end end -local _addSkillInInfluenceAtkp = function(skillInfo, battleData, battleController) +local _addSkillInInfluenceAtkp = function(skillId, skillInfo, battleData, battleController) local elementType = skillInfo.skill_position if not elementType or not skillInfo.effect then return @@ -243,7 +243,7 @@ local _addSkillInInfluenceAtkp = function(skillInfo, battleData, battleControlle end end -local _addSkillAttackBeforeEffect = function(skillInfo, battleData, battleController) +local _addSkillAttackBeforeEffect = function(skillId, skillInfo, battleData, battleController) local elementType = skillInfo.skill_position if not elementType or not skillInfo.effect then return @@ -260,13 +260,16 @@ local _addSkillAttackBeforeEffect = function(skillInfo, battleData, battleContro local entity = battleData:getSkillEntityByElement(elementType) if entity then + if skillInfo.cover_unlock then + entity:removeSkillAttackBeforeEffect(skillInfo.cover_unlock) + end for k, effect in ipairs(skillInfo.effect) do - entity:addSkillAttackBeforeEffect(k, effect, unitEntity, skillInfo.obj) + entity:addSkillAttackBeforeEffect(skillId, k, effect, unitEntity, skillInfo.obj) end end end -local _addSkillElementCountEffect = function(skillInfo, battleData, battleController) +local _addSkillElementCountEffect = function(skillId, skillInfo, battleData, battleController) local elementType = skillInfo.skill_position if not elementType or not skillInfo.effect then return @@ -283,8 +286,69 @@ local _addSkillElementCountEffect = function(skillInfo, battleData, battleContro local entity = battleData:getSkillEntityByElement(elementType) if entity then - for _, effect in ipairs(skillInfo.effect) do - entity:addElementCountEffect(effect, unitEntity, skillInfo.obj) + if skillInfo.cover_unlock then + entity:removeElementCountEffect(skillInfo.cover_unlock) + end + for k, effect in ipairs(skillInfo.effect) do + entity:addElementCountEffect(skillId, k, effect, unitEntity, skillInfo.obj) + end + end +end + +local _addLinkCountMoreEffect = function(skillId, skillInfo, battleData, battleController) + local elementType = skillInfo.skill_position + if not elementType or not skillInfo.effect or not skillInfo.parameter then + return + end + + if not battleController.battleData or not battleController.battleData.atkTeam then + return + end + + local unitEntity = battleController.battleData.atkTeam:getAllMembers()[elementType] + if not unitEntity then + return + end + + local entity = battleData:getSkillEntityByElement(elementType) + if entity then + if skillInfo.cover_unlock then + entity:removeLinkCountMoreEffects(skillInfo.cover_unlock) + end + for k, effect in ipairs(skillInfo.effect) do + local paramsCount = skillInfo.parameter[k] + if paramsCount then + entity:addLinkCountMoreEffects(skillId, k, effect, unitEntity, skillInfo.obj, paramsCount) + end + end + end +end + +local _addLinkCountPowerEffect = function(skillId, skillInfo, battleData, battleController) + local elementType = skillInfo.skill_position + if not elementType or not skillInfo.effect or not skillInfo.parameter then + return + end + + if not battleController.battleData or not battleController.battleData.atkTeam then + return + end + + local unitEntity = battleController.battleData.atkTeam:getAllMembers()[elementType] + if not unitEntity then + return + end + + local entity = battleData:getSkillEntityByElement(elementType) + if entity then + if skillInfo.cover_unlock then + entity:removeLinkCountPowerEffects(skillInfo.cover_unlock) + end + for k, effect in ipairs(skillInfo.effect) do + local paramsCount = skillInfo.parameter[k] + if paramsCount then + entity:addLinkCountPowerEffects(skillId, k, effect, unitEntity, skillInfo.obj, paramsCount) + end end end end @@ -303,6 +367,8 @@ BattleRogueSkillHandle._effectOn = { [11] = _addSkillInInfluenceAtkp, -- 技能消除的增加伤害 [12] = _addSkillAttackBeforeEffect, -- 技能触发前的技能效果 [13] = _addSkillElementCountEffect, -- 技能链接中每一个元素累加的技能效果 + [14] = _addLinkCountMoreEffect, -- 链接超过x元素获得一次技能效果 + [15] = _addLinkCountPowerEffect, -- 链接超过x元素获得倍数技能效果 } function BattleRogueSkillHandle.takeEffect(skillId, battleData, battleController, value) @@ -313,7 +379,7 @@ function BattleRogueSkillHandle.takeEffect(skillId, battleData, battleController local func = BattleRogueSkillHandle._effectOn[cfg.type] if func then - func(cfg, battleData, battleController, value) + func(skillId, cfg, battleData, battleController, value) end end diff --git a/lua/app/userdata/battle/skill/battle_board_skill_entity.lua b/lua/app/userdata/battle/skill/battle_board_skill_entity.lua index fb828706..1808f29e 100644 --- a/lua/app/userdata/battle/skill/battle_board_skill_entity.lua +++ b/lua/app/userdata/battle/skill/battle_board_skill_entity.lua @@ -5,11 +5,12 @@ function BattleBoardSkillEntity:ctor(skillId) self:refreshSkillId(skillId) self.curEnergy = 0 self.addRange = {} - self.linkEffectEntities = {} - self.inInfluenceEntities = {} - self.skillAttackBeforeEffectEntities = {} - self.elementCountEffectEntities = {} - self.cacheBuffEntities = {} + self.linkEffectEntities = {} -- 链接攻击伤害 type = 3 + self.inInfluenceEntities = {} -- 技能消除攻击伤害 type = 11 + self.skillAttackBeforeEffectEntities = {} -- 战斗开始前获得技能效果 type = 12 + self.elementCountEffectEntities = {} -- 根据消除数量获得次数的技能效果 type = 13 + self.linkCountMoreEffects = {} -- 链接超过x元素获得一次技能效果 type = 14 + self.linkCountPowerEffects = {} -- 链接超过x元素获得倍数技能效果 type = 15 self.upSkillIdMap = {} self.getUpSkillKind = 0 @@ -280,27 +281,38 @@ function BattleBoardSkillEntity:addInInfluenceEffect(effect, unitEntity, targetS end end -function BattleBoardSkillEntity:addSkillAttackBeforeEffect(index, effect, unitEntity, targetSide) - local buffEntity = self.skillAttackBeforeEffectEntities[index] +function BattleBoardSkillEntity:addSkillAttackBeforeEffect(rogueSkill, index, effect, unitEntity, targetSide) + if not self.skillAttackBeforeEffectEntities[rogueSkill] then + self.skillAttackBeforeEffectEntities[rogueSkill] = {} + end + local buffEntity = self.skillAttackBeforeEffectEntities[rogueSkill][index] if not buffEntity then buffEntity = BattleBuffEntity:create() buffEntity:init(effect, unitEntity) - self.skillAttackBeforeEffectEntities[index] = buffEntity + self.skillAttackBeforeEffectEntities[rogueSkill][index] = buffEntity else buffEntity:init(effect, unitEntity) end buffEntity:setTargetSide(targetSide) end +function BattleBoardSkillEntity:removeSkillAttackBeforeEffect(rogueSkill) + self.skillAttackBeforeEffectEntities[rogueSkill] = nil +end + function BattleBoardSkillEntity:getSkillAttackBeforeEffects() return self.skillAttackBeforeEffectEntities end -function BattleBoardSkillEntity:addElementCountEffect(effect, unitEntity, targetSide) - local buffEntities = self.elementCountEffectEntities[effect.type] +function BattleBoardSkillEntity:addElementCountEffect(rogueSkill, index, effect, unitEntity, targetSide) + if not self.elementCountEffectEntities[rogueSkill] then + self.elementCountEffectEntities[rogueSkill] = {} + end + local buffEntities = self.elementCountEffectEntities[rogueSkill][index] if not buffEntities then - self.elementCountEffectEntities[effect.type] = {} - buffEntities = self.elementCountEffectEntities[effect.type] + self.elementCountEffectEntities[rogueSkill][index] = {} + buffEntities = self.elementCountEffectEntities[rogueSkill][index] + local originBuffEntity = BattleBuffEntity:create() originBuffEntity:init(effect, unitEntity) originBuffEntity:setTargetSide(targetSide) @@ -325,27 +337,14 @@ function BattleBoardSkillEntity:addElementCountEffect(effect, unitEntity, target end end +function BattleBoardSkillEntity:removeElementCountEffect(rogueSkill) + self.elementCountEffectEntities[rogueSkill] = nil +end + function BattleBoardSkillEntity:getElementCountEffect() return self.elementCountEffectEntities end -function BattleBoardSkillEntity:addBuffEffect(buff, unitEntity) - local buffEntity = self.cacheBuffEntities[buff.type] - if not buffEntity then - buffEntity = BattleBuffEntity:create() - buffEntity:init(buff, unitEntity) - self.cacheBuffEntities[buff.type] = buffEntity - else - local buffNum = buffEntity:getEffectNum() - buffEntity:init(buff, unitEntity) - buffEntity:setEffectNum(buffEntity:getEffectNum() + buffNum) - end -end - -function BattleBoardSkillEntity:getBuffEffects() - return self.cacheBuffEntities -end - function BattleBoardSkillEntity:getEliminateEffects(battleController) local unitEntity = battleController.battleData.atkTeam:getAllMembers()[self:getPosition()] if not unitEntity or not self.config.eliminate_effect then @@ -390,4 +389,52 @@ function BattleBoardSkillEntity:gotUpSKill(skillId) return true end +function BattleBoardSkillEntity:addLinkCountMoreEffects(rogueSkill, index, effect, unitEntity, targetSide, paramsCount) + if not self.linkCountMoreEffects[rogueSkill] then + self.linkCountMoreEffects[rogueSkill] = {} + end + local info = self.linkCountMoreEffects[rogueSkill][index] + if not info then + info = {paramsCount = paramsCount} + info.buffEntity = BattleBuffEntity:create() + info.buffEntity:init(effect, unitEntity) + self.linkCountMoreEffects[rogueSkill][index] = info + else + info.buffEntity:init(effect, unitEntity) + end + info.buffEntity:setTargetSide(targetSide) +end + +function BattleBoardSkillEntity:removeLinkCountMoreEffects(rogueSkill) + self.linkCountMoreEffects[rogueSkill] = nil +end + +function BattleBoardSkillEntity:getLinkCountMoreEffects() + return self.linkCountMoreEffects +end + +function BattleBoardSkillEntity:addLinkCountPowerEffects(rogueSkill, index, effect, unitEntity, targetSide, paramsCount) + if not self.linkCountPowerEffects[rogueSkill] then + self.linkCountPowerEffects[rogueSkill] = {} + end + local info = self.linkCountPowerEffects[rogueSkill][index] + if not info then + info = {paramsCount = paramsCount} + info.buffEntity = BattleBuffEntity:create() + info.buffEntity:init(effect, unitEntity) + self.linkCountPowerEffects[rogueSkill][index] = info + else + info.buffEntity:init(effect, unitEntity) + end + info.buffEntity:setTargetSide(targetSide) +end + +function BattleBoardSkillEntity:removeLinkCountPowerEffects(rogueSkill) + self.linkCountPowerEffects[rogueSkill] = nil +end + +function BattleBoardSkillEntity:getLinkCountPowerEffects() + return self.linkCountPowerEffects +end + return BattleBoardSkillEntity \ No newline at end of file diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index 98291d5a..92608019 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -240,13 +240,15 @@ end function HeroEntity:getRogueSkillList() if not self.rogueSkillList then self.rogueSkillList = {} - for i = 1, 3 do - local id = self.config["rouge_skill_" .. i] + local count = 1 + while true do + local id = self.config["rouge_skill_" .. count] if id then table.insert(self.rogueSkillList, id) else break end + count = count + 1 end end From ff56360efa76d7ebaa48b96822097783c168e86f Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 19 May 2023 16:27:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8A=80=E8=83=BD=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battle/controller/battle_controller.lua | 6 +++--- .../helper/battle_instructions_helper.lua | 19 +++++++++++-------- .../battle_instructions_helper.lua.meta | 10 ++++++++++ .../skill/battle_rogue_skill_handle.lua | 2 +- .../skill/battle_board_skill_entity.lua | 17 +++++++++++++---- .../battle/skill/battle_buff_entity.lua | 2 +- 6 files changed, 39 insertions(+), 17 deletions(-) create mode 100644 lua/app/module/battle/helper/battle_instructions_helper.lua.meta diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 1622ffd6..75d6aae0 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -2440,12 +2440,12 @@ local function _addCurRoundAttr(self, instruction, callback) local mainComp = self:getOtherSideMainUnit(BattleConst.SIDE_DEF) for _, effect in ipairs(instruction.effectList) do local target - if effect:getTartgetSide() == BattleConst.SIDE_DEF then + if effect:getTargetSide() == BattleConst.SIDE_DEF then target = defComp - elseif effect:getTartgetSide() == BattleConst.SIDE_ATK then + elseif effect:getTargetSide() == BattleConst.SIDE_ATK then target = mainComp else - local matchType = BattleConst.SIDE_OBJ_TO_MATCH_TYPE[effect:getTartgetSide()] + local matchType = BattleConst.SIDE_OBJ_TO_MATCH_TYPE[effect:getTargetSide()] if matchType then target = self.atkTeam:getUnitComp()[matchType] end diff --git a/lua/app/module/battle/helper/battle_instructions_helper.lua b/lua/app/module/battle/helper/battle_instructions_helper.lua index 3c2eacee..fef3ecb9 100644 --- a/lua/app/module/battle/helper/battle_instructions_helper.lua +++ b/lua/app/module/battle/helper/battle_instructions_helper.lua @@ -186,21 +186,22 @@ local generateLinkCountMoreEffects = function(instructions, skillEntity, lineCou end local generateLinkCountPowerEffects = function(instructions, skillEntity, lineCount) - if not skillEntity:getLinkCountMoreEffects() then + Logger.logHighlight("generateLinkCountPowerEffects " .. table.nums(skillEntity:getLinkCountPowerEffects())) + if not skillEntity:getLinkCountPowerEffects() then return end local effectList - for rogueSkill, list in pairs(skillEntity:getLinkCountMoreEffects()) do + for rogueSkill, list in pairs(skillEntity:getLinkCountPowerEffects()) do for index, info in pairs(list) do if info.paramsCount and info.paramsCount <= lineCount then - local poser = lineCount // info.paramsCount - for i = 1, poser do - if not effectList then - effectList = {} - end - table.insert(effectList, info.buffEntity) + local power = lineCount // info.paramsCount + if not effectList then + effectList = {} end + local newNum = info.originBuffEntity:getEffectNum() * power + info.useBuffEntity:setEffectNum(newNum) + table.insert(effectList, info.useBuffEntity) end end end @@ -248,6 +249,8 @@ BattleInstructionsHelper.generateInstructions = function(skillEntity, elementTyp BattleInstructionsHelper._generateAttackInstructions(instructions, skillEntity, elementType, elementTypeCount) ---- 加buff BattleInstructionsHelper._generateBuffInstructions(instructions, skillEntity, elementType, lineCount, influenceElementTypeMap, battleController) + + return instructions end return BattleInstructionsHelper diff --git a/lua/app/module/battle/helper/battle_instructions_helper.lua.meta b/lua/app/module/battle/helper/battle_instructions_helper.lua.meta new file mode 100644 index 00000000..cd2ad418 --- /dev/null +++ b/lua/app/module/battle/helper/battle_instructions_helper.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6fd938e7da92c8e4e9a0b7560081b1cd +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/battle/skill/battle_rogue_skill_handle.lua b/lua/app/module/battle/skill/battle_rogue_skill_handle.lua index a4700259..99bd4bed 100644 --- a/lua/app/module/battle/skill/battle_rogue_skill_handle.lua +++ b/lua/app/module/battle/skill/battle_rogue_skill_handle.lua @@ -209,7 +209,7 @@ local _addSkillEffect = function(skillId, skillInfo, battleData, battleControlle end return else - local matchType = BattleConst.SIDE_OBJ_TO_MATCH_TYPE[effect:getTartgetSide()] + local matchType = BattleConst.SIDE_OBJ_TO_MATCH_TYPE[skillInfo.obj] if matchType then target = battleController.atkTeam:getUnitComp()[matchType] end diff --git a/lua/app/userdata/battle/skill/battle_board_skill_entity.lua b/lua/app/userdata/battle/skill/battle_board_skill_entity.lua index 1808f29e..8437fb21 100644 --- a/lua/app/userdata/battle/skill/battle_board_skill_entity.lua +++ b/lua/app/userdata/battle/skill/battle_board_skill_entity.lua @@ -420,13 +420,22 @@ function BattleBoardSkillEntity:addLinkCountPowerEffects(rogueSkill, index, effe local info = self.linkCountPowerEffects[rogueSkill][index] if not info then info = {paramsCount = paramsCount} - info.buffEntity = BattleBuffEntity:create() - info.buffEntity:init(effect, unitEntity) + info.originBuffEntity = BattleBuffEntity:create() + info.originBuffEntity:init(effect, unitEntity) + info.originBuffEntity:setTargetSide(targetSide) + + info.useBuffEntity = BattleBuffEntity:create() + info.useBuffEntity:init(effect, unitEntity) + info.useBuffEntity:setTargetSide(targetSide) + self.linkCountPowerEffects[rogueSkill][index] = info else - info.buffEntity:init(effect, unitEntity) + info.originBuffEntity:init(effect, unitEntity) + info.originBuffEntity:setTargetSide(targetSide) + + info.useBuffEntity:init(effect, unitEntity) + info.useBuffEntity:setTargetSide(targetSide) end - info.buffEntity:setTargetSide(targetSide) end function BattleBoardSkillEntity:removeLinkCountPowerEffects(rogueSkill) diff --git a/lua/app/userdata/battle/skill/battle_buff_entity.lua b/lua/app/userdata/battle/skill/battle_buff_entity.lua index 31a0cd1d..c3677090 100644 --- a/lua/app/userdata/battle/skill/battle_buff_entity.lua +++ b/lua/app/userdata/battle/skill/battle_buff_entity.lua @@ -78,7 +78,7 @@ function BattleBuffEntity:setRound(num) self.round = num end -function BattleBuffEntity:getTartgetSide() +function BattleBuffEntity:getTargetSide() return self.targetSide end From 43dc8332f8c53ca9eeb15d5312d004637576e01d Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 19 May 2023 16:29:02 +0800 Subject: [PATCH 3/4] =?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/bounty_level.lua | 376 +++++++++++----------- lua/app/config/chapter.lua | 6 +- lua/app/config/func_open.lua | 4 +- lua/app/config/hero.lua | 30 +- lua/app/config/item.lua | 48 +++ lua/app/config/skill_rogue.lua | 203 ++++++------ lua/app/config/strings/cn/hero.lua | 42 ++- lua/app/config/strings/cn/skill.lua | 40 +-- lua/app/config/strings/cn/skill_rogue.lua | 314 +++++++++--------- lua/app/config/strings/de/hero.lua | 26 +- lua/app/config/strings/en/hero.lua | 26 +- lua/app/config/strings/fr/hero.lua | 26 +- lua/app/config/strings/id/hero.lua | 26 +- lua/app/config/strings/ja/hero.lua | 26 +- lua/app/config/strings/ko/hero.lua | 26 +- lua/app/config/strings/pt/hero.lua | 26 +- lua/app/config/strings/ru/hero.lua | 26 +- lua/app/config/strings/th/hero.lua | 26 +- lua/app/config/strings/vi/hero.lua | 26 +- lua/app/config/strings/zh/hero.lua | 26 +- 20 files changed, 852 insertions(+), 497 deletions(-) diff --git a/lua/app/config/bounty_level.lua b/lua/app/config/bounty_level.lua index 2e850f78..f717a09d 100644 --- a/lua/app/config/bounty_level.lua +++ b/lua/app/config/bounty_level.lua @@ -7,8 +7,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -27,8 +27,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -67,8 +67,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -87,8 +87,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -127,8 +127,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -147,8 +147,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -185,18 +185,18 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=44001, - ["id_for_nothing"]="UgxcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_type"]=1 }, @@ -208,8 +208,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -228,8 +228,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -268,8 +268,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -288,8 +288,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -328,8 +328,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -348,8 +348,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -386,18 +386,18 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=44001, - ["id_for_nothing"]="UgxcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_type"]=1 }, @@ -409,8 +409,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -429,8 +429,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -469,8 +469,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -489,8 +489,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -529,8 +529,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -549,8 +549,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -587,18 +587,18 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=44001, - ["id_for_nothing"]="UgxcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_type"]=1 }, @@ -610,8 +610,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -630,8 +630,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -670,8 +670,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -690,8 +690,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -730,8 +730,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -750,8 +750,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -788,18 +788,18 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=44001, - ["id_for_nothing"]="UgxcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_type"]=1 }, @@ -811,8 +811,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -831,8 +831,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -871,8 +871,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -891,8 +891,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -931,8 +931,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -951,8 +951,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -989,18 +989,18 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=44001, - ["id_for_nothing"]="UgxcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_type"]=1 }, @@ -1012,8 +1012,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1032,8 +1032,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1072,8 +1072,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1092,8 +1092,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1132,8 +1132,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1152,8 +1152,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1190,18 +1190,18 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=44001, - ["id_for_nothing"]="UgxcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_type"]=1 }, @@ -1213,8 +1213,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1233,8 +1233,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1273,8 +1273,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1293,8 +1293,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1333,8 +1333,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1353,8 +1353,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1391,18 +1391,18 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=44001, - ["id_for_nothing"]="UgxcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=12, + ["id_for_nothing"]="Vwo=", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_type"]=1 }, @@ -1414,8 +1414,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1434,8 +1434,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1474,8 +1474,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1494,8 +1494,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1534,8 +1534,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1554,8 +1554,8 @@ local bounty_level = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, ["reward_pro"]={ ["type"]=1, @@ -1592,18 +1592,18 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=44001, - ["id_for_nothing"]="UgxcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, ["reward_type"]=1 }, @@ -1613,8 +1613,8 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1633,10 +1633,10 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=44001, + ["id_for_nothing"]="UgxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, [202]={ @@ -1805,16 +1805,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=9, + ["id_for_nothing"]="Xw==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, @@ -2006,16 +2006,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=9, + ["id_for_nothing"]="Xw==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, @@ -2207,16 +2207,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=9, + ["id_for_nothing"]="Xw==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, @@ -2408,16 +2408,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=18, + ["id_for_nothing"]="VwA=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, @@ -2609,16 +2609,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=9, + ["id_for_nothing"]="Xw==", ["num"]=10, ["num_for_nothing"]="Vwg=" }, @@ -2810,16 +2810,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=18, + ["id_for_nothing"]="VwA=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, @@ -3011,16 +3011,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=12, + ["id_for_nothing"]="Vwo=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, @@ -3212,16 +3212,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=44001, + ["id_for_nothing"]="UgxcA2Q=", ["num"]=10, ["num_for_nothing"]="Vwg=" }, @@ -3233,8 +3233,8 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index b97c6a32..908c6726 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -14,9 +14,9 @@ local chapter = { }, ["involved_skill"]={ { - 3200101, - 2200101, - 4200101 + 3200100, + 2200100, + 4200100 } }, ["not_involved_skill"]={ diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua index 82f2a069..74adf7f7 100644 --- a/lua/app/config/func_open.lua +++ b/lua/app/config/func_open.lua @@ -4,10 +4,10 @@ local func_open = { ["pop_ups"]=1 }, ["bounty_open"]={ - ["stage"]=2 + ["stage"]=3 }, ["task"]={ - ["stage"]=2 + ["stage"]=3 }, ["act_level_gift"]={ ["level"]=5 diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index f275e7ae..aaa5658b 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -113,7 +113,7 @@ local hero = { ["model_id"]="p0014", ["icon"]="5", ["item_id"]=13001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [13002]={ ["position"]=1, @@ -171,7 +171,7 @@ local hero = { ["model_id"]="p0009", ["icon"]="5", ["item_id"]=13002, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [14001]={ ["position"]=1, @@ -229,7 +229,7 @@ local hero = { ["model_id"]="p0011", ["icon"]="5", ["item_id"]=14001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [22001]={ ["position"]=2, @@ -345,7 +345,7 @@ local hero = { ["model_id"]="p0010", ["icon"]="5", ["item_id"]=23001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [23002]={ ["position"]=2, @@ -403,7 +403,7 @@ local hero = { ["model_id"]="p0010", ["icon"]="5", ["item_id"]=23002, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [24001]={ ["position"]=2, @@ -461,7 +461,7 @@ local hero = { ["model_id"]="p0007", ["icon"]="7", ["item_id"]=24001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [32001]={ ["position"]=3, @@ -577,7 +577,7 @@ local hero = { ["model_id"]="p0006", ["icon"]="6", ["item_id"]=33001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [33002]={ ["position"]=3, @@ -635,7 +635,7 @@ local hero = { ["model_id"]="p0006", ["icon"]="6", ["item_id"]=33002, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [34001]={ ["position"]=3, @@ -693,7 +693,7 @@ local hero = { ["model_id"]="p0006", ["icon"]="6", ["item_id"]=34001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [42001]={ ["position"]=4, @@ -809,7 +809,7 @@ local hero = { ["model_id"]="p0003", ["icon"]="3", ["item_id"]=43001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [43002]={ ["position"]=4, @@ -867,7 +867,7 @@ local hero = { ["model_id"]="p0003", ["icon"]="3", ["item_id"]=43002, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [44001]={ ["position"]=4, @@ -925,7 +925,7 @@ local hero = { ["model_id"]="p0008", ["icon"]="8", ["item_id"]=44001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [52001]={ ["position"]=5, @@ -1041,7 +1041,7 @@ local hero = { ["model_id"]="p0004", ["icon"]="4", ["item_id"]=53001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [53002]={ ["position"]=5, @@ -1099,7 +1099,7 @@ local hero = { ["model_id"]="p0004", ["icon"]="4", ["item_id"]=53002, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 }, [54001]={ ["position"]=5, @@ -1157,7 +1157,7 @@ local hero = { ["model_id"]="p0004", ["icon"]="4", ["item_id"]=54001, - ["unlock_chapter"]=1 + ["unlock_chapter"]=3 } } local config = { diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index bcf5eb91..013e3660 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -74,11 +74,47 @@ local item = { ["num"]=1, ["weight"]=100 }, + { + ["type"]=1, + ["id"]=23002, + ["num"]=1, + ["weight"]=100 + }, { ["type"]=1, ["id"]=33001, ["num"]=1, ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=33002, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=43001, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=43002, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=53001, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=53002, + ["num"]=1, + ["weight"]=100 } } }, @@ -99,11 +135,23 @@ local item = { ["num"]=1, ["weight"]=100 }, + { + ["type"]=1, + ["id"]=34001, + ["num"]=1, + ["weight"]=100 + }, { ["type"]=1, ["id"]=44001, ["num"]=1, ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=54001, + ["num"]=1, + ["weight"]=100 } } }, diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 03f96338..919aa503 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -663,7 +663,7 @@ local skill_rogue = { }, [1200101]={ ["limit_times"]=1, - ["weight"]=2000, + ["weight"]=3000, ["qlt"]=3, ["type"]=2, ["skill_position"]=1, @@ -698,7 +698,7 @@ local skill_rogue = { }, [1200103]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=1, ["parameter"]={ @@ -709,7 +709,7 @@ local skill_rogue = { }, [1200104]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=2, ["skill_position"]=1, @@ -735,7 +735,7 @@ local skill_rogue = { }, [1200105]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=14, ["parameter"]={ @@ -755,7 +755,7 @@ local skill_rogue = { }, [1200106]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=9, ["skill_position"]=1, @@ -774,7 +774,7 @@ local skill_rogue = { ["unlock"]=1200105, ["cover_unlock"]=1200105, ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=14, ["parameter"]={ @@ -794,7 +794,7 @@ local skill_rogue = { }, [1300100]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=30000, ["qlt"]=4, ["type"]=6, ["skill_position"]=1, @@ -802,7 +802,7 @@ local skill_rogue = { }, [1300101]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["skill_position"]=1, @@ -819,7 +819,7 @@ local skill_rogue = { }, [1300102]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=12, ["skill_position"]=1, @@ -836,7 +836,7 @@ local skill_rogue = { }, [1300103]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=1, ["parameter"]={ @@ -849,7 +849,7 @@ local skill_rogue = { ["unlock"]=1300101, ["cover_unlock"]=1300101, ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=12, ["skill_position"]=1, @@ -866,7 +866,7 @@ local skill_rogue = { }, [1300105]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=14, ["parameter"]={ @@ -888,7 +888,7 @@ local skill_rogue = { ["unlock"]=1300105, ["cover_unlock"]=1300105, ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=14, ["parameter"]={ @@ -908,7 +908,7 @@ local skill_rogue = { }, [1300107]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["skill_position"]=1, @@ -925,14 +925,14 @@ local skill_rogue = { }, [1300200]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=30000, ["qlt"]=4, ["type"]=6, ["skill_position"]=1 }, [1300201]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=2, ["skill_position"]=1, @@ -950,7 +950,7 @@ local skill_rogue = { }, [1300202]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=12, ["skill_position"]=1, @@ -967,7 +967,7 @@ local skill_rogue = { }, [1300203]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=1, ["parameter"]={ @@ -978,7 +978,7 @@ local skill_rogue = { }, [1300204]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=2, ["skill_position"]=1, @@ -996,7 +996,7 @@ local skill_rogue = { }, [1300205]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=7, ["parameter"]={ @@ -1008,7 +1008,7 @@ local skill_rogue = { }, [1300206]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=9, ["skill_position"]=1, @@ -1025,7 +1025,7 @@ local skill_rogue = { }, [1300207]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["skill_position"]=1, @@ -1048,14 +1048,14 @@ local skill_rogue = { }, [1400100]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=30000, ["qlt"]=4, ["type"]=6, ["skill_position"]=1 }, [1400101]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["skill_position"]=1, @@ -1072,7 +1072,7 @@ local skill_rogue = { }, [1400102]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=12, ["skill_position"]=1, @@ -1089,7 +1089,7 @@ local skill_rogue = { }, [1400103]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=12, ["skill_position"]=1, @@ -1106,7 +1106,7 @@ local skill_rogue = { }, [1400104]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["skill_position"]=1, @@ -1125,7 +1125,7 @@ local skill_rogue = { ["unlock"]=1400101, ["cover_unlock"]=1400101, ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["skill_position"]=1, @@ -1142,7 +1142,7 @@ local skill_rogue = { }, [1400106]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=9, ["skill_position"]=1, @@ -1159,7 +1159,7 @@ local skill_rogue = { }, [1400107]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=15, ["parameter"]={ @@ -1199,7 +1199,7 @@ local skill_rogue = { }, [2200102]={ ["limit_times"]=1, - ["weight"]=2000, + ["weight"]=3000, ["qlt"]=3, ["type"]=2, ["skill_position"]=2, @@ -1225,7 +1225,7 @@ local skill_rogue = { }, [2200103]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=12, ["skill_position"]=2, @@ -1242,7 +1242,7 @@ local skill_rogue = { }, [2200104]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=9, ["skill_position"]=2, @@ -1259,7 +1259,7 @@ local skill_rogue = { }, [2200105]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["skill_position"]=2, @@ -1276,7 +1276,7 @@ local skill_rogue = { }, [2200106]={ ["limit_times"]=1, - ["weight"]=2000, + ["weight"]=3000, ["qlt"]=3, ["type"]=2, ["skill_position"]=2, @@ -1302,7 +1302,7 @@ local skill_rogue = { }, [2200107]={ ["limit_times"]=1, - ["weight"]=2000, + ["weight"]=3000, ["qlt"]=2, ["type"]=12, ["skill_position"]=2, @@ -1327,7 +1327,7 @@ local skill_rogue = { }, [2300101]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=12, ["skill_position"]=2, @@ -1344,7 +1344,7 @@ local skill_rogue = { }, [2300102]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=1, ["parameter"]={ @@ -1355,7 +1355,7 @@ local skill_rogue = { }, [2300103]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["skill_position"]=2, @@ -1374,7 +1374,7 @@ local skill_rogue = { ["unlock"]=2300101, ["cover_unlock"]=2300101, ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=12, ["skill_position"]=2, @@ -1391,7 +1391,7 @@ local skill_rogue = { }, [2300105]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=9, ["skill_position"]=2, @@ -1410,7 +1410,7 @@ local skill_rogue = { ["unlock"]=2300103, ["cover_unlock"]=2300103, ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["skill_position"]=2, @@ -1427,7 +1427,7 @@ local skill_rogue = { }, [2300107]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=9, ["skill_position"]=2, @@ -1452,7 +1452,7 @@ local skill_rogue = { }, [2300201]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=2, ["skill_position"]=2, @@ -1478,7 +1478,7 @@ local skill_rogue = { }, [2300202]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=9, ["skill_position"]=2, @@ -1495,7 +1495,7 @@ local skill_rogue = { }, [2300203]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=2, ["type"]=3, ["skill_position"]=2, @@ -1512,7 +1512,7 @@ local skill_rogue = { }, [2300204]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=2, ["skill_position"]=2, @@ -1538,7 +1538,7 @@ local skill_rogue = { }, [2300205]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=14, ["parameter"]={ @@ -1560,7 +1560,7 @@ local skill_rogue = { ["unlock"]=2300205, ["cover_unlock"]=2300205, ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=14, ["parameter"]={ @@ -1580,7 +1580,7 @@ local skill_rogue = { }, [2300207]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["skill_position"]=2, @@ -1605,7 +1605,7 @@ local skill_rogue = { }, [2400101]={ ["limit_times"]=1, - ["weight"]=2000, + ["weight"]=3000, ["qlt"]=3, ["type"]=2, ["skill_position"]=2, @@ -1650,7 +1650,7 @@ local skill_rogue = { ["unlock"]=2400102, ["cover_unlock"]=2400102, ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["skill_position"]=2, @@ -1667,7 +1667,7 @@ local skill_rogue = { }, [2400104]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=9, ["skill_position"]=2, @@ -1684,7 +1684,7 @@ local skill_rogue = { }, [2400105]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=1, ["parameter"]={ @@ -1697,7 +1697,7 @@ local skill_rogue = { ["unlock"]=2400105, ["cover_unlock"]=2400105, ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=1, ["parameter"]={ @@ -1708,7 +1708,7 @@ local skill_rogue = { }, [2400107]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["skill_position"]=2, @@ -1733,7 +1733,7 @@ local skill_rogue = { }, [3200101]={ ["limit_times"]=1, - ["weight"]=2000, + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["skill_position"]=3, @@ -1767,7 +1767,7 @@ local skill_rogue = { }, [3200103]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=7, ["parameter"]={ @@ -1780,7 +1780,7 @@ local skill_rogue = { }, [3200104]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=2, ["skill_position"]=3, @@ -1815,7 +1815,7 @@ local skill_rogue = { }, [3200105]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["skill_position"]=3, @@ -1834,7 +1834,7 @@ local skill_rogue = { ["unlock"]=3200105, ["cover_unlock"]=3200105, ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=12, ["skill_position"]=3, @@ -1851,7 +1851,7 @@ local skill_rogue = { }, [3200107]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=12, ["skill_position"]=3, @@ -1876,7 +1876,7 @@ local skill_rogue = { }, [3300101]={ ["limit_times"]=1, - ["weight"]=2000, + ["weight"]=3000, ["qlt"]=3, ["type"]=7, ["parameter"]={ @@ -1948,7 +1948,7 @@ local skill_rogue = { }, [3300105]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["skill_position"]=3, @@ -2004,7 +2004,7 @@ local skill_rogue = { }, [3300200]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=30000, ["qlt"]=4, ["type"]=6, ["skill_position"]=3, @@ -2012,7 +2012,7 @@ local skill_rogue = { }, [3300201]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=12, ["skill_position"]=3, @@ -2029,7 +2029,7 @@ local skill_rogue = { }, [3300202]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=3, ["skill_position"]=3, @@ -2046,7 +2046,7 @@ local skill_rogue = { }, [3300203]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=7, ["parameter"]={ @@ -2058,7 +2058,7 @@ local skill_rogue = { }, [3300204]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=1, ["parameter"]={ @@ -2070,7 +2070,7 @@ local skill_rogue = { [3300205]={ ["unlock"]=3300204, ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=7, ["parameter"]={ @@ -2082,7 +2082,7 @@ local skill_rogue = { }, [3300206]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=9, ["skill_position"]=4, @@ -2101,7 +2101,7 @@ local skill_rogue = { ["unlock"]=3300204, ["cover_unlock"]=3300204, ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=1, ["parameter"]={ @@ -2111,11 +2111,13 @@ local skill_rogue = { ["icon"]="38" }, [3400100]={ + ["weight"]=30000, ["qlt"]=4, ["type"]=6, ["icon"]="67" }, [3400101]={ + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["effect"]={ @@ -2157,7 +2159,7 @@ local skill_rogue = { }, [3400103]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=9, ["skill_position"]=4, @@ -2175,6 +2177,7 @@ local skill_rogue = { [3400104]={ ["unlock"]=3400101, ["cover_unlock"]=3400101, + ["weight"]=3000, ["qlt"]=3, ["type"]=12, ["effect"]={ @@ -2189,6 +2192,7 @@ local skill_rogue = { ["icon"]="67" }, [3400105]={ + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["effect"]={ @@ -2205,6 +2209,7 @@ local skill_rogue = { [3400106]={ ["unlock"]=3400106, ["cover_unlock"]=3400106, + ["weight"]=3000, ["qlt"]=3, ["type"]=12, ["effect"]={ @@ -2219,6 +2224,7 @@ local skill_rogue = { ["icon"]="67" }, [3400107]={ + ["weight"]=3000, ["qlt"]=4, ["type"]=14, ["parameter"]={ @@ -2245,7 +2251,7 @@ local skill_rogue = { }, [4200101]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=2, ["skill_position"]=4, @@ -2293,7 +2299,7 @@ local skill_rogue = { }, [4200104]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=2, ["skill_position"]=4, @@ -2324,7 +2330,7 @@ local skill_rogue = { }, [4200106]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=9, ["skill_position"]=4, @@ -2360,7 +2366,7 @@ local skill_rogue = { }, [4300100]={ ["limit_times"]=1, - ["weight"]=3000, + ["weight"]=30000, ["qlt"]=4, ["type"]=6, ["icon"]="57" @@ -2487,7 +2493,7 @@ local skill_rogue = { }, [4300300]={ ["limit_times"]=1, - ["weight"]=3000, + ["weight"]=30000, ["qlt"]=4, ["icon"]="57" }, @@ -2619,7 +2625,7 @@ local skill_rogue = { }, [4400101]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=8, ["parameter"]={ @@ -2631,7 +2637,7 @@ local skill_rogue = { }, [4400102]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=12, ["skill_position"]=4, @@ -2648,7 +2654,7 @@ local skill_rogue = { }, [4400103]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=2, ["skill_position"]=4, @@ -2662,7 +2668,7 @@ local skill_rogue = { }, [4400104]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=7, ["parameter"]={ @@ -2674,7 +2680,7 @@ local skill_rogue = { }, [4400105]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["skill_position"]=4, @@ -2691,7 +2697,7 @@ local skill_rogue = { }, [4400106]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=9, ["skill_position"]=4, @@ -2710,7 +2716,7 @@ local skill_rogue = { ["unlock"]=4400105, ["cover_unlock"]=4400105, ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=12, ["skill_position"]=4, @@ -2764,7 +2770,7 @@ local skill_rogue = { }, [5200103]={ ["limit_times"]=1, - ["weight"]=2000, + ["weight"]=3000, ["qlt"]=3, ["type"]=8, ["parameter"]={ @@ -2802,7 +2808,7 @@ local skill_rogue = { }, [5200105]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=1, ["parameter"]={ @@ -2813,7 +2819,7 @@ local skill_rogue = { }, [5200106]={ ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=3, ["type"]=9, ["skill_position"]=5, @@ -2830,9 +2836,8 @@ local skill_rogue = { }, [5200107]={ ["unlock"]=5200105, - ["cover_unlock"]=5200105, ["limit_times"]=1, - ["weight"]=1000, + ["weight"]=3000, ["qlt"]=4, ["type"]=1, ["parameter"]={ @@ -2843,7 +2848,7 @@ local skill_rogue = { }, [5300100]={ ["limit_times"]=1, - ["weight"]=3000, + ["weight"]=30000, ["qlt"]=4, ["type"]=6, ["skill_position"]=5, @@ -2974,7 +2979,7 @@ local skill_rogue = { }, [5300200]={ ["limit_times"]=1, - ["weight"]=3000, + ["weight"]=30000, ["qlt"]=4, ["type"]=6, ["skill_position"]=5, @@ -3109,11 +3114,15 @@ local skill_rogue = { }, [5400100]={ ["limit_times"]=1, + ["weight"]=30000, + ["qlt"]=4, ["type"]=6, ["skill_position"]=5 }, [5400101]={ ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, ["type"]=7, ["parameter"]={ 1, @@ -3123,6 +3132,8 @@ local skill_rogue = { }, [5400102]={ ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, ["type"]=12, ["skill_position"]=5, ["effect"]={ @@ -3136,6 +3147,8 @@ local skill_rogue = { }, [5400103]={ ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=3, ["type"]=12, ["skill_position"]=5, ["effect"]={ @@ -3166,6 +3179,8 @@ local skill_rogue = { }, [5400105]={ ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, ["type"]=1, ["parameter"]={ 5400123 @@ -3174,6 +3189,8 @@ local skill_rogue = { }, [5400106]={ ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, ["type"]=12, ["skill_position"]=5, ["effect"]={ @@ -3187,6 +3204,8 @@ local skill_rogue = { }, [5400107]={ ["limit_times"]=1, + ["weight"]=3000, + ["qlt"]=4, ["type"]=12, ["skill_position"]=5, ["effect"]={ diff --git a/lua/app/config/strings/cn/hero.lua b/lua/app/config/strings/cn/hero.lua index 3bf4c0de..e3a1412a 100644 --- a/lua/app/config/strings/cn/hero.lua +++ b/lua/app/config/strings/cn/hero.lua @@ -3,40 +3,64 @@ local hero = { ["name"]="舞娘" }, [13001]={ - ["name"]="独臂哥" + ["name"]="克劳德" }, [13002]={ ["name"]="火旺" }, [14001]={ - ["name"]="铁锤赵" + ["name"]="亚历山大" }, [22001]={ - ["name"]="黑刀妹" + ["name"]="刀妹" }, [23001]={ ["name"]="野蛮人" }, + [23002]={ + ["name"]="二丫" + }, [24001]={ - ["name"]="魔童剑士" + ["name"]="巨剑魔童" }, [32001]={ - ["name"]="洋葱骑士" + ["name"]="洋葱头" }, [33001]={ ["name"]="小鹿" }, + [33002]={ + ["name"]="森林狼" + }, + [34001]={ + ["name"]="木兰" + }, [42001]={ - ["name"]="法师" + ["name"]="蓝法" + }, + [43001]={ + ["name"]="冰女" + }, + [43002]={ + ["name"]="鸦姐" }, [44001]={ - ["name"]="冰刃" + ["name"]="寒冰妖姬" }, [52001]={ - ["name"]="忍者" + ["name"]="忍者伦" + }, + [53001]={ + ["name"]="魔女琪琪" + }, + [53002]={ + ["name"]="灵魂猎手" + }, + [54001]={ + ["name"]="蝴蝶" } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/skill.lua b/lua/app/config/strings/cn/skill.lua index 50097ec6..5e2d05f1 100644 --- a/lua/app/config/strings/cn/skill.lua +++ b/lua/app/config/strings/cn/skill.lua @@ -1,63 +1,63 @@ local skill = { [1200120]={ - ["desc"]="红R舞女-舞步消散将左右2格元素进行消除,并造成一次伤害" + ["desc"]="舞步消散：沿横向消除5格，并造成一次技能伤害。" }, [1300120]={ - ["desc"]="红SR-克劳德-技能攻击500%多段（3段）" + ["desc"]="巨剑旋风：额外造成多次技能伤害。" }, [1300220]={ - ["desc"]="红SR-武僧-技能400%攻击+50%几率灼烧+上下消除2格" + ["desc"]="炎拳：沿纵向消除5格，并造成一次技能伤害，50%概率附加灼烧效果，2回合。" }, [1400120]={ - ["desc"]="红SSR-铁锤小孩-技能攻击600%+上下4个元素变为当前连接色" + ["desc"]="钢铁重击：将周围4个元素变色，并造成多次大量技能伤害。" }, [2200120]={ - ["desc"]="黄R黑妹拔刀斩使用一次拔刀斩终结技，造成大量伤害400%伤害" + ["desc"]="拔刀斩：额外造成一次技能伤害。" }, [2300120]={ - ["desc"]="黄SR野蛮人技能多段伤害4段500%" + ["desc"]="骨旋风：额外造成多次技能伤害。" }, [2300220]={ - ["desc"]="黄SR二丫技能攻击500%(配334%）+链接增伤50%" + ["desc"]="幻影剑袭：使用后本次技能伤害提升，并额外造成多次大量技能伤害。" }, [2400120]={ - ["desc"]="巨剑罗伯特巨剑连斩巨剑造成大量伤害。" + ["desc"]="巨剑轰击：额外造成一次巨量技能伤害。" }, [3200120]={ - ["desc"]="绿R洋葱技能使用一次长枪突刺终结技，造成大量伤害" + ["desc"]="长枪突刺：额外造成一次技能伤害。" }, [3300120]={ - ["desc"]="绿SR小鹿快速治愈恢复以艾芙琳攻击力*150%的生命值" + ["desc"]="急速治疗：使用后本次恢复生命。" }, [3300220]={ - ["desc"]="绿SR森林狼技能攻击500%(配334%）+链接增伤50%" + ["desc"]="森林狼：使用后本次伤害提升，并造成多次技能伤害。" }, [3400120]={ - ["desc"]="绿SSR花木兰技能攻击700%配437.5%+链接增伤60%" + ["desc"]="流星追月：使用后本次伤害提升，并一次巨量技能伤害。" }, [4200120]={ - ["desc"]="蓝R莉莉丝元素链接随机额外消除3个元素,并造成伤害" + ["desc"]="元素链接：随机消除3个元素，并造成一次技能伤害。" }, [4300120]={ - ["desc"]="蓝SR冰女技能攻击400%+冰霜1回合" + ["desc"]="冰女：额外造成一次技能伤害，附加冰霜效果，1回合。" }, [4300220]={ - ["desc"]="蓝SR鸦姐技能攻击400%+100%腐败1回合" + ["desc"]="鸦姐：额外造成一次技能伤害，附加腐败效果，1回合。" }, [4400120]={ - ["desc"]="蓝SSR冰刃霜冻剑舞随机消除4个元素，释放一次附带冰霜1回合效果的剑舞攻击。" + ["desc"]="冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。" }, [5200120]={ - ["desc"]="紫R艾伦魔法罩生成一个魔法罩持续1回合，可承受最大生命值10%伤害" + ["desc"]="护盾术：为团队附加一个护盾，1回合。" }, [5300120]={ - ["desc"]="紫SR女巫技能攻击500%" + ["desc"]="魔女琪琪：额外造成一次大量技能伤害。" }, [5300220]={ - ["desc"]="紫SR德古拉技能攻击500%" + ["desc"]="灵魂猎手：额外造成一次大量技能伤害。" }, [5400120]={ - ["desc"]="紫SSR蝴蝶技能攻击600%" + ["desc"]="蝴蝶：额外造成一次大量技能伤害。" } } local config = { diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index 0142fa1f..3ad8b63b 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -132,484 +132,484 @@ local skill_rogue = { ["desc"]="将场上随机5个非紫色元素变为紫色" }, [1200100]={ - ["desc"]="解锁舞步消散：将左右2格元素进行消除" + ["desc"]="解锁舞步消散：沿横向消除5格，并造成一次技能伤害。" }, [1200101]={ - ["desc"]="舞步消散上下可多消1格" + ["desc"]="舞步消散纵向可额外消除2格。" }, [1200102]={ - ["desc"]="舞步消散使用时本次普攻伤害提升10%" + ["desc"]="舞步消散使用时本次普攻伤害提升10%。" }, [1200103]={ - ["desc"]="舞步消散对冰霜敌人的伤害增加" + ["desc"]="舞步消散对冰霜敌人的伤害增加50%。" }, [1200104]={ - ["desc"]="舞步消散上下左右可多消1格" + ["desc"]="舞步消散横向和纵向可额外消除2格。" }, [1200105]={ - ["desc"]="舞步消散链接超过5个元素附加亢奋效果，持续2回合" + ["desc"]="舞步消散链接超过5个元素附加亢奋效果，2回合。" }, [1200106]={ - ["desc"]="舞步消散的这个英雄攻击力提升" + ["desc"]="舞娘攻击提升15%。" }, [1200107]={ - ["desc"]="链接元素要求减为3个，并且附加2层亢奋效果" + ["desc"]="舞步消散附加亢奋效果的要求降低到链接超过3个元素。" }, [1300100]={ - ["desc"]="解锁破坏旋风：造成大量伤害" + ["desc"]="解锁巨剑旋风：额外造成多次技能伤害。" }, [1300101]={ - ["desc"]="破坏旋风附加灼烧效果，持续2回合" + ["desc"]="巨剑旋风可附加灼烧效果，2回合。" }, [1300102]={ - ["desc"]="破坏旋风对流血敌人的伤害增加" + ["desc"]="巨剑旋风对流血敌人的伤害增加50%。" }, [1300103]={ - ["desc"]="破坏旋风的伤害提升（300%)多段换技能" + ["desc"]="巨剑旋风技能伤害提升。" }, [1300104]={ - ["desc"]="破坏旋风的灼烧效果提升" + ["desc"]="巨剑旋风附加的灼烧伤效果，伤害提升。" }, [1300105]={ - ["desc"]="破坏旋风链接超过4个元素时，伤害提升30%，持续2回合。" + ["desc"]="巨剑旋风链接超过4个元素，伤害提升30%，2回合。" }, [1300106]={ - ["desc"]="破坏旋风链接超过4个元素时伤害提升效果持续回合数+1" + ["desc"]="巨剑旋风附加的伤害提升效果，回合数+1。" }, [1300107]={ - ["desc"]="释放破坏旋风的回合击杀敌人则施加2回合亢奋效果" + ["desc"]="巨剑旋风击杀敌人则附加亢奋效果，2回合。" }, [1300200]={ - ["desc"]="解锁炎拳：400%攻击+50%几率灼烧+上下消除2格" + ["desc"]="解锁炎拳：沿纵向消除5格，并造成一次技能伤害，50%概率附加灼烧效果，2回合。" }, [1300201]={ - ["desc"]="炎拳左右多消除2格" + ["desc"]="炎拳沿横向可额外消除4格。" }, [1300202]={ - ["desc"]="炎拳对禁锢敌人的伤害增加（增加技能）" + ["desc"]="炎拳对禁锢敌人的伤害增加50%。" }, [1300203]={ - ["desc"]="灼烧几率提高到100%（换技能ID）" + ["desc"]="炎拳的灼烧概率提高到100%。" }, [1300204]={ - ["desc"]="炎拳上下多消除1格" + ["desc"]="炎拳纵向可额外消除2格。" }, [1300205]={ - ["desc"]="炎拳施加的灼烧效果伤害提升50%" + ["desc"]="炎拳附加的灼烧效果，伤害提升。" }, [1300206]={ - ["desc"]="本英雄的攻击力提高15%" + ["desc"]="火旺攻击提升15%。" }, [1300207]={ - ["desc"]="炎拳攻击可释放2次" + ["desc"]="炎拳攻击将释放2次。" }, [1400100]={ - ["desc"]="解锁铁锤双击：攻击600%+上下左右4个元素变色" + ["desc"]="解锁钢铁重击：将周围4个元素变色，并造成多次大量技能伤害。" }, [1400101]={ - ["desc"]="攻击附加灼烧2回合（增加技能）" + ["desc"]="钢铁重击可附加灼烧效果，2回合。" }, [1400102]={ - ["desc"]="如果目标有眩晕则施加一个2回合的眩晕效果（增加技能）" + ["desc"]="钢铁重击对眩晕敌人再施附加眩晕效果，2回合。" }, [1400103]={ - ["desc"]="对流血敌人的伤害额外造成300%伤害（增加技能）" + ["desc"]="钢铁重击对流血敌人额外造成1次伤害。" }, [1400104]={ - ["desc"]="有50%概率眩晕敌人2回合（增加技能）" + ["desc"]="钢铁重击50%概率附加眩晕，2回合。" }, [1400105]={ - ["desc"]="灼烧伤害提升+灼烧回合数+1（替换技能）" + ["desc"]="钢铁重击附加的灼烧效果，伤害提升，回合数+1。" }, [1400106]={ - ["desc"]="本英雄的攻击力提高15%" + ["desc"]="亚历山大攻击提升15%。" }, [1400107]={ - ["desc"]="连接每超过4个则额外发射1个火球造成伤害(增加技能)" + ["desc"]="钢铁重击每连接超过4个元素则额外发射1个火球造成伤害。" }, [2200100]={ - ["desc"]="解锁拔刀斩：卡拉使用一次拔刀斩终结技，造成大量伤害" + ["desc"]="解锁拔刀斩：额外造成一次技能伤害。" }, [2200101]={ - ["desc"]="拔刀斩伤害提升" + ["desc"]="拔刀斩技能伤害提升。" }, [2200102]={ - ["desc"]="拔刀斩释放时上下左右各消除1格" + ["desc"]="拔刀斩沿＋方向可额外消除4格。" }, [2200103]={ - ["desc"]="拔刀斩对灼烧敌人的伤害增加" + ["desc"]="拔刀斩对灼烧敌人的伤害增加50%。" }, [2200104]={ - ["desc"]="拔刀斩的这个英雄攻击力提升" + ["desc"]="刀妹攻击提升15%。" }, [2200105]={ - ["desc"]="拔刀斩终结技可放2次" + ["desc"]="拔刀斩攻击将释放2次。" }, [2200106]={ - ["desc"]="拔刀斩可消除4个斜方向的元素" + ["desc"]="拔刀斩沿X方向可额外消除4格。" }, [2200107]={ - ["desc"]="拔刀斩链接超过5个元素后，拔刀斩伤害提高（技能伤害提高）" + ["desc"]="拔刀斩链接超过5个元素，则技能伤害提高。" }, [2300100]={ - ["desc"]="解锁旋风骨：野蛮人使用的终结技，造成大量伤害" + ["desc"]="解锁骨旋风：额外造成多次技能伤害。" }, [2300101]={ - ["desc"]="旋风骨造成伤害时对对手附加2回合流血效果" + ["desc"]="旋风骨可附加流血效果，2回合。" }, [2300102]={ - ["desc"]="技能倍率提升300%（换技能ID）" + ["desc"]="旋风骨技能伤害提升。" }, [2300103]={ - ["desc"]="攻击昏睡敌人有50%概率附加眩晕效果1回合" + ["desc"]="旋风骨对昏睡敌人有50%概率附加眩晕效果，1回合。" }, [2300104]={ - ["desc"]="流血回合数增加1（替换上面技能）" + ["desc"]="旋风骨附加的流血效果，回合数+1。" }, [2300105]={ - ["desc"]="每有一名流血中的敌人死亡提升黄sir的攻击力10%，本局生效" + ["desc"]="每有1名敌人因流血死亡，则野蛮人伤害提升10%。" }, [2300106]={ - ["desc"]="眩晕回合数+1（替换上面技能）" + ["desc"]="旋风骨附加的眩晕效果，回合数+1。" }, [2300107]={ - ["desc"]="本英雄的攻击力提高15%" + ["desc"]="野蛮人攻击提升15%。" }, [2300200]={ - ["desc"]="解锁刺剑突破：造成一次伤害，连接增伤" + ["desc"]="解锁幻影剑袭：使用后本次技能伤害提升，并额外造成多次大量技能伤害。" }, [2300201]={ - ["desc"]="刺剑突破上下左右可消除1格" + ["desc"]="幻影剑袭沿＋方向可额外消除4格。" }, [2300202]={ - ["desc"]="本英雄的攻击力提高" + ["desc"]="二丫攻击提升15%。" }, [2300203]={ - ["desc"]="刺剑突破使用时本次普攻伤害提升15%" + ["desc"]="幻影剑袭使用时本次普攻伤害提升10%。" }, [2300204]={ - ["desc"]="刺剑突破可消除4个斜方向的元素" + ["desc"]="幻影剑袭沿X方向可额外消除4格。" }, [2300205]={ - ["desc"]="刺剑突破链接超4个元素，本回合暴击提升20%。（增加技能）" + ["desc"]="幻影剑袭链接超过4个元素，本回合暴击提升20%。" }, [2300206]={ - ["desc"]="刺剑突破链接超4个元素，本回合暴击提升30%。（增加技能）" + ["desc"]="幻影剑袭链接超过4个元素，本回合暴击提升30%。" }, [2300207]={ - ["desc"]="刺剑突破链接后本回合对50%以下敌人暴击伤害提升50%（增加技能）" + ["desc"]="幻影剑袭使用时本回合对生命值50%以下的敌人暴击伤害提升50%。" }, [2400100]={ - ["desc"]="解锁巨剑连斩：造成巨大伤害" + ["desc"]="解锁巨剑轰击：额外造成一次巨量技能伤害。" }, [2400101]={ - ["desc"]="巨剑连被连接消除其4个斜方向消除1格" + ["desc"]="巨剑轰击沿X方向可额外消除4格。" }, [2400102]={ - ["desc"]="攻击冻结敌人几率破碎冰块(冻结改为眩晕2回合)，造成巨额伤害" + ["desc"]="巨剑轰击对冻结敌人伤害大服增加，并有50%概率附加眩晕效果，1回合。" }, [2400103]={ - ["desc"]="冻结的敌人眩晕几率提高" + ["desc"]="巨剑轰击附加眩晕效果的概率提高到70%。" }, [2400104]={ - ["desc"]="本英雄的攻击力提高" + ["desc"]="巨剑魔童攻击提升15%。" }, [2400105]={ - ["desc"]="巨剑连斩技能伤害增加，且几率附加禁锢（换技能ID）" + ["desc"]="巨剑轰击技能伤害大服增加，并有50%概率附加禁锢效果，1回合。" }, [2400106]={ - ["desc"]="禁锢几率提升（继续换技能ID）" + ["desc"]="巨剑轰击附加禁锢效果的概率提高到70%。" }, [2400107]={ - ["desc"]="巨剑连斩造成双倍伤害" + ["desc"]="巨剑轰击将造成双倍伤害。" }, [3200100]={ - ["desc"]="解锁长枪突刺：造成一次大量伤害。" + ["desc"]="解锁长枪突刺：额外造成一次技能伤害。" }, [3200101]={ ["desc"]="长枪突刺可恢复一定量生命。" }, [3200102]={ - ["desc"]="长枪突刺对中毒的目标伤害增加" + ["desc"]="长枪突刺对中毒敌人的伤害增加50%。" }, [3200103]={ ["desc"]="长枪突刺伤害提升。" }, [3200104]={ - ["desc"]="长枪突刺可消除4个斜方向的元素" + ["desc"]="长枪突刺沿X方向可额外消除4格。" }, [3200105]={ - ["desc"]="长枪突刺有30%几率眩晕一回合" + ["desc"]="长枪突刺有30%概率附加眩晕效果，1回合。" }, [3200106]={ ["desc"]="长枪突刺眩晕几率提高20%" }, [3200107]={ - ["desc"]="长枪突刺结束后附加50%格挡，持续2回合" + ["desc"]="长枪突刺后为团队增加20%格挡，2回合" }, [3300100]={ - ["desc"]="解锁快速治愈：立即恢复80%攻击力的生命值" + ["desc"]="解锁急速治疗：使用后本次恢复生命。" }, [3300101]={ - ["desc"]="提升快速治愈的回血量" + ["desc"]="急速治疗回血效果提升。" }, [3300102]={ - ["desc"]="快速治愈使用时本次普攻伤害提升15%" + ["desc"]="急速治疗使用时本次普攻伤害提升15%。" }, [3300103]={ - ["desc"]="快速治愈上下左右可消除1格" + ["desc"]="急速治疗沿＋方向可额外消除4格。" }, [3300104]={ - ["desc"]="释放时同时释放技能伤害提升，持续2回合(增加技能)" + ["desc"]="急速治疗额外为团队提供技能伤害提升效果，2回合。" }, [3300105]={ - ["desc"]="连接快速治愈的每一击都将恢复以艾芙琳攻击力*5%的生命值" + ["desc"]="急速治疗使用时本次普攻每一击都将恢复生命。" }, [3300106]={ - ["desc"]="技能伤害提升持续回合数+1（增加技能）" + ["desc"]="急速治疗附加的技能伤害提升效果，回合数+1。" }, [3300107]={ - ["desc"]="链接超过5个元素回血量提升" + ["desc"]="急速治疗链接超过5个元素，回血效果提升。" }, [3300200]={ - ["desc"]="解锁致命爪击：攻击500%(配334%）+链接增伤50%" + ["desc"]="解锁森林狼技能：使用后本次伤害提升，并造成多次技能伤害。" }, [3300201]={ - ["desc"]="攻击50%几率附加易伤（增加技能）" + ["desc"]="森林狼技能有50%概率附加易伤效果，2回合。" }, [3300202]={ - ["desc"]="致命爪击使用时本次普攻伤害提升15%" + ["desc"]="森林狼技能使用时本次普攻伤害提升15%。" }, [3300203]={ - ["desc"]="致命爪击技能伤害提升300%" + ["desc"]="森林狼技能伤害提升。" }, [3300204]={ - ["desc"]="致命爪击攻击中毒敌人有50%概率额外增加1层中毒2回合（更换技能ID）" + ["desc"]="森林狼技能对中毒敌人有50%概率附加中毒效果，2回合。" }, [3300205]={ - ["desc"]="致命爪击增加的中毒伤害翻倍" + ["desc"]="森林狼技能附加的中毒效果，伤害提升。" }, [3300206]={ - ["desc"]="本英雄的攻击力提高15%" + ["desc"]="森林狼技能攻击提升15%。" }, [3300207]={ - ["desc"]="致命爪击攻击中毒敌人有100%概率额外增加1层中毒2回合（更换技能ID）" + ["desc"]="森林狼技能对中毒敌人有100%概率附加中毒效果，2回合。" }, [3400100]={ - ["desc"]="解锁花木兰技能：攻击700%配437.5%+链接增伤60%" + ["desc"]="解锁流星追月：使用后本次伤害提升，并一次巨量技能伤害。" }, [3400101]={ - ["desc"]="攻击百分比增加易伤（增加技能）" + ["desc"]="流星追月可附加易伤效果，2回合。" }, [3400102]={ - ["desc"]="上下左右消除1格" + ["desc"]="流星追月沿＋方向可额外消除4格。" }, [3400103]={ - ["desc"]="本英雄的攻击力提高15%" + ["desc"]="木兰攻击提升15%。" }, [3400104]={ - ["desc"]="易伤效果提升10%（增加技能）" + ["desc"]="流星追月附加的易伤效果，效果提升。" }, [3400105]={ - ["desc"]="攻击附加流血效果2回合（增加技能）" + ["desc"]="流星追月可附加流血效果，2回合。" }, [3400106]={ - ["desc"]="流血效果伤害提升（增加技能）" + ["desc"]="流星追月附加的流血效果，伤害提升。" }, [3400107]={ - ["desc"]="链接超过4个元素，大招额外释放一次" + ["desc"]="流星追月链接超过4个元素，流星追月攻击将释放2次。" }, [4200100]={ - ["desc"]="解锁元素链接：随机额外消除3个元素" + ["desc"]="解锁元素链接：随机消除3个元素，并造成一次技能伤害。" }, [4200101]={ - ["desc"]="元素链接随机消除元素增加2个" + ["desc"]="元素链接随机消除元素+2。" }, [4200102]={ - ["desc"]="元素链接使用时本次普攻伤害提升10%" + ["desc"]="元素链接使用时本次普攻伤害提升10%。" }, [4200103]={ - ["desc"]="元素链接有50%冰霜2回合" + ["desc"]="元素链接有50%概率附加冰霜效果，2回合。" }, [4200104]={ - ["desc"]="元素链接随机消除元素增加2个" + ["desc"]="元素链接随机消除元素+2。" }, [4200105]={ - ["desc"]="攻击冰霜敌人有20%概率冻结1回合" + ["desc"]="元素链接对冰霜敌人有20%概率附加冻结效果，1回合。" }, [4200106]={ - ["desc"]="本英雄的攻击力提高" + ["desc"]="蓝法攻击提升15%。" }, [4200107]={ - ["desc"]="攻击冰霜英雄有40%概率冻结1回合" + ["desc"]="元素链接附加冻结效果概率提升到40%。" }, [4300100]={ - ["desc"]="解锁冰女技能：攻击400%+冰霜1回合" + ["desc"]="解锁冰女技能：额外造成一次技能伤害，附加冰霜效果，1回合。" }, [4300101]={ - ["desc"]="上下左右消除1格" + ["desc"]="冰女技能沿＋方向可额外消除4格。" }, [4300102]={ - ["desc"]="对灼烧伤害增加50%（加技能）" + ["desc"]="冰女技能对灼烧敌人的伤害增加50%。" }, [4300103]={ - ["desc"]="冰霜持续回合数+1" + ["desc"]="冰女技能附加的冰霜效果，回合数+1。" }, [4300104]={ - ["desc"]="技能倍率提升300%" + ["desc"]="冰女技能伤害提升。" }, [4300105]={ - ["desc"]="攻击冰霜敌人有50%几率冻结1回合（加技能）" + ["desc"]="冰女技能对冰霜敌人有50%概率附加冻结效果，1回合。" }, [4300106]={ - ["desc"]="冰女技能命中后获得冰盾2回合（加技能）" + ["desc"]="冰女技能后为团队附加冰盾效果，2回合。" }, [4300107]={ - ["desc"]="冰女技能命中后获得反伤400%冰盾2回合（加技能）" + ["desc"]="冰女技能附加的冰盾，可反伤400%。" }, [4300300]={ - ["desc"]="解锁鸦姐技能：攻击400%+腐败1回合" + ["desc"]="解锁鸦姐技能：额外造成一次技能伤害，附加腐败效果，1回合。" }, [4300301]={ - ["desc"]="腐败回合数+1" + ["desc"]="鸦姐技能附加的腐败效果，回合数+1." }, [4300302]={ - ["desc"]="攻击易伤敌人附加冰霜1回合（加技能）" + ["desc"]="鸦姐技能对易伤敌人附加冰霜效果，1回合。" }, [4300303]={ - ["desc"]="技能使用时本次普攻伤害提升15%" + ["desc"]="鸦姐技能使用时本次普攻伤害提升15%。" }, [4300304]={ - ["desc"]="技能附加的冰霜效果回合数+1（加技能）" + ["desc"]="鸦姐技能附加的冰霜效果，回合数+1。" }, [4300305]={ - ["desc"]="攻击附加100%削弱buff2回合（加技能）" + ["desc"]="鸦姐技能附加削弱效果，2回合。" }, [4300306]={ - ["desc"]="上下左右消除1格" + ["desc"]="鸦姐技能沿＋方向可额外消除4格。" }, [4300307]={ - ["desc"]="附加削弱buff为4回合（加技能）" + ["desc"]="鸦姐技能附加的削弱效果，回合数+2。" }, [4400100]={ - ["desc"]="解锁霜冻剑舞：额外造成1次伤害并给敌人1回合冰霜效果（普攻次数-1）" + ["desc"]="解锁冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。" }, [4400101]={ - ["desc"]="冰霜持续回合数+1" + ["desc"]="冰霜剑舞附加的冰霜效果，回合数+1" }, [4400102]={ - ["desc"]="对灼烧伤害增加50%" + ["desc"]="冰霜剑舞对灼烧敌人伤害增加50%。" }, [4400103]={ - ["desc"]="霜冻剑舞随机消除元素增加3个" + ["desc"]="冰霜剑舞随机消除元素+3" }, [4400104]={ - ["desc"]="冰霜效果提升（普攻-2）" + ["desc"]="冰霜剑舞附加的冰霜效果，效果提升。" }, [4400105]={ - ["desc"]="霜冻剑舞50%几率附加冻结2回合" + ["desc"]="霜冻剑舞有50%概率附加冻结效果，2回合。" }, [4400106]={ - ["desc"]="攻击提升15%（本英雄）" + ["desc"]="寒冰妖姬攻击提升15%。" }, [4400107]={ - ["desc"]="霜冻剑舞70%几率附加冻结2回合" + ["desc"]="霜冻剑舞附加冻结效果概率提升到70%。" }, [5200100]={ - ["desc"]="解锁魔法罩：艾伦生成一个魔法罩持续1回合，可承受最大生命值10%伤害" + ["desc"]="解锁护盾术：为团队附加一个护盾，1回合。" }, [5200101]={ - ["desc"]="增加魔法罩承受伤害增加到16%" + ["desc"]="护盾术附加的护盾，承受伤害增加。" }, [5200102]={ - ["desc"]="魔法罩使用时本次普攻伤害提升10%" + ["desc"]="护盾术使用时本次普攻伤害提升10%。" }, [5200103]={ - ["desc"]="生成的魔法罩如果没有破可以额外持续1回合" + ["desc"]="护盾术附加的护盾，回合数+1。" }, [5200104]={ - ["desc"]="魔法罩上下左右可消除1格" + ["desc"]="护盾术沿＋方向可额外消除4格。" }, [5200105]={ - ["desc"]="魔法罩存在时可反伤对方造成200%伤害(替换技能)" + ["desc"]="护盾术附加的护盾，可反伤200%。" }, [5200106]={ - ["desc"]="攻击提升15%（本英雄）" + ["desc"]="忍者伦攻击提升15%。" }, [5200107]={ - ["desc"]="魔法罩存在时可反伤对方造成400%伤害(继续替换技能)" + ["desc"]="护盾术附加的护盾，反伤效果翻倍。" }, [5300100]={ - ["desc"]="解锁女巫技能：攻击500%" + ["desc"]="解锁魔女琪琪技能：额外造成一次大量技能伤害。" }, [5300101]={ - ["desc"]="技能命中附加中毒2回合（加技能）" + ["desc"]="魔女琪琪技能可附加中毒效果，2回合。" }, [5300102]={ - ["desc"]="技能使用时本次普攻伤害提升15%" + ["desc"]="魔女琪琪技能使用时本次普攻伤害提升15%。" }, [5300103]={ - ["desc"]="攻击附加昏睡2回合（加技能）" + ["desc"]="魔女琪琪技能可附加昏睡效果，2回合。" }, [5300104]={ - ["desc"]="中毒伤害提升（加技能）" + ["desc"]="魔女琪琪技能附加的中毒效果，伤害提升。" }, [5300105]={ - ["desc"]="技能使用后随机增加一种技能的能量2点（加技能）" + ["desc"]="魔女琪琪技能使用后随机增加一种技能的能量2点。" }, [5300106]={ - ["desc"]="技能使用后增加能量的数量提升2点（加技能）" + ["desc"]="魔女琪琪技能使用后随机增加一种技能的能量2点。" }, [5300107]={ - ["desc"]="技能命中后有15%几率附加不死buff1回合（加技能）" + ["desc"]="魔女琪琪技能有15%概率为团队附加不死效果，1回合。" }, [5300200]={ - ["desc"]="解锁德古拉技能：攻击500%" + ["desc"]="解锁灵魂猎手技能：额外造成一次大量技能伤害。" }, [5300201]={ - ["desc"]="上下左右消除1格" + ["desc"]="灵魂猎手技能沿＋方向可额外消除4格。" }, [5300202]={ - ["desc"]="攻击冰霜敌人50%几率将其冻结1回合（加技能）" + ["desc"]="灵魂猎手技能对冰霜敌人有50%概率附加冻结效果，1回合。" }, [5300203]={ - ["desc"]="技能倍率提升300%" + ["desc"]="灵魂猎手技能伤害提升。" }, [5300204]={ - ["desc"]="攻击提升15%（本英雄）" + ["desc"]="灵魂猎手攻击提升15%。" }, [5300205]={ - ["desc"]="50%几率附加反击buff，持续2回合（加技能）" + ["desc"]="灵魂猎手技能有50%概率为团队附加反击效果，2回合。" }, [5300206]={ - ["desc"]="冻结回合数+1，冻结概率加20%（加技能）" + ["desc"]="灵魂猎手技能附加冻结效果，概率提升到70%，回合数+1。" }, [5300207]={ - ["desc"]="100%附加反击buff（加技能）" + ["desc"]="灵魂猎手技能附加反击效果，概率提升到100%。" }, [5400100]={ - ["desc"]="解锁蝴蝶技能：攻击600%" + ["desc"]="解锁蝴蝶技能：额外造成一次大量技能伤害。" }, [5400101]={ - ["desc"]="技能倍率提升300%" + ["desc"]="蝴蝶技能伤害提升。" }, [5400102]={ - ["desc"]="技能释放后随机增加一种技能的能量2点（加技能）" + ["desc"]="蝴蝶技能使用后随机增加一种技能的能量2点。" }, [5400103]={ - ["desc"]="技能释放后把场上随机3个元素变为紫色（加技能）" + ["desc"]="蝴蝶技能使用后将场上随机3个元素变为紫色元素。" }, [5400104]={ - ["desc"]="攻击提升15%（本英雄）" + ["desc"]="蝴蝶攻击提升15%。" }, [5400105]={ - ["desc"]="紫色技能激活所需能量减2（换技能ID）" + ["desc"]="蝴蝶技能激活所需能量-2。" }, [5400106]={ - ["desc"]="每击杀1个敌人，技能伤害提升50%，本场战斗生效。（加技能）" + ["desc"]="蝴蝶技能每击杀1个敌人，技能伤害提升50%。" }, [5400107]={ - ["desc"]="击杀敌人后增加紫色能量2点（加技能）" + ["desc"]="蝴蝶技能击杀敌人后将增加蝴蝶技能能量2点。" } } local config = { diff --git a/lua/app/config/strings/de/hero.lua b/lua/app/config/strings/de/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/de/hero.lua +++ b/lua/app/config/strings/de/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/hero.lua b/lua/app/config/strings/en/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/en/hero.lua +++ b/lua/app/config/strings/en/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/hero.lua b/lua/app/config/strings/fr/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/fr/hero.lua +++ b/lua/app/config/strings/fr/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/hero.lua b/lua/app/config/strings/id/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/id/hero.lua +++ b/lua/app/config/strings/id/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/hero.lua b/lua/app/config/strings/ja/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/ja/hero.lua +++ b/lua/app/config/strings/ja/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/hero.lua b/lua/app/config/strings/ko/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/ko/hero.lua +++ b/lua/app/config/strings/ko/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/hero.lua b/lua/app/config/strings/pt/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/pt/hero.lua +++ b/lua/app/config/strings/pt/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/hero.lua b/lua/app/config/strings/ru/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/ru/hero.lua +++ b/lua/app/config/strings/ru/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/hero.lua b/lua/app/config/strings/th/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/th/hero.lua +++ b/lua/app/config/strings/th/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/hero.lua b/lua/app/config/strings/vi/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/vi/hero.lua +++ b/lua/app/config/strings/vi/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/hero.lua b/lua/app/config/strings/zh/hero.lua index 72c8771b..fe5b3598 100644 --- a/lua/app/config/strings/zh/hero.lua +++ b/lua/app/config/strings/zh/hero.lua @@ -16,6 +16,9 @@ local hero = { }, [23001]={ + }, + [23002]={ + }, [24001]={ @@ -25,18 +28,39 @@ local hero = { }, [33001]={ + }, + [33002]={ + + }, + [34001]={ + }, [42001]={ + }, + [43001]={ + + }, + [43002]={ + }, [44001]={ }, [52001]={ + }, + [53001]={ + + }, + [53002]={ + + }, + [54001]={ + } } local config = { -data=hero,count=12 +data=hero,count=20 } return config \ No newline at end of file From d1fe14d396b18f20526f4e9d15e482fdae988460 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 19 May 2023 16:31:26 +0800 Subject: [PATCH 4/4] =?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/module/battle/helper/battle_instructions_helper.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/app/module/battle/helper/battle_instructions_helper.lua b/lua/app/module/battle/helper/battle_instructions_helper.lua index fef3ecb9..163fa8d6 100644 --- a/lua/app/module/battle/helper/battle_instructions_helper.lua +++ b/lua/app/module/battle/helper/battle_instructions_helper.lua @@ -186,7 +186,6 @@ local generateLinkCountMoreEffects = function(instructions, skillEntity, lineCou end local generateLinkCountPowerEffects = function(instructions, skillEntity, lineCount) - Logger.logHighlight("generateLinkCountPowerEffects " .. table.nums(skillEntity:getLinkCountPowerEffects())) if not skillEntity:getLinkCountPowerEffects() then return end