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

GameClient/Assets/Game/HotUpdate/Data/StoryDialogDataManager.cs

@@ -8,8 +8,10 @@ namespace GFGGame
     {
         public void Clear()
         {
-            _waitPicFade = false;
-            _waitBgChange = false;
+            _waitPicFade = false;          // 等待立绘加载
+            _waitBgChange = false;         // 等待背景更换
+            _dialogShowDelay = 0.0f;      // 对话延迟出现
+            _waiting = false;
         }
 
         private bool _waitPicFade = false;          // 等待立绘加载
@@ -21,9 +23,11 @@ namespace GFGGame
         public bool waitPicFade { get { return _waitPicFade; } set { _waitPicFade = value; } }
         public bool waitBgChange { get { return _waitBgChange; } set { _waitBgChange = value; } }
         public float dialogShowDelay { get { return _dialogShowDelay; } set { _dialogShowDelay = value; } }
-        
+
 
         public bool waiting { get { return _waiting; } set { _waiting = value; } }
+
+
     }
 }
 

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

@@ -22,6 +22,7 @@ namespace GFGGame
 
         public static void UpdateDialogBg(string value, GameObject sceneObj)
         {
+            StoryDialogDataManager.Instance.waitBgChange = false;
             Transform bg = sceneObj.transform.Find("Bg");
             Transform bgNext = sceneObj.transform.Find("BgNext");
             SpriteRenderer bgSpr = bg.GetComponent<SpriteRenderer>();
@@ -78,6 +79,7 @@ namespace GFGGame
 
         public static async void UpdateDialogPic(string value, GameObject sceneObj)
         {
+            StoryDialogDataManager.Instance.waitPicFade = false;
             Transform tf = sceneObj.transform.Find("Pic");
             SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
             if (value == "0")

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -153,6 +153,7 @@ namespace GFGGame
             }
 
             _ui.m_btnBack.visible = InstanceZonesDataManager.CheckLevelPass(100001001);
+            StoryDialogDataManager.Instance.Clear();
 
         }
 
@@ -356,6 +357,7 @@ namespace GFGGame
 
             while (StoryDialogDataManager.Instance.waitBgChange)
             {
+                //Debug.Log("等待背景转换");
                 yield return new WaitForEndOfFrame();
             }
 
@@ -640,6 +642,7 @@ namespace GFGGame
 
             while (StoryDialogDataManager.Instance.waitPicFade || StoryDialogDataManager.Instance.waiting)
             {
+                //Debug.Log("等待立绘/动画结束");
                 yield return new WaitForEndOfFrame();
             }