套装部件展示一次展示全部

FGUIProject/assets/CommonGame/GetSuitItemUI.xml

@@ -27,7 +27,7 @@
     <group id="n6_tu96" name="n6" xy="204,1391" size="672,166" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
-    <component id="n9_tu96" name="item" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,1712">
+    <component id="n9_tu96" name="item" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,1712" visible="false">
       <relation target="n6_tu96" sidePair="top-bottom"/>
     </component>
   </displayList>

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/GetSuitItemController.cs

@@ -6,6 +6,7 @@ namespace GFGGame
     {
         public static bool enable = true;
         private static List<int> _waitingToShowList = new List<int>();
+        private static List<int> _waitingToShowSuit = new List<int>();
 
         public static void AddItemId(int itemId)
         {
@@ -14,26 +15,35 @@ namespace GFGGame
                 return;
             }
             _waitingToShowList.Add(itemId);
+            int suitId = SuitCfgManager.Instance.GetItemSuitId(itemId);
+            if (_waitingToShowSuit.IndexOf(suitId) < 0)
+            {
+                _waitingToShowSuit.Add(suitId);
+            }
         }
 
         public static int TryShow(int itemId)
         {
+            int suitId = 0;
             if (itemId > 0)
             {
-                int index = _waitingToShowList.IndexOf(itemId);
+                // int index = _waitingToShowList.IndexOf(itemId);
+                suitId = SuitCfgManager.Instance.GetItemSuitId(itemId);
+
+                int index = _waitingToShowSuit.IndexOf(suitId);
                 if (index >= 0)
                 {
-                    _waitingToShowList.RemoveAt(index);
-                    ViewManager.Show(ViewName.GET_SUIT_ITEM_VIEW, itemId);
+                    _waitingToShowSuit.RemoveAt(index);
+                    ViewManager.Show(ViewName.GET_SUIT_ITEM_VIEW, suitId);
                 }
             }
-            else if (_waitingToShowList.Count > 0)
+            else if (_waitingToShowSuit.Count > 0)
             {
-                itemId = _waitingToShowList[0];
-                _waitingToShowList.RemoveAt(0);
-                ViewManager.Show(ViewName.GET_SUIT_ITEM_VIEW, itemId);
+                suitId = _waitingToShowSuit[0];
+                _waitingToShowSuit.RemoveAt(0);
+                ViewManager.Show(ViewName.GET_SUIT_ITEM_VIEW, suitId);
             }
-            return itemId;
+            return suitId;
         }
     }
 }

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

@@ -47,9 +47,9 @@ namespace GFGGame
         {
             base.OnShown();
             GRoot.inst.touchable = true;
-            int itemId = (int)viewData;
+            int suitId = (int)viewData;
             guideId = 0;
-            UpdateView(itemId);
+            UpdateView(suitId);
         }
 
         protected override void OnHide()
@@ -78,11 +78,11 @@ namespace GFGGame
 
         private void OnClickBg()
         {
-            int itemId = GetSuitItemController.TryShow(0);
-            if (itemId > 0)
+            int suitId = GetSuitItemController.TryShow(0);
+            if (suitId > 0)
             {
 
-                UpdateView(itemId);
+                UpdateView(suitId);
             }
             else
             {
@@ -110,15 +110,15 @@ namespace GFGGame
             GoodsItemTipsController.ShowItemTips(itemID);
         }
 
-        private void UpdateView(int itemId)
+        private void UpdateView(int suitId)
         {
             _ui.m_holderEffect.visible = true;
-            int count = 0;
+            int count = 0;//套装当前拥有的部件数量
             int totalCount = 1;
-            int suitId = 0;
+            // int suitId = 0;
             int[] itemIds = null;
-            DressUpMenuSuitDataManager.GetSuitProgressByItemId(itemId, out suitId, out count);
-            totalCount = SuitCfgManager.Instance.GetTotalCountOfOneSuit(suitId);
+            DressUpMenuSuitDataManager.GetSuitProgressBySuitId(suitId, out count, out totalCount);
+            // totalCount = SuitCfgManager.Instance.GetTotalCountOfOneSuit(suitId);
             itemIds = SuitCfgManager.Instance.GetSuitItems(suitId);
             if (suitId > 0)
             {
@@ -136,7 +136,7 @@ namespace GFGGame
             }
             _ui.m_probar.max = totalCount;
             _ui.m_probar.value = count;
-            UpdateItem(itemId);
+            // UpdateItem(itemId);
             if (_sceneObject != null)
             {
                 GameObject.Destroy(_sceneObject);

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

@@ -123,7 +123,7 @@ namespace GFGGame
                                 }
                                 else
                                 {
-                                    int itemId = GetSuitItemController.TryShow(0);
+                                    GetSuitItemController.TryShow(0);
                                 }
                             });
                         }

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

@@ -95,7 +95,7 @@ namespace GFGGame
                 }
                 else if (_type == (int)FirstGetCardViewType.CANNOT_JUMP)
                 {
-                    int itemId = GetSuitItemController.TryShow(0);
+                    GetSuitItemController.TryShow(0);
 
                 }
                 this.Hide();