zhaoyang 2 年之前
父節點
當前提交
24f81557c3

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Constant/ConstGuideId.cs

@@ -5,7 +5,6 @@ namespace GFGGame
 
         // public const string START_STORY = "START_STORY";
         // public const string SINGLE_FIGHT = "SINGLE_FIGHT";
-        // public const string FIGHT_TIPS = "FIGHT_TIPS";
 
 
         // public const string UP_CARD_STAR = "UP_CARD_STAR";
@@ -22,6 +21,7 @@ namespace GFGGame
         public const string FREEDOM_DRESS = "FREEDOM_DRESS";
         public const string ENTER_CHAPTER = "ENTER_CHAPTER";
         public const string BUY_CLOTHING = "BUY_CLOTHING";
+        public const string FIGHT_TIPS = "FIGHT_TIPS";
         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";

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

@@ -1000,7 +1000,7 @@ namespace GFGGame
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0
-             || GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)
+             || GuideDataManager.IsGuideFinish(ConstGuideId.AUTOPLAY_FIGHT) <= 0)
             {
                 UpdateToCheckGuide(null);
             }
@@ -1030,7 +1030,8 @@ namespace GFGGame
                         taozhuangIndex = i;
                         break;
                     }
-                    if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0 && _fightCfg.needItemId > 0)
+
+                    if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0 && _fightCfg.needItemId > 0 && ItemUtil.CheckMenuType1(_fightCfg.needItemId, _fightCfg.needSuitId, dressUpMenuItemCfg1.id))
                     {
                         buyClothingIndex = i;
                         break;
@@ -1046,12 +1047,12 @@ namespace GFGGame
             // GuideController.TryCompleteGuide(ConstGuideId.START_FIGHT, 5);
 
             GuideController.TryGuide(_ui.m_compNeed.target, ConstGuideId.BUY_CLOTHING, 3, "当提示有“必需品”时,需要穿上对应物品才能通关。");
-            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.BUY_CLOTHING, 7, "按照指示就可以找到必需品啦。", buyClothingIndex);
+            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.BUY_CLOTHING, 7, "按照指示就可以找到必需品啦,点击换上吧。", buyClothingIndex);
             GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.BUY_CLOTHING, 8, "", buyClothingSubIndex);
             GuideController.TryCompleteGuide(ConstGuideId.BUY_CLOTHING, 8);
 
-            GuideController.TryGuide(_ui.m_btnHint, ConstGuideId.TARGET_FIGHT, 1, "这次换装需要获得别人的认可呢。");
-            GuideController.TryGuide(_ui.m_btnNext, ConstGuideId.TARGET_FIGHT, 2, "");
+            GuideController.TryGuide(_ui.m_btnHint, ConstGuideId.FIGHT_TIPS, 1, "这次换装需要获得别人的认可呢。");
+            GuideController.TryCompleteGuide(ConstGuideId.FIGHT_TIPS, 1);
 
             GuideController.TryGuide(_ui.m_btnRecommend, ConstGuideId.AUTOPLAY_FIGHT, 1, "衣服太多难以选择,可以点击这里。");
             GuideController.TryGuide(_ui.m_btnAutoPlay, ConstGuideId.AUTOPLAY_FIGHT, 2, "勾选后,自动进行比拼哦~~");

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

@@ -91,7 +91,7 @@ namespace GFGGame
                 {
                     _ui.m_compTxt.target.y = compTxtY;
                 }
-
+                _ui.m_comHolder.target.visible = false;
                 _ui.m_compTxt.target.visible = !String.IsNullOrEmpty(txtContent);
 
             }

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

@@ -165,7 +165,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(null, ConstGuideId.SKILL_CARD_FIGHT, 1, "", -1, true, _ui.m_btnCancel.y + _ui.m_btnCancel.height);
+            GuideController.TryGuide(null, ConstGuideId.SKILL_CARD_FIGHT, 1, "词牌可以辅助战斗,增加过关概率哦。", -1, true, _ui.m_btnCancel.y + _ui.m_btnCancel.height);
             GuideController.TryGuide(_ui.m_listCard, ConstGuideId.SKILL_CARD_FIGHT, 2, "选择一张合适的词牌,增加过关战斗力。", 0);
             GuideController.TryCompleteGuide(ConstGuideId.SKILL_CARD_FIGHT, 2);
         }

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

@@ -191,6 +191,8 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER, 4, "", 0);
 
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_DECOMPOSE, 1, "点击返回主界面。");
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_LV, 1, "点击返回主界面。");
+
 
 
         }

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

@@ -291,9 +291,8 @@ namespace GFGGame
 
             GuideController.TryGuide(_unPasslevelItem, ConstGuideId.BUY_CLOTHING, 1, "衣服被弄脏了,到机场更衣室换身衣服吧。");
 
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_LV, 1, "点击返回主界面。", -1);
-
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.LUCKY_BOX, 1, "点击返回主界面。");
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_METAL, 1, "点击返回主界面。");
+            // GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.LUCKY_BOX, 1, "点击返回主界面。");
         }
         protected override void TryCompleteGuide()
         {

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

@@ -764,10 +764,10 @@ namespace GFGGame
 
             if (playStop)
             {
-                GuideController.TryGuide(_ui.m_comMineCircle.target, ConstGuideId.TARGET_FIGHT, 3, "这里可以观察双方的分数计算。");
+                GuideController.TryGuide(_ui.m_comMineCircle.target, ConstGuideId.TARGET_FIGHT, 1, "这里可以观察双方的分数计算。");
             }
-            GuideController.TryGuide(_ui.m_btnSkill0.target, ConstGuideId.TARGET_FIGHT, 4, "使用技能,可以增加胜出的几率哦,点击看看。");
-            GuideController.TryCompleteGuide(ConstGuideId.TARGET_FIGHT, 4);
+            GuideController.TryGuide(_ui.m_btnSkill0.target, ConstGuideId.TARGET_FIGHT, 2, "使用技能,可以增加胜出的几率哦,长按查看技能说明。");
+            GuideController.TryCompleteGuide(ConstGuideId.TARGET_FIGHT, 2);
 
         }
     }

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

@@ -604,7 +604,7 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER, 3, "海市蜃楼,镜花水月,是所有故事开始的地方。", -1, false);
 
 
-            GuideController.TryGuide(_ui.m_btnZhaiXing.target, ConstGuideId.LUCKY_BOX, 2, "“摘星”里可以通过星辰的力量获得服饰。", -1, false);
+            // GuideController.TryGuide(_ui.m_btnZhaiXing.target, ConstGuideId.LUCKY_BOX, 2, "“摘星”里可以通过星辰的力量获得服饰。", -1, false);
             GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_DECOMPOSE, 2, "绣坊里增添了新功能。", -1, false);
 
             GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_SYNTHETIC, 1, "进入绣坊界面。", -1, false);
@@ -612,15 +612,14 @@ namespace GFGGame
 
             GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_LV, 2, "“词牌”可进行升级和管理。", -1, false);
 
-            // 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, "工作室开门啦,进去看看。");
+            bool isGuide = GuideController.TryGuide(_ui.target, ConstGuideId.STUDIO_METAL, 3, "向左滑动界面。", -1, false);
+            if (isGuide)
+            {
+                MainDataManager.Instance.CanSwipe = true;
+            }
+            if (MainDataManager.Instance.ViewType == 1) GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_METAL, 2, "工作室开门啦,进去看看~");
 
-            GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.SUIT_LIST_VIEW, 1, "获得“天衣”服饰后,可进行养护和焕新,到绣坊看看");
+            GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.SUIT_LIST_VIEW, 1, "获得“天衣”服饰后,可进行养护和焕新,到绣坊看看");
             // 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_METAL) <= 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.m_comMetal.target, ConstGuideId.STUDIO_METAL, 4, "通关相应副本,可以获得各种升级材料哦,快开始今天的日常工作吧~");
+            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_METAL, 4);
 
         }