Browse Source

删除就引导

zhaoyang 3 years ago
parent
commit
29cdc980da
30 changed files with 76 additions and 1118 deletions
  1. 0 22
      GameClient/Assets/Game/HotUpdate/Constant/ConstGuideId.cs
  2. 9 9
      GameClient/Assets/Game/HotUpdate/Controller/GameController.cs
  3. 0 724
      GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs
  4. 0 12
      GameClient/Assets/Game/HotUpdate/Data/GuideDataManager.cs
  5. 1 1
      GameClient/Assets/Game/HotUpdate/Data/StoryDataManager.cs
  6. 0 2
      GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs
  7. 0 3
      GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs
  8. 0 5
      GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs
  9. 1 20
      GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs
  10. 0 1
      GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs
  11. 0 3
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachOfItemView.cs
  12. 0 2
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyCountView.cs
  13. 1 5
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetBonusView.cs
  14. 3 9
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs
  15. 1 9
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs
  16. 0 2
      GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs
  17. 2 100
      GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs
  18. 2 4
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs
  19. 1 18
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs
  20. 0 6
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs
  21. 0 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs
  22. 8 52
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs
  23. 33 32
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs
  24. 1 13
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs
  25. 3 25
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs
  26. 3 16
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs
  27. 2 18
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs
  28. 0 1
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  29. 5 1
      GameClient/Assets/Game/HotUpdate/Views/UIView.cs
  30. 0 2
      GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

+ 0 - 22
GameClient/Assets/Game/HotUpdate/Constant/ConstGuideId.cs

@@ -2,28 +2,6 @@ namespace GFGGame
 {
     public class ConstGuideId
     {
-        public const int SINGLE_FIGHT_GUIDE = 1;//单人战斗引导
-        public const int CLOTHING_SHOP_VIEW_BTN_BUY = 11; //引导购买必需品
-        public const int SEE_DRESS_TIPS = 12; //点击查看关卡提示
-        public const int TARGET_FIGHT_GUIDE = 13; //双人对战算分提示
-        public const int MAIN_UI_BTN_ZHAI_XING = 3;//引导摘星
-        public const int LUCKY_BOX_VIEW_BTN_BACK = 4;//引导摘星后引导返回主界面
-        public const int MAIN_UI_BTN_HUAN_ZHUANG = 2;//引导换装
-        public const int SUIT_SYNTHETIC_GUIDE = 14;//引导套装合成
-        public const int USE_CARD_FIGHT = 15;//引导使用卡牌战斗
-        public const int TIPS_TAGS_FIGHT = 16;//提示标签
-        public const int CARD_UP_STAR = 17;//词牌升星
-        public const int PHOTOGRAPH_GUIDE = 18;//引导拍照
-        public const int FIGHT_RESULT_TIPS_GUIDE = 19;//战斗结束提示语
-
-
-        public const int CHAPTER_RESULT_VIEW = 6;
-        public const int GET_SUIT_ITEM_VIEW_FULL = 7;
-        public const int GET_BONUS_VIEW = 8;
-        public const int GET_SUIT_ITEM_VIEW_FIRST = 9;
-
-
-        public const int DRESS_UP_VIEW_BTN_BACK = 10;
 
         public const string START_STORY = "START_STORY";
         public const string SINGLE_FIGHT = "SINGLE_FIGHT";

+ 9 - 9
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -225,15 +225,15 @@ namespace GFGGame
             else
             {
                 StoryDataManager.currentChapter = 1;
-                if (!StoryDataManager.CheckLevelPass(1, 1))
-                {
-                    ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW, });
-                    StoryController.ShowLevelView(StoryDataManager.currentChapter, 1);
-                }
-                else
-                {
-                    ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW });
-                }
+                // if (!StoryDataManager.CheckLevelPass(1, 1))
+                // {
+                //     ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW, });
+                //     StoryController.ShowLevelView(StoryDataManager.currentChapter, 1);
+                // }
+                // else
+                // {
+                ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW });
+                // }
             }
             AfterEnterGame();
         }

+ 0 - 724
GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -10,682 +10,6 @@ namespace GFGGame
     public class GuideController
     {
 
-        /*******************************************************单人战斗引导***********************************************/
-        public static void TryGuideChapterViewLevelItem(GObject target, string guideStr = null)
-        {
-            if (GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
-            {
-                if (guideStr == null)
-                {
-                    UI_CompStoryLevelItem levelItem = UI_CompStoryLevelItem.Proxy(target);
-                    if (levelItem != null)
-                    {
-                        int level = int.Parse(levelItem.target.name.Replace("g", ""));
-                        string levelID = StoryDataManager.currentChapter + "_" + level;
-                        StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(levelID);
-                        if (storyLevelCfg.fightID != null && storyLevelCfg.fightID.Length > 0)
-                        {
-                            guideStr = "遇到意外事件了,暂时解释不清,先按请求换上服饰吧";
-                        }
-                        else
-                        {
-                            guideStr = "点击关卡图标,继续故事";
-                        }
-                    }
-                    else
-                    {
-                        guideStr = "点击,继续";
-                    }
-                }
-                GuideDataManager.currentGuideId = ConstGuideId.SINGLE_FIGHT_GUIDE;
-                ShowGuide(target, true, guideStr);
-            }
-            else if (GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
-            {
-
-            }
-        }
-
-        public static void TryGuideChapterInfoViewBtnStart(GObject target, string guideStr = null)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
-            {
-                if (guideStr == null)
-                {
-                    guideStr = "点击,继续";
-                }
-                ShowGuide(target, true, guideStr);
-            }
-        }
-
-        public static bool TryGuideDressUpFightViewMenuType0(GList list)
-        {
-
-            if (StoryDataManager.currentChapter == 1 && StoryDataManager.currentLevel <= 2
-                && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel))
-            {
-                int len = list.numChildren;
-                for (int i = 0; i < len; i++)
-                {
-                    UI_TypeItem item = UI_TypeItem.Proxy(list.GetChildAt(i));
-                    if (item != null)
-                    {
-                        int menuID = (int)item.target.data;
-                        DressUpMenuItemCfg1 dressUpMenuItemCfg1 = DressUpMenuItemCfg1Array.Instance.GetCfg(menuID);
-                        if (dressUpMenuItemCfg1.type == ConstDressUpItemType.LIAN_YI_QUN)
-                        {
-                            ShowGuide(item.target, true, "点击相应的分类,可以快速找到服饰");
-                            return true;
-                        }
-                    }
-                }
-            }
-            return false;
-        }
-        public static void TryGuideDressUpFightViewMenuPart0(GList list, string guideStr)
-        {
-
-            if (StoryDataManager.currentChapter == 1 && StoryDataManager.currentLevel <= 2
-            && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel))
-            {
-                if (list.numChildren > 0)
-                {
-                    UI_PartsListItem listItem = UI_PartsListItem.Proxy(list.GetChildAt(0));
-                    if (listItem != null)
-                    {
-                        ShowGuide(listItem.target, true, guideStr);
-                        return;
-                    }
-                }
-            }
-        }
-        public static void TryGuideDressUpFightViewBtnNext0(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
-            {
-                ShowGuide(target, false, "接下来验证一下,换上的服饰是否符合需求");
-            }
-        }
-
-        public static void TryGuideSingleScoreViewComClickCircle(GObject target)
-        {
-
-            ShowGuide(target, false, "服饰比较繁琐,适当的整理会更加分,点击为各部位修整吧");
-        }
-
-        /*******************************************************引导购买必需品***********************************************/
-
-        public static void TryGuideDressUpFightViewBtnRecommend(GObject target, GList list)
-        {
-
-            _list = list;
-            if (GuideDataManager.GetGuideCount(ConstGuideId.CLOTHING_SHOP_VIEW_BTN_BUY) <= 0
-                && StoryDataManager.currentLevel == 4
-                && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel)
-                && DressUpMenuItemDataManager.GetRecommendCount() >= 2)
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.CLOTHING_SHOP_VIEW_BTN_BUY;
-                ShowGuide(target, false, "当提示有“必需品”时,需要穿上对应物品才能通关");
-            }
-        }
-
-        public static void TryGuideApproachOfItemViewList(GList list)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.CLOTHING_SHOP_VIEW_BTN_BUY) <= 0
-                && StoryDataManager.currentLevel == 4
-                && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel)
-                && DressUpMenuItemDataManager.GetRecommendCount() >= 2)
-            {
-                UI.CommonGame.UI_ApproachOfItemUI listItem = UI.CommonGame.UI_ApproachOfItemUI.Proxy(list.GetChildAt(0));
-                if (listItem != null)
-                {
-                    ShowGuide(listItem.target, false, "该物品可以在服装店购买,点开服装店看看");
-                }
-
-            }
-        }
-
-        public static void TryGuideBuyCountViewBtnSure(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.CLOTHING_SHOP_VIEW_BTN_BUY) <= 0
-                && StoryDataManager.currentLevel == 4
-                && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel))
-            {
-                ShowGuide(target, false, "找到需要的物品了,点击购买吧");
-            }
-        }
-
-        public static void TryGuideClothingShopViewBtnBack(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.CLOTHING_SHOP_VIEW_BTN_BUY) <= 0
-                && StoryDataManager.currentLevel == 4
-                && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel))
-            {
-                ShowGuide(target, false, "点击返回,回到换装");
-            }
-        }
-        private static GList _list;
-        public static bool TryGuideDressUpFightViewMenuType1()
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.CLOTHING_SHOP_VIEW_BTN_BUY) <= 0
-               && StoryDataManager.currentLevel == 4
-               && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel))
-            {
-                int len = _list.numChildren;
-                for (int i = 0; i < len; i++)
-                {
-                    UI_comListType item = UI_comListType.Proxy(_list.GetChildAt(i));
-                    if (item != null)
-                    {
-                        int menuID = (int)item.target.data;
-                        DressUpMenuItemCfg1 dressUpMenuItemCfg1 = DressUpMenuItemCfg1Array.Instance.GetCfg(menuID);
-                        if (dressUpMenuItemCfg1.type == ConstDressUpItemType.LIAN_YI_QUN)
-                        {
-                            ShowGuide(item.target, true, "在相应分类里就可以找到必需品啦");
-                            _list = null;
-                            return true;
-                        }
-                    }
-                }
-            }
-            return false;
-        }
-
-        public static void TryGuideDressUpFightViewMenuPart1(GList list, string guideStr)
-        {
-
-            if (StoryDataManager.currentChapter == 1 && StoryDataManager.currentLevel == 4
-            && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel))
-            {
-                if (list.numChildren > 0)
-                {
-                    UI_PartsList listItem = UI_PartsList.Proxy(list.GetChildAt(0));
-                    if (listItem != null)
-                    {
-                        ShowGuide(listItem.target, true, guideStr);
-                        return;
-                    }
-                }
-            }
-        }
-
-        /***************************************************点击查看关卡提示***************************************************/
-        public static void TryGuideDressUpFightViewBtnHint(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.SEE_DRESS_TIPS) <= 0
-                && StoryDataManager.currentLevel == 6
-                && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel))
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.SEE_DRESS_TIPS;
-                ShowGuide(target, false, "这次换装需要获得别人的认可呢");
-            }
-        }
-
-
-        /******************************************************双人对战评分************************************************/
-
-        public static void TryGuideStoryFightTargetScoreComCircle(GObject target, float devWidth, float devHeight)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.TARGET_FIGHT_GUIDE) <= 0
-                && StoryDataManager.currentLevel == 6
-                && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel))
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.TARGET_FIGHT_GUIDE;
-                ShowGuide(target, false, "这里可以观察双方的分数计算", 0, false, devWidth, devHeight);
-            }
-        }
-        public static void TryGuideStoryFightTargetScorebtnSkill0(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.TARGET_FIGHT_GUIDE) <= 0
-                && StoryDataManager.currentLevel == 6
-                && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel))
-            {
-                ShowGuide(target, false, "使用技能,可以增加胜出的几率哦,点击看看");
-            }
-        }
-        /*******************************************************引导抽奖***********************************************/
-        public static bool TryGuideGoBackStoryChapter(GObject target)
-        {
-
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_ZHAI_XING) <= 0
-                && StoryDataManager.CheckLevelPass(1, 10)
-                && !StoryDataManager.CheckLevelPass(1, 11))
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.MAIN_UI_BTN_ZHAI_XING;
-                ShowGuide(target, true, "点击返回主界面", 0);
-                return true;
-            }
-            return false;
-        }
-        public static bool TryGuideLuckyBox(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_ZHAI_XING) <= 0
-                && StoryDataManager.CheckLevelPass(1, 10)
-                && !StoryDataManager.CheckLevelPass(1, 11))
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.MAIN_UI_BTN_ZHAI_XING;
-                ShowGuide(target, false, "“摘星”里可以通过星辰的力量获得服饰");
-                return true;
-            }
-            return false;
-        }
-        public static bool TryGuideLuckyBoxStar()
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_ZHAI_XING) <= 0
-                && StoryDataManager.CheckLevelPass(1, 10)
-                && !StoryDataManager.CheckLevelPass(1, 11))
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.MAIN_UI_BTN_ZHAI_XING;
-                ShowGuide(null, false, "点击将星星链接在一起", 1400);
-                return true;
-            }
-            return false;
-        }
-        /*****************************************************引导自由换装保存套装*************************************************/
-
-        public static bool TryGuideDressUpViewMenuType1(GList list)
-        {
-
-            if (GuideDataManager.currentGuideId == ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG)
-            {
-                int len = list.numChildren;
-                list.ScrollToView(len - 1);
-                for (int i = 0; i < len; i++)
-                {
-                    UI_comListType item = UI_comListType.Proxy(list.GetChildAt(i));
-                    if (item != null)
-                    {
-                        int menuID = (int)item.target.data;
-                        DressUpMenuItemCfg1 dressUpMenuItemCfg1 = DressUpMenuItemCfg1Array.Instance.GetCfg(menuID);
-                        if (dressUpMenuItemCfg1.type == ConstDressUpItemType.TAO_ZHUANG)
-                        {
-                            ShowGuide(item.target, true, "套装分类里,可以查看集齐成套的服饰");
-                            return true;
-                        }
-                    }
-                }
-            }
-            return false;
-        }
-
-        public static void TryGuideDressUpViewMenuPart(GList list)
-        {
-
-            if (GuideDataManager.currentGuideId == ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG)
-            {
-                if (list.numChildren > 0)
-                {
-                    UI_PartsList listItem = UI_PartsList.Proxy(list.GetChildAt(0));
-                    if (listItem != null)
-                    {
-                        ShowGuide(listItem.target, true, "点击一键换上");
-                        return;
-                    }
-
-                }
-            }
-        }
-
-
-        /************************************************************引导合成套装*******************************************************/
-
-        public static void TryGuideStoryChapterView(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
-                && StoryDataManager.CheckLevelPass(2, 1)
-                && !StoryDataManager.CheckLevelPass(2, 2)
-                && StoryDataManager.currentChapter == 2 && StoryDataManager.currentLevel <= 2)
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.SUIT_SYNTHETIC_GUIDE;
-                ShowGuide(target, false, "点击进行下一关");
-            }
-        }
-        public static void TryGuideStoryLevelInfoViewTxtNeed(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
-                && StoryDataManager.CheckLevelPass(2, 1)
-                && !StoryDataManager.CheckLevelPass(2, 2)
-                && StoryDataManager.currentChapter == 2 && StoryDataManager.currentLevel <= 2)
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.SUIT_SYNTHETIC_GUIDE;
-                ShowGuide(target, false, "这次必需品,要通过合成获得", 0, true);
-            }
-        }
-        public static void TryGuideStoryLevelInfoView(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
-                && StoryDataManager.CheckLevelPass(2, 1)
-                && !StoryDataManager.CheckLevelPass(2, 2)
-                && GuideDataManager.currentGuideId == ConstGuideId.SUIT_SYNTHETIC_GUIDE)
-            {
-                ShowGuide(target, false, "点击空白处关闭", 1400);
-            }
-        }
-        public static void TryGuideStoryChapterViewBtnHome(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
-                && StoryDataManager.CheckLevelPass(2, 1)
-                && !StoryDataManager.CheckLevelPass(2, 2))
-            {
-                ShowGuide(target, false, "先回到主界面", 0);
-            }
-        }
-        public static bool TryGuideMainUIViewBtnXiuFang(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
-                && StoryDataManager.CheckLevelPass(2, 1)
-                && !StoryDataManager.CheckLevelPass(2, 2)
-            // && GuideDataManager.currentGuideId == ConstGuideId.SUIT_SYNTHETIC_GUIDE
-            )
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.SUIT_SYNTHETIC_GUIDE;
-                ShowGuide(target, false, "绣坊里增添了新功能", 0);
-                return true;
-            }
-            return false;
-
-        }
-        public static void TryGuideSuitSyntheticView(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
-                && StoryDataManager.CheckLevelPass(2, 1)
-                && !StoryDataManager.CheckLevelPass(2, 2))
-            {
-                ShowGuide(target, false, "这里可以查看已获得的服饰图谱", 0);
-            }
-        }
-        public static void TryGuideSuitSyntheticViewList(GList list)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
-                && StoryDataManager.CheckLevelPass(2, 1)
-                && !StoryDataManager.CheckLevelPass(2, 2))
-            {
-                if (list.numChildren > 0)
-                {
-                    UI_SuitListItem listItem = UI_SuitListItem.Proxy(list.GetChildAt(0));
-                    if (listItem != null)
-                    {
-                        ShowGuide(listItem.target, true, "查看已解锁的图谱");
-                        return;
-                    }
-
-                }
-            }
-        }
-        public static void TryGuideClothingSyntheticViewSuitList(GList list)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
-                && StoryDataManager.CheckLevelPass(2, 1)
-                && !StoryDataManager.CheckLevelPass(2, 2))
-            {
-                if (list.numChildren > 0)
-                {
-                    UI_MateriasListItem listItem = UI_MateriasListItem.Proxy(list.GetChildAt(0));
-                    if (listItem != null)
-                    {
-                        ShowGuide(listItem.m_loaderIcon, true, "找到需要合成的物品", 0, false);
-                        return;
-                    }
-
-                }
-            }
-        }
-        public static void TryGuideClothingSyntheticViewList(GList list)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
-                && StoryDataManager.CheckLevelPass(2, 1)
-                && !StoryDataManager.CheckLevelPass(2, 2))
-            {
-                if (list.numChildren > 0)
-                {
-                    UI_MateriasListItem listItem = UI_MateriasListItem.Proxy(list.GetChildAt(0));
-                    if (listItem != null)
-                    {
-                        ShowGuide(listItem.m_loaderIcon, true, "这里可以查看合成需要的材料,和材料的获取途径", 0, false);
-                        return;
-                    }
-
-                }
-            }
-        }
-        public static void TryGuideClothingSyntheticViewBtnProduction(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
-                && StoryDataManager.CheckLevelPass(2, 1)
-                && !StoryDataManager.CheckLevelPass(2, 2))
-            {
-
-                ShowGuide(target, true, "点击合成物品");
-
-            }
-        }
-        public static void TryGuideClothingSyntheticViewBtnHome(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
-                && StoryDataManager.CheckLevelPass(2, 1)
-                && !StoryDataManager.CheckLevelPass(2, 2))
-            {
-                ShowGuide(target, true, "获得必需品啦,继续通关主线剧情吧");
-            }
-        }
-
-        /************************************************************引导使用卡牌战斗*******************************************************/
-        public static void TryGuideStoryCardChoose(GList list)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.USE_CARD_FIGHT) <= 0
-                && StoryDataManager.CheckLevelPass(2, 5)
-                && !StoryDataManager.CheckLevelPass(2, 6)
-                && StoryDataManager.currentChapter == 2 && StoryDataManager.currentLevel == 6)
-            {
-                if (list.numChildren > 0)
-                {
-                    UI_ListCardItem listItem = UI_ListCardItem.Proxy(list.GetChildAt(0));
-                    if (listItem != null)
-                    {
-                        GuideDataManager.currentGuideId = ConstGuideId.USE_CARD_FIGHT;
-                        ShowGuide(listItem.target, true, "选择一张合适的词牌,增加过关战斗力");
-                        return;
-                    }
-
-                }
-            }
-        }
-        public static void TryGuideStoryCardChooseBtnConfirm(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.USE_CARD_FIGHT) <= 0
-                && StoryDataManager.CheckLevelPass(2, 5)
-                && !StoryDataManager.CheckLevelPass(2, 6))
-            {
-
-                ShowGuide(target, true, "点击确定进行战斗");
-            }
-        }
-        /*****************************************************************提示标签**************************************************/
-        public static void TryGuideStoryLevelInfoListTag(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.TIPS_TAGS_FIGHT) <= 0
-                && StoryDataManager.CheckLevelPass(2, 7)
-                && !StoryDataManager.CheckLevelPass(2, 8))
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.TIPS_TAGS_FIGHT;
-                ShowGuide(target, true, "选择相应的关卡标签,可提高分数", 0, true);
-            }
-        }
-        /***********************************************************词牌升星********************************************************/
-        public static void TryGuideStoryLevelInfoBtnHome(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.CARD_UP_STAR) <= 0
-                && StoryDataManager.CheckLevelPass(2, 14)
-                && !StoryDataManager.CheckLevelPass(2, 15))
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.CARD_UP_STAR;
-                ShowGuide(target, true, "已经收集了足够的材料,可以给词牌升星了", 0, true);
-            }
-        }
-        public static void TryGuideMainUIViewBtnCiPai(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.CARD_UP_STAR) <= 0
-               && StoryDataManager.CheckLevelPass(2, 14)
-                && !StoryDataManager.CheckLevelPass(2, 15))
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.CARD_UP_STAR;
-                ShowGuide(target, true, "点击词牌", 0);
-            }
-        }
-
-        public static void TryGuideCardDetailViewList(GList list)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.CARD_UP_STAR) <= 0
-                  && StoryDataManager.CheckLevelPass(2, 14)
-                && !StoryDataManager.CheckLevelPass(2, 15))
-            {
-                if (list.numChildren > 0)
-                {
-                    UI.Card.UI_ListCardItem listItem = UI.Card.UI_ListCardItem.Proxy(list.GetChildAt(0));
-                    if (listItem != null)
-                    {
-                        GuideDataManager.currentGuideId = ConstGuideId.CARD_UP_STAR;
-                        ShowGuide(listItem.target, true, "选择可升星的词牌", 0);
-                        return;
-                    }
-
-                }
-
-            }
-        }
-        public static void TryGuideCardFosterViewBtnStar(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.CARD_UP_STAR) <= 0
-                && StoryDataManager.CheckLevelPass(2, 14)
-                && !StoryDataManager.CheckLevelPass(2, 15))
-            {
-
-                ShowGuide(target, true, "升满5星后,可解锁词牌的隐藏卡面哦", 0);
-            }
-        }
-        /***********************************************************引导拍照********************************************************/
-        // PHOTOGRAPH_GUIDE
-        public static bool TryGuideGoBackStoryChapter1(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0
-                && StoryDataManager.CheckLevelPass(2, 4)
-                && !StoryDataManager.CheckLevelPass(2, 5))
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
-                ShowGuide(target, false, "拍照功能已开启,解锁更多搭配和玩法哦,点这里看看吧", 0);
-                return true;
-            }
-            return false;
-        }
-        public static bool TryGuideOpenDressUpView(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0
-                && StoryDataManager.CheckLevelPass(2, 4)
-                && !StoryDataManager.CheckLevelPass(2, 5))
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
-                ShowGuide(target, false, "点击自由换装", 0);
-                return true;
-            }
-            return false;
-        }
-        public static bool TryGuideDressUpViewMenuType2(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0
-               && StoryDataManager.CheckLevelPass(2, 4)
-               && !StoryDataManager.CheckLevelPass(2, 5))
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
-                ShowGuide(target, false, "点击拍照", 0);
-                return true;
-            }
-            return false;
-        }
-        public static void TryGuideDressUpViewMenuPart1(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0
-                && StoryDataManager.CheckLevelPass(2, 4)
-                && !StoryDataManager.CheckLevelPass(2, 5))
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
-                ShowGuide(target, false, "可以自由添加已有道具", 0);
-            }
-        }
-        public static bool TryGuideBtnPhotograph(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0
-                && StoryDataManager.CheckLevelPass(2, 4)
-                && !StoryDataManager.CheckLevelPass(2, 5))
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
-                ShowGuide(target, false, "点击空白处查看整体效果", 0);
-                return true;
-            }
-            return false;
-        }
-        public static bool TryGuideOpenPhotographView(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0
-                && StoryDataManager.CheckLevelPass(2, 4)
-                && !StoryDataManager.CheckLevelPass(2, 5))
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
-                ShowGuide(target, false, "双指可控制放大缩小,或点击边框上的按键控制", 0);
-                return true;
-            }
-            return false;
-        }
-
-        public static bool TryGuideBtnSave(GObject target)
-        {
-
-            if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0
-                && StoryDataManager.CheckLevelPass(2, 4)
-                && !StoryDataManager.CheckLevelPass(2, 5))
-            {
-                GuideDataManager.currentGuideId = ConstGuideId.PHOTOGRAPH_GUIDE;
-                ShowGuide(target, false, "点击拍照,可以记录和分享美照啦~", 0);
-                return true;
-            }
-            return false;
-        }
-        /*********************************************************************************************************************************/
         public static bool IsGuide()
         {
 
@@ -797,53 +121,5 @@ namespace GFGGame
 
             ViewManager.Hide(ViewName.GUIDE_VIEW);
         }
-        /************************************************************************************************************/
-
-        public static bool TryGuideByGuideId(GObject target, int guideId, int maxCount = 1, bool needUpdate = false, string guideStr = null, int yTxt = 0, int preGuideIdAtThisLogin = 0)
-        {
-            if (GuideController.useNewGuide) return false;
-
-            if (preGuideIdAtThisLogin > 0 && !GuideDataManager.CheckGuideIsCompletedAtThisLogin(preGuideIdAtThisLogin))
-            {
-                return false;
-            }
-            if (GuideDataManager.GetGuideCount(guideId) < maxCount)
-            {
-                GuideDataManager.currentGuideId = guideId;
-                ShowGuide(target, needUpdate, guideStr, yTxt);
-                return true;
-            }
-            return false;
-        }
-
-        public static bool TryCompleteGuide(int guideId)
-        {
-            if (useNewGuide) return false;
-            bool result = GuideDataManager.TryCompleteGuide(guideId);
-            if (result)
-            {
-                HideGuide();
-            }
-            return result;
-        }
-
-        public static void HideGuide()
-        {
-            if (useNewGuide) return;
-            ViewManager.Hide(ViewName.GUIDE_VIEW);
-        }
-
-        private static void ShowGuide(GObject target, bool needUpdate = false, string guideStr = null, int yTxt = 0, bool isOptionalGuide = false, float devWidth = 0, float devHeight = 0)
-        {
-            if (useNewGuide) return;
-
-            HideGuide();
-            if (GameGlobal.skipGuide)
-            {
-                return;
-            }
-            ViewManager.Show(ViewName.GUIDE_VIEW, new List<object> { target, needUpdate, guideStr, yTxt, isOptionalGuide, devWidth, devHeight
-});
-        }
     }
 }

+ 0 - 12
GameClient/Assets/Game/HotUpdate/Data/GuideDataManager.cs

@@ -72,18 +72,6 @@ namespace GFGGame
             return false;
         }
 
-        public static int GetGuideCount(int guideId)
-        {
-            if (GuideController.useNewGuide) return 1;
-            if (_dataDic.ContainsKey(guideId))
-            {
-                GuideData guideData = _dataDic[guideId];
-                return guideData.count;
-            }
-            return 0;
-        }
-
-
 
         public static bool CheckGuideIsCompletedAtThisLogin(int guideId)
         {

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

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

+ 0 - 2
GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -54,7 +54,6 @@ namespace GFGGame
             _ui.m_listRole.selectedIndex = this._selectType;
             _ui.m_listRole.numItems = listRoleCount;
             this.UpdateCardList(_ui.m_listRole.selectedIndex);
-            GuideController.TryGuideCardDetailViewList(_ui.m_listCard);
 
         }
         private void UpdateCardList(int rarity = 0)
@@ -132,7 +131,6 @@ namespace GFGGame
 
         private void OnClickBtnHome()
         {
-            GuideController.TryCompleteGuide(ConstGuideId.SUIT_SYNTHETIC_GUIDE);
             GameController.GoBackToMainView();
             this.Clear();
 

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

@@ -108,7 +108,6 @@ namespace GFGGame
             this.UpdateCardRes();
             this.UpdateUpLvView();
             _comFosterBottom.m_ctrlTab.selectedIndex = this._selectTab;
-            GuideController.TryGuideCardFosterViewBtnStar(_ui.m_ComFosterBottom.m_btnStar);
         }
 
         private void UpdateNormal()
@@ -661,8 +660,6 @@ namespace GFGGame
             else if (_comFosterBottom.m_ctrlTab.selectedIndex == 1)
             {
                 this.UpdateUpStarView();
-                GuideController.HideGuide();
-                GuideController.TryCompleteGuide(ConstGuideId.CARD_UP_STAR);
             }
             else
             {

+ 0 - 5
GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -185,24 +185,19 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            GuideController.HideGuide();
             ViewManager.GoBackFrom(ViewName.CLOTHING_SHOP_VIEW);
             this.Hide();
-            GuideController.TryGuideDressUpFightViewMenuType1();
 
         }
 
         private void OnclickBtnBuy()
         {
-            GuideController.HideGuide();
             int count = _selectedItemId > 0 && _cfgSelected.itemID == _selectedItemId ? _selectedItemCount : INIT_COUNT;
             BuyItemConteoller.Show(_cfgSelected.itemID, _cfgSelected.costID, INIT_COUNT, _cfgSelected.costNum, count, null, true, false, MAX_COUNT);
 
         }
         private void UpdateItemChange()
         {
-            GuideController.TryGuideClothingShopViewBtnBack(_ui.m_btnBack);
-
             UpdateCJGoodsCount();
             UpdateList(false);
 

+ 1 - 20
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -111,7 +111,6 @@ namespace GFGGame
             UpdateClothingList(false);
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnItemNumChanged);
 
-            GuideController.TryGuideClothingSyntheticViewSuitList(_ui.m_listClothing);
         }
 
         protected override void OnHide()
@@ -138,13 +137,10 @@ namespace GFGGame
         private void OnClickListClothingItem(EventContext context)
         {
             UpdateSelectedItemInfo(context.data as GComponent, true);
-            GuideController.TryGuideClothingSyntheticViewList(_ui.m_listMaterias);
         }
 
         private void OnClickBtnProcuction()
         {
-            Timers.inst.AddUpdate(UpdateTryGuide);
-            // GuideController.HideGuide();
             if (ItemDataManager.GetItemNum(_selectedItemId) > 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("不能制作已经拥有的物品!");
@@ -329,13 +325,6 @@ namespace GFGGame
                     listItem.m_groupCount.target.onClick.Add(OnClickMateriasItemPlus);
                     listItem.target.data = itemData;
 
-                    if (i == 0)
-                    {
-                        listItem.m_loaderIcon.onClick.Add(() =>
-                        {
-                            GuideController.TryGuideClothingSyntheticViewBtnProduction(_ui.m_btnProduction);
-                        });
-                    }
                 }
                 else
                 {
@@ -378,17 +367,9 @@ namespace GFGGame
         }
         private void OnClickBtnHome()
         {
-            Timers.inst.Remove(UpdateTryGuide);
-            GuideController.TryCompleteGuide(ConstGuideId.SUIT_SYNTHETIC_GUIDE);
             GameController.GoBackToMainView();
         }
-        private void UpdateTryGuide(object param)
-        {
-            if (GRoot.inst.GetTopWindow() == this.viewCom)
-            {
-                GuideController.TryGuideClothingSyntheticViewBtnHome(_ui.m_btnHome);
-            }
-        }
+
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;

+ 0 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs

@@ -39,7 +39,6 @@ namespace GFGGame
             UpdateSuitList();
 
             EventAgent.AddEventListener(ConstMessage.SUIT_BOX_STATUS_CHANGED, UpdateSuitBoxStatus);
-            GuideController.TryGuideSuitSyntheticViewList(_ui.m_listSuit);
         }
 
         protected override void OnHide()

+ 0 - 3
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachOfItemView.cs

@@ -60,8 +60,6 @@ namespace GFGGame
                 _ui.m_listApproach.height = 162;
             }
 
-            GuideController.TryGuideApproachOfItemViewList(_ui.m_listApproach);
-
         }
 
         protected override void OnHide()
@@ -95,7 +93,6 @@ namespace GFGGame
 
         private void OnClickListApproachItem(EventContext context)
         {
-            GuideController.HideGuide();
             GObject listItem = context.data as GObject;
             string[] infos = listItem.data as string[];
             string functionId = infos[0];

+ 0 - 2
GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyCountView.cs

@@ -77,8 +77,6 @@ namespace GFGGame
             base.OnShown();
             _ui.m_txtCount.text = "" + _count;
             UpdateView();
-            GuideController.TryGuideBuyCountViewBtnSure(_ui.m_btnSure);
-
         }
         private void UpdateView()
         {

+ 1 - 5
GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetBonusView.cs

@@ -42,15 +42,11 @@ namespace GFGGame
                 _ui.m_listBonus.columnGap = 60;
             }
             int targetY = (int)(this.viewCom.y + _ui.target.y + _ui.target.height);
-            GuideController.TryGuideByGuideId(null, ConstGuideId.GET_BONUS_VIEW, 1, false, "恭喜你,获得了第一份奖励,点击图标可以查看物品信息,点击半透明区域继续", targetY);
         }
 
         protected override void OnHide()
         {
             base.OnHide();
-            GuideController.HideGuide();
-            GuideController.TryCompleteGuide(ConstGuideId.GET_BONUS_VIEW);
-            TryCompleteGuide();
             GetSuitItemController.TryShow(0);
         }
 
@@ -80,7 +76,7 @@ namespace GFGGame
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(null, ConstGuideId.GET_BONUS_FIRST, 1, "恭喜你,获得了第一份奖励,点击图标可以查看物品信息,点击半透明区域继续", false, 0, true, false, (int)(this.viewCom.y + _ui.target.y + _ui.target.height));
         }
-        private void TryCompleteGuide()
+        protected override void TryCompleteGuide()
         {
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.GET_BONUS_FIRST);
             GuideController.TryCompleteGuideIndex(cfg.id, 1);

+ 3 - 9
GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

@@ -63,9 +63,7 @@ namespace GFGGame
                     GetSuitItemController.TryShow(0);
                 });
             }
-            GuideController.HideGuide();
-            GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_VIEW_FIRST);
-            GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_VIEW_FULL);
+
             TryCompleteGuide();
         }
 
@@ -74,9 +72,7 @@ namespace GFGGame
             int itemId = GetSuitItemController.TryShow(0);
             if (itemId > 0)
             {
-                GuideController.HideGuide();
-                GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_VIEW_FIRST);
-                GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_VIEW_FULL);
+
                 UpdateView(itemId);
             }
             else
@@ -122,12 +118,10 @@ namespace GFGGame
                 if (count == totalCount)
                 {
                     guideId = 1;
-                    GuideController.TryGuideByGuideId(null, ConstGuideId.GET_SUIT_ITEM_VIEW_FULL, 1, false, "恭喜你,集齐了第一套套装,快去换装界面穿上试试吧!点击空白区域继续", targetY);
                 }
                 else
                 {
                     guideId = 2;
-                    GuideController.TryGuideByGuideId(null, ConstGuideId.GET_SUIT_ITEM_VIEW_FIRST, 1, false, "恭喜你,获得了一件套装配件,集齐套装有惊喜哦!点击空白区域继续", targetY);
                 }
             }
             _ui.m_probar.max = totalCount;
@@ -159,7 +153,7 @@ namespace GFGGame
             if (guideId == 1) GuideController.TryGuide(null, ConstGuideId.GET_SUIT_ITEM_FULL, 1, "恭喜你,集齐了第一套套装,快去换装界面穿上试试吧!点击空白区域继续", false, 0, true, false, (int)(this.viewCom.height - 150));
             if (guideId == 2) GuideController.TryGuide(null, ConstGuideId.GET_SUIT_ITEM_FIRST, 1, "恭喜你,获得了一件套装配件,集齐套装有惊喜哦!点击空白区域继续", false, 0, true, false, (int)(this.viewCom.height - 150));
         }
-        private void TryCompleteGuide()
+        protected override void TryCompleteGuide()
         {
             GuideCfg cfg;
             cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.GET_SUIT_ITEM_FULL);

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

@@ -97,15 +97,13 @@ namespace GFGGame
             }
             _ui.m_comboBox.selectedIndex = CustomSuitDataManager.currentIndex;
             EquipDataCache.cacher.PutOnCurrentSuitSaved();
-            GuideController.TryGuideDressUpViewMenuType1(_ui.m_comListType1.m_listType);
-            GuideController.TryGuideDressUpViewMenuType2(_ui.m_btnPhoto);
+
         }
 
         protected override void OnHide()
         {
             base.OnHide();
             listTypeItem_FreedomDress = null;
-            GuideController.HideGuide();
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
             if (_sceneObject != null)
             {
@@ -117,7 +115,6 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             Reset();
-            GuideController.TryCompleteGuide(ConstGuideId.DRESS_UP_VIEW_BTN_BACK);
             this.Hide();
             ViewManager.Show(ViewName.MAINUI_VIEW);
         }
@@ -142,7 +139,6 @@ namespace GFGGame
 
         private void OnClickListType1Item(EventContext context)
         {
-            GuideController.HideGuide();
             GObject typeItem = (GObject)context.data as GObject;
             int order = (int)typeItem.data;
             DressUpMenuItemCfg1 item1 = DressUpMenuItemCfg1Array.Instance.dataArray[order - 1];
@@ -153,7 +149,6 @@ namespace GFGGame
             else
             {
                 this.showListParts(item1.type);
-                GuideController.TryGuideDressUpViewMenuPart(_ui.m_partsList.m_list);
             }
             this.hideListType1();
             UpdateListPartsSelected();
@@ -173,7 +168,6 @@ namespace GFGGame
 
         private void OnClickPartsListItem(EventContext context)
         {
-            GuideController.TryGuideByGuideId(_ui.m_btnSave, ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG, 1, false, "搭配好的服饰,可以保存随时查看");
             GObject listItem = (GObject)context.data as GObject;
             int id = (int)listItem.data;
             if (_currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG)
@@ -217,8 +211,6 @@ namespace GFGGame
 
         private void OnClickBtnSave()
         {
-            GuideController.TryCompleteGuide(ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG);
-            GuideController.TryGuideByGuideId(_ui.m_btnBack, ConstGuideId.DRESS_UP_VIEW_BTN_BACK, 1, false, "保存成功,回主界面看看吧", 0, ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG);
             CustomSuitDataManager.SaveCurrentSuit(_ui.m_comboBox.selectedIndex);
             PromptController.Instance.ShowFloatTextPrompt("保存成功", MessageType.SUCCESS);
         }

+ 0 - 2
GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs

@@ -32,7 +32,6 @@ namespace GFGGame
             float height = width * tex.height / tex.width;
             _ui.m_imgRes.SetSize(width, height);
             _ui.m_imgBorder.SetSize(width, height + 12);
-            GuideController.TryGuideBtnSave(_ui.m_btnSave);
 
         }
 
@@ -48,7 +47,6 @@ namespace GFGGame
 
         private void OnClickBtnSave()
         {
-            GuideController.TryCompleteGuide(ConstGuideId.PHOTOGRAPH_GUIDE);
             string path = Application.persistentDataPath + "/Pictures/WanshiJing/";
 
             //判断目录是否存在,不存在则会创建目录

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

@@ -123,9 +123,7 @@ namespace GFGGame
             UpdateBg(ItemCfgArray.Instance.GetCfg(EquipDataCache.cacher.bgId));
             UpdateBody();
             UpdateScene();
-            GuideController.TryGuideDressUpViewMenuPart1(_ui.m_ComSelectRes.m_comBtnTab.m_btn2);
-            // GuideController.TryGuideBtnPhotograph(_ui.m_btnPhotograph);
-            if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) > 0 && GuideDataManager.GetGuideCountCopy(ConstGuideId.PHOTOGRAPH) > 0)
+            if (GuideDataManager.GetGuideCountCopy(ConstGuideId.PHOTOGRAPH) > 0)
             {
                 _ui.m_loaGuide.enabled = false;
                 _ui.m_loaGuide1.enabled = false;
@@ -142,7 +140,6 @@ namespace GFGGame
         {
             int index = _ui.m_ComSelectRes.m_comBtnTab.m_c1.selectedIndex;
             RefreshList((EnumPhotographType)index);
-            GuideController.TryGuideBtnPhotograph(_ui.m_loaGuide);
         }
         private void RefreshList(EnumPhotographType index)
         {
@@ -515,13 +512,11 @@ namespace GFGGame
             _ui.m_loaGuide1.enabled = true;
             _ui.m_loaGuide.enabled = false;
             _ui.m_ComSelectRes.target.visible = false;
-            GuideController.TryGuideOpenPhotographView(_ui.m_loaGuide1);
         }
         private void OnClickLoaGuide1()
         {
             _ui.m_loaGuide1.enabled = false;
             _ui.m_ComSelectRes.target.visible = false;
-            GuideController.TryGuideBtnSave(_ui.m_btnPhotograph);
         }
         private void OnTouchBtnFlipBegin()//翻转
         {
@@ -575,8 +570,6 @@ namespace GFGGame
         }
         private void OnClickBtnPhotograph()
         {
-            GuideController.HideGuide();
-            GuideController.TryCompleteGuide(ConstGuideId.PHOTOGRAPH_GUIDE);
             _ui.target.visible = false;
             Timers.inst.StartCoroutine(ScreenShotTex());// ();
         }
@@ -629,6 +622,7 @@ namespace GFGGame
             }
             base.Dispose();
         }
+
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
@@ -638,98 +632,6 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnPhotograph, ConstGuideId.PHOTOGRAPH, 7, "点击拍照,可以记录和分享美照啦");
             GuideController.TryCompleteGuide(ConstGuideId.PHOTOGRAPH, 7);
         }
-
-
-
-        private void CreatTex()
-        {
-            Rect rect = new Rect(-(UnityEngine.Screen.width / 2), -(UnityEngine.Screen.height / 2), UnityEngine.Screen.width, UnityEngine.Screen.height);
-            Texture2D tex = new Texture2D((int)rect.width, (int)rect.height, TextureFormat.ARGB32, false);//新建一个Texture2D对象
-            Transform transform = _sceneObject.transform.Find("Scene/Role");
-            Dictionary<SpriteRenderer, int> data = new Dictionary<SpriteRenderer, int>();
-
-            float width = 0;
-            float height = 0;
-            for (int i = 0; i < transform.childCount; i++)
-            {
-                SpriteRenderer sr = transform.GetChild(i).GetComponent<SpriteRenderer>();
-                if (sr != null)
-                {
-                    width = Math.Max(sr.bounds.size.x + sr.transform.position.x, width);
-                    height = Math.Max(sr.bounds.size.x + sr.transform.position.x, width);
-
-                    data.Add(sr, sr.sortingOrder);
-                }
-            }
-            List<KeyValuePair<SpriteRenderer, int>> lst = new List<KeyValuePair<SpriteRenderer, int>>(data);
-            lst.Sort(delegate (KeyValuePair<SpriteRenderer, int> s1, KeyValuePair<SpriteRenderer, int> s2) { return s2.Value.CompareTo(s1.Value); });
-            data.Clear();
-
-            for (int i = lst.Count - 1; i >= 0; i--)
-            {
-                SpriteRenderer sr = lst[i].Key;
-                if (sr != null)
-                {
-                    // Sprite sprite1 = sr.GetComponent<Sprite>();
-                    Texture2D texture2D = sr.sprite.texture;
-                    for (int j = 0; j < texture2D.width; j++)
-                    {
-                        for (int k = 0; k < texture2D.height; k++)
-                        {
-                            var color = texture2D.GetPixel(j, k);
-                            tex.SetPixel(j, k, color);
-                            tex.Apply();
-                            Debug.Log("color:" + color + "     " + j + "   " + k);
-                        }
-                    }
-                    // var color = texture2D.GetPixel(0, 0);
-
-                    // tex.SetPixel(0, 0, color);
-                    // tex.Apply();//保存像素信息
-                }
-            }
-            Sprite sprite = Sprite.Create(tex, rect, new Vector2(-(UnityEngine.Screen.width / 2), -(UnityEngine.Screen.height / 2)));
-            GameObject gameObject = _sceneObject.transform.Find("Scene/Role/BodyRes").gameObject;
-            gameObject.AddComponent<SpriteRenderer>();
-            gameObject.GetComponent<SpriteRenderer>().sprite = sprite;
-
-            // // Dictionary<string, int> data = new Dictionary<string, int>();
-            // // for (int i = 0; i < _equipRoleData.Count; i++)
-            // // {
-            // //     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_equipRoleData[i]);
-            // //     ItemTypeCfg typeCfg = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType);
-
-            // //     if (itemCfg.resLayer1 > 0)
-            // //     {
-            // //         data.Add(itemCfg.res, typeCfg.defaultLayer);
-            // //     }
-            // //     if (itemCfg.resLayer2 > 0)
-            // //     {
-            // //         data.Add(string.Format("{0}_t", itemCfg.res), typeCfg.defaultLayer);
-            // //     }
-            // // }
-            // // List<KeyValuePair<string, int>> lst = new List<KeyValuePair<string, int>>(data);
-            // // lst.Sort(delegate (KeyValuePair<string, int> s1, KeyValuePair<string, int> s2) { return s2.Value.CompareTo(s1.Value); });
-            // // data.Clear();
-            // // for (int i = lst.Count - 1; i >= 0; i--)
-            // // {
-            // //     string res = lst[i].Key;
-            // //     int sortingOrder = lst[i].Value;
-
-            // //     float tx, ty;
-            // //     DressUpUtil.LoadSpritePos(res, out tx, out ty);
-            // //     string resPath = ResPathUtil.GetDressUpPath(res);
-            // //     Bitmap bmp = new Bitmap(resPath);
-
-            // //     tex.SetPixel(0, 0, );//读取像素,屏幕左下角为0点
-            // //     tex.Apply();//保存像素信息
-            // // }
-            // tex.SetPixel(0, 0, );//读取像素,屏幕左下角为0点
-
-            // tex.Apply();//保存像素信息
-            // return tex;
-        }
-
     }
 }
 

+ 2 - 4
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs

@@ -79,7 +79,7 @@ namespace GFGGame
         }
         private void ResetStartView()
         {
-            showGuide = GuideController.TryGuideLuckyBoxStar() || GuideDataManager.GetGuideCountCopy(ConstGuideId.LUCKY_BOX) <= 0;
+            showGuide = GuideDataManager.GetGuideCountCopy(ConstGuideId.LUCKY_BOX) <= 0;
 
             curComStar = null;
             comStars.Clear();
@@ -201,8 +201,6 @@ namespace GFGGame
             {
                 TryCompleteGuide();
                 Timers.inst.Add(0.3f, 1, ClickUIEnd);
-                GuideController.HideGuide();
-                GuideController.TryCompleteGuide(ConstGuideId.MAIN_UI_BTN_ZHAI_XING);
             }
         }
         private void ClickUIEnd(object param)
@@ -247,7 +245,7 @@ namespace GFGGame
             GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX, 4, "点击将星星链接在一起", false, 0, true, false, (int)(this.viewCom.height - 150));
             TryCompleteGuide();
         }
-        private void TryCompleteGuide()
+        protected override void TryCompleteGuide()
         {
             if (comStars.Count == 0)
             {

+ 1 - 18
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -199,7 +199,7 @@ namespace GFGGame
         {
             // bool result = GuideController.TryCompleteGuide(ConstGuideId.MAIN_UI_BTN_ZHAI_XING);
             LuckyBoxCfg luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxBonusDataCache.currentBoxId);
-            if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_ZHAI_XING) <= 0 || GuideDataManager.GetGuideCountCopy(ConstGuideId.LUCKY_BOX) <= 0)
+            if (GuideDataManager.GetGuideCountCopy(ConstGuideId.LUCKY_BOX) <= 0)
             {
 
                 int count = ItemDataManager.GetItemNum(luckyBoxCfg.costID);
@@ -239,7 +239,6 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            GuideController.TryCompleteGuide(ConstGuideId.LUCKY_BOX_VIEW_BTN_BACK);
             this.Hide();
 
             Reset();
@@ -257,25 +256,9 @@ namespace GFGGame
         }
         protected override void UpdateToCheckGuide(object param)
         {
-            if (this.viewCom.parent != null)
-            {
-                if (GRoot.inst.GetTopWindow() == this.viewCom)
-                {
-                    if (GuideController.TryGuideByGuideId(_ui.m_btnBuyTen.target, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, true, "点击摘取十次"))
-                    {
-                    }
-                    else
-                    {
-                        if (GuideController.TryGuideByGuideId(_ui.m_btnBack, ConstGuideId.LUCKY_BOX_VIEW_BTN_BACK, 1, true, "获得一套完整的服装啦,马上去试穿一下", 0, ConstGuideId.MAIN_UI_BTN_ZHAI_XING))
-                        {
-                        }
-                    }
-                }
-            }
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(_ui.m_btnBuyTen.target, ConstGuideId.LUCKY_BOX, 3, "点击摘取十次");
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.FREEDOM_DRESS, 1, "获得一套完整的服装啦,马上去试穿一下");
-
         }
     }
 }

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

@@ -44,8 +44,6 @@ namespace GFGGame
             _ui.m_listCard.numItems = cardList.Count;
             _ui.m_listCard.selectedIndex = 0;
             UpdateView(0);
-
-            GuideController.TryGuideStoryCardChoose(_ui.m_listCard);
         }
 
         private void UpdateView(int index)
@@ -70,8 +68,6 @@ namespace GFGGame
         private void OnListCardItemClick(EventContext context)
         {
             UpdateView(_ui.m_listCard.selectedIndex);
-            GuideController.TryGuideStoryCardChooseBtnConfirm(_ui.m_btnConfirm);
-
         }
         private void OnBtnComfirmClick()
         {
@@ -80,8 +76,6 @@ namespace GFGGame
             StoryDataManager.currentCardId = cfgs.Length > 0 ? cardId : -1;
             this.Hide();
             EventAgent.DispatchEvent(ConstMessage.CARD_CHOOSE);
-            GuideController.HideGuide();
-            GuideController.TryCompleteGuide(ConstGuideId.USE_CARD_FIGHT);
         }
 
         private static List<CardData> SortCardList(List<CardData> arrayList)

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

@@ -56,7 +56,6 @@ namespace GFGGame
 
         protected override void OnHide()
         {
-            GuideController.HideGuide();
             _ui.m_listChapter.RemoveChildrenToPool();
             base.OnHide();
         }

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

@@ -69,12 +69,7 @@ namespace GFGGame
             _ui.m_chapter.AddChild(_compChapter);
             InitChapter();
             _valueBarController.OnShown();
-            if (GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0
-            || GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_ZHAI_XING) <= 0
-            || GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
-            || GuideDataManager.GetGuideCount(ConstGuideId.CARD_UP_STAR) <= 0)
-            {
-            }
+
         }
 
         protected override void OnHide()
@@ -82,7 +77,6 @@ namespace GFGGame
             base.OnHide();
             _unPasslevelItem = null;
             _endLevelItem = null;
-            GuideController.HideGuide();
             _ui.m_chapter.RemoveChildren(0, 0, true);
             _valueBarController.OnHide();
         }
@@ -94,8 +88,6 @@ namespace GFGGame
 
         private void OnClickBtnHome()
         {
-            GuideController.HideGuide();
-            GuideController.TryCompleteGuide(ConstGuideId.SINGLE_FIGHT_GUIDE);
             GameController.GoBackToMainView();
         }
 
@@ -248,50 +240,8 @@ namespace GFGGame
 
         protected override void UpdateToCheckGuide(object param)
         {
-            // if (this.viewCom.parent != null)
-            // {
-            //     int index = this.viewCom.parent.GetChildIndex(this.viewCom);
-            //     if (index == this.viewCom.parent.numChildren - 1 && GRoot.inst.GetTopWindow() == null)
-            //     {
-
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-
-            if (_unPasslevelItem != null && GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
-            {
-                GuideController.TryGuideChapterViewLevelItem(_unPasslevelItem);
-                // Timers.inst.Remove(UpdateToCheckGuide);
-
-            }
-            else if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_ZHAI_XING) <= 0)
-            {
-                GuideController.TryGuideGoBackStoryChapter(_ui.m_btnHome);
-                // Timers.inst.Remove(UpdateToCheckGuide);
-
-            }
-            else if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0 && GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG) > 0 && GuideDataManager.currentGuideId != ConstGuideId.SUIT_SYNTHETIC_GUIDE)
-            {
-                GuideController.TryGuideStoryChapterView(_unPasslevelItem);
-                // Timers.inst.Remove(UpdateToCheckGuide);
-
-            }
-            else if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0 && GuideDataManager.currentGuideId == ConstGuideId.SUIT_SYNTHETIC_GUIDE)
-            {
-                GuideController.TryGuideStoryChapterViewBtnHome(_ui.m_btnHome);
-                // Timers.inst.Remove(UpdateToCheckGuide);
-
-            }
-            else if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0)
-            {
-                GuideController.TryGuideGoBackStoryChapter1(_ui.m_btnHome);
-            }
-
-            else if (GuideDataManager.GetGuideCount(ConstGuideId.CARD_UP_STAR) <= 0)
-            {
-                GuideController.TryGuideStoryLevelInfoBtnHome(_ui.m_btnHome);
-                // Timers.inst.Remove(UpdateToCheckGuide);
-
-            }
-
+            GuideController.TryGuide(_unPasslevelItem, ConstGuideId.START_STORY, 1, "点击关卡,开启新历程");
 
             GuideController.TryGuide(_unPasslevelItem, ConstGuideId.SINGLE_FIGHT, 1, "遇到意外事件了,暂时解释不清,先按请求换上服饰吧");
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.LUCKY_BOX, 1, "点击返回主界面");
@@ -304,6 +254,12 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.PHOTOGRAPH, 1, "拍照功能已开启,解锁更多搭配和玩法哦");
 
         }
+        protected override void TryCompleteGuide()
+        {
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.START_STORY);
+            GuideController.TryCompleteGuideIndex(cfg.id, 1);
+            GuideController.TryCompleteGuide(ConstGuideId.START_STORY, 1);
+        }
     }
 
 }

+ 33 - 32
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -38,7 +38,7 @@ namespace GFGGame
         public override void Dispose()
         {
             base.Dispose();
-            if(_scenePrefab != null)
+            if (_scenePrefab != null)
             {
                 GameObject.Destroy(_scenePrefab);
                 _scenePrefab = null;
@@ -83,7 +83,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            if(_sceneObject == null)
+            if (_sceneObject == null)
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
             }
@@ -95,7 +95,7 @@ namespace GFGGame
             string stroyStartID = (string)datas[0];
             bool skipable = (bool)datas[1];
             _onCompleteStoryDialogCall = (OnCompleteStoryDialogCall)datas[2];
-            if(datas.Length > 3)
+            if (datas.Length > 3)
             {
                 _onCompleteStoryDialogCallParam = datas[3];
             }
@@ -118,7 +118,7 @@ namespace GFGGame
             Timers.inst.Remove(ShowNextWords);
             ScreenBlackController.Instance.HideBlack();
             StopAutoPlay();
-            if(_sceneObject != null)
+            if (_sceneObject != null)
             {
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
@@ -130,7 +130,7 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            Over(true);
+            Over(false);
         }
 
         private void OnClickBtnNext()
@@ -212,20 +212,20 @@ namespace GFGGame
             _ui.m_dialogHead.target.visible = false;
             float delay = 0;
             //ÆÁĻЧ¹û
-            if(_currentStepCfg != null)
+            if (_currentStepCfg != null)
             {
-                if(_currentStepCfg.blackScreenDur > 0)
+                if (_currentStepCfg.blackScreenDur > 0)
                 {
                     delay = _currentStepCfg.blackScreenDur;
                     ScreenBlackController.Instance.ShowBlack(delay, this.viewCom, 0);
                 }
-                else if(_currentStepCfg.blankScreenDur > 0)
+                else if (_currentStepCfg.blankScreenDur > 0)
                 {
                     delay = _currentStepCfg.blankScreenDur;
                     UpdatePic("0");
                 }
             }
-            if(delay > 0)
+            if (delay > 0)
             {
                 //ת»»³ÉÃë
                 delay = delay / 1000f;
@@ -259,7 +259,7 @@ namespace GFGGame
             PlayShake(storyDialogCfg.shakeInfoArr);
             string content = storyDialogCfg.content;
             content = storyDialogCfg.content.Replace("self", RoleDataManager.roleName);
-            if(content.IndexOf("//") >= 0)
+            if (content.IndexOf("//") >= 0)
             {
                 showList(content);
             }
@@ -279,13 +279,14 @@ namespace GFGGame
             _ui.m_dialogHead.target.visible = false;
             _ui.m_list.visible = true;
             _ui.m_list.RemoveChildrenToPool();
-            string[] list = Regex.Split(content,"//");
-            _ui.m_list.itemRenderer = (int index, GObject item) =>{
+            string[] list = Regex.Split(content, "//");
+            _ui.m_list.itemRenderer = (int index, GObject item) =>
+            {
                 string itemInfo = list[index];
                 string[] itemInfoList = Regex.Split(itemInfo, "=");
                 UI_ListDialogItem dialogItem = UI_ListDialogItem.Proxy(item);
                 dialogItem.m_txtContent.text = itemInfoList[0];
-                dialogItem.target.data = itemInfoList.Length > 1?itemInfoList[1]: null;
+                dialogItem.target.data = itemInfoList.Length > 1 ? itemInfoList[1] : null;
             };
             _ui.m_list.numItems = list.Length;
 
@@ -304,7 +305,7 @@ namespace GFGGame
                 roleName = RoleDataManager.roleName;
             }
             //»Ø¹Ë
-            if(roleName != null)
+            if (roleName != null)
             {
                 _dialogListLookBack.Add("[color=#FDA2B1]" + roleName + "[/color]");
             }
@@ -318,7 +319,7 @@ namespace GFGGame
                 _wordTextField = _ui.m_dialogHead.m_txtContent;
                 _arrow = _ui.m_dialogHead.m_iconNext;
             }
-            else if(!string.IsNullOrEmpty(roleName))
+            else if (!string.IsNullOrEmpty(roleName))
             {
                 _ui.m_dialogText.target.visible = false;
                 _ui.m_dialogName.target.visible = true;
@@ -343,13 +344,13 @@ namespace GFGGame
 
         private void ShowNextDialog()
         {
-            if(_wordList != null && _wordList.Length > _wordIndex)
+            if (_wordList != null && _wordList.Length > _wordIndex)
             {
                 string itemInfo = _wordList[_wordIndex];
                 string[] itemInfoList = Regex.Split(itemInfo, "=");
                 _currentWords = itemInfoList[0];
                 StartShowLetters();
-                if(itemInfoList.Length > 1)
+                if (itemInfoList.Length > 1)
                 {
                     _wordTextField.data = itemInfoList[1];
                 }
@@ -372,24 +373,24 @@ namespace GFGGame
             _dialogListLookBack.Add(_currentWords);
             _isShowLetters = false;
             _wordIndex++;
-            if(_autoPlay)
+            if (_autoPlay)
             {
-                Timers.inst.Add(GameConst.NEXT_WORDS_INTERVAL_MAX/_speedAutoPlay, 1, ShowNextWords);
+                Timers.inst.Add(GameConst.NEXT_WORDS_INTERVAL_MAX / _speedAutoPlay, 1, ShowNextWords);
             }
         }
 
         private void ShowNextWords(object param = null)
         {
-            if(_wordTextField != null)
+            if (_wordTextField != null)
             {
-                if(_isShowLetters)
+                if (_isShowLetters)
                 {
                     ShowCurrentWords();
                 }
                 else
                 {
                     string stepID = (string)_wordTextField.data;
-                    if(stepID != null)
+                    if (stepID != null)
                     {
                         OnStepComplete(stepID);
                     }
@@ -408,13 +409,13 @@ namespace GFGGame
             _wordTextField.verticalAlign = VertAlignType.Top;
             _wordTextField.text = "";
             ArrayList letters = StoryUtil.GetLettersList(_currentWords);
-            Timers.inst.Add(GameConst.LETTERS_INTERVAL_MAX/_speedAutoPlay, 0, UpdateLetters, letters);
+            Timers.inst.Add(GameConst.LETTERS_INTERVAL_MAX / _speedAutoPlay, 0, UpdateLetters, letters);
         }
 
         private void UpdateLetters(object param)
         {
             ArrayList letters = (ArrayList)param;
-            if(letters == null || letters.Count <= 0)
+            if (letters == null || letters.Count <= 0)
             {
                 ShowCurrentWords();
             }
@@ -428,7 +429,7 @@ namespace GFGGame
 
         private void UpdateBg(string value)
         {
-            if(value.Length > 0)
+            if (value.Length > 0)
             {
                 SceneController.UpdateDialogBg(value, _sceneObject);
             }
@@ -436,7 +437,7 @@ namespace GFGGame
 
         private void UpdatePic(string value)
         {
-            if(value.Length > 0)
+            if (value.Length > 0)
             {
                 SceneController.UpdateDialogPic(value, _sceneObject);
             }
@@ -444,7 +445,7 @@ namespace GFGGame
 
         private void UpdateMusic(string value)
         {
-            if(value.Length > 0)
+            if (value.Length > 0)
             {
                 if (value == "0")
                 {
@@ -464,11 +465,11 @@ namespace GFGGame
 
         private void PlayShake(int[] shakeInfoArr)
         {
-            if(shakeInfoArr != null && shakeInfoArr.Length > 0)
+            if (shakeInfoArr != null && shakeInfoArr.Length > 0)
             {
                 Vector3 position = _sceneObject.transform.position;
-                position.x = (float)shakeInfoArr[0]/GameConst.PIXELS_PER_UNITY_UNIT;
-                position.y = (float)shakeInfoArr[1]/ GameConst.PIXELS_PER_UNITY_UNIT;
+                position.x = (float)shakeInfoArr[0] / GameConst.PIXELS_PER_UNITY_UNIT;
+                position.y = (float)shakeInfoArr[1] / GameConst.PIXELS_PER_UNITY_UNIT;
                 _sceneObject.transform.position = position;
                 float attenuationX = (float)shakeInfoArr[2] / GameConst.PIXELS_PER_UNITY_UNIT;
                 float attenuationY = (float)shakeInfoArr[3] / GameConst.PIXELS_PER_UNITY_UNIT;
@@ -514,7 +515,7 @@ namespace GFGGame
             }
             done = doneX && doneY;
             _sceneObject.transform.position = position;
-            if(done)
+            if (done)
             {
                 Timers.inst.Remove(UpdateShake);
             }
@@ -522,7 +523,7 @@ namespace GFGGame
 
         private void Over(bool isSkip = false)
         {
-            if(_onCompleteStoryDialogCall != null)
+            if (_onCompleteStoryDialogCall != null)
             {
                 _onCompleteStoryDialogCall(isSkip, _onCompleteStoryDialogCallParam);
             }

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

@@ -93,21 +93,11 @@ namespace GFGGame
             _ui.m_comClickCircle.target.visible = true;
 
 
-            if (_index == 0 && GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
+            if (_index == 0 && GuideDataManager.GetGuideCountCopy(ConstGuideId.SINGLE_FIGHT) <= 0)
             {
                 _ui.m_comClickCircle.m_loaCircle.touchable = false;
                 _ui.m_comClickCircle.m_t0.Play(1, 0, 0, 0.5f, () =>
                 {
-                    GuideController.TryGuideSingleScoreViewComClickCircle(_ui.m_comClickCircle.m_loaCircle);
-                    _ui.m_comClickCircle.m_loaCircle.touchable = true;
-                });
-            }
-            else if (_index == 0 && GuideDataManager.GetGuideCountCopy(ConstGuideId.SINGLE_FIGHT) <= 0)
-            {
-                _ui.m_comClickCircle.m_loaCircle.touchable = false;
-                _ui.m_comClickCircle.m_t0.Play(1, 0, 0, 0.5f, () =>
-                {
-                    GuideController.TryGuideSingleScoreViewComClickCircle(_ui.m_comClickCircle.m_loaCircle);
                     _ui.m_comClickCircle.m_loaCircle.touchable = true;
                 });
             }
@@ -120,8 +110,6 @@ namespace GFGGame
 
         private void CircleScoreEnd()
         {
-            GuideController.HideGuide();
-            GuideController.TryCompleteGuide(ConstGuideId.SINGLE_FIGHT_GUIDE);
             _ui.m_comClickCircle.m_loaCircle.onClick.Remove(CircleScoreEnd);
 
             int clickState = GetClickState();

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

@@ -82,7 +82,7 @@ namespace GFGGame
             });
             _ui.m_comMineCircle.target.onClick.Add(() =>
             {
-                if (_index == 0 && GuideDataManager.GetGuideCount(ConstGuideId.TARGET_FIGHT_GUIDE) <= 0 && playStop || _index == 0 && GuideDataManager.GetGuideCountCopy(ConstGuideId.TARGET_FIGHT) <= 0 && playStop)
+                if (_index == 0 && GuideDataManager.GetGuideCountCopy(ConstGuideId.TARGET_FIGHT) <= 0 && playStop)
                 {
                     playStop = false;
                     _ui.m_comTargetCircle.target.visible = false;
@@ -92,7 +92,6 @@ namespace GFGGame
                     _ui.m_comMineCircle.m_t0.Play(CircleScoreEnd);
                     _ui.m_comTargetCircle.m_t0.Play();
                     _ui.m_btnSkill0.target.touchable = true;
-                    GuideController.TryGuideStoryFightTargetScorebtnSkill0(_ui.m_btnSkill0.target);
                     // CircleScoreEnd();
 
                 }
@@ -126,11 +125,7 @@ namespace GFGGame
             _mainScore = ScoreSystemData.Instance.GetMainScore();
             _targetMainScore = fightCfg.targetMainScore;
 
-            if (_index == 0 && GuideDataManager.GetGuideCount(ConstGuideId.TARGET_FIGHT_GUIDE) <= 0)
-            {
-                _ui.m_btnSkill0.target.touchable = false;
-            }
-            else if (_index == 0 && GuideDataManager.GetGuideCountCopy(ConstGuideId.TARGET_FIGHT) <= 0)
+            if (_index == 0 && GuideDataManager.GetGuideCountCopy(ConstGuideId.TARGET_FIGHT) <= 0)
             {
                 _ui.m_btnSkill0.target.touchable = false;
             }
@@ -225,18 +220,7 @@ namespace GFGGame
 
             _ui.m_comTargetCircle.target.visible = true;
             _ui.m_comTargetCircle.m_txtPart.text = FightScoreCfgArray.Instance.GetCfg(_index + 1).name;
-            if (_index == 0 && GuideDataManager.GetGuideCount(ConstGuideId.TARGET_FIGHT_GUIDE) <= 0)
-            {
-
-                _ui.m_comMineCircle.m_t0.Play(1, 0, 0, 0.75f, () =>
-                 {
-                     playStop = true;
-                     GuideController.TryGuideStoryFightTargetScoreComCircle(_ui.m_comMineCircle.target, -128f, -128f);
-                 });
-                _ui.m_comTargetCircle.m_t0.Play(1, 0, 0, 0.75f, null);
-                return;
-            }
-            else if (_index == 0 && GuideDataManager.GetGuideCountCopy(ConstGuideId.TARGET_FIGHT) <= 0)
+            if (_index == 0 && GuideDataManager.GetGuideCountCopy(ConstGuideId.TARGET_FIGHT) <= 0)
             {
                 _ui.m_comMineCircle.m_t0.Play(1, 0, 0, 0.75f, () =>
                 {
@@ -341,12 +325,6 @@ namespace GFGGame
 
             UpdateProgressBar();
 
-            if (_index == 0 && GuideDataManager.GetGuideCount(ConstGuideId.TARGET_FIGHT_GUIDE) <= 0 && role == SkillDataManager.MINE)
-            {
-                GuideController.HideGuide();
-                GuideController.TryCompleteGuide(ConstGuideId.TARGET_FIGHT_GUIDE);
-                CircleScoreEnd();
-            }
         }
 
         //荆钗效果

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

@@ -49,9 +49,7 @@ namespace GFGGame
             _ui.m_btnStart.touchable = true;
             UpdateView();
 
-            GuideController.TryGuideChapterInfoViewBtnStart(_ui.m_btnStart, "点击开启换装");
-            GuideController.TryGuideStoryLevelInfoViewTxtNeed(_ui.m_txtNeed);
-            GuideController.TryGuideStoryLevelInfoListTag(_ui.m_listTag);
+
 
             EventAgent.AddEventListener(ConstMessage.ROLE_POWER_CHANGED, UpdateBtnFightTimes);
         }
@@ -61,13 +59,6 @@ namespace GFGGame
             base.OnHide();
 
             EventAgent.RemoveEventListener(ConstMessage.ROLE_POWER_CHANGED, UpdateBtnFightTimes);
-            TryCompleteGuide();
-
-            if (GuideDataManager.currentGuideId == ConstGuideId.SUIT_SYNTHETIC_GUIDE)
-            {
-                GuideController.HideGuide();
-            }
-            GuideController.TryCompleteGuide(ConstGuideId.TIPS_TAGS_FIGHT);
         }
 
         private void OnClickBtnStart()
@@ -75,7 +66,6 @@ namespace GFGGame
             int time = StoryDataManager.GetCanFightTime(_levelID);
             if (time > 0)
             {
-                GuideController.HideGuide();
                 ViewManager.Show(ViewName.DRESS_UP_FIGHT_VIEW, _levelID, null, true);
             }
             else
@@ -252,13 +242,10 @@ namespace GFGGame
 
         protected override void UpdateToCheckGuide(object param)
         {
-            // if (GRoot.inst.GetTopWindow() == this.viewCom)
-            // {
+
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuideStoryLevelInfoView(null);
             GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.SINGLE_FIGHT, 2, "点击开启换装");
-
             if (GuideController.TryGuide(_ui.m_txtNeed, ConstGuideId.CLOTHING_SYNTHETIC, 2, "这次必需品,要通过合成获得"))
             {
                 _ui.m_btnStart.touchable = false;
@@ -270,7 +257,7 @@ namespace GFGGame
 
         }
 
-        private void TryCompleteGuide()
+        protected override void TryCompleteGuide()
         {
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.CLOTHING_SYNTHETIC);
             GuideController.TryCompleteGuideIndex(cfg.id, 3);

+ 2 - 18
GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -80,9 +80,7 @@ namespace GFGGame
                 _ui.m_expBar.m_txtLvlAdded.text = "0";
                 _ui.m_expBar.target.visible = false;
                 _ui.m_btnClose.enabled = true;
-                string txt = "不要气馁呀,可以通过再次挑战已通关的关卡、摘星、绣坊等途径获取更多的物资来提升自己的战斗力哦!";
                 int targetY = (int)_ui.m_expBar.target.y - 250;
-                GuideController.TryGuideByGuideId(null, ConstGuideId.CHAPTER_RESULT_VIEW, 5, false, txt, targetY);
             }
             else
             {
@@ -131,10 +129,6 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            // Timers.inst.Remove(UpdateToCheckGuide);
-            TryCompleteGuide();
-            GuideController.TryCompleteGuide(ConstGuideId.CHAPTER_RESULT_VIEW);
-            GuideController.TryCompleteGuide(ConstGuideId.FIGHT_RESULT_TIPS_GUIDE);
             Timers.inst.Remove(AddExp);
             if (_sceneObject != null)
             {
@@ -173,17 +167,7 @@ namespace GFGGame
             _ui.m_expBar.m_pbExp.TweenValue(RoleDataManager.exp, 0.2f);
             _ui.m_btnClose.enabled = true;
             int targetY = (int)_ui.m_expBar.target.y - 250;
-            int count = GuideDataManager.GetGuideCount(ConstGuideId.CHAPTER_RESULT_VIEW);
-            string txt = null;
-            if (_curLvfirstPass && StoryDataManager._passChapter + 1 == 1 && StoryDataManager._passLevel == 2)
-            {
-                txt = "这条连衣裙可真好看!点击空白区域继续";
-            }
-            else if (_curLvfirstPass && StoryDataManager._passChapter + 1 == 1 && StoryDataManager._passLevel == 6)
-            {
-                txt = "你太厉害了,初次对战就获得了这么好的战绩,继续加油吧";
-            }
-            GuideController.TryGuideByGuideId(null, ConstGuideId.FIGHT_RESULT_TIPS_GUIDE, 2, false, txt, targetY);
+
         }
         protected override void UpdateToCheckGuide(object param)
         {
@@ -193,7 +177,7 @@ namespace GFGGame
             if (resule) GuideController.TryGuide(null, ConstGuideId.FIRST_FIGHT_TARGET_WIN, 1, "你太厉害了,初次对战就获得了这么好的战绩,继续加油吧", false, 0, true, false, (int)(this.viewCom.height - 350));
         }
 
-        private void TryCompleteGuide()
+        protected override void TryCompleteGuide()
         {
             GuideCfg cfg;
             cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.FIRST_FIGHT_FAILED);

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

@@ -138,7 +138,6 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            GuideController.HideGuide();
             if (_sceneObject != null)
             {
                 GameObject.Destroy(_sceneObject);

+ 5 - 1
GameClient/Assets/Game/HotUpdate/Views/UIView.cs

@@ -134,12 +134,16 @@ namespace GFGGame
             viewData = null;
 
             Timers.inst.Remove(UpdateToCheckGuide);
-
+            TryCompleteGuide();
         }
         virtual protected void UpdateToCheckGuide(object param)
         {
 
         }
+        virtual protected void TryCompleteGuide()
+        {
+
+        }
         protected virtual void DoShowAnimation()
         {
             OnShown();

+ 0 - 2
GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -35,8 +35,6 @@ namespace GFGGame
             base.OnShown();
 
             _ui.m_component.target.scrollPane.SetPosX(0, false);
-
-            GuideController.TryGuideSuitSyntheticView(_ui.m_component.m_btnSuitSynthetic);
         }
 
         protected override void OnHide()