Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/Platform/QDHYKBManager.cs

@@ -112,16 +112,17 @@ namespace GFGGame
 
         public override void OnLoginFailed(int code, string message)
         {
-            //instance.ShowText.text = "code:" + code + " -message:" + message;
             Log.Debug($"OnLoginFailed code: " + code + " - message:" + message);
-            //PromptController.Instance.ShowFloatTextPrompt(message);
+            if (code == 2003)
+            {
+                ViewManager.Hide<ModalStatusView>();
+                return;
+            }
             EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_LOGINED, null);
         }
 
         public override void OnLoginSucceed(HykbUser user)
         {
-            //instance.ShowText.text = "" + user.getNick();
-
             Log.Debug("OnLoginSucceed");
             EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_LOGINED, user.getUserId());
         }

GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -125,6 +125,7 @@ namespace GFGGame
             var success = (bool)context.data;
             Debug.Log($"InitPlatform success {success}");
             _ui.m_btnTapLogin.visible = QDManager.IsTaptap;
+            _ui.m_btnStart.visible = !QDManager.IsTaptap;
             if (success)
             {
                 //尝试自动登录
@@ -144,7 +145,14 @@ namespace GFGGame
             if(!string.IsNullOrEmpty(account))
             {
                 _ui.m_btnTapLogin.visible = false;
-                LoginController.LoginTest(account).Coroutine();
+                if(QDManager.IsHYKB)
+                {
+                    Timers.inst.Add(1, 1, (a) => { LoginController.LoginTest(account).Coroutine(); });
+                }
+                else
+                {
+                    LoginController.LoginTest(account).Coroutine();
+                }
             }
             else
             {

GameClient/Assets/StreamingAssets/Bundles/Manifest

@@ -1 +1 @@
-{"version":1,"appVersion":"1.4","bundles":[{"id":0,"name":"privacypolicy","assets":["Assets/ResIn/Txt/privacyPolicy.txt"],"size":9314,"crc":65622739,"nameWithAppendHash":"privacypolicy_e619923224a05b27c6edbab55b2afbf7","dependencies":[]},{"id":1,"name":"privacypolicychildren","assets":["Assets/ResIn/Txt/privacyPolicyChildren.txt"],"size":12857,"crc":2147024475,"nameWithAppendHash":"privacypolicychildren_4b4c084ab06cd5a3370e845b1479a003","dependencies":[]},{"id":2,"name":"serviceprotocal","assets":["Assets/ResIn/Txt/serviceProtocal.txt"],"size":14562,"crc":952260727,"nameWithAppendHash":"serviceprotocal_c45e9bb36af2e000bbfa833337c6c345","dependencies":[]}]}
+{"version":3,"appVersion":"1.6","bundles":[{"id":0,"name":"privacypolicy","assets":["Assets/ResIn/Txt/privacyPolicy.txt"],"size":9314,"crc":65622739,"nameWithAppendHash":"privacypolicy_e619923224a05b27c6edbab55b2afbf7","dependencies":[]},{"id":1,"name":"privacypolicychildren","assets":["Assets/ResIn/Txt/privacyPolicyChildren.txt"],"size":12857,"crc":2147024475,"nameWithAppendHash":"privacypolicychildren_4b4c084ab06cd5a3370e845b1479a003","dependencies":[]},{"id":2,"name":"serviceprotocal","assets":["Assets/ResIn/Txt/serviceProtocal.txt"],"size":14562,"crc":952260727,"nameWithAppendHash":"serviceprotocal_c45e9bb36af2e000bbfa833337c6c345","dependencies":[]}]}

GameClient/Assets/StreamingAssets/Bundles/Manifest.version

@@ -1 +1 @@
-{"crc":2604006040,"size":664,"version":1,"appVersion":"1.4"}
+{"crc":2491647443,"size":664,"version":3,"appVersion":"1.6"}