Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
commit
1d943716c8
|
|
@ -42,7 +42,6 @@ function EnemyView:onCreate(go, role, position, root, isBoss, enemyId)
|
||||||
local roleId = role.roleData.roleId
|
local roleId = role.roleData.roleId
|
||||||
self.roleId = roleId
|
self.roleId = roleId
|
||||||
local live = HeroConfig[role.roleData.roleId].Live
|
local live = HeroConfig[role.roleData.roleId].Live
|
||||||
LogError("roleid=========================" .. roleId)
|
|
||||||
-- 判断是否有皮肤
|
-- 判断是否有皮肤
|
||||||
if not role.roleData.skinId or role.roleData.skinId == 0 then
|
if not role.roleData.skinId or role.roleData.skinId == 0 then
|
||||||
self.skinId = 0
|
self.skinId = 0
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ end
|
||||||
-- 校对时间
|
-- 校对时间
|
||||||
function this.CalibrateTime(time)
|
function this.CalibrateTime(time)
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDK then
|
||||||
App.TAMgr:CalibrateTime(time*1000)
|
--App.TAMgr:CalibrateTime(time*1000)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -57,26 +57,26 @@ end
|
||||||
-- 设置访客Id
|
-- 设置访客Id
|
||||||
function this.SetDistinctId(distinctId)
|
function this.SetDistinctId(distinctId)
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDK then
|
||||||
App.TAMgr:SetDistinctId(distinctId)
|
--App.TAMgr:SetDistinctId(distinctId)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 获取访客Id
|
-- 获取访客Id
|
||||||
function this.GetDistinctId()
|
function this.GetDistinctId()
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDK then
|
||||||
return App.TAMgr:GetDistinctId()
|
--return App.TAMgr:GetDistinctId()
|
||||||
end
|
end
|
||||||
return ""
|
return ""
|
||||||
end
|
end
|
||||||
-- 获取设备Id
|
-- 获取设备Id
|
||||||
function this.GetDeviceId()
|
function this.GetDeviceId()
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDK then
|
||||||
if ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.ThinkAnalysis_GetDeviceID)
|
--if ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.ThinkAnalysis_GetDeviceID)
|
||||||
or ServerConfigManager.GetSDKVersionCode() >= 24
|
--or ServerConfigManager.GetSDKVersionCode() >= 24
|
||||||
then
|
--then
|
||||||
return App.TAMgr:GetDeviceId()
|
--return App.TAMgr:GetDeviceId()
|
||||||
end
|
--end
|
||||||
return AndroidDeviceInfo.Instance:GetDeviceID()
|
--return AndroidDeviceInfo.Instance:GetDeviceID()
|
||||||
end
|
end
|
||||||
return ""
|
return ""
|
||||||
end
|
end
|
||||||
|
|
@ -85,13 +85,13 @@ end
|
||||||
-- 登录
|
-- 登录
|
||||||
function this.Login(accountId)
|
function this.Login(accountId)
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDK then
|
||||||
App.TAMgr:Login(accountId)
|
--App.TAMgr:Login(accountId)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- 登出
|
-- 登出
|
||||||
function this.Logout()
|
function this.Logout()
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDK then
|
||||||
App.TAMgr:Logout()
|
--App.TAMgr:Logout()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -99,30 +99,30 @@ end
|
||||||
local _SuperPropertise = {}
|
local _SuperPropertise = {}
|
||||||
function this.SetSuperProperties(data)
|
function this.SetSuperProperties(data)
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDK then
|
||||||
for key, value in pairs(data) do
|
--for key, value in pairs(data) do
|
||||||
_SuperPropertise[key] = value
|
--_SuperPropertise[key] = value
|
||||||
end
|
--end
|
||||||
|
|
||||||
local sData = _DicToStr(_SuperPropertise)
|
--local sData = _DicToStr(_SuperPropertise)
|
||||||
Log("打点静态数据:"..sData)
|
--Log("打点静态数据:"..sData)
|
||||||
App.TAMgr:SetSuperProperties(sData)
|
--App.TAMgr:SetSuperProperties(sData)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- 清除静态数据
|
-- 清除静态数据
|
||||||
function this.ClearSuperProperties()
|
function this.ClearSuperProperties()
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDK then
|
||||||
_SuperPropertise = {}
|
_SuperPropertise = {}
|
||||||
App.TAMgr:ClearSuperProperties()
|
--App.TAMgr:ClearSuperProperties()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 打点事件
|
-- 打点事件
|
||||||
function this.Track(event, data)
|
function this.Track(event, data)
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDK then
|
||||||
Log("打点事件:"..event)
|
--Log("打点事件:"..event)
|
||||||
local dStr = data and _DicToStr(data) or ""
|
--local dStr = data and _DicToStr(data) or ""
|
||||||
Log("打点数据:"..dStr)
|
--Log("打点数据:"..dStr)
|
||||||
App.TAMgr:Track(event, dStr)
|
--App.TAMgr:Track(event, dStr)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -274,7 +274,7 @@ function FightPointPassMainPanel:InitComponent()
|
||||||
this.battleUpLvTip = Util.GetGameObject(self.gameObject, "Bg/btnDown/battleUpLvTip")
|
this.battleUpLvTip = Util.GetGameObject(self.gameObject, "Bg/btnDown/battleUpLvTip")
|
||||||
this.battleUpLvTipImg = this.battleUpLvTip:GetComponent("Image")
|
this.battleUpLvTipImg = this.battleUpLvTip:GetComponent("Image")
|
||||||
this.battleUpLvTipTxt = Util.GetGameObject(self.gameObject, "Bg/btnDown/battleUpLvTip/Text"):GetComponent("Text")
|
this.battleUpLvTipTxt = Util.GetGameObject(self.gameObject, "Bg/btnDown/battleUpLvTip/Text"):GetComponent("Text")
|
||||||
this.battleLockGo = Util.GetGameObject(self.gameObject, "Bg/btnDown/battleUpLvTip/Image")
|
--this.battleLockGo = Util.GetGameObject(self.gameObject, "Bg/btnDown/battleUpLvTip/Image")
|
||||||
--山河社稷图OpenPanel
|
--山河社稷图OpenPanel
|
||||||
this.btnFightLevel = Util.GetGameObject(self.gameObject, "Bg/LeftUp/box/btnFightLevel")
|
this.btnFightLevel = Util.GetGameObject(self.gameObject, "Bg/LeftUp/box/btnFightLevel")
|
||||||
this.btnFightLevel:SetActive(false)
|
this.btnFightLevel:SetActive(false)
|
||||||
|
|
@ -1315,7 +1315,7 @@ function this.RefreshBattleUpLvTip(isShowUIOpen)
|
||||||
this.battleUpLvTip:SetActive(false)
|
this.battleUpLvTip:SetActive(false)
|
||||||
this.battleUpLvTipImg.enabled = false
|
this.battleUpLvTipImg.enabled = false
|
||||||
this.battleUpLvTipTxt.gameObject:SetActive(false)
|
this.battleUpLvTipTxt.gameObject:SetActive(false)
|
||||||
this.battleLockGo:SetActive(false)
|
--this.battleLockGo:SetActive(false)
|
||||||
-- 么解锁章节不显示
|
-- 么解锁章节不显示
|
||||||
if not FightPointPassManager.IsChapterClossState() then
|
if not FightPointPassManager.IsChapterClossState() then
|
||||||
return
|
return
|
||||||
|
|
@ -1330,7 +1330,7 @@ function this.RefreshBattleUpLvTip(isShowUIOpen)
|
||||||
this.battleUpLvTip:SetActive(true)
|
this.battleUpLvTip:SetActive(true)
|
||||||
this.battleUpLvTipImg.enabled = true
|
this.battleUpLvTipImg.enabled = true
|
||||||
this.battleUpLvTipTxt.gameObject:SetActive(true)
|
this.battleUpLvTipTxt.gameObject:SetActive(true)
|
||||||
this.battleLockGo:SetActive(false)
|
--this.battleLockGo:SetActive(false)
|
||||||
|
|
||||||
this.battleUpLvTipTxt.text = Language[10610]
|
this.battleUpLvTipTxt.text = Language[10610]
|
||||||
return
|
return
|
||||||
|
|
@ -1357,7 +1357,7 @@ function this.RefreshBattleUpLvTip(isShowUIOpen)
|
||||||
this.battleUpLvTip:SetActive(true)
|
this.battleUpLvTip:SetActive(true)
|
||||||
this.battleUpLvTipImg.enabled = false
|
this.battleUpLvTipImg.enabled = false
|
||||||
this.battleUpLvTipTxt.gameObject:SetActive(false)
|
this.battleUpLvTipTxt.gameObject:SetActive(false)
|
||||||
this.battleLockGo:SetActive(true)
|
--this.battleLockGo:SetActive(true)
|
||||||
Util.AddOnceClick(this.battleUpLvTip, function()
|
Util.AddOnceClick(this.battleUpLvTip, function()
|
||||||
JumpManager.GoJump(36023)
|
JumpManager.GoJump(36023)
|
||||||
end)
|
end)
|
||||||
|
|
@ -1366,7 +1366,7 @@ function this.RefreshBattleUpLvTip(isShowUIOpen)
|
||||||
this.battleUpLvTip:SetActive(true)
|
this.battleUpLvTip:SetActive(true)
|
||||||
this.battleUpLvTipImg.enabled = false
|
this.battleUpLvTipImg.enabled = false
|
||||||
this.battleUpLvTipTxt.gameObject:SetActive(false)
|
this.battleUpLvTipTxt.gameObject:SetActive(false)
|
||||||
this.battleLockGo:SetActive(true)
|
--this.battleLockGo:SetActive(true)
|
||||||
Util.AddOnceClick(this.battleUpLvTip, function()
|
Util.AddOnceClick(this.battleUpLvTip, function()
|
||||||
JumpManager.GoJump(1011)
|
JumpManager.GoJump(1011)
|
||||||
end)
|
end)
|
||||||
|
|
@ -1375,7 +1375,7 @@ function this.RefreshBattleUpLvTip(isShowUIOpen)
|
||||||
this.battleUpLvTip:SetActive(true)
|
this.battleUpLvTip:SetActive(true)
|
||||||
this.battleUpLvTipImg.enabled = false
|
this.battleUpLvTipImg.enabled = false
|
||||||
this.battleUpLvTipTxt.gameObject:SetActive(false)
|
this.battleUpLvTipTxt.gameObject:SetActive(false)
|
||||||
this.battleLockGo:SetActive(true)
|
--this.battleLockGo:SetActive(true)
|
||||||
Util.AddOnceClick(this.battleUpLvTip, function()
|
Util.AddOnceClick(this.battleUpLvTip, function()
|
||||||
JumpManager.GoJump(1007)
|
JumpManager.GoJump(1007)
|
||||||
end)
|
end)
|
||||||
|
|
@ -1384,7 +1384,7 @@ function this.RefreshBattleUpLvTip(isShowUIOpen)
|
||||||
this.battleUpLvTip:SetActive(true)
|
this.battleUpLvTip:SetActive(true)
|
||||||
this.battleUpLvTipImg.enabled = false
|
this.battleUpLvTipImg.enabled = false
|
||||||
this.battleUpLvTipTxt.gameObject:SetActive(false)
|
this.battleUpLvTipTxt.gameObject:SetActive(false)
|
||||||
this.battleLockGo:SetActive(true)
|
--this.battleLockGo:SetActive(true)
|
||||||
Util.AddOnceClick(this.battleUpLvTip, function()
|
Util.AddOnceClick(this.battleUpLvTip, function()
|
||||||
JumpManager.GoJump(40033)
|
JumpManager.GoJump(40033)
|
||||||
end)
|
end)
|
||||||
|
|
@ -1393,7 +1393,7 @@ function this.RefreshBattleUpLvTip(isShowUIOpen)
|
||||||
this.battleUpLvTip:SetActive(true)
|
this.battleUpLvTip:SetActive(true)
|
||||||
this.battleUpLvTipImg.enabled = false
|
this.battleUpLvTipImg.enabled = false
|
||||||
this.battleUpLvTipTxt.gameObject:SetActive(false)
|
this.battleUpLvTipTxt.gameObject:SetActive(false)
|
||||||
this.battleLockGo:SetActive(true)
|
--this.battleLockGo:SetActive(true)
|
||||||
Util.AddOnceClick(this.battleUpLvTip, function()
|
Util.AddOnceClick(this.battleUpLvTip, function()
|
||||||
JumpManager.GoJump(22001)
|
JumpManager.GoJump(22001)
|
||||||
end)
|
end)
|
||||||
|
|
|
||||||
|
|
@ -281,6 +281,7 @@ function this.CheckNextGuideListen(nextId)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.ShowGuide(id, ...)
|
function this.ShowGuide(id, ...)
|
||||||
|
LogError("执行引导:"..tostring(id))
|
||||||
-- 引导数据打点
|
-- 引导数据打点
|
||||||
DataCenterManager.CommitClickStatus(Language[10832], tostring(id))
|
DataCenterManager.CommitClickStatus(Language[10832], tostring(id))
|
||||||
ThinkingAnalyticsManager.Track("guild", {
|
ThinkingAnalyticsManager.Track("guild", {
|
||||||
|
|
|
||||||
|
|
@ -220,7 +220,7 @@ function this:BindEvent()
|
||||||
OpenWeb("http://smi.648sy.com/about/share")
|
OpenWeb("http://smi.648sy.com/about/share")
|
||||||
end)
|
end)
|
||||||
Util.AddClick(this.btn_beian, function()
|
Util.AddClick(this.btn_beian, function()
|
||||||
OpenWeb("https://beian.miit.gov.cn/#/Integrated/recordQuery")
|
OpenWeb("https://beian.miit.gov.cn/#/Integrated/index")
|
||||||
end)
|
end)
|
||||||
Util.AddClick(this.ConfirmBtn, function()
|
Util.AddClick(this.ConfirmBtn, function()
|
||||||
local confirm = PlayerPrefs.GetInt("IHaveConfirmProtos")
|
local confirm = PlayerPrefs.GetInt("IHaveConfirmProtos")
|
||||||
|
|
|
||||||
|
|
@ -31,9 +31,14 @@ function ServerListItem:SetValue(serverInfo, flag)
|
||||||
self.serverName.text = serverInfo.name
|
self.serverName.text = serverInfo.name
|
||||||
self.tipsBg.gameObject:SetActive(not not flag)
|
self.tipsBg.gameObject:SetActive(not not flag)
|
||||||
self.newServerFlag:SetActive(serverInfo.isnew == 1)
|
self.newServerFlag:SetActive(serverInfo.isnew == 1)
|
||||||
self.serverArea.text = tonumber(string.sub(serverInfo.server_id, 0, -5)) .. Language[11138]
|
if string.find(serverInfo.name, "主播") then
|
||||||
|
self.serverArea.text = ""
|
||||||
|
else
|
||||||
|
self.serverArea.text = tonumber(string.sub(serverInfo.server_id, 0, -5)) .. Language[11138]
|
||||||
|
end
|
||||||
|
|
||||||
if not ServerStateIconDef[serverInfo.state] then
|
if not ServerStateIconDef[serverInfo.state] then
|
||||||
LogError(serverInfo.server_id.." serverInfo.state:"..serverInfo.state)
|
LogError(serverInfo.server_id .. " serverInfo.state:" .. serverInfo.state)
|
||||||
self.serverState.sprite = self.root.spLoader:LoadSprite(ServerStateIconDef[1])
|
self.serverState.sprite = self.root.spLoader:LoadSprite(ServerStateIconDef[1])
|
||||||
else
|
else
|
||||||
self.serverState.sprite = self.root.spLoader:LoadSprite(ServerStateIconDef[serverInfo.state])
|
self.serverState.sprite = self.root.spLoader:LoadSprite(ServerStateIconDef[serverInfo.state])
|
||||||
|
|
|
||||||
|
|
@ -99,7 +99,11 @@ function ServerListSelectPanel:SetServerNew()
|
||||||
end
|
end
|
||||||
self.newServerPart.serverItem:SetActive(not not self.context.recommend)
|
self.newServerPart.serverItem:SetActive(not not self.context.recommend)
|
||||||
if self.serverInfoNew then
|
if self.serverInfoNew then
|
||||||
self.newServerPart.areaBelong.text = tonumber(string.sub(self.serverInfoNew.server_id, 0, -5)) .. Language[11138]
|
if string.find( self.serverInfoNew.name, "主播") then
|
||||||
|
self.newServerPart.areaBelong.text = ""
|
||||||
|
else
|
||||||
|
self.newServerPart.areaBelong.text = tonumber(string.sub(self.serverInfoNew.server_id, 0, -5)) .. Language[11138]
|
||||||
|
end
|
||||||
self.newServerPart.serverName.text = self.serverInfoNew.name
|
self.newServerPart.serverName.text = self.serverInfoNew.name
|
||||||
self.newServerPart.serverState.sprite = self.spLoader:LoadSprite(ServerStateIconDef[self.serverInfoNew.state])
|
self.newServerPart.serverState.sprite = self.spLoader:LoadSprite(ServerStateIconDef[self.serverInfoNew.state])
|
||||||
self.newServerPart.newServerFlag:SetActive(self.serverInfoNew.isnew == 1)
|
self.newServerPart.newServerFlag:SetActive(self.serverInfoNew.isnew == 1)
|
||||||
|
|
@ -115,7 +119,11 @@ function ServerListSelectPanel:SetServerRecent()
|
||||||
if self.context.lastServer then
|
if self.context.lastServer then
|
||||||
local serverInfo = self:GetServerInfo(self.context.lastServer.serverid)
|
local serverInfo = self:GetServerInfo(self.context.lastServer.serverid)
|
||||||
if serverInfo then
|
if serverInfo then
|
||||||
self.recentLoginPart.areaBelong.text = tonumber(string.sub(self.context.lastServer.serverid, 0, -5)) .. Language[11138]
|
if string.find( serverInfo.name, "主播") then
|
||||||
|
self.recentLoginPart.areaBelong.text = ""
|
||||||
|
else
|
||||||
|
self.recentLoginPart.areaBelong.text = tonumber(string.sub(self.context.lastServer.serverid, 0, -5)) .. Language[11138]
|
||||||
|
end
|
||||||
self.recentLoginPart.serverName.text = serverInfo.name
|
self.recentLoginPart.serverName.text = serverInfo.name
|
||||||
self.recentLoginPart.serverState.sprite = self.spLoader:LoadSprite(ServerStateIconDef[serverInfo.state])
|
self.recentLoginPart.serverState.sprite = self.spLoader:LoadSprite(ServerStateIconDef[serverInfo.state])
|
||||||
self.recentLoginPart.playerName.text = self.context.lastServer.name .. "\t" .. self.context.lastServer.level .. Language[10065]
|
self.recentLoginPart.playerName.text = self.context.lastServer.name .. "\t" .. self.context.lastServer.level .. Language[10065]
|
||||||
|
|
|
||||||
|
|
@ -55,8 +55,8 @@ function CreateNamePopup:InitComponent()
|
||||||
-- 性别区分
|
-- 性别区分
|
||||||
this.roleLive = Util.GetGameObject(self.gameObject, "roleHill/roleLIve")
|
this.roleLive = Util.GetGameObject(self.gameObject, "roleHill/roleLIve")
|
||||||
this.roleStand = Util.GetGameObject(self.gameObject, "roleStand")
|
this.roleStand = Util.GetGameObject(self.gameObject, "roleStand")
|
||||||
-- this.boyLive = Util.GetGameObject(self.gameObject, "roleStand/boy")
|
this.boyLive = Util.GetGameObject(self.gameObject, "roleStand/boy")
|
||||||
-- this.girlLive = Util.GetGameObject(self.gameObject, "roleStand/girl")
|
this.girlLive = Util.GetGameObject(self.gameObject, "roleStand/girl")
|
||||||
this.Shadow = Util.GetGameObject(self.gameObject, "roleStand"):GetComponent("Image")
|
this.Shadow = Util.GetGameObject(self.gameObject, "roleStand"):GetComponent("Image")
|
||||||
this.Text = Util.GetGameObject(self.gameObject, "content"):GetComponent("Image")
|
this.Text = Util.GetGameObject(self.gameObject, "content"):GetComponent("Image")
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue