zhaoyang 2 жил өмнө
parent
commit
b8852eeba6

+ 12 - 2
GameClient/Assets/Game/HotUpdate/Constant/ConstGuideId.cs

@@ -25,12 +25,22 @@ namespace GFGGame
         public const string TARGET_FIGHT = "TARGET_FIGHT";
         public const string SKILL_CARD_FIGHT = "SKILL_CARD_FIGHT";
         public const string UP_CARD_LV = "UP_CARD_LV";
+        public const string ENTER_CHAPTER_1 = "ENTER_CHAPTER_1";
         public const string AUTOPLAY_FIGHT = "AUTOPLAY_FIGHT";
-        public const string STUDIO_METAL = "STUDIO_METAL";
+        public const string STUDIO_PORCELAIN = "STUDIO_PORCELAIN";
+        public const string ENTER_CHAPTER_2 = "ENTER_CHAPTER_2";
         public const string CLOTHING_DECOMPOSE = "CLOTHING_DECOMPOSE";
         public const string CLOTHING_SYNTHETIC = "CLOTHING_SYNTHETIC";
+
+        public const string ENTER_CHAPTER_3 = "ENTER_CHAPTER_3";
+        public const string UP_CARD_STAR = "UP_CARD_STAR";
+        public const string STUDIO_PROPERTY = "STUDIO_PROPERTY";
+        public const string ENTER_CHAPTER_4 = "ENTER_CHAPTER_4";
+        public const string ARENA_OPEN = "ARENA_OPEN";
+        public const string ENTER_CHAPTER_5 = "ENTER_CHAPTER_5";
+
         public const string STUDIO_FILING = "STUDIO_FILING";
-        public const string OPEN_TAGS = "OPEN_TAGS";
+        // public const string OPEN_TAGS = "OPEN_TAGS";
         public const string POEM = "POEM";
         public const string TRAVEL = "TRAVEL";
         public const string SUIT_LIST_VIEW = "SUIT_LIST_VIEW";

+ 22 - 0
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDressInfoView.cs

@@ -81,6 +81,7 @@ namespace GFGGame
                 MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
             }
             UpdateView();
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
@@ -216,5 +217,26 @@ namespace GFGGame
             int itemId = (int)gesture.host.data;
             GoodsItemTipsController.ShowItemTips(itemId);
         }
+
+
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0)
+            {
+                UpdateToCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+
+            GuideController.TryGuide(_ui.m_btnRecommend, ConstGuideId.ARENA_OPEN, 6, "");
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ARENA_OPEN, 7, "搭配好啦,挑个对手比拼吧~");
+        }
     }
 }

+ 23 - 0
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -117,6 +117,7 @@ namespace GFGGame
             UpdateValue();
             UpdateRole();
 
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
@@ -443,6 +444,28 @@ namespace GFGGame
             }
             ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.TAEGET, 0, targetData.FightDatas, "" }, new object[] { typeof(ArenaView).FullName, this.viewData }, true);
         }
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0)
+            {
+                UpdateToCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(_ui.m_loaScore0.asCom, ConstGuideId.ARENA_OPEN, 4, "搭配这些标签和属性的衣服会获得更强的战力哦~");
+            GuideController.TryGuide(_ui.m_btnDress, ConstGuideId.ARENA_OPEN, 5, "点这里可以自由搭配~");
+            GuideController.TryGuide(_ui.m_listTarget, ConstGuideId.ARENA_OPEN, 8, "", 0);
+            GuideController.TryGuide(_ui.m_btnFight, ConstGuideId.ARENA_OPEN, 9, "");
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ARENA_OPEN, 10, "厉害了,你赢啦,我们继续新故事吧!");
+            GuideController.TryCompleteGuide(ConstGuideId.ARENA_OPEN, 10);
+        }
 
     }
 }

+ 9 - 1
GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -159,7 +159,9 @@ namespace GFGGame
 
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0)
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0
+            || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_1) <= 0
+            || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_STAR) <= 0)
             {
                 UpdateToCheckGuide(null);
             }
@@ -173,6 +175,12 @@ namespace GFGGame
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
             GuideController.TryGuide(_ui.m_listCard, ConstGuideId.UP_CARD_LV, 3, "选择可升级的词牌。", 0);
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER_1, 1, "");
+            GuideController.TryGuide(_ui.m_listCard, ConstGuideId.UP_CARD_STAR, 3, "选择可升星的词牌。", 0);
+
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.UP_CARD_STAR, 7, "");
+            GuideController.TryCompleteGuide(ConstGuideId.UP_CARD_STAR, 7);
+
         }
     }
 }

+ 11 - 3
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -929,7 +929,8 @@ namespace GFGGame
 
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0)
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0
+            || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_STAR) <= 0)
             {
                 UpdateToCheckGuide(null);
             }
@@ -942,8 +943,15 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_ComFosterBottom.m_listLvConsume, ConstGuideId.UP_CARD_LV, 4, "长按材料图标,可持续给词牌增加经验。", 0);
-            GuideController.TryCompleteGuide(ConstGuideId.UP_CARD_LV, 4);
+            GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnAll, ConstGuideId.UP_CARD_LV, 4, "");
+            GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnUpLv, ConstGuideId.UP_CARD_LV, 5, "");
+            GuideController.TryGuide(_ui.m_ComFosterTop.m_btnback, ConstGuideId.UP_CARD_LV, 6, "升级成功啦,我们继续新旅程吧~");
+            GuideController.TryCompleteGuide(ConstGuideId.UP_CARD_LV, 6);
+
+            GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnStar, ConstGuideId.UP_CARD_STAR, 4, "");
+            GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnUpStar, ConstGuideId.UP_CARD_STAR, 5, "");
+
+
         }
     }
 }

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

@@ -96,7 +96,7 @@ namespace GFGGame
             }
 
             //一些特殊引导
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_METAL);
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_PORCELAIN);
             GuideCfg cfg1 = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_FILING);
             GuideCfg cfg2 = GuideCfgArray.Instance.GetCfg(ConstGuideId.FIELD);
             if (guideId == cfg.id && guideIndex == 2 || guideId == cfg1.id && guideIndex == 2 || guideId == cfg2.id && guideIndex == 1)

+ 14 - 2
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs

@@ -175,7 +175,13 @@ namespace GFGGame
         private void CheckGuide(object param)
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER) <= 0
-             || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_METAL) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_1) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_2) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_3) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_5) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0)
             {
                 UpdateToCheckGuide(null);
@@ -190,8 +196,14 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER, 4, "", 0, true, _ui.target.height / 2);
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_METAL, 1, "点击返回主界面。");
+            GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_1, 3, "", 0, true, _ui.target.height / 2);
+            GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_2, 4, "", 1, true, _ui.target.height / 2);
+            GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_3, 2, "", 1, true, _ui.target.height / 2);
+            GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_4, 2, "", 1, true, _ui.target.height / 2);
+            GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_5, 2, "", 1, true, _ui.target.height / 2);
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_PORCELAIN, 1, "点击返回主界面。");
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_FILING, 1, "点击返回主界面。");
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.ARENA_OPEN, 1, "点击返回主界面。");
 
         }
 

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

@@ -273,6 +273,12 @@ namespace GFGGame
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_1) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_2) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_3) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_5) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_STAR) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_DECOMPOSE) <= 0)
             {
                 UpdateToCheckGuide(null);
@@ -291,12 +297,28 @@ namespace GFGGame
             bool isGuide1 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.FREEDOM_DRESS, 1, "获得的服饰随时可以查看和试穿。");
             bool isGuide2 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER, 5, "来继续我们的旅程吧。");
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER, 5);
+            bool isGuide3 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_1, 4, "来继续我们的旅程吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_1, 4);
 
             bool isGuide4 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.BUY_CLOTHING, 1, "衣服被弄脏了,到机场更衣室换身衣服吧。");
             bool isGuide5 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_LV, 1, "点击返回主界面。");
 
             bool isGuide6 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_DECOMPOSE, 1, "点击返回主界面。");
-            _ui.m_chapter.scrollPane.touchEffect = !isGuide0 && !isGuide1 && !isGuide2 && !isGuide4 && !isGuide5 && !isGuide6;
+
+            bool isGuide7 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_2, 5, "来继续我们的旅程吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 5);
+
+            bool isGuide8 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_3, 3, "来继续我们的旅程吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_3, 3);
+
+            bool isGuide10 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_4, 5, "来继续我们的旅程吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_4, 5);
+
+            bool isGuide11 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_5, 3, "来继续我们的旅程吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_5, 3);
+
+            bool isGuide9 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_STAR, 1, "点击返回主界面。");
+            _ui.m_chapter.scrollPane.touchEffect = !isGuide0 && !isGuide1 && !isGuide2 && !isGuide3 && !isGuide4 && !isGuide5 && !isGuide6 && !isGuide7 && !isGuide8 && !isGuide9 && !isGuide10;
 
         }
         protected override void TryCompleteGuide()

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

@@ -311,7 +311,8 @@ namespace GFGGame
         {
             if (
               GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0
-              || GuideDataManager.IsGuideFinish(ConstGuideId.OPEN_TAGS) <= 0
+               || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0
+               || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PROPERTY) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
 
             {
@@ -330,9 +331,10 @@ namespace GFGGame
 
             GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.START_FIGHT, 2, "点击开启换装。");
             GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.BUY_CLOTHING, 2, "");
-            GuideController.TryGuide(_ui.m_listTag, ConstGuideId.OPEN_TAGS, 1, "选择相应的关卡标签,可提高分数。", -1, true, _ui.m_btnStart.LocalToGlobal(Vector2.zero).y + _ui.m_btnStart.height + 400, true);
-            GuideController.TryCompleteGuide(ConstGuideId.OPEN_TAGS, 1);
-
+            // GuideController.TryGuide(_ui.m_listTag, ConstGuideId.OPEN_TAGS, 1, "选择相应的关卡标签,可提高分数。", -1, true, _ui.m_btnStart.LocalToGlobal(Vector2.zero).y + _ui.m_btnStart.height + 400, true);
+            // GuideController.TryCompleteGuide(ConstGuideId.OPEN_TAGS, 1);
+            GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.STUDIO_PORCELAIN, 6, "");
+            GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.STUDIO_PROPERTY, 5, "");
         }
 
         protected override void TryCompleteGuide()

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

@@ -178,7 +178,7 @@ namespace GFGGame
             _ui.m_btnChange.m_c1.selectedIndex = 1;
             _ui.m_btnChange.target.selected = true;
 
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.OPEN_TAGS);
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.ARENA_OPEN);
             // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + cfg.id, 0).Coroutine();
             // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + cfg.id, 1).Coroutine();
             AddEffect();
@@ -977,7 +977,15 @@ namespace GFGGame
                 || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.FIELD) <= 0
-                || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_METAL) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_1) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_2) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_3) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_STAR) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_5) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PROPERTY) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.SUIT_LIST_VIEW) <= 0)
             {
                 UpdateToCheckGuide(null);
@@ -1003,18 +1011,30 @@ namespace GFGGame
                 GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SYNTHETIC, 7);
 
                 GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_LV, 2, "“词牌”可进行升级和管理。", -1, false);
+                GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_1, 2, "", -1, false);
+
+                GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_2, 3, "", -1, false);
+                GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_3, 1, "", -1, false);
+                GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_4, 3, "", -1, false);
+
+                GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_STAR, 2, "“词牌”可进行升星。", -1, false);
+
+                GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_5, 2, "");
 
                 GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.SUIT_LIST_VIEW, 1,
                     "获得“天衣”服饰后,可进行养护和焕新,到绣坊看看。");
 
-                bool isStudioMetalGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_METAL, 2, "向左滑动界面。", -1,
+                bool isStudioMetalGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_PORCELAIN, 2, "向左滑动界面。", -1,
                     false, _ui.target.height - 700);
                 bool isStudioFilingGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_FILING, 2, "向左滑动界面。", -1,
                     false, _ui.target.height - 700);
-                bool isFieldGuide = GuideController.TryGuide(null, ConstGuideId.FIELD, 1, "向左滑动界面。", -1, false,
-                    _ui.target.height - 700);
+                bool isFieldGuide = GuideController.TryGuide(null, ConstGuideId.FIELD, 1, "向左滑动界面。", -1, false, _ui.target.height - 700);
+
+                bool isStudioPropertyGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_PROPERTY, 1, "向左滑动界面。", -1, false, _ui.target.height - 700);
+                bool isArenaGuide = GuideController.TryGuide(_ui.m_loaLeft.target, ConstGuideId.ARENA_OPEN, 2, "新玩法-飞花令开启了哦", -1, false, _ui.target.height - 700);
 
-                if (isStudioMetalGuide || isStudioFilingGuide || isFieldGuide)
+
+                if (isStudioMetalGuide || isStudioFilingGuide || isFieldGuide || isStudioPropertyGuide || isArenaGuide)
                 {
                     _ui.m_loaGuidestudio.visible = true;
                     MainDataManager.Instance.CanSwipe = true;
@@ -1027,9 +1047,24 @@ namespace GFGGame
             if (MainDataManager.Instance.ViewType == 1)
             {
                 _ui.m_loaGuidestudio.visible = false;
-                GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_METAL, 3, "工作室开门啦,进去看看~");
+                GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_PORCELAIN, 3, "工作室开门啦,进去看看~");
                 GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_FILING, 3, "工作室有新的任务啦。");
                 GuideController.TryGuide(_ui.m_btnField.target, ConstGuideId.FIELD, 2, "外出进行历史考察,会有意想不到的收获哦。");
+                GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_PROPERTY, 2, "");
+                GuideController.TryGuide(_ui.m_btnArena.target, ConstGuideId.ARENA_OPEN, 3, "在这里可以与其他小伙伴比拼搭配哦~");
+                GuideController.TryGuide(_ui.m_loaLeft.target, ConstGuideId.ENTER_CHAPTER_5, 1, "");
+
+                bool isEnterChapter2 = GuideController.TryGuide(null, ConstGuideId.ENTER_CHAPTER_2, 2, "向右滑动界面。", -1, false, _ui.target.height - 700);
+                bool isEnterChapter4 = GuideController.TryGuide(null, ConstGuideId.ENTER_CHAPTER_4, 2, "向右滑动界面。", -1, false, _ui.target.height - 700);
+                if (isEnterChapter2 || isEnterChapter4)
+                {
+                    _ui.m_loaGuidestudio.visible = true;
+                    MainDataManager.Instance.CanSwipe = true;
+                }
+                else
+                {
+                    _ui.m_loaGuidestudio.visible = false;
+                }
             }
         }
     }

+ 25 - 6
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPorcelainView.cs

@@ -8,7 +8,7 @@ namespace GFGGame
     //瓷器副本
     public class StudioPorcelainView : StudioBaseView
     {
-
+        private GComponent _comPorcelain;
         public override void Dispose()
         {
             base.Dispose();
@@ -28,21 +28,22 @@ namespace GFGGame
 
         protected override void OnShown()
         {
-            GComponent com = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComPorcelain").asCom;
-            AddChildCom(com);
-            com.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("hz_bjbj");
+            _comPorcelain = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComPorcelain").asCom;
+            AddChildCom(_comPorcelain);
+            _comPorcelain.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("hz_bjbj");
 
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioPorcelainView).FullName;
             this._studioCfg = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPorcelainView).Name)[StudioDataManager.Instance.PorcelainTheme - 1];
             this.storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(this._studioCfg.type, this._studioCfg.subType, this._studioCfg.id);
 
-            com.GetChild("loaScore").asLoader.url = string.Format("ui://Studio/cqxf_zdqh_{0}", StudioDataManager.Instance.PorcelainTheme);
+            _comPorcelain.GetChild("loaScore").asLoader.url = string.Format("ui://Studio/cqxf_zdqh_{0}", StudioDataManager.Instance.PorcelainTheme);
             list.numItems = this.storyLevelCfgs.Count;
             list.ScrollToView(curIndex);
 
             base.OnShown();
-            com.height = _ui.target.height;
+            _comPorcelain.height = _ui.target.height;
 
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
@@ -60,5 +61,23 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(StudioPorcelainView).FullName);
         }
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0)
+            {
+                UpdateToCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(_comPorcelain.GetChild("list").asList, ConstGuideId.STUDIO_PORCELAIN, 5, "", 0);
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.STUDIO_PORCELAIN, 7, "挑战成功啦,让我们继续新故事吧");
+            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_PORCELAIN, 7);
+        }
     }
 }

+ 20 - 41
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPropertyView.cs

@@ -57,6 +57,7 @@ namespace GFGGame
             list.numItems = this.storyLevelCfgs.Count;
             list.ScrollToView(curIndex);
 
+            Timers.inst.AddUpdate(CheckGuide);
             base.OnShown();
 
         }
@@ -71,47 +72,6 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(StudioPropertyView).FullName);
         }
-        // private void ListPropertyItemRender(int index, GObject obj)
-        // {
-        //     List<StudioCfg> studioCfgs = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPropertyView).Name);
-        //     GButton item = obj.asButton;
-        //     item.GetChild("icon0").asLoader.url = string.Format("ui://Studio/gzsltb_{0}", index + 1);
-        //     item.GetChild("icon1").asLoader.url = string.Format("ui://Studio/gzsatb_{0}", index + 1);
-        //     item.GetChild("icon2").asLoader.url = string.Format("ui://Studio/gzswtb_{0}", index + 1);
-        //     item.GetChild("icon2").asLoader.visible = TimeUtil.CheckDayOfWeek(studioCfgs[index].timeArr) ? false : true;
-        //     if (firstOpenProperty < 0 && TimeUtil.CheckDayOfWeek(studioCfgs[index].timeArr)) firstOpenProperty = index;
-        //     item.data = index;
-        // }
-        // private void OnClickListProperty(EventContext context)
-        // {
-
-        //     GButton item = (context.data as GObject).asButton;
-        //     int index = (int)item.data;
-        //     List<StudioCfg> studioCfgs = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPropertyView).Name);
-        //     StudioCfg studioCfg = studioCfgs[index];
-        //     if (!TimeUtil.CheckDayOfWeek(studioCfg.timeArr))
-        //     {
-        //         _listProperty.selectedIndex = _propertySelectIndex;
-        //         string str = "";
-        //         for (int i = 0; i < studioCfg.timeArr.Length; i++)
-        //         {
-        //             str += NumberUtil.GetChiniseNumberWeekText(studioCfg.timeArr[i]);
-        //             if (i == studioCfg.timeArr.Length - 1) break;
-        //             str += "、";
-        //         }
-        //         PromptController.Instance.ShowFloatTextPrompt(string.Format("周{0}开放", str));
-        //         return;
-        //     }
-        //     _propertySelectIndex = index;
-        //     this.studioCfg = studioCfg;
-        //     this.studioData = StudioDataManager.Instance.GetStudioDataById(this.studioCfg.id);
-        //     this.storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(this.studioCfg.type, this.studioCfg.subType, this.studioCfg.id);
-        //     list.numItems = this.storyLevelCfgs.Count;
-        //     list.ScrollToView(curIndex);
-        //     UpdateView();
-        //     StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _listProperty.selectedIndex;
-
-        // }
 
         private void OnControllerChange()
         {
@@ -139,5 +99,24 @@ namespace GFGGame
             UpdateView();
             StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _croProperty.selectedIndex;
         }
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PROPERTY) <= 0)
+            {
+                UpdateToCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(list, ConstGuideId.STUDIO_PROPERTY, 4, "通关这个副本可以获得风系词牌的升星材料哦~");
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.STUDIO_PROPERTY, 6, "挑战成功啦,让我们继续新旅程~");
+            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_PROPERTY, 6);
+        }
     }
 }

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

@@ -125,7 +125,10 @@ namespace GFGGame
         }
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_METAL) <= 0
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0
+            || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
+            || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PROPERTY) <= 0
+            || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_2) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0)
             {
                 UpdateToCheckGuide(null);
@@ -139,11 +142,16 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_comMetal.target, ConstGuideId.STUDIO_METAL, 4, "通关相应副本,可以获得各种升级材料哦,快开始今天的日常工作吧~");
-            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_METAL, 4);
+            GuideController.TryGuide(_ui.m_comPorcelain.target, ConstGuideId.STUDIO_PORCELAIN, 4, "通关这个副本可以获得词牌升级材料,快去挑战吧。");
 
             GuideController.TryGuide(_ui.m_comFiling.target, ConstGuideId.STUDIO_FILING, 4, "完成小伙伴的心愿,获得服饰碎片哦。");
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER_2, 1, "");
 
+            GuideController.TryGuide(_ui.m_comPorcelain.target, ConstGuideId.STUDIO_PORCELAIN, 4, "通关这个副本可以获得词牌升级材料,快去挑战吧。");
+
+            GuideController.TryGuide(_ui.m_comProperty.target, ConstGuideId.STUDIO_PROPERTY, 3, "");
+
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER_4, 1, "");
         }
 
         protected override void TryCompleteGuide()