Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-07-30 14:17:55 +08:00
commit 0ed878daac
2 changed files with 25 additions and 12 deletions

View File

@ -538,19 +538,18 @@ function this.ChatItemAdapter(node, data, isShowTime)
if data.senderId == PlayerManager.uid then
lv.text = PlayerManager.level
name.text = PracticeManager.SetNameColor(PlayerManager.nickName,PracticeManager.PracticeLevel)
if data.serverName and data.serverName ~= "" then
name.text = name.text.." "..data.serverName
end
-- if data.serverName and data.serverName ~= "" then
-- name.text = name.text.." "..data.serverName
-- end
head.sprite = GetPlayerHeadSprite(this.spLoader, PlayerManager.head)
headKuang.sprite = GetPlayerHeadFrameSprite(this.spLoader, HeadManager.GetCurFrameId())
title=PlayerManager.GetPlayerDesignation()
else
lv.text = data.senderlevel
if data.serverName and data.serverName ~= "" then
name.text = data.serverName .." "..data.senderName
else
name.text = data.senderName
end
name.text = data.senderName
-- if data.serverName and data.serverName ~= "" then
-- name.text = data.serverName .." "..data.senderName
-- end
head.sprite = GetPlayerHeadSprite(this.spLoader, data.head)
headKuang.sprite = GetPlayerHeadFrameSprite(this.spLoader, data.frame)
title=data.userTitle

View File

@ -31,11 +31,23 @@ end
--绑定事件(用于子类重写)
function ChatTipView:BindEvent()
Util.AddClick(self.btn, function()
if self._ViewType == VIEW_TYPE.MAIN then
UIManager.OpenPanel(UIName.ChatPanel)
elseif self._ViewType == VIEW_TYPE.GUILD then
UIManager.OpenPanel(UIName.ChatPanel, 2, 2)
local jumpType = 1
if self._ViewType == VIEW_TYPE.GUILD then
jumpType = 2
end
local tabIndex = 3
if not self.channel then
tabIndex = 3
elseif self.channel == CHAT_CHANNEL.SYSTEM then
tabIndex = 5
elseif self.channel == CHAT_CHANNEL.FAMILY then
tabIndex = 2
elseif self.channel == CHAT_CHANNEL.GLOBAL then
tabIndex = 3
elseif self.channel == CHAT_CHANNEL.JUMP_SERVER then
tabIndex = 4
end
UIManager.OpenPanel(UIName.ChatPanel, tabIndex, jumpType)
end)
Util.AddClick(self.redPackage,function()
UIManager.OpenPanel(UIName.RedPacketPanel,3)
@ -101,8 +113,10 @@ function ChatTipView:RefreshChatShow()
local chat = ChatManager.AnalysisGlobalChat(msg.chat.msg)
content = string.format("[跨服]%s%s", msg.chat.senderName, chat.content)
end
self.channel = msg.channel
end
self.content.text = content
end
-- 开始聊天数据刷新