引导购买必需品

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit 922a5dd4ec294df4557e5f88706b9c7cbfdeaea9
+Subproject commit 1a8577b7d594da95b70e8c8e0887286afbbfeb8e

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

@@ -2,7 +2,7 @@ namespace GFGGame
 {
     public class ConstGuideId
     {
-        public const int CHAPTER_VIEW_BTN_HOME = 1;
+        public const int SINGLE_FIGHT_GUIDE = 1;//单人战斗引导
         public const int MAIN_UI_BTN_HUAN_ZHUANG = 2;
         public const int MAIN_UI_BTN_ZHAI_XING = 3;
         public const int LUCKY_BOX_VIEW_BTN_BACK = 4;
@@ -12,5 +12,6 @@ namespace GFGGame
         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 int CLOTHING_SHOP_VIEW_BTN_BUY = 11;
     }
 }

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

@@ -2,15 +2,17 @@ using FairyGUI;
 using UI.DressUp;
 using UI.Main;
 using System.Collections.Generic;
+using UnityEngine;
 
 namespace GFGGame
 {
     public class GuideController
     {
 
+        /*******************************************************单人战斗引导***********************************************/
         public static void TryGuideChapterViewLevelItem(GObject target, string guideStr = null)
         {
-            if (GuideDataManager.GetGuideCount(ConstGuideId.CHAPTER_VIEW_BTN_HOME) <= 0)
+            if (GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
             {
                 if (guideStr == null)
                 {
@@ -34,13 +36,14 @@ namespace GFGGame
                         guideStr = "点击，继续";
                     }
                 }
+                GuideDataManager.currentGuideId = ConstGuideId.SINGLE_FIGHT_GUIDE;
                 ShowGuide(target, true, guideStr);
             }
         }
 
         public static void TryGuideChapterInfoViewBtnStart(GObject target, string guideStr = null)
         {
-            if (GuideDataManager.GetGuideCount(ConstGuideId.CHAPTER_VIEW_BTN_HOME) <= 0)
+            if (GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
             {
                 if (guideStr == null)
                 {
@@ -50,7 +53,7 @@ namespace GFGGame
             }
         }
 
-        public static bool TryGuideDressUpFightViewMenuType1(GList list)
+        public static bool TryGuideDressUpFightViewMenuType0(GList list)
         {
             if (StoryDataManager.currentChapter == 1 && StoryDataManager.currentLevel <= 2
                 && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel))
@@ -73,56 +76,155 @@ namespace GFGGame
             }
             return false;
         }
-
-        public static void TryGuideDressUpFightViewMenuPart(GList list)
+        public static void TryGuideDressUpFightViewMenuPart0(GList list, string guideStr)
         {
-            if (list.numChildren > 0)
+            if (StoryDataManager.currentChapter == 1 && StoryDataManager.currentLevel <= 2
+            && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel))
             {
-                UI_PartsListItem listItem = UI_PartsListItem.Proxy(list.GetChildAt(0));
-                if (listItem != null)
+                if (list.numChildren > 0)
                 {
-                    ShowGuide(listItem.target, true, "点击图标，换上新衣服吧");
-                    return;
+                    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.CHAPTER_VIEW_BTN_HOME) <= 0)
+            if (GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
             {
                 ShowGuide(target, false, "换好衣服后，点击下一步进行战斗");
             }
         }
+
         public static void TryGuideSingleScoreViewComClickCircle(GObject target)
         {
-            // if (GuideDataManager.GetGuideCount(ConstGuideId.CHAPTER_VIEW_BTN_HOME) <= 0)
-            // {
+
             ShowGuide(target, false, "点击圆圈进行部件评分，精准率越高，部件额外加分越高哦");
-            // }
         }
 
-        public static void TryGuideDressUpFightViewBtnRecommend(GObject target)
+        /*******************************************************引导购买必需品***********************************************/
+
+        public static void TryGuideDressUpFightViewBtnRecommend(GObject target, GList list)
         {
-            if (GuideDataManager.GetGuideCount(ConstGuideId.CHAPTER_VIEW_BTN_HOME) <= 0
+            _list = list;
+            Debug.Log(StoryDataManager.currentLevel);
+            if (GuideDataManager.GetGuideCount(ConstGuideId.CLOTHING_SHOP_VIEW_BTN_BUY) <= 0
+                && StoryDataManager.currentLevel == 4
                 && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel)
                 && DressUpMenuItemDataManager.GetRecommendCount() >= 2)
             {
-                ShowGuide(target, false, "点击推荐搭配， 可快速换上目标属性最高的服装");
+                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_PartsListItem listItem = UI_PartsListItem.Proxy(list.GetChildAt(0));
+                if (listItem != null)
+                {
+                    ShowGuide(listItem.target, false, "这里是物品产出的所有来源，点击服装店");
+                }
 
-        public static void TryGuideDressUpFightViewBtnNext(GObject target)
+            }
+        }
+        public static void TryGuideClothingShopViewBtnBug(GObject target)
+        {
+            if (GuideDataManager.GetGuideCount(ConstGuideId.CLOTHING_SHOP_VIEW_BTN_BUY) <= 0
+                 && StoryDataManager.currentLevel == 4
+                 && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel)
+                 && DressUpMenuItemDataManager.GetRecommendCount() >= 2)
+            {
+                ShowGuide(target, false, "已经选中需要的衣服，点击购买");
+            }
+        }
+        public static void TryGuideBuyCountViewBtnSure(GObject target)
         {
-            if (GuideDataManager.GetGuideCount(ConstGuideId.CHAPTER_VIEW_BTN_HOME) <= 0
+            if (GuideDataManager.GetGuideCount(ConstGuideId.CLOTHING_SHOP_VIEW_BTN_BUY) <= 0
+                && StoryDataManager.currentLevel == 4
                 && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel)
-                 && EquipDataCache.cacher.CheckCurrentScoreEnough()
-                && EquipDataCache.cacher.CheckEquipedFightNeeded())
+                && DressUpMenuItemDataManager.GetRecommendCount() >= 2)
             {
-                ShowGuide(target, false, "服装搭配好后，点击下一步，看看战果如何");
+                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)
+                && DressUpMenuItemDataManager.GetRecommendCount() >= 2)
+            {
+                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)
+               && DressUpMenuItemDataManager.GetRecommendCount() >= 2)
+            {
+                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, "点击必需品图标");
+                            _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_PartsListItem listItem = UI_PartsListItem.Proxy(list.GetChildAt(0));
+                    if (listItem != null)
+                    {
+                        ShowGuide(listItem.target, true, guideStr);
+                        return;
+                    }
+                }
+            }
+        }
+        // public static void TryGuideDressUpFightViewMenuPart(GList list)
+        // {
+        //     if (list.numChildren > 0)
+        //     {
+        //         UI_PartsListItem listItem = UI_PartsListItem.Proxy(list.GetChildAt(0));
+        //         if (listItem != null)
+        //         {
+        //             ShowGuide(listItem.target, true, "点击");
+        //             return;
+        //         }
+        //     }
+        // }
+
+
         public static bool TryGuideDressUpViewMenuType1(GList list)
         {
             if (GuideDataManager.currentGuideId == ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG)

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

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

GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -55,7 +55,7 @@ namespace GFGGame
                 _dressUpObjDataCache = null;
             }
             _cfgSelected = null;
-            EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateCJGoodsCount);
+            EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateItemChange);
             base.Dispose();
 
         }
@@ -85,7 +85,7 @@ namespace GFGGame
 
             _ui.m_compItemInfo.m_listTag.itemRenderer = RenderListTagItem;
 
-            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateCJGoodsCount);
+            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateItemChange);
 
         }
 
@@ -154,6 +154,8 @@ namespace GFGGame
             {
                 _valueBarController.Controller(3);
             }
+
+            GuideController.TryGuideClothingShopViewBtnBug(_ui.m_compItemInfo.m_btnBuy);
         }
 
         protected override void OnHide()
@@ -174,16 +176,23 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
+            GuideController.HideGuide();
             ViewManager.GoBackFrom(ViewName.CLOTHING_SHOP_VIEW);
-
             this.Hide();
+            GuideController.TryGuideDressUpFightViewMenuType1();
+
         }
 
         private void OnclickBtnBuy()
         {
             BuyItemConteoller.Show(_cfgSelected.itemID, _cfgSelected.costID, INIT_COUNT, _cfgSelected.costNum, INIT_COUNT, null, true, false, MAX_COUNT);
 
-            // ItemUtil.ExchangeItemById(_cfgSelected.itemID, INIT_COUNT, false, null, false, MAX_COUNT, false);
+        }
+        private void UpdateItemChange()
+        {
+            GuideController.TryGuideClothingShopViewBtnBack(_ui.m_btnBack);
+
+            UpdateCJGoodsCount();
         }
         private void UpdateCJGoodsCount()
         {

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachOfItemView.cs

@@ -59,6 +59,8 @@ namespace GFGGame
                 _ui.m_txtNone.visible = true;
                 _ui.m_listApproach.height = 162;
             }
+
+            GuideController.TryGuideApproachOfItemViewList(_ui.m_listApproach);
         }
 
         protected override void OnHide()
@@ -92,6 +94,7 @@ 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];

GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyCountView.cs

@@ -77,6 +77,7 @@ namespace GFGGame
             base.OnShown();
             _ui.m_txtCount.text = "" + _count;
             UpdateView();
+            GuideController.TryGuideBuyCountViewBtnSure(_ui.m_btnSure);
         }
         private void UpdateView()
         {
@@ -244,14 +245,13 @@ namespace GFGGame
                 {
                     int buyCount = price / _perCostCount * _perCount;
                     ItemUtil.AddItemUseCost(_itemId, buyCount, _costId, price);
-
+                    // GuideController.HideGuide();
                     if (_onSuccess != null)
                     {
                         _onSuccess();
                     }
                     if (_showTips)
                     {
-
                         PromptController.Instance.ShowFloatTextPrompt("购买成功", MessageType.SUCCESS);
                     }
                 }
@@ -260,6 +260,7 @@ namespace GFGGame
             {
                 PromptController.Instance.ShowFloatTextPrompt("购买异常", MessageType.ERR);
             }
+
             this.Hide();
         }
 

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

@@ -92,6 +92,7 @@ namespace GFGGame
 
             EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
             EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
+            // EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdatePartsListSort);
             EventAgent.AddEventListener(ConstMessage.CARD_CHOOSE, StartCalculateScore);
         }
 
@@ -151,10 +152,14 @@ namespace GFGGame
             }
             UpdateScore();
             EventAgent.AddEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
-            _guideMenu = GuideController.TryGuideDressUpFightViewMenuType1(_ui.m_comListType1.m_listType);
-            if (!_guideMenu)
+
+            if (GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
+            {
+                _guideMenu = GuideController.TryGuideDressUpFightViewMenuType0(_ui.m_comListType1.m_listType);
+            }
+            else if (GuideDataManager.GetGuideCount(ConstGuideId.CLOTHING_SHOP_VIEW_BTN_BUY) <= 0)
             {
-                GuideController.TryGuideDressUpFightViewBtnRecommend(_ui.m_btnRecommend);
+                GuideController.TryGuideDressUpFightViewBtnRecommend(_ui.m_compNeed.target, _ui.m_comListType1.m_listType);
             }
         }
 
@@ -192,7 +197,7 @@ namespace GFGGame
         private void OnClickListType1Item(EventContext context)
         {
 
-            GuideController.HideGuide();
+            // GuideController.HideGuide();
             GObject typeItem = context.data as GObject;
             int order = (int)typeItem.data;
             DressUpMenuItemCfg1 item1 = DressUpMenuItemCfg1Array.Instance.dataArray[order - 1];
@@ -203,9 +208,14 @@ namespace GFGGame
             else
             {
                 this.showListParts(item1.type);
-                if (_guideMenu)
+
+                if (GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
+                {
+                    GuideController.TryGuideDressUpFightViewMenuPart0(_ui.m_partsList.m_list, "点击图标，换上新衣服吧");
+                }
+                else if (GuideDataManager.GetGuideCount(ConstGuideId.CLOTHING_SHOP_VIEW_BTN_BUY) <= 0)
                 {
-                    GuideController.TryGuideDressUpFightViewMenuPart(_ui.m_partsList.m_list);
+                    GuideController.TryGuideDressUpFightViewMenuPart1(_ui.m_partsList.m_list, "点击穿戴必须品");
                 }
             }
             this.hideListType1();
@@ -235,11 +245,12 @@ namespace GFGGame
                 EquipDataCache.cacher.TryCancelSuit(id);
                 EquipDataCache.cacher.AddOrRemove(id, true);
                 UpdateListPartsSelected();
-                if (_guideMenu)
-                {
-                    GuideController.TryGuideDressUpFightViewBtnNext0(_ui.m_btnNext);
-                }
+
+                GuideController.TryGuideDressUpFightViewBtnNext0(_ui.m_btnNext);
+
             }
+            GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SHOP_VIEW_BTN_BUY);
+
         }
 
         private void OnTouchPad()
@@ -580,7 +591,7 @@ namespace GFGGame
         private void UpdateScore()
         {
             _ui.m_txtScore.text = "" + EquipDataCache.cacher.score;
-            GuideController.TryGuideDressUpFightViewBtnNext(_ui.m_btnNext);
+            // GuideController.TryGuideDressUpFightViewBtnNext(_ui.m_btnNext);
         }
 
         private void OnClickBtnSearch()
@@ -620,6 +631,7 @@ namespace GFGGame
         }
         private void OnClickComNeed()
         {
+            GuideController.HideGuide();
             if (_fightCfg.needItemId <= 0 && _fightCfg.needSuitId <= 0)
             {
                 return;

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

@@ -60,7 +60,7 @@ namespace GFGGame
             _ui.m_chapter.AddChild(_compChapter);
             InitChapter();
             _valueBarController.OnShown();
-            if (GuideDataManager.GetGuideCount(ConstGuideId.CHAPTER_VIEW_BTN_HOME) <= 0)
+            if (GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
             {
                 Timers.inst.AddUpdate(UpdateToCheckGuide);
             }
@@ -84,7 +84,7 @@ namespace GFGGame
 
         private void OnClickBtnHome()
         {
-            GuideController.TryCompleteGuide(ConstGuideId.CHAPTER_VIEW_BTN_HOME);
+            GuideController.TryCompleteGuide(ConstGuideId.SINGLE_FIGHT_GUIDE);
             GameController.GoBackToMainView();
         }
 
@@ -233,7 +233,7 @@ namespace GFGGame
                 {
                     if (StoryDataManager.CheckLevelPass(1, 4))
                     {
-                        GuideController.TryGuideByGuideId(_ui.m_btnHome, ConstGuideId.CHAPTER_VIEW_BTN_HOME, 1, false, "点击按钮，进入主界面");
+                        GuideController.TryGuideByGuideId(_ui.m_btnHome, ConstGuideId.SINGLE_FIGHT_GUIDE, 1, false, "点击按钮，进入主界面");
                     }
                     else
                     {

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

@@ -96,7 +96,7 @@ namespace GFGGame
             _ui.m_comClickCircle.target.visible = true;
 
 
-            if (_index == 0 && GuideDataManager.GetGuideCount(ConstGuideId.CHAPTER_VIEW_BTN_HOME) <= 0)
+            if (_index == 0 && GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
             {
                 _ui.m_comClickCircle.m_t0.Play(1, 0, 0, 0.5f, () =>
                 {
@@ -113,6 +113,7 @@ namespace GFGGame
         private void CircleScoreEnd()
         {
             GuideController.HideGuide();
+            GuideController.TryCompleteGuide(ConstGuideId.SINGLE_FIGHT_GUIDE);
             _ui.m_comClickCircle.m_loaCircle.onClick.Remove(CircleScoreEnd);
 
             int clickState = GetClickState();