diff --git a/lua/app/ui/battle/battle_base_ui.lua b/lua/app/ui/battle/battle_base_ui.lua index 9a588cf1..700ece1e 100644 --- a/lua/app/ui/battle/battle_base_ui.lua +++ b/lua/app/ui/battle/battle_base_ui.lua @@ -2463,14 +2463,14 @@ function BattleBaseUI:showCommonSkillTips(skillId) end local valueStr - if skillId == 24 then -- 特殊处理 - if ModuleManager.BattleManager.battleController then - valueStr = ModuleManager.BattleManager.battleController.battleData:getSkillCount(skillId) - valueStr = I18N:getText("skill_rogue", skillId, "desc", valueStr) - end - else - valueStr = ModuleManager.HeroManager:getSkillRogueDesc(skillId, value) - end + -- if skillId == 24 then -- 特殊处理 + -- if ModuleManager.BattleManager.battleController then + -- valueStr = ModuleManager.BattleManager.battleController.battleData:getSkillCount(skillId) + -- valueStr = I18N:getText("skill_rogue", skillId, "desc", valueStr) + -- end + -- else + valueStr = ModuleManager.HeroManager:getSkillRogueDesc2(skillId, value) + -- end if self.showCommonSkillTipsSid then diff --git a/lua/app/ui/battle/battle_pause_ui.lua b/lua/app/ui/battle/battle_pause_ui.lua index 9376a59b..3667ec0a 100644 --- a/lua/app/ui/battle/battle_pause_ui.lua +++ b/lua/app/ui/battle/battle_pause_ui.lua @@ -107,14 +107,14 @@ function BattlePauseUI:_refreshScrollRect() cell:refresh(skillId, count, str) cell:addClickListener(function() - local valueStr = ModuleManager.HeroManager:getSkillRogueDesc(skillId, value) + local valueStr = ModuleManager.HeroManager:getSkillRogueDesc2(skillId, value) -- if skillId == 24 then -- 特殊处理 -- if ModuleManager.BattleManager.battleController then -- valueStr = ModuleManager.BattleManager.battleController.battleData:getSkillCount(skillId) -- valueStr = I18N:getText("skill_rogue", skillId, "desc", valueStr) -- end -- else - -- valueStr = ModuleManager.HeroManager:getSkillRogueDesc(skillId, value) + -- valueStr = ModuleManager.HeroManager:getSkillRogueDesc2(skillId, value) -- end if EDITOR_MODE then valueStr = valueStr .. "\n技能ID:" .. skillId .. "" diff --git a/lua/app/ui/battle/cell/battle_select_skill_cell.lua b/lua/app/ui/battle/cell/battle_select_skill_cell.lua index 765efa59..ebc9069b 100644 --- a/lua/app/ui/battle/cell/battle_select_skill_cell.lua +++ b/lua/app/ui/battle/cell/battle_select_skill_cell.lua @@ -14,7 +14,7 @@ function BattleSelectSkillCell:refresh(skillId, func) self.value = math.random(cfg.attr.minnum, cfg.attr.maxnum) self.value = self.value // 100 * 100 valueStr = GFunc.getFinalBuffValue(cfg.attr.type, self.value) - value = ModuleManager.HeroManager:getSkillRogueDesc(skillId, self.value) + value = ModuleManager.HeroManager:getSkillRogueDesc2(skillId, self.value) else -- self.value = nil -- if skillId == 24 then -- 特殊处理 @@ -25,7 +25,7 @@ function BattleSelectSkillCell:refresh(skillId, func) -- else -- value = ModuleManager.HeroManager:getSkillRogueDesc(skillId, self.value) -- end - value = ModuleManager.HeroManager:getSkillRogueDesc(skillId, self.value or 0) + value = ModuleManager.HeroManager:getSkillRogueDesc2(skillId, self.value or 0) end local uiMap = self:getUIMap() diff --git a/lua/app/ui/battle/cell/grid_cell.lua b/lua/app/ui/battle/cell/grid_cell.lua index 736495d3..e7ad3e9e 100644 --- a/lua/app/ui/battle/cell/grid_cell.lua +++ b/lua/app/ui/battle/cell/grid_cell.lua @@ -111,7 +111,7 @@ function GridCell:refresh(gridEntity, curElement, skillPosId) downBg:setVisible(true) skillIcon:setVisible(false) showMask = false - downBg:setSprite(GConst.ATLAS_PATH.BATTLE, "battle_bg_lv") + downBg:setSprite(GConst.ATLAS_PATH.BATTLE, "battle_skill_colorful_2") else skillIcon:setVisible(false) end @@ -187,7 +187,7 @@ function GridCell:showHighLight(show, mainElementType) show = true -- 有技能,强制显示特效 elseif isUniversal then downBg:setVisible(true) - downBg:setSprite(GConst.ATLAS_PATH.BATTLE, "battle_bg_lv") + downBg:setSprite(GConst.ATLAS_PATH.BATTLE, "battle_skill_colorful_2") else downBg:setVisible(false) end