Branch_oumei
parent
2c6e3a9835
commit
59604eeae8
|
|
@ -12,7 +12,8 @@ local lastServerIndex = "lastServerIndex"
|
||||||
local defaultOpenIdkey = GetLanguageStrById(11118)
|
local defaultOpenIdkey = GetLanguageStrById(11118)
|
||||||
local defaultOpenIdPw = ""
|
local defaultOpenIdPw = ""
|
||||||
local LoginRoot_Url = VersionManager:GetVersionInfo("serverUrl")
|
local LoginRoot_Url = VersionManager:GetVersionInfo("serverUrl")
|
||||||
local LoginRoot_SubChannel = GetChannelConfig().Button_PlayerSet_Exchange and VersionManager:GetVersionInfo("subChannel") or "3000"
|
local LoginRoot_SubChannel = GetChannelConfig().Button_PlayerSet_Exchange and VersionManager:GetVersionInfo("subChannel") or
|
||||||
|
"3000"
|
||||||
local LoginRoot_Channel = VersionManager:GetVersionInfo("channel")
|
local LoginRoot_Channel = VersionManager:GetVersionInfo("channel")
|
||||||
local LoginRoot_Version = VersionManager:GetVersionInfo("version")
|
local LoginRoot_Version = VersionManager:GetVersionInfo("version")
|
||||||
local LoginRoot_PackageVersion = VersionManager:GetVersionInfo("packageVersion")
|
local LoginRoot_PackageVersion = VersionManager:GetVersionInfo("packageVersion")
|
||||||
|
|
@ -52,7 +53,8 @@ function this:InitComponent()
|
||||||
this.LoginPanel_Btn2 = Util.GetGameObject(this.loginPart, "btns/LoginPanel_Btn2") --个人信息
|
this.LoginPanel_Btn2 = Util.GetGameObject(this.loginPart, "btns/LoginPanel_Btn2") --个人信息
|
||||||
this.btnLogout = Util.GetGameObject(this.loginPart, "btns/btnLogout") --登出
|
this.btnLogout = Util.GetGameObject(this.loginPart, "btns/btnLogout") --登出
|
||||||
this.btnCustomerService2 = Util.GetGameObject(this.loginPart, "btns/btnCustomerService2") --客服(SDK)
|
this.btnCustomerService2 = Util.GetGameObject(this.loginPart, "btns/btnCustomerService2") --客服(SDK)
|
||||||
|
this.btnAiHelp = Util.GetGameObject(this.loginPart, "btns/btnAiHelp") --aihelp
|
||||||
|
this.btnAiHelp:SetActive(GetChannelConfig().Button_PlayerSet_Exchange)
|
||||||
---selectServerPart
|
---selectServerPart
|
||||||
this.serverSelectPart = Util.GetGameObject(this.loginPart, "serverSelect")
|
this.serverSelectPart = Util.GetGameObject(this.loginPart, "serverSelect")
|
||||||
this.serverImage = Util.GetGameObject(this.serverSelectPart, "Image"):GetComponent("Image")
|
this.serverImage = Util.GetGameObject(this.serverSelectPart, "Image"):GetComponent("Image")
|
||||||
|
|
@ -99,7 +101,12 @@ function this:BindEvent()
|
||||||
fun()
|
fun()
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
--客服中心
|
||||||
|
Util.AddClick(this.btnAiHelp, function()
|
||||||
|
if AppConst.isSDKLogin then
|
||||||
|
SDKMgr:CustomerService()
|
||||||
|
end
|
||||||
|
end)
|
||||||
Util.AddClick(this.btnLogin, this.OnLoginClick)
|
Util.AddClick(this.btnLogin, this.OnLoginClick)
|
||||||
Util.AddClick(this.btnUser, function()
|
Util.AddClick(this.btnUser, function()
|
||||||
local user = PlayerPrefs.GetString(openIdkey, defaultOpenIdkey)
|
local user = PlayerPrefs.GetString(openIdkey, defaultOpenIdkey)
|
||||||
|
|
@ -753,11 +760,11 @@ function this.ExecuteLoading()
|
||||||
return "FriendChatManager.InitData"
|
return "FriendChatManager.InitData"
|
||||||
end) -- 好友消息
|
end) -- 好友消息
|
||||||
--table.insert(requestList,
|
--table.insert(requestList,
|
||||||
--function()
|
--function()
|
||||||
--this.LogTime(#requestList + 1)
|
--this.LogTime(#requestList + 1)
|
||||||
-- MyGuildManager.InitBaseData(LoadingPanel.OnStep)
|
-- MyGuildManager.InitBaseData(LoadingPanel.OnStep)
|
||||||
--return "MyGuildManager.InitBaseData"
|
--return "MyGuildManager.InitBaseData"
|
||||||
--end) -- 公会信息
|
--end) -- 公会信息
|
||||||
--table.insert(requestList, function() this.LogTime(#requestList + 1) MyGuildManager.RequestMyGuildMembers(LoadingPanel.OnStep) return "MyGuildManager.RequestMyGuildMembers" end) -- 公会成员申请
|
--table.insert(requestList, function() this.LogTime(#requestList + 1) MyGuildManager.RequestMyGuildMembers(LoadingPanel.OnStep) return "MyGuildManager.RequestMyGuildMembers" end) -- 公会成员申请
|
||||||
table.insert(requestList,
|
table.insert(requestList,
|
||||||
function()
|
function()
|
||||||
|
|
@ -778,11 +785,11 @@ function this.ExecuteLoading()
|
||||||
return "InitFightPointLevelInfo"
|
return "InitFightPointLevelInfo"
|
||||||
end) -- 关卡
|
end) -- 关卡
|
||||||
--table.insert(requestList,
|
--table.insert(requestList,
|
||||||
--function()
|
--function()
|
||||||
--this.LogTime(#requestList + 1)
|
--this.LogTime(#requestList + 1)
|
||||||
--NetManager.GuildHelpGetAllRequest(LoadingPanel.OnStep)
|
--NetManager.GuildHelpGetAllRequest(LoadingPanel.OnStep)
|
||||||
--return "GuildHelpGetAllRequest"
|
--return "GuildHelpGetAllRequest"
|
||||||
--end) -- 公会援助
|
--end) -- 公会援助
|
||||||
table.insert(requestList,
|
table.insert(requestList,
|
||||||
function()
|
function()
|
||||||
this.LogTime(#requestList + 1)
|
this.LogTime(#requestList + 1)
|
||||||
|
|
@ -900,11 +907,11 @@ function this.ExecuteLoading()
|
||||||
return "InitPrivilegeCard"
|
return "InitPrivilegeCard"
|
||||||
end) -- 特权卡
|
end) -- 特权卡
|
||||||
--table.insert(requestList,
|
--table.insert(requestList,
|
||||||
--function()
|
--function()
|
||||||
--this.LogTime(#requestList + 1)
|
--this.LogTime(#requestList + 1)
|
||||||
--ChaosManager.SetCampWarState(LoadingPanel.OnStep)
|
--ChaosManager.SetCampWarState(LoadingPanel.OnStep)
|
||||||
--return "SetCampWarState"
|
--return "SetCampWarState"
|
||||||
--end) -- 混乱之治状态
|
--end) -- 混乱之治状态
|
||||||
table.insert(requestList,
|
table.insert(requestList,
|
||||||
function()
|
function()
|
||||||
this.LogTime(#requestList + 1)
|
this.LogTime(#requestList + 1)
|
||||||
|
|
@ -928,10 +935,10 @@ function this.ExecuteLoading()
|
||||||
this.LogTime(#requestList + 1)
|
this.LogTime(#requestList + 1)
|
||||||
PowerCenterManager.GetPowerCenterInfo(LoadingPanel.OnStep)
|
PowerCenterManager.GetPowerCenterInfo(LoadingPanel.OnStep)
|
||||||
return "GetPowerCenterInfo"
|
return "GetPowerCenterInfo"
|
||||||
end) -- 异能中心
|
end) -- 异能中心
|
||||||
|
|
||||||
table.insert(requestList,
|
table.insert(requestList,
|
||||||
function() -- 登录请求最终接口,所有请求放在此接口之前
|
function() -- 登录请求最终接口,所有请求放在此接口之前
|
||||||
if AppConst.isGuide then
|
if AppConst.isGuide then
|
||||||
if GuideManager.GetCurId(GuideType.Force) == 1 and PlayerManager.nickName == tostring(PlayerManager.uid) then
|
if GuideManager.GetCurId(GuideType.Force) == 1 and PlayerManager.nickName == tostring(PlayerManager.uid) then
|
||||||
--创号阶段先进入剧情对话,进入假战斗,然后对话起名,最后进入主界面
|
--创号阶段先进入剧情对话,进入假战斗,然后对话起名,最后进入主界面
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue