zhaoyang 3 éve
szülő
commit
031800728d

+ 11 - 13
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachOfItemView.cs

@@ -121,21 +121,21 @@ namespace GFGGame
                     object[] temp = viewData as object[];
                     int count = temp.Length > 2 ? (int)temp[2] : 0;
                     int shopId = int.Parse(infos[1]);
-                    ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { shopId, null, _itemId, count }, _fromeViewDatas, true, true);
+                    isJump = ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { shopId, null, _itemId, count }, _fromeViewDatas, true, true);
                     break;
                 case ConstFunctionId.FU_ZHUANG_DECOMPOSE:
                     this.Hide();
-                    ViewManager.Show<ClothingDecomposeView>(null, _fromeViewDatas);
+                    isJump = ViewManager.Show<ClothingDecomposeView>(null, _fromeViewDatas);
                     break;
                 case ConstFunctionId.SHOP_GIFT_BAG:
                     this.Hide();
                     int giftBagValue = int.Parse(infos[1]);
-                    ViewManager.Show<RechargeStoreView>(giftBagValue, _fromeViewDatas);
+                    isJump = ViewManager.Show<RechargeStoreView>(giftBagValue, _fromeViewDatas);
                     break;
                 case ConstFunctionId.SHOP_EXCHANGE:
                     this.Hide();
                     int exchangeValue = int.Parse(infos[1]);
-                    ViewManager.Show<RechargeStoreView>(exchangeValue, _fromeViewDatas);
+                    isJump = ViewManager.Show<RechargeStoreView>(exchangeValue, _fromeViewDatas);
                     break;
                 case ConstFunctionId.JU_QING_GUAN_QIA:
                     string value = infos[1];
@@ -159,9 +159,8 @@ namespace GFGGame
                             //从战斗换装必需品来源跳转到剧情界面,在剧情界面点返回后直接返回章节界面,无需返回换装界面
                             _fromeViewDatas = null;
                         }
-                        ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, levelCfg.chapterId, _fromeViewDatas, true);
+                        isJump = ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, levelCfg.chapterId, _fromeViewDatas, true);
                         InstanceZonesController.ShowLevelView(levelCfgId, StudioDataManager.Instance.OnFinishStoryLevel);
-                        isJump = true;
                     }
                     else if (levelCfg.type == ConstInstanceZonesType.Studio)
                     {
@@ -220,13 +219,13 @@ namespace GFGGame
                     if (suitId > 0)
                     {
                         this.Hide();
-                        ViewManager.Show(ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { suitId, _itemId }, _fromeViewDatas);
-                        isJump = true;
+                        isJump = ViewManager.Show(ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { suitId, _itemId }, _fromeViewDatas);
+
                     }
                     break;
                 case ConstFunctionId.ZHAI_XING:
                     this.Hide();
-                    ViewManager.Show(ViewName.LUCKY_BOX_VIEW, null, _fromeViewDatas);
+                    isJump = ViewManager.Show(ViewName.LUCKY_BOX_VIEW, null, _fromeViewDatas, true);
                     break;
                 case ConstFunctionId.TAO_ZHUANG_TU_JIAN:
                     isJump = false;
@@ -237,17 +236,16 @@ namespace GFGGame
                         return;
                     }
                     this.Hide();
-                    ViewManager.Show(ViewName.SUIT_GUIDE_VIEW, null, _fromeViewDatas);
-                    isJump = true;
+                    isJump = ViewManager.Show(ViewName.SUIT_GUIDE_VIEW, null, _fromeViewDatas);
 
                     break;
                 case ConstFunctionId.TAO_ZHUANG_HE_CHENG:
                     this.Hide();
-                    ViewManager.Show(ViewName.SUIT_SYNTHETIC_LIST_VIEW);
+                    isJump = ViewManager.Show(ViewName.SUIT_SYNTHETIC_LIST_VIEW);
                     break;
                 case ConstFunctionId.SUIT_FOSTER:
                     this.Hide();
-                    ViewManager.Show<SuitListView>(null, _fromeViewDatas);
+                    isJump = ViewManager.Show<SuitListView>(null, _fromeViewDatas);
                     break;
             }
             if (isJump)

+ 3 - 2
GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -95,12 +95,12 @@ namespace GFGGame
         /// <param name="viewData">Ҫ���ݸ���ͼ�IJ���</param>
         /// <param name="goBackParams">�Ӹ���ͼ���ص���ͼ��Ϣ</param>
         /// <param name="hideOthers">�Ƿ�ر�������ͼ</param>
-        public static void Show(string viewName, object viewData = null, object[] goBackParams = null, bool hideOthers = false, bool resetGobackParams = false)
+        public static bool Show(string viewName, object viewData = null, object[] goBackParams = null, bool hideOthers = false, bool resetGobackParams = false)
         {
             string name = GetName(viewName);
             if (!GameGlobal.skipCheckOpen && !FunctionOpenDataManager.Instance.CheckIsFunOpenById(name))
             {
-                return;
+                return false;
             }
             if (hideOthers)
             {
@@ -143,6 +143,7 @@ namespace GFGGame
                 Debug.Log("当前打开" + name);
 
             }
+            return true;
 
         }
 

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes