zhaoyang 2 years ago
parent
commit
0acb963a83

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -65,10 +65,10 @@ namespace GFGGame
         private static GList targetList = null;
         public static bool TryGuide(GComponent target, string guideKey, int index, string guideStr = null, int listIndex = -1, bool checkPriorIndex = true, float yTxt = 0, bool justHint = false)
         {
-            // if (ViewManager.isViewOpen(typeof(RoleLvUpView).Name)) return false;
+
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(guideKey);
             if (GuideDataManager.currentGuideId != 0 && GuideDataManager.currentGuideId != cfg.id) return false;
-
+            GRoot.inst.touchable = false;
             bool isStoryLevelGuide = cfg.storyLevelId > 0;
             bool isFinishCurId = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_GUIDE + cfg.id) > 0;//当前引导未完成
             bool isFinishPriorId = cfg.priorId <= 0 || StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_GUIDE + cfg.priorId) > 0;//前置引导已完成
@@ -114,7 +114,7 @@ namespace GFGGame
                     }
                     else
                     {
-                        // GRoot.inst.touchable = true;
+                        GRoot.inst.touchable = true;
                         return false;
                     }
                 }
@@ -128,7 +128,7 @@ namespace GFGGame
                 }
                 return true;
             }
-            // GRoot.inst.touchable = true;
+            GRoot.inst.touchable = true;
             MainDataManager.Instance.CanSwipe = true;
 
             return false;

+ 0 - 2
GameClient/Assets/Game/HotUpdate/Data/LuckyBoxDataManager.cs

@@ -73,8 +73,6 @@ namespace GFGGame
             {
                 _dicShowList[boxId] = GetBonusDataList(luckyBoxCfg.bonusShowArr);
             }
-            // _showList = GetBonusDataList(luckyBoxCfg.bonusShowArr);
-
         }
         private List<LuckyBoxBonusData> GetBonusDataList(int[] idsList)
         {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -59,7 +59,7 @@ namespace GFGGame
             justHint = (bool)dataList[5];
 
 
-            // GRoot.inst.touchable = true;
+            GRoot.inst.touchable = true;
             MainDataManager.Instance.CanSwipe = false;
 
             UpdateComTxt(txtContent);