This commit is contained in:
puxuan 2025-10-24 16:36:33 +08:00
parent 168dc1eca3
commit 887400cb76
5 changed files with 13 additions and 11 deletions

View File

@ -24,7 +24,7 @@ DungeonConst.STR_HELP = {
-- banner名称 -- banner名称
DungeonConst.IMG_BANNER = { DungeonConst.IMG_BANNER = {
[DungeonConst.MODULE_KEY_DUNGEON_DAILY] = "supply_banner_1", [DungeonConst.MODULE_KEY_DUNGEON_DAILY] = "dungeon_banner_3",
} }
-- 副本排行榜类型,客户端自定义 -- 副本排行榜类型,客户端自定义

View File

@ -2,7 +2,7 @@ local BattleResultUI = class("BattleResultUI", BaseUI)
local UNIT_RESULT_RERPORT_CELL = "app/ui/battle/cell/unit_result_report_cell" local UNIT_RESULT_RERPORT_CELL = "app/ui/battle/cell/unit_result_report_cell"
local MAX_SCROLL_SHOW_COUNT = 10 local MAX_SCROLL_SHOW_COUNT = 10
local SCROLL_LINE_HEIGHT = 130 local SCROLL_LINE_HEIGHT = 98
function BattleResultUI:isFullScreen() function BattleResultUI:isFullScreen()
return false return false
@ -405,13 +405,13 @@ function BattleResultUI:refreshRewards()
comp.movementType = CS.UnityEngine.UI.ScrollRect.MovementType.Clamped comp.movementType = CS.UnityEngine.UI.ScrollRect.MovementType.Clamped
if rewardCount >= 5 then if rewardCount >= 5 then
self.rewardScrollRectComp:setPerLineNum(5) self.rewardScrollRectComp:setPerLineNum(5)
self.rewardScrollRect:setSizeDeltaX(560) self.rewardScrollRect:setSizeDeltaX(490)
elseif rewardCount <= 0 then elseif rewardCount <= 0 then
self.rewardScrollRectComp:setPerLineNum(1) self.rewardScrollRectComp:setPerLineNum(1)
self.rewardScrollRect:setSizeDeltaX(560) self.rewardScrollRect:setSizeDeltaX(490)
else else
self.rewardScrollRectComp:setPerLineNum(rewardCount) self.rewardScrollRectComp:setPerLineNum(rewardCount)
self.rewardScrollRect:setSizeDeltaX(112*rewardCount) self.rewardScrollRect:setSizeDeltaX(98*rewardCount)
end end
end end
self.rewardScrollRectComp:refillCells(rewardCount) self.rewardScrollRectComp:refillCells(rewardCount)

View File

@ -4,10 +4,10 @@ local SELECT_SKILL_CELL = "app/ui/battle/cell/battle_select_skill_cell"
local BATTLE_COMMON_PATH = "assets/arts/textures/background/battle_common/%s.png" local BATTLE_COMMON_PATH = "assets/arts/textures/background/battle_common/%s.png"
local SKILL_ICON_POS = { local SKILL_ICON_POS = {
{x =-240, y= 158}, {x =-240, y= 154},
{x =-240, y= 0}, {x =-240, y= -2},
{x =-240, y= -158}, {x =-240, y= -158},
{x =-240, y= 316}, {x =-240, y= 310},
} }
function BattleSkillSelectComp:refresh(skillList, isGodSkill) function BattleSkillSelectComp:refresh(skillList, isGodSkill)
@ -100,8 +100,10 @@ function BattleSkillSelectComp:refreshBtns()
end end
local allCount = battleController.battleData:getAllSkillCount() local allCount = battleController.battleData:getAllSkillCount()
if getAllAdCount > allCount then if getAllAdCount > allCount then
adBtn:setAnchoredPositionX(-102)
allBtn:setActive(true) allBtn:setActive(true)
else else
adBtn:setAnchoredPositionX(0)
allBtn:setActive(false) allBtn:setActive(false)
end end

View File

@ -26,7 +26,7 @@ function DungeonCell:init()
ModuleManager.TipsManager:showHelpTips(params) ModuleManager.TipsManager:showHelpTips(params)
end) end)
self.baseObject:addClickListener(function() self.contentNode:addClickListener(function()
self:onClickGo() self:onClickGo()
end) end)
end end
@ -48,7 +48,7 @@ function DungeonCell:refresh(moduleKey)
cell:setActive(false) cell:setActive(false)
end end
end end
self.baseObject:setSprite(GConst.ATLAS_PATH.UI_SUPPLY, GConst.DungeonConst.IMG_BANNER[self.moduleKey]) self.baseObject:setSprite(GConst.ATLAS_PATH.UI_DUNGEON, GConst.DungeonConst.IMG_BANNER[self.moduleKey])
if DataManager.DungeonData:isOpen(self.moduleKey) then if DataManager.DungeonData:isOpen(self.moduleKey) then
self.infoNode:setVisible(true) self.infoNode:setVisible(true)
self.lockNode:setVisible(false) self.lockNode:setVisible(false)

View File

@ -901,7 +901,7 @@ function BattleBaseData:initHeroData(formation)
---- 攻击力 ---- 攻击力
for matchType, attrName in pairs(GConst.MATCH_ATTACK_NAME) do for matchType, attrName in pairs(GConst.MATCH_ATTACK_NAME) do
unitData.attr[attrName] = heroEntity:getTotalAttrValue(attrName) // DEFAULT_FACTOR unitData.attr[attrName] = heroEntity:getTotalAttrValue(attrName)-- // DEFAULT_FACTOR
end end
---- 暴击率 ---- 暴击率