Просмотр исходного кода

修复华容道套装进度显示层级的问题

leiyasi 1 год назад
Родитель
Сommit
dc77af7aae

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoEntryView.cs

@@ -24,6 +24,7 @@ namespace GFGGame
             viewCom = _ui.target;
             isfullScreen = true;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gf_pjxq_bj");
+            isReturnView = true;
 
             _ui.m_btnStart.onClick.Add(OnBtnStartClick);
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);

+ 11 - 12
GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoSuccessView.cs

@@ -35,7 +35,6 @@ namespace GFGGame
             clickBlankToClose = false;
 
             _ui.m_listReward.itemRenderer = RenderListRewardItem;
-            _ui.m_againCom.m_btnRestart.onClick.Add(OnClickBtnRestart);
             _ui.m_btnExit.onClick.Add(OnClickBtnExit);
         }
 
@@ -46,6 +45,7 @@ namespace GFGGame
             cfg = (HuarongRoadGame)viewData;
             itemDatas = ItemUtil.CreateItemDataList(cfg.bonusWinArr);
             InitReward();
+            Timers.inst.StartCoroutine(ShowSuitLater());
             //_ui.m_listReward.numItems = itemDatas.Count;
             //_ui.m_againCom.target.visible = (cfg.comsumeStartArr.Length > 0);
         }
@@ -53,7 +53,6 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            GetSuitItemController.TryShow(0);
         }
 
         protected override void AddEventListener()
@@ -68,7 +67,7 @@ namespace GFGGame
 
         private void RenderListRewardItem(int index, GObject obj)
         {
-            if(index >= itemDatas.Count)
+            if (index >= itemDatas.Count)
             {
                 return;
             }
@@ -81,18 +80,10 @@ namespace GFGGame
             (obj.data as ItemView).SetData(reward);
         }
 
-        private void OnClickBtnRestart()
-        {
-            // 消耗对应物品
-
-            ViewManager.Show<ActivityHuaRongDaoView>(cfg);
-            Hide();
-        }
-
         private void OnClickBtnExit()
         {
-            ViewManager.Hide<ActivityHuaRongDaoView>();
             Hide();
+            ViewManager.Hide<ActivityHuaRongDaoView>();
         }
 
         private void InitReward()
@@ -100,5 +91,13 @@ namespace GFGGame
             _ui.m_reward.data = new ItemView(_ui.m_reward);
             (_ui.m_reward.data as ItemView).SetData(itemDatas[0]);
         }
+
+        private IEnumerator ShowSuitLater()
+        {
+            GRoot.inst.touchable = false;
+            yield return new WaitForSeconds(0.25f);
+            GetSuitItemController.TryShow(0);
+            GRoot.inst.touchable = true;
+        }
     }
 }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoView.cs

@@ -307,12 +307,12 @@ namespace GFGGame
 
         private void MoveItem(Grid newGrid, int changeNum)
         {
-            for(int i = 0; i < _items.Count; i++)
+            for (int i = 0; i < _items.Count; i++)
             {
                 GObject obj = _items[i];
                 int num = (int)obj.data;
 
-                if(num == changeNum)
+                if (num == changeNum)
                 {
                     _ui.m_maskGlobal.visible = true;
                     obj.TweenMove(newGrid.pos, 0.1f).OnComplete(() =>