引导摘星换装

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

@@ -6,10 +6,11 @@ namespace GFGGame
         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 MAIN_UI_BTN_HUAN_ZHUANG = 2;
-        public const int MAIN_UI_BTN_ZHAI_XING = 3;
-        public const int LUCKY_BOX_VIEW_BTN_BACK = 4;
         public const int MAIN_UI_BTN_STORY = 5;
         public const int CHAPTER_RESULT_VIEW = 6;
         public const int GET_SUIT_ITEM_VIEW_FULL = 7;

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

@@ -111,7 +111,6 @@ namespace GFGGame
         public static void TryGuideDressUpFightViewBtnRecommend(GObject target, GList list)
         {
             _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)
@@ -243,7 +242,46 @@ namespace GFGGame
                 ShowGuide(target, false, "点击使用技能");
             }
         }
-        /******************************************************************************************************/
+        /*******************************************************引导抽奖***********************************************/
+        public static bool TryGuideGoBackStoryChapter(GObject target)
+        {
+            Debug.Log(StoryDataManager.CheckLevelPass(1, 10));
+
+            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)
         {
@@ -287,6 +325,72 @@ namespace GFGGame
         }
 
 
+        /************************************************************引导合成套装*******************************************************/
+
+        public static void TryGuideStoryLevelInfoViewTxtNeed(GObject target)
+        {
+
+            if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
+                && StoryDataManager.CheckLevelPass(1, 11)
+                && !StoryDataManager.CheckLevelPass(1, 12))
+            {
+                GuideDataManager.currentGuideId = ConstGuideId.SUIT_SYNTHETIC_GUIDE;
+                ShowGuide(target, false, "还没有通关必须合成的衣服，快去合成一件吧！", 0);
+            }
+        }
+        public static void TryGuideStoryLevelInfoView(GObject target)
+        {
+
+            if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
+                && StoryDataManager.CheckLevelPass(1, 11)
+                && !StoryDataManager.CheckLevelPass(1, 12))
+            {
+                ShowGuide(target, false, "点击空白处关闭", 0);
+            }
+        }
+        public static void TryGuideStoryChapterViewBtnHome(GObject target)
+        {
+
+            if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
+                && StoryDataManager.CheckLevelPass(1, 11)
+                && !StoryDataManager.CheckLevelPass(1, 12))
+            {
+                ShowGuide(target, false, "点击返回主界面", 0);
+            }
+        }
+        public static void TryGuideMainUIViewBtnXiuFang(GObject target)
+        {
+
+            if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
+                && StoryDataManager.CheckLevelPass(1, 11)
+                && !StoryDataManager.CheckLevelPass(1, 12))
+            {
+                GuideDataManager.currentGuideId = ConstGuideId.SUIT_SYNTHETIC_GUIDE;
+                ShowGuide(target, false, "点击进入绣坊", 0);
+            }
+        }
+        public static void TryGuideSuitSyntheticView(GObject target)
+        {
+
+            if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
+                && StoryDataManager.CheckLevelPass(1, 11)
+                && !StoryDataManager.CheckLevelPass(1, 12))
+            {
+                ShowGuide(target, false, "点击进入套装合成", 0);
+            }
+        }
+        public static void TryGuideSuitSyntheticViewList(GList target)
+        {
+
+            if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
+                && StoryDataManager.CheckLevelPass(1, 11)
+                && !StoryDataManager.CheckLevelPass(1, 12))
+            {
+                ShowGuide(target, false, "点击进入套装合成", 0);
+            }
+        }
+
+
         /*******************************************************************************************************************/
         public static bool TryGuideByGuideId(GObject target, int guideId, int maxCount = 1, bool needUpdate = false, string guideStr = null, int yTxt = 0, int preGuideIdAtThisLogin = 0)
         {

GameClient/Assets/Game/HotUpdate/Data/Cache/LuckyBoxBonusDataCache.cs

@@ -65,7 +65,7 @@ namespace GFGGame
             List<ItemData> bonusList = null;
             if (isGuide)
             {
-                List<ItemData> guideBonusList = ItemUtil.CreateItemDataList("10003*1;10004*1;10006*1;10007*1");
+                List<ItemData> guideBonusList = ItemUtil.CreateItemDataList("10332*1;10334*1;10335*1;10336*1;10338*1");
                 count = count - guideBonusList.Count;
                 bonusList = DropOutDataCache.GetDropItemDatas(_dropOutId, count);
                 while (guideBonusList.Count > 1)

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs

@@ -21,6 +21,8 @@ namespace GFGGame
 
         private const int checkDistance = 40;//鼠标靠近星星周围加减40都算选中星星
         private const int imgLineWidth = 10;//线的原始长度
+
+        private bool isGuide = false;
         public override void Dispose()
         {
             base.Dispose();
@@ -52,6 +54,8 @@ namespace GFGGame
         }
         private void ResetStartView()
         {
+            isGuide = GuideController.TryGuideLuckyBoxStar();
+
             curComStar = null;
             comStars.Clear();
             int index = 0;
@@ -111,6 +115,7 @@ namespace GFGGame
                     lastPos = Vector2.right;
 
                     comStars.RemoveAt(i);
+
                 }
                 else
                 {
@@ -139,24 +144,19 @@ namespace GFGGame
 
 
         }
-        //private async void OnClickUIEnd()
-        //{
-        //    if (curComStar != null)
-        //    {
-        //        if (curComStar != null)
-        //        {
-        //            await Task.Delay(1000);
-
-        //            RemoveListener();
-        //            ViewManager.Show(ViewName.LUCKY_BOX_CARD_VIEW, new object[] { _rewardList, 0 });
-        //            this.Hide();
-        //        }
-        //    }
-        //}
 
         private void OnClickUIEnd()
         {
-            Timers.inst.Add(0.3f, 1, ClickUIEnd);
+            if (isGuide && comStars.Count > 0)
+            {
+                ResetStartView();
+            }
+            else
+            {
+                Timers.inst.Add(0.3f, 1, ClickUIEnd);
+                GuideController.HideGuide();
+                GuideController.TryCompleteGuide(ConstGuideId.MAIN_UI_BTN_ZHAI_XING);
+            }
         }
         private void ClickUIEnd(object param)
         {

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -116,10 +116,14 @@ namespace GFGGame
             _ui.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg.costID).res);
             _ui.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg.costID).res);
 
-            if (!GuideController.TryGuideByGuideId(_ui.m_btnBuyTen, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, true, "点击按钮，开始抽奖，可以抽到好看的服装哦"))
-            {
-                GuideController.TryGuideByGuideId(_ui.m_btnBack, ConstGuideId.LUCKY_BOX_VIEW_BTN_BACK, 1, true, "点击按钮，返回主界面", 0, ConstGuideId.MAIN_UI_BTN_ZHAI_XING);
-            }
+            // if (!GuideController.TryGuideByGuideId(_ui.m_btnBuyTen, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, true, "点击按钮，开始抽奖，可以抽到好看的服装哦"))
+            // {
+            //     GuideController.TryGuideByGuideId(_ui.m_btnBack, ConstGuideId.LUCKY_BOX_VIEW_BTN_BACK, 1, true, "点击按钮，返回主界面", 0, ConstGuideId.MAIN_UI_BTN_ZHAI_XING);
+            // }
+            // if (GuideDataManager.GetGuideCount(ConstGuideId.LUCKY_BOX_VIEW_BTN_BACK) <= 0)
+            // {
+            Timers.inst.AddUpdate(UpdateToCheckGuide);
+            // }
             int count = LuckyBoxBonusDataCache.GetOwnedCount();
             _ui.m_txtOwned.SetVar("v1", "" + count).FlushVars();
 
@@ -180,12 +184,12 @@ namespace GFGGame
 
         private void OnClickBtnBuyTen()
         {
-            bool result = GuideController.TryCompleteGuide(ConstGuideId.MAIN_UI_BTN_ZHAI_XING);
+            // bool result = GuideController.TryCompleteGuide(ConstGuideId.MAIN_UI_BTN_ZHAI_XING);
             LuckyBoxCfg luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxBonusDataCache.currentBoxId);
-            if (result)
+            if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_ZHAI_XING) <= 0)
             {
                 ItemDataManager.Remove(luckyBoxCfg.costID, luckyBoxCfg.costNumTen);
-                LuckyBoxDataManager.Instance.RewardList = LuckyBoxBonusDataCache.GetBonusList(10, result);
+                LuckyBoxDataManager.Instance.RewardList = LuckyBoxBonusDataCache.GetBonusList(10, true);
                 ViewManager.Show(ViewName.LUCKY_BOX_STAR_VIEW, _ui.m_c1.selectedIndex);
             }
             else
@@ -194,19 +198,34 @@ namespace GFGGame
                 LuckyBoxBonusDataCache.CheckItemEnough(luckyBoxCfg.costID, luckyBoxCfg.costNumTen, 10, () =>
                  {
                      ItemDataManager.Remove(luckyBoxCfg.costID, luckyBoxCfg.costNumTen);
-                     LuckyBoxDataManager.Instance.RewardList = LuckyBoxBonusDataCache.GetBonusList(10, result);
+                     LuckyBoxDataManager.Instance.RewardList = LuckyBoxBonusDataCache.GetBonusList(10, false);
                      ViewManager.Show(ViewName.LUCKY_BOX_STAR_VIEW, _ui.m_c1.selectedIndex);
 
                  });
             }
         }
+        private void UpdateToCheckGuide(object param)
+        {
+            if (this.viewCom.parent != null)
+            {
+                // int index = this.viewCom.parent.GetChildIndex(this.viewCom);
+                if (GRoot.inst.GetTopWindow() == this.viewCom)
+                {
+                    if (!GuideController.TryGuideByGuideId(_ui.m_btnBuyTen, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, true, "点击按钮，开始抽奖，可以抽到好看的服装哦"))
+                    {
+                        GuideController.TryGuideByGuideId(_ui.m_btnBack, ConstGuideId.LUCKY_BOX_VIEW_BTN_BACK, 1, true, "点击按钮，返回主界面", 0, ConstGuideId.MAIN_UI_BTN_ZHAI_XING);
+                    }
+                }
+            }
 
+        }
 
         protected override void OnHide()
         {
             base.OnHide();
             _valueBarController.OnHide();
 
+            Timers.inst.Remove(UpdateToCheckGuide);
             Timers.inst.Remove(CheckTime);
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateNormal);
             EventAgent.RemoveEventListener(ConstMessage.MONEY_CHANGE, UpdateNormal);

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

@@ -64,6 +64,11 @@ namespace GFGGame
             {
                 Timers.inst.AddUpdate(UpdateToCheckGuide);
             }
+            else if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_ZHAI_XING) <= 0)
+            {
+                // GuideController.TryGuideGoBackStoryChapter(_ui.m_btnHome);
+                Timers.inst.AddUpdate(UpdateToCheckGuide);
+            }
         }
 
         protected override void OnHide()
@@ -84,6 +89,7 @@ namespace GFGGame
 
         private void OnClickBtnHome()
         {
+            GuideController.HideGuide();
             GuideController.TryCompleteGuide(ConstGuideId.SINGLE_FIGHT_GUIDE);
             GameController.GoBackToMainView();
         }
@@ -231,17 +237,15 @@ namespace GFGGame
                 int index = this.viewCom.parent.GetChildIndex(this.viewCom);
                 if (index == this.viewCom.parent.numChildren - 1 && GRoot.inst.GetTopWindow() == null)
                 {
-                    if (StoryDataManager.CheckLevelPass(1, 4))
+                    if (_unPasslevelItem != null && GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
                     {
-                        GuideController.TryGuideByGuideId(_ui.m_btnHome, ConstGuideId.SINGLE_FIGHT_GUIDE, 1, false, "点击按钮，进入主界面");
+                        GuideController.TryGuideChapterViewLevelItem(_unPasslevelItem);
                     }
-                    else
+                    else if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_ZHAI_XING) <= 0)
                     {
-                        if (_unPasslevelItem != null)
-                        {
-                            GuideController.TryGuideChapterViewLevelItem(_unPasslevelItem);
-                        }
+                        GuideController.TryGuideGoBackStoryChapter(_ui.m_btnHome);
                     }
+
                 }
             }
 

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

@@ -59,7 +59,6 @@ namespace GFGGame
             _prefectCount = 0;
             _mainScore = ScoreSystemData.Instance.GetMainScore();
 
-
             Timers.inst.Add(0.5f, 1, (param) =>
             {
                 SkillScoreStart(null);

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

@@ -85,6 +85,7 @@ namespace GFGGame
                     _ui.m_comMineCircle.target.visible = false;
                     _ui.m_comMineCircle.m_t0.Stop(true, false);
                     _ui.m_comTargetCircle.m_t0.Stop(true, false);
+                    _ui.m_btnSkill0.target.touchable = true;
                     GuideController.TryGuideStoryFightTargetScorebtnSkill0(_ui.m_btnSkill0.target);
                 }
             });
@@ -115,6 +116,10 @@ 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;
+            }
             Timers.inst.Add(0.5f, 1, CircleScoreStart);//评分开始
         }
         private void UpdateNormal()
@@ -172,7 +177,8 @@ namespace GFGGame
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(StoryDataManager.currentLevelID);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
             double targetScore = fightCfg.targetPartsScoreArr[_index] * ConstScoreSystem.PART_SCORE;
-            _ui.m_comTargetCircle.m_txtCount.text = targetScore.ToString();
+            Debug.Log("targetScore:" + targetScore);
+            _ui.m_comTargetCircle.m_txtCount.text = ((int)targetScore).ToString();
             _targetScore += targetScore;
             EquipDataCache.cacher.npcTotalScore = (int)Math.Round(_targetScore);
 
@@ -185,6 +191,8 @@ namespace GFGGame
         {
             _ui.m_proScore.m_txtMineScore.text = ((int)_score).ToString();
             _ui.m_proScore.m_txtNpcScore.text = ((int)_targetScore).ToString();
+            Debug.Log("_targetScore:" + _targetScore);
+
             double value = _score / (_score + _targetScore) * _ui.m_proScore.target.max;
             _ui.m_proScore.target.TweenValue(value, 0.5f);
         }

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -117,7 +117,7 @@ namespace GFGGame
             _valueBarController.OnShown();
             AddEffect();
 
-            // TryGuide();
+            TryGuide();
             Timers.inst.AddUpdate(Update);
         }
 
@@ -293,11 +293,12 @@ namespace GFGGame
 
         private void TryGuide()
         {
-            if (!GuideController.TryGuideByGuideId(_ui.m_btnZhaiXing.target, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, false, "点击摘星按钮，进入抽奖界面"))
+            // TryGuideByGuideId(_ui.m_btnZhaiXing.target, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, false, "点击摘星按钮，进入抽奖界面")
+            if (!GuideController.TryGuideLuckyBox(_ui.m_btnZhaiXing.target))
             {
                 if (!GuideController.TryGuideByGuideId(_ui.m_btnHuanZhuang.target, ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG, 1, false, "点击自由换装按钮，进入换装界面"))
                 {
-                    GuideController.TryGuideByGuideId(_ui.m_btnMain.target, ConstGuideId.MAIN_UI_BTN_STORY, 1, false, "这套服装搭配这个背景可真好看！点击按钮，继续故事可以获取更多好看的服装");
+                    // GuideController.TryGuideMainUIViewBtnXiuFang(_ui.m_btnXiuFang.target);
                 }
             }
         }