Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
0ed878daac
|
|
@ -538,19 +538,18 @@ function this.ChatItemAdapter(node, data, isShowTime)
|
||||||
if data.senderId == PlayerManager.uid then
|
if data.senderId == PlayerManager.uid then
|
||||||
lv.text = PlayerManager.level
|
lv.text = PlayerManager.level
|
||||||
name.text = PracticeManager.SetNameColor(PlayerManager.nickName,PracticeManager.PracticeLevel)
|
name.text = PracticeManager.SetNameColor(PlayerManager.nickName,PracticeManager.PracticeLevel)
|
||||||
if data.serverName and data.serverName ~= "" then
|
-- if data.serverName and data.serverName ~= "" then
|
||||||
name.text = name.text.." "..data.serverName
|
-- name.text = name.text.." "..data.serverName
|
||||||
end
|
-- end
|
||||||
head.sprite = GetPlayerHeadSprite(this.spLoader, PlayerManager.head)
|
head.sprite = GetPlayerHeadSprite(this.spLoader, PlayerManager.head)
|
||||||
headKuang.sprite = GetPlayerHeadFrameSprite(this.spLoader, HeadManager.GetCurFrameId())
|
headKuang.sprite = GetPlayerHeadFrameSprite(this.spLoader, HeadManager.GetCurFrameId())
|
||||||
title=PlayerManager.GetPlayerDesignation()
|
title=PlayerManager.GetPlayerDesignation()
|
||||||
else
|
else
|
||||||
lv.text = data.senderlevel
|
lv.text = data.senderlevel
|
||||||
if data.serverName and data.serverName ~= "" then
|
|
||||||
name.text = data.serverName .." "..data.senderName
|
|
||||||
else
|
|
||||||
name.text = data.senderName
|
name.text = data.senderName
|
||||||
end
|
-- if data.serverName and data.serverName ~= "" then
|
||||||
|
-- name.text = data.serverName .." "..data.senderName
|
||||||
|
-- end
|
||||||
head.sprite = GetPlayerHeadSprite(this.spLoader, data.head)
|
head.sprite = GetPlayerHeadSprite(this.spLoader, data.head)
|
||||||
headKuang.sprite = GetPlayerHeadFrameSprite(this.spLoader, data.frame)
|
headKuang.sprite = GetPlayerHeadFrameSprite(this.spLoader, data.frame)
|
||||||
title=data.userTitle
|
title=data.userTitle
|
||||||
|
|
|
||||||
|
|
@ -31,11 +31,23 @@ end
|
||||||
--绑定事件(用于子类重写)
|
--绑定事件(用于子类重写)
|
||||||
function ChatTipView:BindEvent()
|
function ChatTipView:BindEvent()
|
||||||
Util.AddClick(self.btn, function()
|
Util.AddClick(self.btn, function()
|
||||||
if self._ViewType == VIEW_TYPE.MAIN then
|
local jumpType = 1
|
||||||
UIManager.OpenPanel(UIName.ChatPanel)
|
if self._ViewType == VIEW_TYPE.GUILD then
|
||||||
elseif self._ViewType == VIEW_TYPE.GUILD then
|
jumpType = 2
|
||||||
UIManager.OpenPanel(UIName.ChatPanel, 2, 2)
|
|
||||||
end
|
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)
|
end)
|
||||||
Util.AddClick(self.redPackage,function()
|
Util.AddClick(self.redPackage,function()
|
||||||
UIManager.OpenPanel(UIName.RedPacketPanel,3)
|
UIManager.OpenPanel(UIName.RedPacketPanel,3)
|
||||||
|
|
@ -101,8 +113,10 @@ function ChatTipView:RefreshChatShow()
|
||||||
local chat = ChatManager.AnalysisGlobalChat(msg.chat.msg)
|
local chat = ChatManager.AnalysisGlobalChat(msg.chat.msg)
|
||||||
content = string.format("[跨服]%s:%s", msg.chat.senderName, chat.content)
|
content = string.format("[跨服]%s:%s", msg.chat.senderName, chat.content)
|
||||||
end
|
end
|
||||||
|
self.channel = msg.channel
|
||||||
end
|
end
|
||||||
self.content.text = content
|
self.content.text = content
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 开始聊天数据刷新
|
-- 开始聊天数据刷新
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue