|
@@ -5,6 +5,7 @@ using ET;
|
|
using TapTap.Bootstrap;
|
|
using TapTap.Bootstrap;
|
|
using System;
|
|
using System;
|
|
using TapTap.Common;
|
|
using TapTap.Common;
|
|
|
|
+using System.Threading.Tasks;
|
|
|
|
|
|
namespace GFGGame
|
|
namespace GFGGame
|
|
{
|
|
{
|
|
@@ -49,7 +50,7 @@ namespace GFGGame
|
|
_ui.m_btnStart.onClick.Add(OnClickBtnStart);
|
|
_ui.m_btnStart.onClick.Add(OnClickBtnStart);
|
|
_ui.m_btnLogout.onClick.Add(OnClickBtnLogout);
|
|
_ui.m_btnLogout.onClick.Add(OnClickBtnLogout);
|
|
_ui.m_btnAge.onClick.Add(OnClickBtnAge);
|
|
_ui.m_btnAge.onClick.Add(OnClickBtnAge);
|
|
- _ui.m_btnTapLogin.onClick.Add(OnClickBtnTabLogin);
|
|
|
|
|
|
+ _ui.m_btnTapLogin.onClick.Add(OnClickBtnStart);
|
|
|
|
|
|
_ui.m_imgLogo.visible = LauncherConfig.netType != LauncherConfig.EnumNetType.TEMP;
|
|
_ui.m_imgLogo.visible = LauncherConfig.netType != LauncherConfig.EnumNetType.TEMP;
|
|
|
|
|
|
@@ -62,6 +63,8 @@ namespace GFGGame
|
|
base.AddEventListener();
|
|
base.AddEventListener();
|
|
EventAgent.AddEventListener(ConstMessage.SERVER_CHANGE, OnSeverChangeListener);
|
|
EventAgent.AddEventListener(ConstMessage.SERVER_CHANGE, OnSeverChangeListener);
|
|
EventAgent.AddEventListener(ConstMessage.LOGIN_SUCCESS, OnLoginSuccess);
|
|
EventAgent.AddEventListener(ConstMessage.LOGIN_SUCCESS, OnLoginSuccess);
|
|
|
|
+ EventAgent.AddEventListener(ConstMessage.ON_PLATFORM_SDK_INITED, OnPlatformInitet);
|
|
|
|
+ EventAgent.AddEventListener(ConstMessage.ON_PLATFORM_SDK_LOGINED, OnPlatformLogined);
|
|
}
|
|
}
|
|
protected override void OnShown()
|
|
protected override void OnShown()
|
|
{
|
|
{
|
|
@@ -78,8 +81,9 @@ namespace GFGGame
|
|
_ui.m_btnStart.visible = false;
|
|
_ui.m_btnStart.visible = false;
|
|
_ui.m_btnTapLogin.visible = false;
|
|
_ui.m_btnTapLogin.visible = false;
|
|
_ui.m_btnLogout.visible = false;
|
|
_ui.m_btnLogout.visible = false;
|
|
- InitLoginStatus(serverInfosComponent).Coroutine();
|
|
|
|
|
|
|
|
|
|
+ //初始化平台配置
|
|
|
|
+ QDManager.InitPlatform();
|
|
}
|
|
}
|
|
|
|
|
|
protected override void OnHide()
|
|
protected override void OnHide()
|
|
@@ -97,34 +101,8 @@ namespace GFGGame
|
|
base.RemoveEventListener();
|
|
base.RemoveEventListener();
|
|
EventAgent.RemoveEventListener(ConstMessage.SERVER_CHANGE, OnSeverChangeListener);
|
|
EventAgent.RemoveEventListener(ConstMessage.SERVER_CHANGE, OnSeverChangeListener);
|
|
EventAgent.RemoveEventListener(ConstMessage.LOGIN_SUCCESS, OnLoginSuccess);
|
|
EventAgent.RemoveEventListener(ConstMessage.LOGIN_SUCCESS, OnLoginSuccess);
|
|
- }
|
|
|
|
- private async ETTask InitLoginStatus(ServerInfosComponent serverInfosComponent)
|
|
|
|
- {
|
|
|
|
- if (PlatformManager.IsTaptap)//taptap平台
|
|
|
|
- {
|
|
|
|
- var success = await PlatformTapManager.Instance.LoginCache();
|
|
|
|
- _ui.m_btnTapLogin.visible = !success;
|
|
|
|
- }
|
|
|
|
- else//自有登录
|
|
|
|
- {
|
|
|
|
- _ui.m_btnStart.visible = true;
|
|
|
|
- //尝试自动登录
|
|
|
|
- if (serverInfosComponent.ServerInfoList.Count <= 0)
|
|
|
|
- {
|
|
|
|
- OnClickBtnStart();
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- private void OnClickBtnTabLogin()
|
|
|
|
- {
|
|
|
|
- OnClickBtnTabLoginAsync().Coroutine();
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- private async ETTask OnClickBtnTabLoginAsync()
|
|
|
|
- {
|
|
|
|
- var success = await PlatformTapManager.Instance.Login();
|
|
|
|
- _ui.m_btnTapLogin.visible = !success;
|
|
|
|
|
|
+ EventAgent.RemoveEventListener(ConstMessage.ON_PLATFORM_SDK_INITED, OnPlatformInitet);
|
|
|
|
+ EventAgent.RemoveEventListener(ConstMessage.ON_PLATFORM_SDK_LOGINED, OnPlatformLogined);
|
|
}
|
|
}
|
|
|
|
|
|
private void UpdateServer(ServerInfo info)
|
|
private void UpdateServer(ServerInfo info)
|
|
@@ -141,6 +119,47 @@ namespace GFGGame
|
|
LogServerHelperHttp.SendNodeLog((int)LogNode.ShowSelectServer);
|
|
LogServerHelperHttp.SendNodeLog((int)LogNode.ShowSelectServer);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ private void OnPlatformInitet(EventContext context)
|
|
|
|
+ {
|
|
|
|
+ var success = (bool)context.data;
|
|
|
|
+ Debug.Log($"InitPlatform success {success}");
|
|
|
|
+ if (success)
|
|
|
|
+ {
|
|
|
|
+ _ui.m_btnStart.visible = !QDManager.IsTaptap;
|
|
|
|
+ //尝试自动登录
|
|
|
|
+ OnClickBtnStart();
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ ViewManager.Hide<ModalStatusView>();
|
|
|
|
+ AlertSystem.Show("初始化平台sdk失败!")
|
|
|
|
+ .SetRightButton(true, "重试", (t) => { QDManager.InitPlatform(); });
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private void OnPlatformLogined(EventContext context)
|
|
|
|
+ {
|
|
|
|
+ var account = (string)context.data;
|
|
|
|
+ if(!string.IsNullOrEmpty(account))
|
|
|
|
+ {
|
|
|
|
+ if(QDManager.IsHYKB)
|
|
|
|
+ {
|
|
|
|
+ Timers.inst.Add(1, 1, (a) => { LoginController.LoginTest(account).Coroutine(); });
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ LoginController.LoginTest(account).Coroutine();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ ViewManager.Hide<ModalStatusView>();
|
|
|
|
+ AlertSystem.Show("sdk登录失败!")
|
|
|
|
+ .SetRightButton(true, "重试", (t) => { QDHYKBManager.Instance.Login(); });
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
private void OnLoginSuccess(EventContext context)
|
|
private void OnLoginSuccess(EventContext context)
|
|
{
|
|
{
|
|
_ui.m_btnLogout.visible = true;
|
|
_ui.m_btnLogout.visible = true;
|
|
@@ -169,14 +188,18 @@ namespace GFGGame
|
|
|
|
|
|
private void OnClickBtnStart()
|
|
private void OnClickBtnStart()
|
|
{
|
|
{
|
|
- if (PlatformManager.IsTaptap)//taptap平台
|
|
|
|
|
|
+ var serverInfosComponent = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>();
|
|
|
|
+ if (serverInfosComponent.ServerInfoList.Count <= 0)
|
|
{
|
|
{
|
|
- LoginController.GetRoles().Coroutine();
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- var serverInfosComponent = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>();
|
|
|
|
- if (serverInfosComponent.ServerInfoList.Count <= 0)
|
|
|
|
|
|
+ if (QDManager.IsTaptap)
|
|
|
|
+ {
|
|
|
|
+ OnClickBtnTabLoginAsync().Wait();
|
|
|
|
+ }
|
|
|
|
+ else if (QDManager.IsHYKB)
|
|
|
|
+ {
|
|
|
|
+ QDHYKBManager.Instance.Login();
|
|
|
|
+ }
|
|
|
|
+ else
|
|
{
|
|
{
|
|
bool login = GameController.CheckLoginCache(true);
|
|
bool login = GameController.CheckLoginCache(true);
|
|
if (!login)
|
|
if (!login)
|
|
@@ -184,11 +207,17 @@ namespace GFGGame
|
|
ViewManager.Show<LoginInputView>();
|
|
ViewManager.Show<LoginInputView>();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- else
|
|
|
|
- {
|
|
|
|
- LoginController.GetRoles().Coroutine();
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ LoginController.GetRoles().Coroutine();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private async Task OnClickBtnTabLoginAsync()
|
|
|
|
+ {
|
|
|
|
+ var success = await QDTapTapManager.Instance.Login();
|
|
|
|
+ _ui.m_btnTapLogin.visible = !success;
|
|
}
|
|
}
|
|
|
|
|
|
private void OnClickBtnLogout()
|
|
private void OnClickBtnLogout()
|