Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
0bb076913b
|
@ -301,7 +301,7 @@ function this.RequestServerVersion(func)
|
|||
LogPink(url)
|
||||
networkMgr:SendGetHttp(url, function (str)
|
||||
LogPink(str)
|
||||
if str == "null" or string.find(str, "<html>") then
|
||||
if str == "null" or string.find(str, "html") then
|
||||
LogWarn("获取到的ServerVersion数据是空值,请检查!")
|
||||
else
|
||||
local json = require 'cjson'
|
||||
|
|
|
@ -27,6 +27,7 @@ function ServerListSelectPanel:InitComponent()
|
|||
serverName = Util.GetGameObject(self.quickLoginPart, "serverItemNew/serverName"):GetComponent("Text"),
|
||||
serverState = Util.GetGameObject(self.quickLoginPart, "serverItemNew/serverState"):GetComponent("Image"),
|
||||
newServerFlag = Util.GetGameObject(self.quickLoginPart, "serverItemNew/newServerFlag"),
|
||||
tipsBg = Util.GetGameObject(self.quickLoginPart, "serverItemNew/tipsBg"),
|
||||
}
|
||||
self.newServerPart.serverItem:SetActive(false)
|
||||
self.serverInfoNew = nil
|
||||
|
@ -99,6 +100,9 @@ function ServerListSelectPanel:SetServerNew()
|
|||
self.newServerPart.serverState.sprite = self.spLoader:LoadSprite(ServerStateIconDef[self.serverInfoNew.state])
|
||||
self.newServerPart.newServerFlag:SetActive(self.serverInfoNew.isnew == 1)
|
||||
self:QuickSeverClicked(self.newServerPart.serverItem, self.serverInfoNew.server_id)
|
||||
--
|
||||
local index = table.indexof(self.context.myServerList, self.serverInfoNew.server_id)
|
||||
self.newServerPart.tipsBg:SetActive(not not index)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue