服装店返回

FGUIProject/assets/LuckyBox/components/ComStar.xml

@@ -9,7 +9,11 @@
     <image id="n2_l5nz" name="n2" src="l5nzn" fileName="images/cj_xk_xx.png" xy="0,0" pivot="0.5,0.5">
       <gearDisplay controller="c1" pages="1"/>
     </image>
-    <graph id="n5_tt1q" name="holder" xy="38,38" size="1,1"/>
-    <graph id="n6_tt1q" name="holder1" xy="38,38" size="1,1"/>
+    <graph id="n5_tt1q" name="holder" xy="38,38" size="1,1">
+      <gearDisplay controller="c1" pages="0"/>
+    </graph>
+    <graph id="n6_tt1q" name="holder1" xy="38,38" size="1,1">
+      <gearDisplay controller="c1" pages="1"/>
+    </graph>
   </displayList>
 </component>

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -184,7 +184,8 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             this.Hide();
-            ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter);
+            // ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter);
+            ViewManager.GoBackFrom(ViewName.STORY_CHAPTER_VIEW);
         }
 
         private void OnClickBtnHome()
@@ -645,7 +646,7 @@ namespace GFGGame
             if (_fightCfg.needSuitId > 0)
             {
 
-                ViewManager.Show(ViewName.SUIT_GUIDE_VIEW, new object[] { _ui.m_compNeed.target.data, new object[] { ViewName.DRESS_UP_FIGHT_VIEW, this.viewData } });
+                ViewManager.Show(ViewName.SUIT_GUIDE_VIEW, new object[] { _ui.m_compNeed.target.data, new object[] { ViewName.DRESS_UP_FIGHT_VIEW, this.viewData } }, new object[] { ViewName.DRESS_UP_FIGHT_VIEW, this.viewData });
             }
             else
             {

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

@@ -13,6 +13,8 @@ namespace GFGGame
         private UI_LuckyBoxStarUI _ui;
         private List<GObject> comStars = new List<GObject>();
 
+        private GameObject[] _effectObjs;
+        private GoWrapper[] _wrappers;
 
         private GObject curComStar;//当前选中的星星
         private Vector2 lastPos;//鼠标的上一个位置，每颗星星初始时默认为Vector2.right;

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

@@ -63,8 +63,9 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            this.Hide();
-            ViewManager.Show(ViewName.MAINUI_VIEW);
+            // this.Hide();
+            // ViewManager.Show(ViewName.MAINUI_VIEW);
+            ViewManager.GoBackFrom(ViewName.STORY_CHAPTER_LIST_VIEW);
         }
 
         private void OnClickBtnHome()

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -165,8 +165,8 @@ namespace GFGGame
             Timers.inst.Add(effectTime, 1, (param) =>
             {
                 _ui.m_btnMain.m_holder1.visible = false;
-                this.Hide();
-                ViewManager.Show(ViewName.STORY_CHAPTER_LIST_VIEW);
+                // this.Hide();
+                ViewManager.Show(ViewName.STORY_CHAPTER_LIST_VIEW, null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
                 isOpen = false; ;
 
 

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -83,17 +83,18 @@ namespace GFGGame
                 {
                     view.Refresh();
                 }
-                if (goBackParams != null)
-                {
-                    _goBackDatas[viewName] = goBackParams;
-                }
-                else if (resetGobackParams)
+                if (resetGobackParams)
                 {
                     if (_goBackDatas.ContainsKey(viewName) == true)
                     {
                         _goBackDatas.Remove(viewName);
                     }
                 }
+                if (goBackParams != null)
+                {
+                    _goBackDatas[viewName] = goBackParams;
+                }
+                // else 
             }
 
         }