فهرست منبع

屏蔽废弃引导

zhaoyang 2 سال پیش
والد
کامیت
d2fbcc3c69

+ 28 - 17
GameClient/Assets/Game/HotUpdate/Constant/ConstGuideId.cs

@@ -4,28 +4,39 @@ namespace GFGGame
     {
 
         // public const string START_STORY = "START_STORY";
-        public const string SINGLE_FIGHT = "SINGLE_FIGHT";
+        // public const string SINGLE_FIGHT = "SINGLE_FIGHT";
+        // public const string FIGHT_TIPS = "FIGHT_TIPS";
+
+
+        // public const string UP_CARD_STAR = "UP_CARD_STAR";
+        // public const string PHOTOGRAPH = "PHOTOGRAPH";
+        // public const string FIRST_FIGHT_FAILED = "FIRST_FIGHT_FAILED";
+        // public const string FIRST_FIGHT_SINGLE_WIN = "FIRST_FIGHT_SINGLE_WIN";
+        // public const string FIRST_FIGHT_TARGET_WIN = "FIRST_FIGHT_TARGET_WIN";
+        // public const string GET_SUIT_ITEM_FIRST = "GET_SUIT_ITEM_FIRST";
+        // public const string GET_SUIT_ITEM_FULL = "GET_SUIT_ITEM_FULL";
+        // public const string GET_BONUS_FIRST = "GET_BONUS_FIRST";
+        // public const string STUDIO_OPEN = "STUDIO_OPEN";
+
+        public const string START_FIGHT = "START_FIGHT";
+        public const string FREEDOM_DRESS = "FREEDOM_DRESS";
+        public const string ENTER_CHAPTER = "ENTER_CHAPTER";
         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 LUCKY_BOX_LINE = "LUCKY_BOX_LINE";
-        public const string FREEDOM_DRESS = "FREEDOM_DRESS";
+        public const string SKILL_CARD_FIGHT = "SKILL_CARD_FIGHT";
+        public const string UP_CARD_LV = "UP_CARD_LV";
+        public const string AUTOPLAY_FIGHT = "AUTOPLAY_FIGHT";
+        public const string STUDIO_METAL = "STUDIO_METAL";
         public const string CLOTHING_DECOMPOSE = "CLOTHING_DECOMPOSE";
         public const string CLOTHING_SYNTHETIC = "CLOTHING_SYNTHETIC";
-
-        public const string SKILL_CARD_FIGHT = "SKILL_CARD_FIGHT";
+        public const string STUDIO_FILING = "STUDIO_FILING";
         public const string OPEN_TAGS = "OPEN_TAGS";
-        public const string UP_CARD_STAR = "UP_CARD_STAR";
-        public const string UP_CARD_LV = "UP_CARD_LV";
-        public const string PHOTOGRAPH = "PHOTOGRAPH";
-        public const string FIRST_FIGHT_FAILED = "FIRST_FIGHT_FAILED";
-        public const string FIRST_FIGHT_SINGLE_WIN = "FIRST_FIGHT_SINGLE_WIN";
-        public const string FIRST_FIGHT_TARGET_WIN = "FIRST_FIGHT_TARGET_WIN";
-        public const string GET_SUIT_ITEM_FIRST = "GET_SUIT_ITEM_FIRST";
-        public const string GET_SUIT_ITEM_FULL = "GET_SUIT_ITEM_FULL";
-        public const string GET_BONUS_FIRST = "GET_BONUS_FIRST";
-        public const string STUDIO_OPEN = "STUDIO_OPEN";
+        public const string POEM = "POEM";
+        public const string TRAVEL = "TRAVEL";
         public const string SUIT_LIST_VIEW = "SUIT_LIST_VIEW";
+        public const string FIELD = "FIELD";
+        public const string LUCKY_BOX = "LUCKY_BOX";
+        public const string LUCKY_BOX_LINE = "LUCKY_BOX_LINE";
+
     }
 }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/MainStoryDataManager.cs

@@ -91,7 +91,7 @@ namespace GFGGame
 
         public static bool CheckOpenMainUI()
         {
-            return InstanceZonesDataManager.CheckLevelPass(100001002) && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) > 0;
+            return InstanceZonesDataManager.CheckLevelPass(100001002);
         }
 
         //检查指定章节对应的普通章节是否通关

+ 0 - 32
GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

@@ -60,7 +60,6 @@ namespace GFGGame
             int suitId = (int)viewData;
             guideId = 0;
             UpdateView(suitId);
-            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
@@ -85,7 +84,6 @@ namespace GFGGame
             }
 
             TryCompleteGuide();
-            Timers.inst.Remove(CheckGuide);
 
         }
 
@@ -170,35 +168,5 @@ namespace GFGGame
             }
 
         }
-
-        private void CheckGuide(object param)
-        {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.GET_SUIT_ITEM_FULL) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.GET_SUIT_ITEM_FIRST) <= 0)
-            {
-                UpdateToCheckGuide(null);
-            }
-            else
-            {
-                Timers.inst.Remove(CheckGuide);
-            }
-        }
-        protected override void UpdateToCheckGuide(object param)
-        {
-            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            if (guideId == 1) GuideController.TryGuide(null, ConstGuideId.GET_SUIT_ITEM_FULL, 1, "恭喜你,集齐了第一套套装,快去换装界面穿上试试吧!点击空白区域继续。", -1, true, (int)(this.viewCom.height - 150));
-            if (guideId == 2) GuideController.TryGuide(null, ConstGuideId.GET_SUIT_ITEM_FIRST, 1, "恭喜你,获得了一件套装配件,集齐套装有惊喜哦!点击空白区域继续。", -1, true, (int)(this.viewCom.height - 150));
-        }
-        protected override void TryCompleteGuide()
-        {
-            GuideCfg cfg;
-            cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.GET_SUIT_ITEM_FULL);
-            GuideController.TryCompleteGuideIndex(cfg.id, 1);
-            GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_FULL, 1);
-            cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.GET_SUIT_ITEM_FIRST);
-            GuideController.TryCompleteGuideIndex(cfg.id, 1);
-            GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_FIRST, 1);
-
-        }
     }
 }

+ 21 - 21
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -997,9 +997,9 @@ namespace GFGGame
 
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.FIGHT_TIPS) <= 0)
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
+            // || GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0
+            // || GuideDataManager.IsGuideFinish(ConstGuideId.FIGHT_TIPS) <= 0)
             {
                 UpdateToCheckGuide(null);
             }
@@ -1013,8 +1013,8 @@ namespace GFGGame
 
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            int syIndex = 0;
-            int xzIndex = 0;
+            // int syIndex = 0;
+            // int xzIndex = 0;
             int buyClothingIndex = 0;
             int buyClothingSubIndex = 0;
 
@@ -1026,14 +1026,14 @@ namespace GFGGame
                 {
                     int menuID = (int)item.target.data;
                     DressUpMenuItemCfg1 dressUpMenuItemCfg1 = DressUpMenuItemCfg1Array.Instance.GetCfg(menuID);
-                    if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0 && dressUpMenuItemCfg1.type == ConstDressUpItemType.SHANG_YI)
-                    {
-                        syIndex = i;
-                    }
-                    if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0 && dressUpMenuItemCfg1.type == ConstDressUpItemType.XIA_ZHUANG)
-                    {
-                        xzIndex = i;
-                    }
+                    // if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0 && dressUpMenuItemCfg1.type == ConstDressUpItemType.SHANG_YI)
+                    // {
+                    //     syIndex = i;
+                    // }
+                    // if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0 && dressUpMenuItemCfg1.type == ConstDressUpItemType.XIA_ZHUANG)
+                    // {
+                    //     xzIndex = i;
+                    // }
                     if (_fightCfg.needItemId > 0)
                     {
                         int type = ItemUtilCS.GetItemSubType(_fightCfg.needItemId);
@@ -1078,12 +1078,12 @@ namespace GFGGame
                     buyClothingIdIndex = i;
                 }
             }
-            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.SINGLE_FIGHT, 3, "点击相应的分类,可以快速找到服饰。", syIndex);
-            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.SINGLE_FIGHT, 4, "", 0, true, (int)_ui.m_partsList.m_list.y);
-            GuideController.TryGuide(_ui.m_btnGuide, ConstGuideId.SINGLE_FIGHT, 5, "", -1, true, 0, 0, 0, false);
-            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.SINGLE_FIGHT, 6, "接下来把裙子也换上。", xzIndex);
-            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.SINGLE_FIGHT, 7, "", 0, true, (int)_ui.m_partsList.m_list.y);
-            GuideController.TryGuide(_ui.m_btnNext, ConstGuideId.SINGLE_FIGHT, 8, "穿着完毕,来验证一下,换上的服饰是否符合需求。");
+            // GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.SINGLE_FIGHT, 3, "点击相应的分类,可以快速找到服饰。", syIndex);
+            // GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.SINGLE_FIGHT, 4, "", 0, true, (int)_ui.m_partsList.m_list.y);
+            // GuideController.TryGuide(_ui.m_btnGuide, ConstGuideId.SINGLE_FIGHT, 5, "", -1, true, 0, 0, 0, false);
+            // GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.SINGLE_FIGHT, 6, "接下来把裙子也换上。", xzIndex);
+            // GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.SINGLE_FIGHT, 7, "", 0, true, (int)_ui.m_partsList.m_list.y);
+            // GuideController.TryGuide(_ui.m_btnNext, ConstGuideId.SINGLE_FIGHT, 8, "穿着完毕,来验证一下,换上的服饰是否符合需求。");
 
             GuideController.TryGuide(_ui.m_compNeed.target, ConstGuideId.BUY_CLOTHING, 3, "当提示有“必需品”时,需要穿上对应物品才能通关。", -1, true, 170);
             GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.BUY_CLOTHING, 7, "按照指示就可以找到必需品啦。", buyClothingIndex);
@@ -1091,8 +1091,8 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.BUY_CLOTHING, 9, "点击换上吧。", buyClothingIdIndex, true, 170);
             GuideController.TryCompleteGuide(ConstGuideId.BUY_CLOTHING, 9);
 
-            GuideController.TryGuide(_ui.m_btnHint, ConstGuideId.FIGHT_TIPS, 1, "这次换装需要获得别人的认可呢。");
-            GuideController.TryCompleteGuide(ConstGuideId.FIGHT_TIPS, 1);
+            // GuideController.TryGuide(_ui.m_btnHint, ConstGuideId.FIGHT_TIPS, 1, "这次换装需要获得别人的认可呢。");
+            // GuideController.TryCompleteGuide(ConstGuideId.FIGHT_TIPS, 1);
 
 
         }

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -895,8 +895,8 @@ namespace GFGGame
         }
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.FREEDOM_DRESS) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.PHOTOGRAPH) <= 0)
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.FREEDOM_DRESS) <= 0)
+            // || GuideDataManager.IsGuideFinish(ConstGuideId.PHOTOGRAPH) <= 0)
             {
                 UpdateToCheckGuide(null);
             }
@@ -935,7 +935,7 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.FREEDOM_DRESS, 6, "保存成功,回主界面看看吧。");
             GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 6);
 
-            GuideController.TryGuide(_ui.m_btnPhoto, ConstGuideId.PHOTOGRAPH, 1, "完成心水搭配后,可以拍照留下纪念哦。");
+            // GuideController.TryGuide(_ui.m_btnPhoto, ConstGuideId.PHOTOGRAPH, 1, "完成心水搭配后,可以拍照留下纪念哦。");
 
         }
     }

+ 27 - 27
GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs

@@ -142,16 +142,16 @@ namespace GFGGame
             PhotographDataManager.Instance.SetLayer(null, "refresh");
 
             _ui.m_txtCount.text = string.Format("{0}/{1}", PoemGalleryDataManager.Instance.MyWorksCountOfTheme, GlobalCfgArray.globalCfg.maxGalleryWorksCount);
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.PHOTOGRAPH) > 0)
-            {
-                _ui.m_loaGuide.enabled = false;
-                _ui.m_loaGuide1.enabled = false;
-            }
-            else
-            {
-                _ui.m_loaGuide.enabled = true;
-                _ui.m_loaGuide1.enabled = false;
-            }
+            // if (GuideDataManager.IsGuideFinish(ConstGuideId.PHOTOGRAPH) > 0)
+            // {
+            _ui.m_loaGuide.enabled = false;
+            _ui.m_loaGuide1.enabled = false;
+            // }
+            // else
+            // {
+            //     _ui.m_loaGuide.enabled = true;
+            //     _ui.m_loaGuide1.enabled = false;
+            // }
             Timers.inst.AddUpdate(CheckGuide);
         }
         /************************************************************UI界面*********************************************************/
@@ -628,27 +628,27 @@ namespace GFGGame
 
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.PHOTOGRAPH) <= 0)
-            {
-                UpdateToCheckGuide(null);
-                GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.PHOTOGRAPH);
-                if (GuideDataManager.IsGuideIndexFinish(cfg.id, 3))
-                {
-                    GuideController.TryCompleteGuide(ConstGuideId.PHOTOGRAPH, 3);
-                }
-            }
-            else
-            {
-                Timers.inst.Remove(CheckGuide);
-            }
+            // if (GuideDataManager.IsGuideFinish(ConstGuideId.PHOTOGRAPH) <= 0)
+            // {
+            //     UpdateToCheckGuide(null);
+            //     GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.PHOTOGRAPH);
+            //     if (GuideDataManager.IsGuideIndexFinish(cfg.id, 3))
+            //     {
+            //         GuideController.TryCompleteGuide(ConstGuideId.PHOTOGRAPH, 3);
+            //     }
+            // }
+            // else
+            // {
+            //     Timers.inst.Remove(CheckGuide);
+            // }
         }
 
         protected override void UpdateToCheckGuide(object param)
         {
-            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_ComSelectRes.m_comBtnTab.m_btn0, ConstGuideId.PHOTOGRAPH, 2, "在这里可以选择已获得的背景、道具等,也可以放大缩小物品,增加画面丰富度。");
-            GuideController.TryGuide(_ui.m_btnPhotograph, ConstGuideId.PHOTOGRAPH, 3, "来记录下这一刻吧。");
-            GuideController.TryCompleteGuide(ConstGuideId.PHOTOGRAPH, 3);
+            // if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            // GuideController.TryGuide(_ui.m_ComSelectRes.m_comBtnTab.m_btn0, ConstGuideId.PHOTOGRAPH, 2, "在这里可以选择已获得的背景、道具等,也可以放大缩小物品,增加画面丰富度。");
+            // GuideController.TryGuide(_ui.m_btnPhotograph, ConstGuideId.PHOTOGRAPH, 3, "来记录下这一刻吧。");
+            // GuideController.TryCompleteGuide(ConstGuideId.PHOTOGRAPH, 3);
         }
     }
 }

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

@@ -65,18 +65,19 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_OPEN);
+            // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_OPEN);
+
+            // if (GuideDataManager.currentGuideId == cfg.id && GuideDataManager.currentGuideIdIndex == 1)
+            // {
+            //     string resPath1 = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_dj_2");
+            //     SceneController.AddObjectToView(_gameObject, _wrapper, _ui.m_comHolder.m_holder, resPath1, out _gameObject, out _wrapper);
+            // }
+            // else
+            // {
+            //     string resPath0 = ResPathUtil.GetViewEffectPath("ui_yd/ui_yd_y", "ui_yd_y");
+            //     SceneController.AddObjectToView(_gameObject, _wrapper, _ui.m_comHolder.m_holder, resPath0, out _gameObject, out _wrapper);
+            // }
 
-            if (GuideDataManager.currentGuideId == cfg.id && GuideDataManager.currentGuideIdIndex == 1)
-            {
-                string resPath1 = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_dj_2");
-                SceneController.AddObjectToView(_gameObject, _wrapper, _ui.m_comHolder.m_holder, resPath1, out _gameObject, out _wrapper);
-            }
-            else
-            {
-                string resPath0 = ResPathUtil.GetViewEffectPath("ui_yd/ui_yd_y", "ui_yd_y");
-                SceneController.AddObjectToView(_gameObject, _wrapper, _ui.m_comHolder.m_holder, resPath0, out _gameObject, out _wrapper);
-            }
             List<object> dataList = viewData as List<object>;
             guideTarget = dataList[0] as GObject;
             string txtContent = (string)dataList[1];

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -266,9 +266,9 @@ namespace GFGGame
         }
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
+            // || GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
             {
                 UpdateToCheckGuide(null);
             }
@@ -282,7 +282,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_unPasslevelItem, ConstGuideId.SINGLE_FIGHT, 1, "遇到意外事件了,暂时解释不清,先按请求换上服饰吧。");
+            // GuideController.TryGuide(_unPasslevelItem, ConstGuideId.SINGLE_FIGHT, 1, "遇到意外事件了,暂时解释不清,先按请求换上服饰吧。");
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.LUCKY_BOX, 1, "点击返回主界面。");
 
             GuideController.TryGuide(_unPasslevelItem, ConstGuideId.BUY_CLOTHING, 1, "");

+ 21 - 25
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -102,11 +102,11 @@ namespace GFGGame
             _score = 0;
             _mainScore = ScoreSystemData.Instance.GetMainScore();
 
-            if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)//引导中禁止自动战斗
-            {
-                EquipDataCache.cacher.fightSpeed = 1;
-                EquipDataCache.cacher.autoPlay = false;
-            }
+            // if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)//引导中禁止自动战斗
+            // {
+            //     EquipDataCache.cacher.fightSpeed = 1;
+            //     EquipDataCache.cacher.autoPlay = false;
+            // }
             Timers.inst.Add(0.5f, 1, (param) =>
             {
                 SkillScore(null);
@@ -156,17 +156,17 @@ namespace GFGGame
             _ui.m_t1.SetValue("start", _ui.m_loaGlass.x, _ui.m_loaGlass.y);
             _ui.m_t1.SetValue("end", _ui.m_proScore.m_comBar.m_imgAni.LocalToGlobal(Vector2.zero).x - _ui.m_loaGlass.width / 2, _ui.m_proScore.target.y - _ui.m_loaGlass.height / 2);
 
-            if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
-            {
-                _ui.m_t1.Play(1, 0, 0, 2, () =>
-                {
-                    Timers.inst.AddUpdate(UpdateToCheckGuide);
-                });
-            }
-            else
-            {
-                _ui.m_t1.Play(UpdateProgress);
-            }
+            // if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
+            // {
+            //     _ui.m_t1.Play(1, 0, 0, 2, () =>
+            //     {
+            //         Timers.inst.AddUpdate(UpdateToCheckGuide);
+            //     });
+            // }
+            // else
+            // {
+            _ui.m_t1.Play(UpdateProgress);
+            // }
 
         }
 
@@ -324,17 +324,13 @@ namespace GFGGame
 
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            // float scaleX = 0;// _gameObject7.transform.localScale.x;
-            // if (scaleX == _prefectScale)
+
+            // bool isGuide = GuideController.TryGuide(_ui.m_comClickCircle.target, ConstGuideId.SINGLE_FIGHT, 9, "服饰比较繁琐,适当的整理会更加分,点击为各部位修整吧。");
+            // if (isGuide)
             // {
-            bool isGuide = GuideController.TryGuide(_ui.m_comClickCircle.target, ConstGuideId.SINGLE_FIGHT, 9, "服饰比较繁琐,适当的整理会更加分,点击为各部位修整吧。");
-            if (isGuide)
-            {
-                _ui.m_comClickCircle.target.touchable = true;
-            }
+            //     _ui.m_comClickCircle.target.touchable = true;
             // }
-            // GuideController.TryGuide(_ui.m_comClickCircle.target, ConstGuideId.SINGLE_FIGHT, 9, "服饰比较繁琐,适当的整理会更加分,点击为各部位修整吧。");
-            GuideController.TryCompleteGuide(ConstGuideId.SINGLE_FIGHT, 9);
+            // GuideController.TryCompleteGuide(ConstGuideId.SINGLE_FIGHT, 9);
         }
     }
 }

+ 4 - 3
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs

@@ -303,9 +303,10 @@ namespace GFGGame
         }
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.OPEN_TAGS) <= 0
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.OPEN_TAGS) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
+            // ||GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
+
             {
                 UpdateToCheckGuide(null);
             }
@@ -320,7 +321,7 @@ namespace GFGGame
 
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.SINGLE_FIGHT, 2, "点击开启换装。");
+            // GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.SINGLE_FIGHT, 2, "点击开启换装。");
 
             GuideController.TryGuide(_ui.m_listTag, ConstGuideId.OPEN_TAGS, 1, "选择相应的关卡标签,可提高分数。", -1, true, (int)(this.viewCom.y + _ui.m_listBonus.y), 0, 0, false);
             GuideController.TryCompleteGuide(ConstGuideId.OPEN_TAGS, 1);

+ 0 - 43
GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -153,7 +153,6 @@ namespace GFGGame
                 _sceneObject = null;
             }
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
-            Timers.inst.Remove(CheckGuide);
             _ui.m_comResult.target.height = 0;
             _ui.m_comExpBar.target.alpha = 0;
             _ui.m_t1.Stop(true, false);
@@ -215,48 +214,6 @@ namespace GFGGame
             _ui.m_btnClose.enabled = true;
 
             UpdateToCheckGuide(null);
-            Timers.inst.AddUpdate(CheckGuide);
         }
-
-        private void CheckGuide(object param)
-        {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.FIRST_FIGHT_FAILED) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.FIRST_FIGHT_SINGLE_WIN) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.FIRST_FIGHT_TARGET_WIN) <= 0)
-            {
-                UpdateToCheckGuide(null);
-            }
-            else
-            {
-                Timers.inst.Remove(CheckGuide);
-            }
-        }
-
-        protected override void UpdateToCheckGuide(object param)
-        {
-            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            if (!_resultData.Result) GuideController.TryGuide(null, ConstGuideId.FIRST_FIGHT_FAILED, 1, "不要气馁呀,可以通过再次挑战已通关的关卡、摘星、绣坊等途径获取更多的物资来提升自己的战斗力哦!", -1, true, (int)(this.viewCom.height - 150));
-            if (_resultData.Result) GuideController.TryGuide(null, ConstGuideId.FIRST_FIGHT_SINGLE_WIN, 1, "这条连衣裙可真好看!点击空白区域继续。", -1, true, (int)(this.viewCom.height - 400));
-            if (_resultData.Result) GuideController.TryGuide(null, ConstGuideId.FIRST_FIGHT_TARGET_WIN, 1, "你太厉害了,初次对战就获得了这么好的战绩,继续加油吧。", -1, true, (int)(this.viewCom.height - 400));
-        }
-
-        protected override void TryCompleteGuide()
-        {
-            GuideCfg cfg;
-            cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.FIRST_FIGHT_FAILED);
-            GuideController.TryCompleteGuideIndex(cfg.id, 1);
-            GuideController.TryCompleteGuide(ConstGuideId.FIRST_FIGHT_FAILED, 1);
-
-            cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.FIRST_FIGHT_SINGLE_WIN);
-            GuideController.TryCompleteGuideIndex(cfg.id, 1);
-            GuideController.TryCompleteGuide(ConstGuideId.FIRST_FIGHT_SINGLE_WIN, 1);
-
-            cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.FIRST_FIGHT_TARGET_WIN);
-            GuideController.TryCompleteGuideIndex(cfg.id, 1);
-            GuideController.TryCompleteGuide(ConstGuideId.FIRST_FIGHT_TARGET_WIN, 1);
-
-        }
-
-
     }
 }

+ 8 - 8
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -628,7 +628,7 @@ namespace GFGGame
             || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_DECOMPOSE) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_SYNTHETIC) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_OPEN) <= 0
+            // || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_OPEN) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.SUIT_LIST_VIEW) <= 0)
             {
                 UpdateToCheckGuide(null);
@@ -654,16 +654,16 @@ namespace GFGGame
 
             GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_LV, 2, "获得了一张“词牌”,点击查看。", -1, false, 0, 0, 0, true, true);
 
-            bool isGuide = GuideController.TryGuide(_ui.target, ConstGuideId.STUDIO_OPEN, 1, "滑动界面看看。", -1, false, (int)(this.viewCom.height - 600), 0, 0, false);
-            if (isGuide)
-            {
-                MainDataManager.Instance.CanSwipe = true;
-            }
+            // bool isGuide = GuideController.TryGuide(_ui.target, ConstGuideId.STUDIO_OPEN, 1, "滑动界面看看。", -1, false, (int)(this.viewCom.height - 600), 0, 0, false);
+            // if (isGuide)
+            // {
+            //     MainDataManager.Instance.CanSwipe = true;
+            // }
 
-            if (MainDataManager.Instance.ViewType == 1) GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_OPEN, 2, "工作室开门啦,进去看看。");
+            // if (MainDataManager.Instance.ViewType == 1) GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_OPEN, 2, "工作室开门啦,进去看看。");
 
             GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.SUIT_LIST_VIEW, 1, "获得“天衣”服饰后,可进行养护和焕新,到绣坊看看。");
-            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_OPEN, 3);
+            // GuideController.TryCompleteGuide(ConstGuideId.STUDIO_OPEN, 3);
 
 
         }

+ 11 - 11
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs

@@ -112,21 +112,21 @@ namespace GFGGame
         }
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_OPEN) <= 0)
-            {
-                UpdateToCheckGuide(null);
-            }
-            else
-            {
-                Timers.inst.Remove(CheckGuide);
-            }
+            // if (GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_OPEN) <= 0)
+            // {
+            //     UpdateToCheckGuide(null);
+            // }
+            // else
+            // {
+            //     Timers.inst.Remove(CheckGuide);
+            // }
         }
 
         protected override void UpdateToCheckGuide(object param)
         {
-            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.target, ConstGuideId.STUDIO_OPEN, 3, "通关相应副本,可以获得各种升级材料哦,快开始今天的日常工作吧。", -1, true, (int)(this.viewCom.height - 280), 0, 0, false, false);
-            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_OPEN, 3);
+            // if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            // GuideController.TryGuide(_ui.target, ConstGuideId.STUDIO_OPEN, 3, "通关相应副本,可以获得各种升级材料哦,快开始今天的日常工作吧。", -1, true, (int)(this.viewCom.height - 280), 0, 0, false, false);
+            // GuideController.TryCompleteGuide(ConstGuideId.STUDIO_OPEN, 3);
 
         }