合成返回原界面

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

@@ -102,7 +102,7 @@ namespace GFGGame
             {
                 case ConstFunctionId.FU_ZHUANG_DIAN:
                     this.Hide();
-                    ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { null, null, _itemId }, null, false, true);
+                    ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { null, null, _itemId }, _fromeViewDatas, true, true);
                     break;
                 case ConstFunctionId.JU_QING_GUAN_QIA:
                     string value = infos[1];
@@ -122,7 +122,7 @@ namespace GFGGame
                     if (suitId > 0)
                     {
                         this.Hide();
-                        ViewManager.Show(ViewName.CLOTHING_SYNTHETIC_VIEW, suitId);
+                        ViewManager.Show(ViewName.CLOTHING_SYNTHETIC_VIEW, suitId, _fromeViewDatas);
                     }
                     break;
                 case ConstFunctionId.ZHAI_XING:

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/FieldGuideView.cs

@@ -8,8 +8,8 @@ namespace GFGGame
     public class FieldGuideView : BaseWindow
     {
         private UI_FieldGuideUI _ui;
-        private int[] _listBannerDatas = new int[3]{ConstBannerId.ZHAI_XING, ConstBannerId.ZHAI_XING, ConstBannerId.ZHAI_XING};
-        private int[] _listGuideDatas = new int[1]{ConstFieldGuideId.SUIT_GUIDE};
+        private int[] _listBannerDatas = new int[3] { ConstBannerId.ZHAI_XING, ConstBannerId.ZHAI_XING, ConstBannerId.ZHAI_XING };
+        private int[] _listGuideDatas = new int[1] { ConstFieldGuideId.SUIT_GUIDE };
 
         public override void Dispose()
         {
@@ -53,7 +53,8 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            this.Hide();
+            // this.Hide();
+            ViewManager.GoBackFrom(ViewName.FIELD_GUIDE_VIEW);
         }
 
         private void ListBannerItemRenderer(int index, GObject item)
@@ -66,7 +67,7 @@ namespace GFGGame
         private void OnClickBannerPic()
         {
             int id = _listBannerDatas[_ui.m_compBanner.m_listTab.selectedIndex];
-            switch(id)
+            switch (id)
             {
                 case ConstBannerId.ZHAI_XING:
                     ViewManager.Show(ViewName.LUCKY_BOX_VIEW);
@@ -92,17 +93,17 @@ namespace GFGGame
         {
             GObject listItem = context.data as GObject;
             int id = (int)listItem.data;
-            switch(id)
+            switch (id)
             {
                 case ConstFieldGuideId.SUIT_GUIDE:
-                    ViewManager.Show(ViewName.SUIT_GUIDE_VIEW);
-                break;
+                    ViewManager.Show(ViewName.SUIT_GUIDE_VIEW, null, new object[] { ViewName.FIELD_GUIDE_VIEW, this.viewData });
+                    break;
             }
         }
 
         private void GetGuideProgress(int id, out int haveCount, out int totalCount)
         {
-            switch(id)
+            switch (id)
             {
                 case ConstFieldGuideId.SUIT_GUIDE:
                     DressUpMenuSuitDataManager.GetTotalProgress(out haveCount, out totalCount);
@@ -117,14 +118,14 @@ namespace GFGGame
         private void UpdatePrgress()
         {
             int num = _ui.m_listGuide.numChildren;
-            for(int i = 0; i < num; i++)
+            for (int i = 0; i < num; i++)
             {
                 UI_CompGuideItem listItem = UI_CompGuideItem.Proxy(_ui.m_listGuide.GetChildAt(i));
                 int id = (int)listItem.target.data;
                 int haveCount = 0;
                 int totalCount = 1;
                 GetGuideProgress(id, out haveCount, out totalCount);
-                decimal value = Math.Floor((decimal)100*haveCount/totalCount);
+                decimal value = Math.Floor((decimal)100 * haveCount / totalCount);
                 listItem.m_txtProgress.text = value + "%";
             }
         }
@@ -133,10 +134,10 @@ namespace GFGGame
         {
             string resName = "tujian_huodtu_1";
             int id = (int)listItem.data;
-            switch(id)
+            switch (id)
             {
                 case ConstBannerId.ZHAI_XING:
-                resName = "tujian_huodtu_1";
+                    resName = "tujian_huodtu_1";
                     break;
             }
             _ui.m_compBanner.m_loaderPic.url = "ui://FieldGuide/" + resName;
@@ -146,10 +147,10 @@ namespace GFGGame
         private void UpdateListBannerItems()
         {
             int num = _ui.m_compBanner.m_listTab.numChildren;
-            for(int i = 0; i < num; i++)
+            for (int i = 0; i < num; i++)
             {
                 UI_ButtonBannerPage listItem = UI_ButtonBannerPage.Proxy(_ui.m_compBanner.m_listTab.GetChildAt(i));
-                if(listItem.target.selected)
+                if (listItem.target.selected)
                 {
                     listItem.target.width = 47;
                 }
@@ -165,7 +166,7 @@ namespace GFGGame
         {
             int index = _ui.m_compBanner.m_listTab.selectedIndex;
             index++;
-            if(index >= _listBannerDatas.Length)
+            if (index >= _listBannerDatas.Length)
             {
                 index = 0;
             }

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideView.cs

@@ -30,7 +30,7 @@ namespace GFGGame
             isfullScreen = true;
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);
-            
+
             _ui.m_listSuit.itemRenderer = ListSuitItemRenderer;
             _ui.m_listType.itemRenderer = ListTypeItemRenderer;
             _ui.m_comBoxSort.items = new string[] { "默认排序", "稀有度高", "稀有度低", "收集度高", "收集度低" };
@@ -74,7 +74,8 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            this.Hide();
+            // this.Hide();
+            ViewManager.GoBackFrom(ViewName.SUIT_GUIDE_VIEW);
         }
 
         private void OnClickBtnSwitch()
@@ -104,13 +105,13 @@ namespace GFGGame
         private void UpdateListType()
         {
             _ui.m_listType.RemoveChildrenToPool();
-            switch(_menuType)
+            switch (_menuType)
             {
                 case ConstSuitGuideTypeId.TYPE_1:
-                    _menuTypeDataArray = new int[]{0, 1, 2, 3, 4, 5};
+                    _menuTypeDataArray = new int[] { 0, 1, 2, 3, 4, 5 };
                     break;
                 default:
-                    _menuTypeDataArray = new int[]{6, 7, 8, 9, 10};
+                    _menuTypeDataArray = new int[] { 6, 7, 8, 9, 10 };
                     break;
             }
             _ui.m_listType.numItems = _menuTypeDataArray.Length;
@@ -148,11 +149,12 @@ namespace GFGGame
             listItem.m_txtName.text = suitCfg.name;
             listItem.m_loaderPic.url = ResPathUtil.GetFieldGuideIconPath(suitCfg.res);
             RarityIconController.UpdateRarityIcon(listItem.m_rarity, suitId, false, true);
-            
+
             listItem.target.data = suitId;
             UpdateSuitStatusView(listItem);
             listItem.m_loaderBonusBox.onClick.Clear();
-            listItem.m_loaderBonusBox.onClick.Add(() => {
+            listItem.m_loaderBonusBox.onClick.Add(() =>
+            {
                 SuitUtil.ShowSuitGuideBonus(suitId);
             });
         }
@@ -160,7 +162,7 @@ namespace GFGGame
         private void UpdateSuitStatus(EventContext eventContext)
         {
             int num = _ui.m_listSuit.numChildren;
-            for(int i = 0; i < num; i++)
+            for (int i = 0; i < num; i++)
             {
                 UI_CompSuitItem listItem = UI_CompSuitItem.Proxy(_ui.m_listSuit.GetChildAt(i));
                 UpdateSuitStatusView(listItem);
@@ -178,7 +180,7 @@ namespace GFGGame
             bool haveSuit = DressUpMenuSuitDataManager.CheckHaveSuit(suitId);
             listItem.m_imgLock.visible = listItem.m_imgLockBg.visible = !haveSuit;
             int status = DressUpMenuSuitDataManager.GetSuitGuideBonusStatus(suitId);
-            if(status == ConstBonusStatus.CAN_GET)
+            if (status == ConstBonusStatus.CAN_GET)
             {
                 listItem.m_loaderBonusBox.url = "ui://FieldGuide/tujian_lw_1";
             }
@@ -187,14 +189,15 @@ namespace GFGGame
                 listItem.m_loaderBonusBox.url = "ui://FieldGuide/tujian_lw_2";
             }
             listItem.m_bg.onClick.Clear();
-            listItem.m_bg.onClick.Add(() => {
+            listItem.m_bg.onClick.Add(() =>
+            {
                 if (haveSuit)
                 {
-                    ViewManager.Show(ViewName.SUIT_SHOW_VIEW, new object[] { _suitTypeId, suitId, _suitIds });
+                    ViewManager.Show(ViewName.SUIT_SHOW_VIEW, new object[] { _suitTypeId, suitId, _suitIds }, new object[] { ViewName.SUIT_SHOW_VIEW, this.viewData });
                 }
                 else
                 {
-                    ViewManager.Show(ViewName.SUIT_PARTS_DETAIL_VIEW, suitId);
+                    ViewManager.Show(ViewName.SUIT_PARTS_DETAIL_VIEW, suitId, new object[] { ViewName.SUIT_PARTS_DETAIL_VIEW, this.viewData });
                 }
             });
         }

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitPartsDetailView.cs

@@ -74,7 +74,7 @@ namespace GFGGame
             else
             {
                 this.Hide();
-                ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { ViewName.SUIT_PARTS_DETAIL_VIEW, this.viewData } });
+                ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { ViewName.SUIT_GUIDE_VIEW, this.viewData } });
             }
         }
     }