Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

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

@@ -94,16 +94,24 @@ namespace GFGGame
             {
                 void UpdateDialogPicAlpha(object param)
                 {
-                    Color c = spr.color;
-                    if (spr.enabled && c.a < 1f)
+                    if(spr != null)
                     {
-                        c.a += 0.05f;
-                        spr.color = c;
+                        Color c = spr.color;
+                        if (spr.enabled && c.a < 1f)
+                        {
+                            c.a += 0.05f;
+                            spr.color = c;
+                        }
+                        else
+                        {
+                            FairyGUI.Timers.inst.Remove(UpdateDialogPicAlpha);
+                        }
                     }
                     else
                     {
                         FairyGUI.Timers.inst.Remove(UpdateDialogPicAlpha);
                     }
+                    
                 }
                 var resPath = ResPathUtil.GetNpcPicSPath(value);
                 Sprite sp = GFGAsset.Load<Sprite>(resPath);

GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

@@ -1,6 +1,7 @@
 using UI.CommonGame;
 using FairyGUI;
 using UnityEngine;
+using static UnityEditor.Progress;
 
 
 namespace GFGGame
@@ -52,13 +53,17 @@ namespace GFGGame
             {
                 _wrapper.wrapTarget = null;
             }
-            Timers.inst.CallLater((object param) =>
+            if(this.viewCom != null && this.viewCom.root == null)
             {
-                GetSuitItemController.TryShow(0);
-            });
-            GuideController.HideGuide();
-            GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_VIEW_FIRST);
-            GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_VIEW_FULL);
+
+                Timers.inst.CallLater((object param) =>
+                {
+                    GetSuitItemController.TryShow(0);
+                });
+                GuideController.HideGuide();
+                GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_VIEW_FIRST);
+                GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_VIEW_FULL);
+            }
         }
 
         private void OnClickBg()