diff --git a/lua/app/common/white_res_manager.lua b/lua/app/common/white_res_manager.lua index 53960b45..a2222dd7 100644 --- a/lua/app/common/white_res_manager.lua +++ b/lua/app/common/white_res_manager.lua @@ -13,7 +13,6 @@ local GAME_RES_WHITE_LIST = { GConst.ATLAS_PATH.ICON_HERO, GConst.ATLAS_PATH.ICON_HERO_2, GConst.ATLAS_PATH.ICON_BUFF, - GConst.ATLAS_PATH.ICON_TASK, GConst.ATLAS_PATH.ICON_AVATAR, GConst.ATLAS_PATH.ICON_EQUIP, } diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index ae812972..3fed0eae 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -233,7 +233,6 @@ GConst.ATLAS_PATH = { ICON_TALENT = "assets/arts/atlas/icon/talent.asset", BOUNTY = "assets/arts/atlas/ui/bounty.asset", UI_SETTING = "assets/arts/atlas/ui/setting.asset", - ICON_TASK = "assets/arts/atlas/icon/task.asset", SHOP = "assets/arts/atlas/ui/shop.asset", HERO = "assets/arts/atlas/ui/hero.asset", UI_FUND = "assets/arts/atlas/ui/fund.asset", diff --git a/lua/app/ui/common/cell/player_head_cell.lua b/lua/app/ui/common/cell/player_head_cell.lua index e5c857e9..f3ecae6e 100644 --- a/lua/app/ui/common/cell/player_head_cell.lua +++ b/lua/app/ui/common/cell/player_head_cell.lua @@ -3,46 +3,46 @@ local PlayerHeadCell = class("PlayerHeadCell", BaseCell) function PlayerHeadCell:init() local uiMap = self.baseObject:genAllChildren() - self.imgFrame = uiMap["player_head_cell.img_frame"] - self.imgAvatar = uiMap["player_head_cell.img_avatar"] + self.imgFrame = uiMap["player_head_cell.img_frame"] + self.imgAvatar = uiMap["player_head_cell.img_avatar"] end -- (avatarId:头像id,frameId:头像框id) function PlayerHeadCell:refresh(avatarId, frameId, showRp) - if avatarId == nil or frameId == nil then - -- 是玩家自己 - avatarId = DataManager.PlayerData:getUsingAvatarId() - frameId = DataManager.PlayerData:getUsingFrameId() - end + if avatarId == nil or frameId == nil then + -- 是玩家自己 + avatarId = DataManager.PlayerData:getUsingAvatarId() + frameId = DataManager.PlayerData:getUsingFrameId() + end - -- 背景颜色 - local smallFrame = DataManager.PlayerData:getAvatarBg(avatarId) - if smallFrame then - self.baseObject:setSprite(GConst.ATLAS_PATH.ICON_HERO, smallFrame) - end + -- 背景颜色 + -- local smallFrame = DataManager.PlayerData:getAvatarBg(avatarId) + -- if smallFrame then + -- self.baseObject:setSprite(GConst.ATLAS_PATH.ICON_HERO, smallFrame) + -- end - -- 头像 - local avatarName = DataManager.PlayerData:getAvatarIconId(avatarId) - if avatarName then - self.imgAvatar:setSprite(GConst.ATLAS_PATH.ICON_HERO, avatarName, function() - self.imgAvatar:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize() - end) - end + -- 头像 + local avatarName = DataManager.PlayerData:getAvatarIconId(avatarId) + if avatarName then + self.imgAvatar:setSprite(GConst.ATLAS_PATH.ICON_HERO, avatarName, function() + self.imgAvatar:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize() + end) + end - -- 头像框 - local frameName = DataManager.PlayerData:getFrameIconId(frameId) - if frameName then - self.imgFrame:setSprite(GConst.ATLAS_PATH.ICON_AVATAR, frameName, function() - self.imgFrame:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize() - end) - end + -- 头像框 + local frameName = DataManager.PlayerData:getFrameIconId(frameId) + if frameName then + self.imgFrame:setSprite(GConst.ATLAS_PATH.ICON_AVATAR, frameName, function() + self.imgFrame:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize() + end) + end - -- 红点 - if showRp and (DataManager.PlayerData:hasNewAvatar() or DataManager.PlayerData:hasNewFrame()) then - self.baseObject:addRedPoint(50, 50, 1) - else - self.baseObject:removeRedPoint() - end + -- 红点 + if showRp and (DataManager.PlayerData:hasNewAvatar() or DataManager.PlayerData:hasNewFrame()) then + self.baseObject:addRedPoint(50, 50, 1) + else + self.baseObject:removeRedPoint() + end end