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

GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs

@@ -195,18 +195,21 @@ namespace GFGGame
                 AddAnimationObj(res, aniObjName, parentObj, sortingOrder);
                 Timers.inst.Add(0.03f, 1, (obj) =>
                 {
-                    Transform tf = parentObj.transform.Find(spritObjName);
-                    if (tf != null && tf.gameObject != null && tf.gameObject.activeInHierarchy)
+                    if(parentObj != null && parentObj.transform != null)
                     {
-                        var assetDisposer = tf.gameObject.GetComponent<AssetReleaser>();
-                        if (assetDisposer != null)
+                        Transform tf = parentObj.transform.Find(spritObjName);
+                        if (tf != null && tf.gameObject != null && tf.gameObject.activeInHierarchy)
                         {
-                            if (!string.IsNullOrEmpty(assetDisposer.resPath))
+                            var assetDisposer = tf.gameObject.GetComponent<AssetReleaser>();
+                            if (assetDisposer != null)
                             {
-                                string resPath = ResPathUtil.GetDressUpPath(res, ext);
-                                if (assetDisposer.resPath == resPath)
+                                if (!string.IsNullOrEmpty(assetDisposer.resPath))
                                 {
-                                    TryClearSpriteObj(parentObj, spritObjName);
+                                    string resPath = ResPathUtil.GetDressUpPath(res, ext);
+                                    if (assetDisposer.resPath == resPath)
+                                    {
+                                        TryClearSpriteObj(parentObj, spritObjName);
+                                    }
                                 }
                             }
                         }

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

@@ -24,6 +24,13 @@ namespace ET
                             GameController.QuitToLoginView(true);
                         });
                     break;
+                case ErrorCode.Err_ServerMaintain:
+                    Alert.Show("服务器维护中！")
+                        .SetLeftButton(true, "返回登录", (obj) =>
+                        {
+                            GameController.QuitToLoginView(true);
+                        });
+                    break;
                 default:
                     if (string.IsNullOrEmpty(message.Message))
                     {