diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index 72a64d81..32ceead8 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -435,13 +435,13 @@ GConst.HERO_FRAME = { } GConst.FRAME_QLT = { - [1] = "hero_frame_1", - [2] = "hero_frame_2", - [3] = "hero_frame_1", - [4] = "hero_frame_1", - [5] = "hero_frame_1", - [6] = "hero_frame_1", - [7] = "hero_frame_1", + [1] = "frame_1", + [2] = "frame_2", + [3] = "frame_3", + [4] = "frame_4", + [5] = "frame_5", + [6] = "frame_6", + [7] = "frame_7", } GConst.HERO_SMALL_FRAME_QLT = { @@ -477,11 +477,11 @@ GConst.HERO_DEC_QLT = { GConst.HERO_FRAME_QLT = { [1] = "hero_frame_1", [2] = "hero_frame_2", - [3] = "hero_frame_3", - [4] = "hero_frame_4", - [5] = "hero_frame_5", - [6] = "hero_frame_6", - [7] = "hero_frame_7", + [3] = "hero_frame_1", + [4] = "hero_frame_1", + [5] = "hero_frame_1", + [6] = "hero_frame_1", + [7] = "hero_frame_1", } GConst.HERO_FRAME_BG_QLT = { diff --git a/lua/app/ui/arena/arena_match_ui.lua b/lua/app/ui/arena/arena_match_ui.lua index 9006e39f..fc9b5c04 100644 --- a/lua/app/ui/arena/arena_match_ui.lua +++ b/lua/app/ui/arena/arena_match_ui.lua @@ -68,7 +68,6 @@ function ArenaMatchUI:onLoadRootComplete() -- 匹配结果页 self.matchResult = uiMap["arena_match_ui.match_result"] self.btnClose = uiMap["arena_match_ui.match_result.btn_close"] - self.spineVS = uiMap["arena_match_ui.match_result.spine_vs"] self.matchAnimator = self.matchResult:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR) -- 对手信息 self.matchAvatar = CellManager:addCellComp(uiMap["arena_match_ui.match_result.match.info.player_head_cell"], GConst.TYPEOF_LUA_CLASS.PLAYER_HEAD_CELL) @@ -159,9 +158,9 @@ function ArenaMatchUI:showMatchResult() self.matchResult:setActive(true) UIManager:setBarsVisible(self, true) - self.spineVS:playAnimComplete("born", false, true, function() - self.spineVS:playAnim("idle", true, true) - end) + -- self.spineVS:playAnimComplete("born", false, true, function() + -- self.spineVS:playAnim("idle", true, true) + -- end) self.txStart:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_CHALLENGE)) self.txConst:setText(DataManager.ArenaData:getFightCostNum()) diff --git a/lua/app/ui/common/cell/hero_cell.lua b/lua/app/ui/common/cell/hero_cell.lua index b3c4f0b6..bfbda214 100644 --- a/lua/app/ui/common/cell/hero_cell.lua +++ b/lua/app/ui/common/cell/hero_cell.lua @@ -170,7 +170,7 @@ end function HeroCell:_refresh(heroInfo, isGray) self.clickCallback = nil self.maskImg2:setActive(isGray) - self.heroBg:setSprite(GConst.ATLAS_PATH.HERO, GConst.FRAME_QLT[heroInfo.qlt]) + self.heroBg:setSprite(GConst.ATLAS_PATH.HERO, GConst.HERO_FRAME_QLT[heroInfo.qlt]) self.heroDec:setSprite(GConst.ATLAS_PATH.HERO, GConst.HERO_DEC_QLT[heroInfo.qlt]) self.matchImg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.HeroConst.MATCH_ICON_NAME[heroInfo.position]) self.check:setVisible(false) diff --git a/lua/app/ui/tips/help_tips.lua b/lua/app/ui/tips/help_tips.lua index ee7a160b..f2aad777 100644 --- a/lua/app/ui/tips/help_tips.lua +++ b/lua/app/ui/tips/help_tips.lua @@ -38,6 +38,7 @@ function HelpTips:onLoadRootComplete() self.arenaTxClose = uiMap["help_tips.style_arena.btn_close.tx_close"] self.arenaContent = uiMap["help_tips.style_arena.ScrollView.Viewport.Content"] self.arenaTxDesc = uiMap["help_tips.style_arena.ScrollView.Viewport.Content.tx_desc"] + self.arenaCloseBtn = uiMap["help_tips.style_arena.close_btn"] self.normaBtnClose:addClickListener(function () self:playCloseAni(function() @@ -47,6 +48,9 @@ function HelpTips:onLoadRootComplete() self.arenaBtnClose:addClickListener(function () self:closeUI() end) + self.arenaCloseBtn:addClickListener(function () + self:closeUI() + end) self.root:addClickListener(function() if self.params.type == GConst.TipsConst.HELP_TIPS_TYPE.NORMAL then self:playCloseAni(function()