引导

FGUIProject/assets/Main/StoryLevelInfoUI.xml

@@ -51,6 +51,5 @@
       <item/>
     </list>
     <loader id="n37_d4iw" name="scoreType" xy="581,272" size="50,50" url="ui://eg2y0ldp842s6h" fill="scale"/>
-    <loader id="n43_yoe2" name="btnClose" xy="3,1305" size="1073,176"/>
   </displayList>
 </component>

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit 7672b26a41f28101af7075414424d6c784acfba4
+Subproject commit dbe5ce715d639215528bc24b5c70f6f29c9a0258

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

@@ -17,11 +17,12 @@ namespace GFGGame
         public const int FIGHT_RESULT_TIPS_GUIDE = 19;//战斗结束提示语
 
 
-        public const int MAIN_UI_BTN_STORY = 5;
         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";
@@ -35,5 +36,11 @@ namespace GFGGame
         public const string OPEN_TAGS = "OPEN_TAGS";
         public const string UP_CARD_STAR = "UP_CARD_STAR";
         public const string PHOTOGRAPH = "PHOTOGRAPH";
+        public const string FIRST_FIGHT_FAILED = "FIRST_FIGHT_FAILED";
+        public const string FIRST_FIGHT_SINGLE_WIN = "FIRST_FIGHT_SINGLE_WIN";
+        public const string FIRST_FIGHT_TARGET_WIN = "FIRST_FIGHT_TARGET_WIN";
+        public const string GET_SUIT_ITEM_FIRST = "GET_SUIT_ITEM_FIRST";
+        public const string GET_SUIT_ITEM_FULL = "GET_SUIT_ITEM_FULL";
+        public const string GET_BONUS_FIRST = "GET_BONUS_FIRST";
     }
 }

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

@@ -687,17 +687,22 @@ namespace GFGGame
         }
         /*********************************************************************************************************************************/
         public static bool useNewGuide = true;
-        public static bool TryGuide(GObject target, string guideKey, int index, string guideStr = null, bool isList = false, int listIndex = 0, bool checkInde = true, bool needUpdate = false, int yTxt = 0, float devWidth = 0, float devHeight = 0)
+        public static bool TryGuide(GObject target, string guideKey, int index, string guideStr = null, bool isList = false, int listIndex = 0, bool checkIndex = true, bool needUpdate = false, int yTxt = 0, float devWidth = 0, float devHeight = 0)
         {
             if (!useNewGuide) return false;
 
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(guideKey);
 
-            if (GuideDataManager.GetGuideCountCopy(guideKey) <= 0
-            && (!checkInde || checkInde && GuideDataManager.IsGuideIndexFinish(cfg.id, index - 1) == true && GuideDataManager.IsGuideIndexFinish(cfg.id, index) == false)
+            if ((GuideDataManager.GetGuideCountCopy(guideKey) <= 0
+            && (!checkIndex || checkIndex && GuideDataManager.IsGuideIndexFinish(cfg.id, index - 1) == true && GuideDataManager.IsGuideIndexFinish(cfg.id, index) == false)
             && (GuideDataManager.currentGuideId == 0 || GuideDataManager.currentGuideId == cfg.id && GuideDataManager.currentGuideIdIndex != index)
+            && (StoryDataManager.currentChapter == 0 || StoryDataManager.CheckCurrentLevelPass() == false)
             && StoryDataManager.CheckLevelPass(cfg.chapterId, cfg.level - 1)
             && !StoryDataManager.CheckLevelPass(cfg.chapterId, cfg.level))
+            ||
+            (cfg.chapterId == 0
+            && GuideDataManager.GetGuideCountCopy(guideKey) <= 0
+            ))
             {
                 GuideDataManager.currentGuideId = cfg.id;
                 GuideDataManager.currentGuideIdIndex = index;
@@ -721,7 +726,7 @@ namespace GFGGame
                     }
                 }
                 ShowGuideIndex(target, needUpdate, guideStr, yTxt, cfg.optionalGuide == 1, devWidth, devHeight, GuideDataManager.currentGuideId, GuideDataManager.currentGuideIdIndex);
-                if (!checkInde)
+                if (!checkIndex)
                 {
                     for (int i = 1; i < index; i++)
                     {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryLevelInfoUI.cs

@@ -26,7 +26,6 @@ namespace UI.Main
         public UI_CompFlower1 m_flower;
         public GList m_listBonus;
         public GLoader m_scoreType;
-        public GLoader m_btnClose;
         public const string URL = "ui://mfvz4q8kvxw538";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryLevelInfoUI";
@@ -93,7 +92,6 @@ namespace UI.Main
             m_flower = (UI_CompFlower1)UI_CompFlower1.Create(comp.GetChild("flower"));
             m_listBonus = (GList)comp.GetChild("listBonus");
             m_scoreType = (GLoader)comp.GetChild("scoreType");
-            m_btnClose = (GLoader)comp.GetChild("btnClose");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -117,7 +115,6 @@ namespace UI.Main
             m_flower = null;
             m_listBonus = null;
             m_scoreType = null;
-            m_btnClose = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -17,7 +17,7 @@ namespace GFGGame
             this.modal = true;
 
             _ui.m_listBonus.itemRenderer = UpdateBonusItem;
-            
+
             _ui.m_listBonus.onClickItem.Add(OnClickListBonusItem);
         }
 
@@ -25,7 +25,7 @@ namespace GFGGame
         {
             base.OnShown();
             _bonusList = this.viewData as List<ItemData>;
-            if(_bonusList != null)
+            if (_bonusList != null)
             {
                 _ui.m_listBonus.numItems = _bonusList.Count;
             }
@@ -33,7 +33,7 @@ namespace GFGGame
             {
                 _ui.m_listBonus.numItems = 0;
             }
-            if(_ui.m_listBonus.numItems > 4)
+            if (_ui.m_listBonus.numItems > 4)
             {
                 _ui.m_listBonus.columnGap = 40;
             }
@@ -43,6 +43,7 @@ namespace GFGGame
             }
             int targetY = (int)(this.viewCom.y + _ui.target.y + _ui.target.height);
             GuideController.TryGuideByGuideId(null, ConstGuideId.GET_BONUS_VIEW, 1, false, "恭喜你，获得了第一份奖励，点击图标可以查看物品信息，点击半透明区域继续", targetY);
+            Timers.inst.AddUpdate(UpdateToCheckGuide);
         }
 
         protected override void OnHide()
@@ -50,7 +51,9 @@ namespace GFGGame
             base.OnHide();
             GuideController.HideGuide();
             GuideController.TryCompleteGuide(ConstGuideId.GET_BONUS_VIEW);
+            TryCompleteGuide();
             GetSuitItemController.TryShow(0);
+            Timers.inst.Remove(UpdateToCheckGuide);
         }
 
         private void OnClickListBonusItem(EventContext context)
@@ -60,7 +63,7 @@ namespace GFGGame
             GoodsItemTipsController.ShowItemTips(itemId);
         }
 
-    private void UpdateBonusItem(int index, GObject item)
+        private void UpdateBonusItem(int index, GObject item)
         {
             ItemData itemData = _bonusList[index] as ItemData;
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
@@ -73,5 +76,18 @@ namespace GFGGame
             RarityIconController.UpdateRarityIcon(listItem.m_goodsItem.m_iconItem.m_rarity, itemData.id, true);
             listItem.target.data = itemData.id;
         }
+
+        private void UpdateToCheckGuide(object param)
+        {
+            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()
+        {
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.GET_BONUS_FIRST);
+            GuideController.TryCompleteGuideIndex(cfg.id, 1);
+            GuideController.TryCompleteGuide(ConstGuideId.GET_BONUS_FIRST, 1);
+
+        }
     }
 }

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

@@ -13,6 +13,7 @@ namespace GFGGame
         private GameObject _sceneObject;
         private GoWrapper _wrapper;
 
+        private int guideId = 0;//0：没有引导 1：首次获得套装2：首次获得套装部件
         public override void Dispose()
         {
             if (_scenePrefab != null)
@@ -38,7 +39,9 @@ namespace GFGGame
         {
             base.OnShown();
             int itemId = (int)viewData;
+            guideId = 0;
             UpdateView(itemId);
+            Timers.inst.AddUpdate(UpdateToCheckGuide);
         }
 
         protected override void OnHide()
@@ -64,6 +67,8 @@ namespace GFGGame
             GuideController.HideGuide();
             GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_VIEW_FIRST);
             GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_VIEW_FULL);
+            Timers.inst.Remove(UpdateToCheckGuide);
+            TryCompleteGuide();
         }
 
         private void OnClickBg()
@@ -118,10 +123,12 @@ namespace GFGGame
                 int targetY = (int)(_ui.m_item.target.y + _ui.m_item.target.height + 50);
                 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);
                 }
             }
@@ -148,5 +155,22 @@ namespace GFGGame
             }
         }
 
+        private void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            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()
+        {
+            GuideCfg cfg;
+            cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.GET_SUIT_ITEM_FULL);
+            GuideController.TryCompleteGuideIndex(cfg.id, 1);
+            GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_FULL, 1);
+            cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.GET_SUIT_ITEM_FIRST);
+            GuideController.TryCompleteGuideIndex(cfg.id, 1);
+            GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_FIRST, 1);
+
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -96,7 +96,7 @@ namespace GFGGame
                 if (GuideController.useNewGuide)
                 {
                     guideTarget.onClick.Add(OnClickTarget);
-
+                    if (guideTarget == null) OnClickTarget();
                 }
             }
             else
@@ -153,8 +153,8 @@ namespace GFGGame
         }
         private void OnClickTarget()
         {
-            if (guideTarget == null) return;
-            guideTarget.onClick.Remove(OnClickTarget);
+            // if (guideTarget == null) return;
+            if (guideTarget != null) guideTarget.onClick.Remove(OnClickTarget);
             GuideController.TryCompleteGuideIndex(guideId, guideIndex);
         }
     }

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

@@ -256,7 +256,7 @@ namespace GFGGame
         {
 
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX, 4, "点击将星星链接在一起", false, 0, true, false, 1780);
+            GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX, 4, "点击将星星链接在一起", false, 0, true, false, (int)(this.viewCom.height - 150));
             TryCompleteGuide();
         }
         private void TryCompleteGuide()

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

@@ -161,6 +161,9 @@ namespace GFGGame
                             // }
                             if (levelItem.m_holder.visible)
                             {
+                                // StoryDataManager.currentChapter = _chapterID;
+                                StoryDataManager.currentLevel = int.Parse(levelItem.target.name.Replace("g", ""));
+
                                 _unPasslevelItem = levelItem.target;
                                 _gameObject = null;
                                 _wrapper = null;

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

@@ -33,10 +33,10 @@ namespace GFGGame
             _ui.m_btnFightOnce.onClick.Add(OnClickBtnFightOnce);
             _ui.m_btnFightTimes.onClick.Add(OnClickBtnFightTimes);
 
-            _ui.m_btnClose.onClick.Add(() =>
-            {
-                this.Hide();
-            });
+            // _ui.m_btnClose.onClick.Add(() =>
+            // {
+            //     this.Hide();
+            // });
 
             _ui.m_listTag.itemRenderer = RenderListTagItem;
         }
@@ -265,7 +265,7 @@ namespace GFGGame
             {
                 _ui.m_btnStart.touchable = false;
             }
-            GuideController.TryGuide(null, ConstGuideId.CLOTHING_SYNTHETIC, 3, "点击空白处关闭", false, 0, true, false, 1300);
+            GuideController.TryGuide(null, ConstGuideId.CLOTHING_SYNTHETIC, 3, "点击空白处关闭", false, 0, true, false, (int)(this.viewCom.y + _ui.m_groupPass.y));
             GuideController.TryGuide(_ui.m_listTag, ConstGuideId.OPEN_TAGS, 1, "选择相应的关卡标签，可提高分数", false, 0, true, false, 0);
             GuideController.TryCompleteGuide(ConstGuideId.OPEN_TAGS, 1);
 

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

@@ -14,6 +14,7 @@ namespace GFGGame
         private bool _fistPassLastLvl;
         private bool _curLvfirstPass = false;
 
+        private bool resule = false;
         public override void Dispose()
         {
             if (_scenePrefab != null)
@@ -49,6 +50,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            // Timers.inst.AddUpdate(UpdateToCheckGuide);
+
             if (_sceneObject == null)
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
@@ -65,11 +68,12 @@ namespace GFGGame
             _ui.m_expBar.m_pbExp.max = roleLevelCfg.exp;
             _ui.m_expBar.m_pbExp.value = RoleDataManager.exp;
 
-            bool resule = GetFightResult();
+            resule = GetFightResult();
             int starCount = !resule ? 0 : StoryDataManager.GetResultStarCount(score);
             StoryUtil.UpdateStar(starCount, _ui.m_selfScore.m_flower.target);
             _ui.m_selfScore.m_bg.url = "ui://Main/zd_jsjm_jszi_" + starCount;
             TextFormat tf = _ui.m_selfScore.m_txtScore.textFormat;
+            UpdateToCheckGuide(null);
             if (!resule)
             {
                 tf.font = "ui://Main/Font3";
@@ -95,6 +99,7 @@ namespace GFGGame
             }
             Timers.inst.Add(0.5f, 1, AddExp);
             _ui.m_selfScore.m_txtScore.textFormat = tf;
+
         }
 
         private bool GetFightResult()
@@ -126,6 +131,8 @@ 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);
@@ -178,6 +185,31 @@ namespace GFGGame
             }
             GuideController.TryGuideByGuideId(null, ConstGuideId.FIGHT_RESULT_TIPS_GUIDE, 2, false, txt, targetY);
         }
+        private void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            if (!resule) GuideController.TryGuide(null, ConstGuideId.FIRST_FIGHT_FAILED, 1, "不要气馁呀，可以通过再次挑战已通关的关卡、摘星、绣坊等途径获取更多的物资来提升自己的战斗力哦！", false, 0, true, false, (int)(this.viewCom.height - 150));
+            if (resule) GuideController.TryGuide(null, ConstGuideId.FIRST_FIGHT_SINGLE_WIN, 1, "这条连衣裙可真好看！点击空白区域继续", false, 0, true, false, (int)(this.viewCom.height - 150));
+            if (resule) GuideController.TryGuide(null, ConstGuideId.FIRST_FIGHT_TARGET_WIN, 1, "你太厉害了，初次对战就获得了这么好的战绩，继续加油吧", false, 0, true, false, (int)(this.viewCom.height - 350));
+        }
+
+        private void TryCompleteGuide()
+        {
+            GuideCfg cfg;
+            cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.FIRST_FIGHT_FAILED);
+            GuideController.TryCompleteGuideIndex(cfg.id, 1);
+            GuideController.TryCompleteGuide(ConstGuideId.FIRST_FIGHT_FAILED, 1);
+
+            cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.FIRST_FIGHT_SINGLE_WIN);
+            GuideController.TryCompleteGuideIndex(cfg.id, 1);
+            GuideController.TryCompleteGuide(ConstGuideId.FIRST_FIGHT_SINGLE_WIN, 1);
+
+            cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.FIRST_FIGHT_TARGET_WIN);
+            GuideController.TryCompleteGuideIndex(cfg.id, 1);
+            GuideController.TryCompleteGuide(ConstGuideId.FIRST_FIGHT_TARGET_WIN, 1);
+
+        }
+
 
     }
 }