引导文本

FGUIProject/assets/ClothingSynthetic/ClothingSyntheticUI.xml

@@ -6,6 +6,7 @@
     </loader>
     <component id="n40_ja9w" name="compHolder" src="ja9w1c" fileName="components/Component1.xml" xy="0,319"/>
     <component id="n1_j539" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n43_g3nf" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="36,196"/>
     <component id="n2_j539" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90" pivot="1,0"/>
     <image id="n3_j539" name="n3" src="j539p" fileName="images/hc_btkuang.png" pkg="eg2y0ldp" xy="259,218"/>
     <text id="n4_j539" name="txtSuitName" xy="466,223" size="148,49" fontSize="36" color="#fdf4e3" text="套装名字">

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

@@ -25,7 +25,7 @@ namespace GFGGame
                         StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(levelID);
                         if (storyLevelCfg.fightID != null && storyLevelCfg.fightID.Length > 0)
                         {
-                            guideStr = "点击关卡图标，继续挑战";
+                            guideStr = "遇到意外事件了，暂时解释不清，先按请求换上服饰吧";
                         }
                         else
                         {
@@ -69,7 +69,7 @@ namespace GFGGame
                         DressUpMenuItemCfg1 dressUpMenuItemCfg1 = DressUpMenuItemCfg1Array.Instance.GetCfg(menuID);
                         if (dressUpMenuItemCfg1.type == ConstDressUpItemType.LIAN_YI_QUN)
                         {
-                            ShowGuide(item.target, true, "点击分类图标，可查看对应类型的服装");
+                            ShowGuide(item.target, true, "点击相应的分类，可以快速找到服饰");
                             return true;
                         }
                     }
@@ -97,14 +97,14 @@ namespace GFGGame
         {
             if (GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
             {
-                ShowGuide(target, false, "换好衣服后，点击下一步进行战斗");
+                ShowGuide(target, false, "接下来验证一下，换上的服饰是否符合需求");
             }
         }
 
         public static void TryGuideSingleScoreViewComClickCircle(GObject target)
         {
 
-            ShowGuide(target, false, "点击圆圈进行部件评分，精准率越高，部件额外加分越高哦");
+            ShowGuide(target, false, "服饰比较繁琐，适当的整理会更加分，点击为各部位修整吧");
         }
 
         /*******************************************************引导购买必需品***********************************************/
@@ -118,7 +118,7 @@ namespace GFGGame
                 && DressUpMenuItemDataManager.GetRecommendCount() >= 2)
             {
                 GuideDataManager.currentGuideId = ConstGuideId.CLOTHING_SHOP_VIEW_BTN_BUY;
-                ShowGuide(target, false, "想要通过此关要穿戴提示的必需品哦，点击必需品提示看看");
+                ShowGuide(target, false, "当提示有“必需品”时，需要穿上对应物品才能通关");
             }
         }
 
@@ -132,7 +132,7 @@ namespace GFGGame
                 UI.CommonGame.UI_ApproachOfItemUI listItem = UI.CommonGame.UI_ApproachOfItemUI.Proxy(list.GetChildAt(0));
                 if (listItem != null)
                 {
-                    ShowGuide(listItem.target, false, "这里是物品产出的所有来源，点击服装店");
+                    ShowGuide(listItem.target, false, "该物品可以在服装店购买，点开服装店看看");
                 }
 
             }
@@ -144,7 +144,7 @@ namespace GFGGame
                  && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel)
                  && DressUpMenuItemDataManager.GetRecommendCount() >= 2)
             {
-                ShowGuide(target, false, "已经选中需要的衣服，点击购买");
+                ShowGuide(target, false, "找到需要的物品了，点击购买吧");
             }
         }
         public static void TryGuideBuyCountViewBtnSure(GObject target)
@@ -163,7 +163,7 @@ namespace GFGGame
                 && StoryDataManager.currentLevel == 4
                 && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel))
             {
-                ShowGuide(target, false, "点击返回，继续搭配衣服");
+                ShowGuide(target, false, "点击返回，回到换装");
             }
         }
         private static GList _list;
@@ -183,7 +183,7 @@ namespace GFGGame
                         DressUpMenuItemCfg1 dressUpMenuItemCfg1 = DressUpMenuItemCfg1Array.Instance.GetCfg(menuID);
                         if (dressUpMenuItemCfg1.type == ConstDressUpItemType.LIAN_YI_QUN)
                         {
-                            ShowGuide(item.target, true, "点击必需品图标");
+                            ShowGuide(item.target, true, "在相应分类里就可以找到必需品啦");
                             _list = null;
                             return true;
                         }
@@ -217,7 +217,7 @@ namespace GFGGame
                 && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel))
             {
                 GuideDataManager.currentGuideId = ConstGuideId.SEE_DRESS_TIPS;
-                ShowGuide(target, false, "点击查看过关提示");
+                ShowGuide(target, false, "这次换装需要获得别人的认可呢");
             }
         }
 
@@ -231,7 +231,7 @@ namespace GFGGame
                 && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel))
             {
                 GuideDataManager.currentGuideId = ConstGuideId.TARGET_FIGHT_GUIDE;
-                ShowGuide(target, false, "双人对战部件评分会显示在这里", 0, false, devWidth, devHeight);
+                ShowGuide(target, false, "这里可以观察双方的分数计算", 0, false, devWidth, devHeight);
             }
         }
         public static void TryGuideStoryFightTargetScorebtnSkill0(GObject target)
@@ -240,7 +240,7 @@ namespace GFGGame
                 && StoryDataManager.currentLevel == 6
                 && !StoryDataManager.CheckLevelPass(StoryDataManager.currentChapter, StoryDataManager.currentLevel))
             {
-                ShowGuide(target, false, "点击使用技能");
+                ShowGuide(target, false, "使用技能，可以增加胜出的几率哦，点击看看");
             }
         }
         /*******************************************************引导抽奖***********************************************/
@@ -265,7 +265,7 @@ namespace GFGGame
                 && !StoryDataManager.CheckLevelPass(1, 11))
             {
                 GuideDataManager.currentGuideId = ConstGuideId.MAIN_UI_BTN_ZHAI_XING;
-                ShowGuide(target, false, "点击摘星按钮，进入抽奖界面");
+                ShowGuide(target, false, "“摘星”里可以通过星辰的力量获得服饰");
                 return true;
             }
             return false;
@@ -277,7 +277,7 @@ namespace GFGGame
                 && !StoryDataManager.CheckLevelPass(1, 11))
             {
                 GuideDataManager.currentGuideId = ConstGuideId.MAIN_UI_BTN_ZHAI_XING;
-                ShowGuide(null, false, "任选一颗星星按住不松手移动到下一颗星星，试着将所有星星连在一起", 1400);
+                ShowGuide(null, false, "点击将星星链接在一起", 1400);
                 return true;
             }
             return false;
@@ -299,7 +299,7 @@ namespace GFGGame
                         DressUpMenuItemCfg1 dressUpMenuItemCfg1 = DressUpMenuItemCfg1Array.Instance.GetCfg(menuID);
                         if (dressUpMenuItemCfg1.type == ConstDressUpItemType.TAO_ZHUANG)
                         {
-                            ShowGuide(item.target, true, "点击套装分类，可查看收集的套装");
+                            ShowGuide(item.target, true, "套装分类里，可以查看集齐成套的服饰");
                             return true;
                         }
                     }
@@ -317,7 +317,7 @@ namespace GFGGame
                     UI_PartsList listItem = UI_PartsList.Proxy(list.GetChildAt(0));
                     if (listItem != null)
                     {
-                        ShowGuide(listItem.target, true, "点击图标，可换上整套衣服");
+                        ShowGuide(listItem.target, true, "点击一键换上");
                         return;
                     }
 
@@ -337,7 +337,7 @@ namespace GFGGame
                 && StoryDataManager.currentChapter == 2 && StoryDataManager.currentLevel <= 2)
             {
                 GuideDataManager.currentGuideId = ConstGuideId.SUIT_SYNTHETIC_GUIDE;
-                ShowGuide(target, false, "还没有通关必须穿戴的衣服，快去合成一件吧！", 0, true);
+                ShowGuide(target, false, "这次必需品，要通过合成获得", 0, true);
             }
         }
         public static void TryGuideStoryLevelInfoView(GObject target)
@@ -358,7 +358,7 @@ namespace GFGGame
                 && StoryDataManager.CheckLevelPass(2, 1)
                 && !StoryDataManager.CheckLevelPass(2, 2))
             {
-                ShowGuide(target, false, "点击返回主界面", 0);
+                ShowGuide(target, false, "先回到主界面", 0);
             }
         }
         public static bool TryGuideMainUIViewBtnXiuFang(GObject target)
@@ -371,7 +371,7 @@ namespace GFGGame
             )
             {
                 GuideDataManager.currentGuideId = ConstGuideId.SUIT_SYNTHETIC_GUIDE;
-                ShowGuide(target, false, "点击进入绣坊", 0);
+                ShowGuide(target, false, "绣坊里增添了新功能", 0);
                 return true;
             }
             return false;
@@ -383,7 +383,7 @@ namespace GFGGame
                 && StoryDataManager.CheckLevelPass(2, 1)
                 && !StoryDataManager.CheckLevelPass(2, 2))
             {
-                ShowGuide(target, false, "点击进入套装合成", 0);
+                ShowGuide(target, false, "这里可以查看已获得的服饰图谱", 0);
             }
         }
         public static void TryGuideSuitSyntheticViewList(GList list)
@@ -398,7 +398,26 @@ namespace GFGGame
                     UI_SuitListItem listItem = UI_SuitListItem.Proxy(list.GetChildAt(0));
                     if (listItem != null)
                     {
-                        ShowGuide(listItem.target, true, "点击套装");
+                        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;
                     }
 
@@ -417,7 +436,7 @@ namespace GFGGame
                     UI_MateriasListItem listItem = UI_MateriasListItem.Proxy(list.GetChildAt(0));
                     if (listItem != null)
                     {
-                        ShowGuide(listItem.m_loaderIcon, true, "点击查看制作材料", 0, false);
+                        ShowGuide(listItem.m_loaderIcon, true, "这里可以查看合成需要的材料，和材料的获取途径", 0, false);
                         return;
                     }
 
@@ -432,10 +451,20 @@ namespace GFGGame
                 && !StoryDataManager.CheckLevelPass(2, 2))
             {
 
-                ShowGuide(target, true, "点击进行制作");
+                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)
@@ -452,7 +481,7 @@ namespace GFGGame
                     if (listItem != null)
                     {
                         GuideDataManager.currentGuideId = ConstGuideId.USE_CARD_FIGHT;
-                        ShowGuide(listItem.target, true, "选择一张卡牌进行战斗");
+                        ShowGuide(listItem.target, true, "选择一张合适的词牌，增加过关战斗力");
                         return;
                     }
 
@@ -479,7 +508,7 @@ namespace GFGGame
                 && !StoryDataManager.CheckLevelPass(2, 8))
             {
                 GuideDataManager.currentGuideId = ConstGuideId.TIPS_TAGS_FIGHT;
-                ShowGuide(target, true, "穿戴符合提示的标签，在战斗中可以获取更多分数", 0, true);
+                ShowGuide(target, true, "选择相应的关卡标签，可提高分数", 0, true);
             }
         }
         /***********************************************************词牌升星********************************************************/
@@ -491,7 +520,7 @@ namespace GFGGame
                 && !StoryDataManager.CheckLevelPass(2, 15))
             {
                 GuideDataManager.currentGuideId = ConstGuideId.CARD_UP_STAR;
-                ShowGuide(target, true, "已经攒够升星材料了，快去词牌升星看看吧", 0, true);
+                ShowGuide(target, true, "已经收集了足够的材料，可以给词牌升星了", 0, true);
             }
         }
         public static void TryGuideMainUIViewBtnCiPai(GObject target)
@@ -500,23 +529,12 @@ namespace GFGGame
             if (GuideDataManager.GetGuideCount(ConstGuideId.CARD_UP_STAR) <= 0
                && StoryDataManager.CheckLevelPass(2, 14)
                 && !StoryDataManager.CheckLevelPass(2, 15))
-            // && GuideDataManager.currentGuideId == ConstGuideId.CARD_UP_STAR)
             {
                 GuideDataManager.currentGuideId = ConstGuideId.CARD_UP_STAR;
                 ShowGuide(target, true, "点击词牌", 0);
             }
         }
-        // public static void TryGuideCardViewBtnDetail(GObject target)
-        // {
-
-        //     if (GuideDataManager.GetGuideCount(ConstGuideId.CARD_UP_STAR) <= 0
-        //          && StoryDataManager.CheckLevelPass(2, 14)
-        //         && !StoryDataManager.CheckLevelPass(2, 15))
-        //     {
 
-        //         ShowGuide(target, true, "点击词牌列表", 0, false, -236, -181);
-        //     }
-        // }
         public static void TryGuideCardDetailViewList(GList list)
         {
 
@@ -530,7 +548,7 @@ namespace GFGGame
                     if (listItem != null)
                     {
                         GuideDataManager.currentGuideId = ConstGuideId.CARD_UP_STAR;
-                        ShowGuide(listItem.target, true, "选择要升星的卡牌", 0);
+                        ShowGuide(listItem.target, true, "选择可升星的词牌", 0);
                         return;
                     }
 
@@ -546,7 +564,7 @@ namespace GFGGame
                 && !StoryDataManager.CheckLevelPass(2, 15))
             {
 
-                ShowGuide(target, true, "点击升星", 0);
+                ShowGuide(target, true, "升满5星后，可解锁词牌的隐藏卡面哦", 0);
             }
         }
         /*******************************************************************************************************************/

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_ClothingSyntheticUI.cs

@@ -10,6 +10,7 @@ namespace UI.ClothingSynthetic
         public GLoader m_bg;
         public UI_Component1 m_compHolder;
         public GButton m_btnBack;
+        public GButton m_btnHome;
         public GComponent m_valueBar;
         public GTextField m_txtSuitName;
         public UI_CompItemInfo m_compItemInfo;
@@ -68,6 +69,7 @@ namespace UI.ClothingSynthetic
             m_bg = (GLoader)comp.GetChild("bg");
             m_compHolder = (UI_Component1)UI_Component1.Create(comp.GetChild("compHolder"));
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnHome = (GButton)comp.GetChild("btnHome");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_txtSuitName = (GTextField)comp.GetChild("txtSuitName");
             m_compItemInfo = (UI_CompItemInfo)UI_CompItemInfo.Create(comp.GetChild("compItemInfo"));
@@ -83,6 +85,7 @@ namespace UI.ClothingSynthetic
             m_compHolder.Dispose();
             m_compHolder = null;
             m_btnBack = null;
+            m_btnHome = null;
             m_valueBar = null;
             m_txtSuitName = null;
             m_compItemInfo.Dispose();

GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -132,7 +132,7 @@ namespace GFGGame
 
         private void OnClickBtnHome()
         {
-            //GuideController.TryCompleteGuide(ConstGuideId.CHAPTER_VIEW_BTN_HOME);
+            GuideController.TryCompleteGuide(ConstGuideId.SUIT_SYNTHETIC_GUIDE);
             GameController.GoBackToMainView();
             this.Clear();
 

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -74,6 +74,7 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
+            packageName = UI_ClothingSyntheticListUI.PACKAGE_NAME;
             _ui = UI_ClothingSyntheticUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
@@ -95,6 +96,8 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_listClothing.onClickItem.Add(OnClickListClothingItem);
             _ui.m_btnProduction.onClick.Add(OnClickBtnProcuction);
+            _ui.m_btnHome.onClick.Add(OnClickBtnHome);
+
         }
 
         protected override void OnShown()
@@ -105,7 +108,7 @@ namespace GFGGame
             UpdateClothingList(false);
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnItemNumChanged);
 
-            GuideController.TryGuideClothingSyntheticViewList(_ui.m_listMaterias);
+            GuideController.TryGuideClothingSyntheticViewSuitList(_ui.m_listClothing);
 
         }
 
@@ -133,6 +136,7 @@ namespace GFGGame
         private void OnClickListClothingItem(EventContext context)
         {
             UpdateSelectedItemInfo(context.data as GComponent, true);
+            GuideController.TryGuideClothingSyntheticViewList(_ui.m_listMaterias);
         }
 
         private void OnClickBtnProcuction()
@@ -167,8 +171,7 @@ namespace GFGGame
             ItemDataManager.Add(_selectedItemId, 1);
             GetSuitItemController.TryShow(_selectedItemId);
 
-            GuideController.HideGuide();
-            GuideController.TryCompleteGuide(ConstGuideId.SUIT_SYNTHETIC_GUIDE);
+            Timers.inst.AddUpdate(UpdateTryGuide);
         }
 
         private void ListClothingItemRender(int index, GObject item)
@@ -368,5 +371,18 @@ namespace GFGGame
             _ui.m_txtProgress.SetVar("v2", "" + totalCount);
             _ui.m_txtProgress.FlushVars();
         }
+        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);
+            }
+        }
     }
 }

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

@@ -215,11 +215,11 @@ namespace GFGGame
 
                 if (GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
                 {
-                    GuideController.TryGuideDressUpFightViewMenuPart0(_ui.m_partsList.m_list, "点击图标，换上新衣服吧");
+                    GuideController.TryGuideDressUpFightViewMenuPart0(_ui.m_partsList.m_list, "找到这条裙子了，换上看看吧");
                 }
                 else if (GuideDataManager.GetGuideCount(ConstGuideId.CLOTHING_SHOP_VIEW_BTN_BUY) <= 0)
                 {
-                    GuideController.TryGuideDressUpFightViewMenuPart1(_ui.m_partsList.m_list, "点击穿戴必须品");
+                    GuideController.TryGuideDressUpFightViewMenuPart1(_ui.m_partsList.m_list, "点击换上吧");
                 }
             }
             this.hideListType1();

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

@@ -167,7 +167,7 @@ namespace GFGGame
 
         private void OnClickPartsListItem(EventContext context)
         {
-            GuideController.TryGuideByGuideId(_ui.m_btnSave, ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG, 1, false, "点击按钮，保存搭配后，可以在主界面显示哦");
+            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)
@@ -212,7 +212,7 @@ 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);
+            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);
         }

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

@@ -211,9 +211,9 @@ namespace GFGGame
                 // 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, "点击按钮，开始抽奖，可以抽到好看的服装哦"))
+                    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);
+                        GuideController.TryGuideByGuideId(_ui.m_btnBack, ConstGuideId.LUCKY_BOX_VIEW_BTN_BACK, 1, true, "获得一套完整的服装啦，马上去试穿一下", 0, ConstGuideId.MAIN_UI_BTN_ZHAI_XING);
                     }
                 }
             }

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

@@ -50,9 +50,6 @@ namespace GFGGame
             _ui.m_proScore.target.max = fightCfg.score3;
             _ui.m_proScore.target.value = 0;
             _ui.m_proScore.m_imgFirstScore.x = (((float)fightCfg.score1 / (float)fightCfg.score3)) * _ui.m_proScore.target.width;
-            // _ui.m_proCount.m_imgCurScore.x = 0;
-            // _ui.m_comProCount.m_comBar.width = 0;
-            // _ui.m_comProCount.m_imgFirstScore.x = (((float)fightCfg.score1 / (float)fightCfg.score3)) * _ui.m_comProCount.target.width;
 
             _index = 0;
             _score = 0;

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

@@ -47,7 +47,7 @@ namespace GFGGame
             _levelID = (string)viewData;
             _storyType = int.Parse(_levelID.Split('_')[0]) / 10000;
             UpdateView();
-            GuideController.TryGuideChapterInfoViewBtnStart(_ui.m_btnStart, "点击按钮，开始挑战");
+            GuideController.TryGuideChapterInfoViewBtnStart(_ui.m_btnStart, "点击开启换装");
             GuideController.TryGuideStoryLevelInfoViewTxtNeed(_ui.m_txtNeed);
             GuideController.TryGuideStoryLevelInfoListTag(_ui.m_listTag);
 
@@ -60,7 +60,7 @@ namespace GFGGame
             base.OnHide();
             EventAgent.RemoveEventListener(ConstMessage.ROLE_POWER_CHANGED, UpdateBtnFightTimes);
             Timers.inst.Remove(UpdateToCheckGuide);
-            GuideController.HideGuide();
+            // GuideController.HideGuide();
             GuideController.TryCompleteGuide(ConstGuideId.TIPS_TAGS_FIGHT);
         }
 

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

@@ -26,9 +26,12 @@ namespace GFGGame
             _ui.m_t0.Play(() =>
             {
                 this.Hide();
-                EventAgent.DispatchEvent(ConstMessage.CARD_SKILL);
             });
         }
-
+        protected override void OnHide()
+        {
+            base.OnHide();
+            EventAgent.DispatchEvent(ConstMessage.CARD_SKILL);
+        }
     }
 }

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

@@ -297,15 +297,17 @@ namespace GFGGame
             // 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, "点击自由换装按钮，进入换装界面"))
+                if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_ZHAI_XING) > 0 && GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG) <= 0)
                 {
-                    if (!GuideController.TryGuideMainUIViewBtnXiuFang(_ui.m_btnXiuFang.target))
-                    {
-                        // if (GuideDataManager.GetGuideCount(ConstGuideId.CARD_UP_STAR) <= 0 && GuideDataManager.currentGuideId == ConstGuideId.CARD_UP_STAR)
-                        // {
-                        GuideController.TryGuideMainUIViewBtnCiPai(_ui.m_btnCiPai.target);
-                        // }
-                    }
+                    GuideController.TryGuideByGuideId(_ui.m_btnHuanZhuang.target, ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG, 1, false, "在这里，可以自由搭配服饰和分享哦~");
+                }
+                else if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG) > 0 && GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0)
+                {
+                    GuideController.TryGuideMainUIViewBtnXiuFang(_ui.m_btnXiuFang.target);
+                }
+                else if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) > 0 && GuideDataManager.GetGuideCount(ConstGuideId.CARD_UP_STAR) <= 0)
+                {
+                    GuideController.TryGuideMainUIViewBtnCiPai(_ui.m_btnCiPai.target);
                 }
             }
         }