Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

GameClient/Assets/Game/HotUpdate/Controller/ErrorCodeController.cs

@@ -12,7 +12,7 @@ namespace GFGGame
                 case ET.ErrorCode.ERR_NetWorkError:
                     {
                         AlertSystem.Show("网络异常")
-                        .SetRightButton(true, "知道了", (object data) =>
+                        .SetRightButton(true, "稍后再试", (object data) =>
                         {
                             Application.Quit();
                         });
@@ -29,14 +29,17 @@ namespace GFGGame
                     break;
                 case ET.ErrorCode.Err_LoginCountFull:
                     {
-                        AlertSystem.Show("游戏已爆满，请稍后再试！")
-                              .SetLeftButton(true, "知道了");
+                        AlertSystem.Show("游戏已爆满！")
+                              .SetLeftButton(true, "稍后再试", (data) =>
+                              {
+                                  Application.Quit();
+                              });
                     }
                     break;
                 case ET.ErrorCode.Err_ServerMaintain:
                     {
-                        AlertSystem.Show("服务器维护中，请稍后再试！")
-                            .SetLeftButton(true, "知道了", (data) =>
+                        AlertSystem.Show("服务器维护中！")
+                            .SetLeftButton(true, "稍后再试", (data) =>
                             {
                                 Application.Quit();
                             });
@@ -46,9 +49,9 @@ namespace GFGGame
                     {
                         string promptStr = "您属于未成年人，已被纳入防沉迷系统。每日22时至次日8时，本游戏将无法为未成年人用户提供游戏服务。";
                         AlertSystem.Show(promptStr)
-                            .SetRightButton(true, "知道啦", (object data) =>
+                            .SetRightButton(true, "稍后再试", (object data) =>
                             {
-
+                                Application.Quit();
                             });
                     }
                     break;

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Account/A2C_DisconnectHandler.cs

@@ -1,4 +1,5 @@
 using GFGGame;
+using UnityEngine;
 
 namespace ET
 {
@@ -26,9 +27,9 @@ namespace ET
                     break;
                 case ErrorCode.Err_ServerMaintain:
                     Alert.Show("服务器维护中！")
-                        .SetLeftButton(true, "返回登录", (obj) =>
+                        .SetLeftButton(true, "稍后再试", (obj) =>
                         {
-                            GameController.QuitToLoginView(true);
+                            Application.Quit();
                         });
                     break;
                 default: