Browse Source

套装合成未开启跳转到合成列表

zhaoyang 2 years ago
parent
commit
a11d0df7f9

+ 7 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs

@@ -47,8 +47,14 @@ namespace GFGGame
         protected override void OnShown()
         protected override void OnShown()
         {
         {
             base.OnShown();
             base.OnShown();
-
             _ui.m_listMenu.selectedIndex = 0;
             _ui.m_listMenu.selectedIndex = 0;
+
+            if (this.viewData != null)
+            {
+                int suitId = (int)this.viewData;
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+                _ui.m_listMenu.selectedIndex = suitCfg.syntheticType - 1;
+            }
             _ui.m_listMenu.GetChildAt(1).visible = false;
             _ui.m_listMenu.GetChildAt(1).visible = false;
             UpdateSuitList();
             UpdateSuitList();
             Timers.inst.AddUpdate(CheckGuide);
             Timers.inst.AddUpdate(CheckGuide);

+ 10 - 2
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -264,8 +264,16 @@ namespace GFGGame
                     int suitId = SuitCfgManager.Instance.GetItemSuitId(_itemId);
                     int suitId = SuitCfgManager.Instance.GetItemSuitId(_itemId);
                     if (suitId > 0)
                     if (suitId > 0)
                     {
                     {
-                        // this.Hide();
-                        isJump = ViewManager.Show(ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { suitId, _itemId }, _fromeViewDatas);
+                        SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+                        bool isPass = InstanceZonesDataManager.CheckLevelPass(suitCfg.syntheticStoryLevelId);
+                        if (suitCfg.syntheticStoryLevelId > 0 && !isPass)
+                        {
+                            isJump = ViewManager.Show(ViewName.SUIT_SYNTHETIC_LIST_VIEW, suitId, _fromeViewDatas);
+                        }
+                        else
+                        {
+                            isJump = ViewManager.Show(ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { suitId, _itemId }, _fromeViewDatas);
+                        }
 
 
                     }
                     }
                     break;
                     break;