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

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -90,7 +90,7 @@ namespace GFGGame
         }
         private void OnBtnBackClick()
         {
-            ViewManager.GoBackFrom(typeof(ActivityThemeLuckyBoxView).FullName);
+            Hide();
         }
 
         private void OnBtnTaskClick()
@@ -106,7 +106,7 @@ namespace GFGGame
             long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
             long curTime = TimeHelper.ServerNow();
             if (endTime < curTime) return;
-            ViewManager.Show<LuckyBoxActivityView>(_activityId, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, this.viewData }, true);
+            ViewManager.Show<LuckyBoxActivityView>(_activityId, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, this.viewData });
         }
 
         private void OnBtnShopClick()

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs

@@ -156,7 +156,7 @@ namespace GFGGame
                     _dressUpObjUIs.Add(dressUpObjUI);
                 }
                 DressUpObjUI _dressUpObjUI = item.m_holder.data as DressUpObjUI;
-                _dressUpObjUI.ResetSceneObj(100, false, true, null, false);
+                _dressUpObjUI.ResetSceneObj(120, false, true, null, false);
                     _dressUpObjUI.dressUpObj.PutOnSuitCfg(vipCfg.suitId, true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
                 _dressUpObjUI.UpdateWrapper(item.m_holder);
             }

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -293,7 +293,7 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(typeof(LuckyBoxActivityView).FullName);
+            Hide();
         }
 
         private void UpdateRedDot()

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

@@ -178,9 +178,6 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            //this.Hide();
-            //ViewManager.GoBackFrom(typeof(StoryDialogView).FullName);
-            //ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StoryChapterView).FullName), true);
             Over(false);
         }