摘星展示流程补充修改

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckBoxBonusShowUI.cs

@@ -24,7 +24,7 @@ namespace UI.LuckyBox
         public UI_LuckyBoxBonusShowItem m_item8;
         public UI_LuckyBoxBonusShowItem m_item9;
         public GButton m_BtnPass;
-        public GGraph m_touchFlipOpen;
+        public GLoader m_touchFlipOpen;
         public Transition m_t0;
         public Transition m_t1;
         public const string URL = "ui://drx9d1use050tf3";
@@ -91,7 +91,7 @@ namespace UI.LuckyBox
             m_item8 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item8"));
             m_item9 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item9"));
             m_BtnPass = (GButton)comp.GetChild("BtnPass");
-            m_touchFlipOpen = (GGraph)comp.GetChild("touchFlipOpen");
+            m_touchFlipOpen = (GLoader)comp.GetChild("touchFlipOpen");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
         }

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

@@ -104,8 +104,16 @@ namespace GFGGame
 
         protected void ReferNextShow()
         {
-            if (_chooseIndex != -1)
+            if (_chooseIndex != -1 && GetSuitItemController.GetSuitWaitingToId(_itemIdList[_chooseIndex]))
                 ClickItem(_chooseIndex);
+            else {
+                if (_handClick)
+                {
+                    _handClick = false;
+                    Timers.inst.Remove(UpClickDataTime);
+                    _ui.m_touchFlipOpen.touchable = false;
+                }
+            }
         }
 
         protected override void OnShown()
@@ -248,11 +256,9 @@ namespace GFGGame
                     item.m_comIcon.m_t0.Play();
 
                     if (!item.m_comIcon.m_imgNew.visible) {
-                        if (_handClick)
-                            _ui.m_touchFlipOpen.touchable = false;
                         _recordOpenIndex.Add(index);
                     }
-                    else if (_countNewRecord < 1)
+                    else if (_countNewRecord < 1) 
                         _countNewRecord += 1;
 
                     return;
@@ -279,6 +285,13 @@ namespace GFGGame
                             _recordOpenIndex.Add(index);
                             _countShow = 0;
                             _countNewRecord = 0;
+
+                            if (_handClick)
+                            {
+                                _handClick = false;
+                                Timers.inst.Remove(UpClickDataTime);
+                                _ui.m_touchFlipOpen.touchable = false;
+                            }
                         }
                     }
                     else
@@ -292,12 +305,6 @@ namespace GFGGame
                     }
                 }
                 UI_LuckyBoxBonusShowItem.ProxyEnd();
-
-                if (_handClick)
-                {
-                    _ui.m_touchFlipOpen.touchable = false;
-                    Timers.inst.Remove(UpClickDataTime);
-                }
             }
             else{
                 GoodsItemTipsController.ShowItemTips(_itemIdList[index]);
@@ -341,7 +348,7 @@ namespace GFGGame
 
                     if (!open)
                     {
-                        _chooseIndex = index;
+                        _chooseIndex = -1;
                         ClickItem(index);
                     }
                 }
@@ -359,8 +366,8 @@ namespace GFGGame
         {
             if (_recordOpenIndex.Count >= _rewardList.Count) {
                 Timers.inst.Remove(UpDataTime);
-                _ui.m_touchFlipOpen.touchable = false;
                 HideOtherShowWindow();
+                _ui.m_touchFlipOpen.touchable = false;
             }
 
             for (int i = 0; i < _rewardList.Count; i++)
@@ -378,8 +385,8 @@ namespace GFGGame
             if (_recordOpenIndex.Contains(index))
             {
                 Timers.inst.Remove(UpClickDataTime);
-                _ui.m_touchFlipOpen.touchable = false;
                 HideOtherShowWindow();
+                _ui.m_touchFlipOpen.touchable = false;
             }
             else
                 ClickItem(index);