引导跳转间隙屏幕不可点击

GameClient/Assets/Game/HotUpdate/Constant/ConstGuideId.cs

@@ -7,6 +7,7 @@ namespace GFGGame
         public const string SINGLE_FIGHT = "SINGLE_FIGHT";
         public const string BUY_CLOTHING = "BUY_CLOTHING";
         public const string TARGET_FIGHT = "TARGET_FIGHT";
+        public const string FIGHT_TIPS = "FIGHT_TIPS";
         public const string LUCKY_BOX = "LUCKY_BOX";
         public const string FREEDOM_DRESS = "FREEDOM_DRESS";
         public const string CLOTHING_DECOMPOSE = "CLOTHING_DECOMPOSE";

GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -139,6 +139,7 @@ namespace GFGGame
             HideGuide();
             if (GuideDataManager.TryCompleteGuideIndex(guideId, index))
             {
+                GRoot.inst.touchable = false;
                 return true;
             }
             return false;
@@ -153,6 +154,7 @@ namespace GFGGame
             result = await GuideDataManager.TryCompleteGuide(cfg.id);
             if (result)
             {
+                GRoot.inst.touchable = true;
                 GuideDataManager.currentGuideId = 0;
                 HideGuide();
             }

GameClient/Assets/Game/HotUpdate/Data/GuideDataManager.cs

@@ -1,16 +1,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using ET;
+using FairyGUI;
 
 namespace GFGGame
 {
 
     public class GuideDataManager
     {
-        // //public static int currentGuideId;
-        // private static Dictionary<int, GuideData> _dataDic = new Dictionary<int, GuideData>();
-        // //本次登录引导的id缓存
-        // private static Dictionary<int, bool> _guideDicAtThisLogin = new Dictionary<int, bool>();
 
         private static Dictionary<int, Dictionary<int, int>> _guideDicIndex = new Dictionary<int, Dictionary<int, int>>();
         public static int _currentGuideId;
@@ -29,22 +26,6 @@ namespace GFGGame
             }
         }
 
-
-
-        // public static void InitServerData(List<GuideData> list)
-        // {
-        //     currentGuideId = 0;
-        //     _dataDic.Clear();
-        //     _guideDicAtThisLogin.Clear();
-        //     if (list != null)
-        //     {
-        //         foreach (GuideData data in list)
-        //         {
-        //             _dataDic.Add(data.guideId, data);
-        //         }
-        //     }
-        // }
-
         public static async ETTask<bool> TryCompleteGuide(int guideId)
         {
             if (GameGlobal.skipGuide)
@@ -54,22 +35,13 @@ namespace GFGGame
             if (currentGuideId == guideId)
             {
                 LogServerHelper.SendNodeLog(GuideDataManager.currentGuideId * 100 + 2);
-
-                return await StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + guideId, 1);
+                bool result = await StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + guideId, 1);
+                return result;
             }
             return false;
         }
 
 
-        // public static bool CheckGuideIsCompletedAtThisLogin(int guideId)
-        // {
-        //     if (_guideDicAtThisLogin.ContainsKey(guideId))
-        //     {
-        //         return _guideDicAtThisLogin[guideId];
-        //     }
-        //     return false;
-        // }
-
         public static int _currentGuideIdIndex;
 
         public static int currentGuideIdIndex

GameClient/Assets/Game/HotUpdate/Data/RoleDataManager.cs

@@ -105,6 +105,7 @@ namespace GFGGame
         }
         private static void CheckUpLv(object param)
         {
+            if (GuideDataManager.currentGuideId > 0) return;
             if (ViewManager.isViewOpen(typeof(FunctionOpenView).Name)) return;//等功能开启展示完成后在展示角色升级
             // if (ViewManager.isViewOpen(typeof(GuideView).Name)) return;
             if (GRoot.inst.GetTopWindow() == null)

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -988,7 +988,9 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.BUY_CLOTHING, 7, "点击换上吧", buyClothingIdIndex, true, 170);
             GuideController.TryCompleteGuide(ConstGuideId.BUY_CLOTHING, 7);
 
-            GuideController.TryGuide(_ui.m_btnHint, ConstGuideId.TARGET_FIGHT, 1, "这次换装需要获得别人的认可呢");
+            GuideController.TryGuide(_ui.m_btnHint, ConstGuideId.FIGHT_TIPS, 1, "这次换装需要获得别人的认可呢");
+            GuideController.TryCompleteGuide(ConstGuideId.FIGHT_TIPS, 1);
+
 
         }
     }

GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs

@@ -80,6 +80,10 @@ namespace GFGGame
             androidJavaObject.Call("scanFile", filePath, "已保存至相册"); //这里我们可以设置保存成功弹窗内容
 #endif
         }
-
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryCompleteGuide(ConstGuideId.PHOTOGRAPH, 3);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -95,8 +95,10 @@ namespace GFGGame
             _ui.m_rectFrameTemp.height = _ui.m_mask.target.height;
             _ui.m_rectFrameTemp.x = 0;
             _ui.m_rectFrameTemp.y = 0;
-
             _ui.m_rectFrameTemp.visible = showAni;
+
+            GRoot.inst.touchable = true;
+
             if (guideTarget != null)
             {
 

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

@@ -320,7 +320,7 @@ namespace GFGGame
         {
 
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX, 5, "点击将星星链接在一起", -1, true, (int)(this.viewCom.height - 150));
+            GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX, 5, "点击将星星全部链接在一起", -1, true, (int)(this.viewCom.height - 150));
             TryCompleteGuide();
         }
         protected override void TryCompleteGuide()

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -689,10 +689,10 @@ namespace GFGGame
 
             if (playStop)
             {
-                GuideController.TryGuide(_ui.m_comMineCircle.target, ConstGuideId.TARGET_FIGHT, 2, "这里可以观察双方的分数计算", -1, true, 0, -128f, -128f);
+                GuideController.TryGuide(_ui.m_comMineCircle.target, ConstGuideId.TARGET_FIGHT, 1, "这里可以观察双方的分数计算", -1, true, 0, -128f, -128f);
             }
-            GuideController.TryGuide(_ui.m_btnSkill0.target, ConstGuideId.TARGET_FIGHT, 3, "使用技能，可以增加胜出的几率哦，点击看看");
-            GuideController.TryCompleteGuide(ConstGuideId.TARGET_FIGHT, 3);
+            GuideController.TryGuide(_ui.m_btnSkill0.target, ConstGuideId.TARGET_FIGHT, 2, "使用技能，可以增加胜出的几率哦，点击看看");
+            GuideController.TryCompleteGuide(ConstGuideId.TARGET_FIGHT, 2);
 
         }
     }