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

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

@@ -54,18 +54,22 @@ namespace GFGGame
             _ui.m_t_open.Play();
             if (GetSuitItemController.isAuto)
             {
-                Timers.inst.Add(0.7f, 1, WaitAutoEnd);
+                Timers.inst.Add(1.2f, 1, WaitAutoEnd);
             }
         }
         private void OnClickBg()
         {
             if(!GetSuitItemController.isAuto)
             {
-                this.Hide();
                 if (count == totalCount)
                 {
                     ViewManager.Show<GetSuitItemVIew>(suitID);
                 }
+                else
+                {
+                    EventAgent.DispatchEvent(ConstMessage.LUCKY_BOX_ANIMATION_WAIT);
+                }
+                this.Hide();
             }
         }
 

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

@@ -41,16 +41,20 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            
             _ui.m_content.m_txtContent.text = "";
+
+            bool needScrollBottom = false;
             if (this.viewData is string)
             {
-                string stroyStartID = (string)this.viewData;
+                string storyStartID = (string)this.viewData;
                 _dialogListLookBack = new List<string>();
-                ShowNextStep(stroyStartID);
+                ShowNextStep(storyStartID);
             }
             else
             {
                 _dialogListLookBack = (List<string>)this.viewData;
+                needScrollBottom = true;
             }
 
             if (_dialogListLookBack != null)
@@ -63,6 +67,15 @@ namespace GFGGame
                 _ui.m_content.m_txtContent.text = content;
                 _ui.m_content.m_txtContent.height = _ui.m_content.m_txtContent.textHeight;
             }
+
+            if (needScrollBottom)
+            {
+                _ui.m_content.target.scrollPane.ScrollBottom();
+            }
+            else
+            {
+                _ui.m_content.target.scrollPane.ScrollTop();
+            }
         }
 
         protected override void OnHide()