zhaoyang 3 年之前
父节点
当前提交
0d3463c645

+ 3 - 0
FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -51,6 +51,9 @@
       <relation target="" sidePair="bottom-bottom"/>
     </text>
     <group id="n23_8xpg" name="groupTaskHint" xy="0,0" size="1080,1920" group="n38_8lqj" advanced="true"/>
+    <loader id="n42_m1l9" name="btnGuide" xy="455,875" size="170,170" group="n38_8lqj" aspect="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
     <component id="n19_8xpg" name="btnClothingShop" src="f4xv3o" fileName="components/Button6.xml" xy="27,895" size="116,106" group="n38_8lqj" visible="false">
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button icon="ui://mbo439wb8xpg2n"/>

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_DressUpFightUI.cs

@@ -23,6 +23,7 @@ namespace UI.DressUp
         public GGraph m_btnClose;
         public GTextField m_txtHint;
         public GGroup m_groupTaskHint;
+        public GLoader m_btnGuide;
         public GButton m_btnClothingShop;
         public GButton m_btnRepeal;
         public GButton m_btnRenewal;
@@ -96,6 +97,7 @@ namespace UI.DressUp
             m_btnClose = (GGraph)comp.GetChild("btnClose");
             m_txtHint = (GTextField)comp.GetChild("txtHint");
             m_groupTaskHint = (GGroup)comp.GetChild("groupTaskHint");
+            m_btnGuide = (GLoader)comp.GetChild("btnGuide");
             m_btnClothingShop = (GButton)comp.GetChild("btnClothingShop");
             m_btnRepeal = (GButton)comp.GetChild("btnRepeal");
             m_btnRenewal = (GButton)comp.GetChild("btnRenewal");
@@ -130,6 +132,7 @@ namespace UI.DressUp
             m_btnClose = null;
             m_txtHint = null;
             m_groupTaskHint = null;
+            m_btnGuide = null;
             m_btnClothingShop = null;
             m_btnRepeal = null;
             m_btnRenewal = null;

+ 68 - 21
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -28,10 +28,10 @@ namespace GFGGame
         private const int SORT_BY_LOW_SCORE = 1;
         private int _scoreIndex = SORT_BY_HIGH_SCORE;
 
-        private const int GUIDE_SY = 10476;
         private bool _guideMenu;
 
-        private UI_TypeItem listTypeItem_SingleFight;
+        private UI_TypeItem listTypeItem_SingleFight_Sy;
+        private UI_TypeItem listTypeItem_SingleFight_Xz;
         private UI_TypeItem listTypeItem_BuyClothing;
 
 
@@ -82,6 +82,7 @@ namespace GFGGame
             _ui.m_partsList2.m_list.onClickItem.Add(OnClickSuitPartsListItem);
             _ui.m_touchPad.onClick.Add(OnTouchPad);
             _ui.m_btnHint.onClick.Add(OnClickBtnHint);
+            _ui.m_btnGuide.onClick.Add(OnTouchPad);
             _ui.m_btnClose.onClick.Add(OnClickBtnClose);
             _ui.m_btnDelete.onClick.Add(OnClickBtnDelete);
             _ui.m_btnNext.onClick.Add(OnClickBtnNext);
@@ -190,7 +191,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
             _fightCfg = null;
             _levelCfg = null;
-            listTypeItem_SingleFight = null;
+            listTypeItem_SingleFight_Sy = null;
             listTypeItem_BuyClothing = null;
 
 
@@ -863,27 +864,41 @@ namespace GFGGame
         {
 
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            if (listTypeItem_SingleFight == null && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0 || listTypeItem_BuyClothing == null && GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
+
+
+            if (listTypeItem_SingleFight_Sy == null && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0 || listTypeItem_SingleFight_Xz == null && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0 || listTypeItem_BuyClothing == null && GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
             {
-                int len = _ui.m_comListType1.m_listType.numChildren;
-                for (int i = 0; i < len; i++)
+                // int len = _ui.m_comListType1.m_listType.numChildren;
+                for (int i = 0; i < _ui.m_comListType1.m_listType.numChildren; i++)
                 {
                     UI_TypeItem item = UI_TypeItem.Proxy(_ui.m_comListType1.m_listType.GetChildAt(i));
                     if (item != null)
                     {
                         int menuID = (int)item.target.data;
                         DressUpMenuItemCfg1 dressUpMenuItemCfg1 = DressUpMenuItemCfg1Array.Instance.GetCfg(menuID);
-                        if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
-                        {
 
-                            if (dressUpMenuItemCfg1.type == ConstDressUpItemType.LIAN_YI_QUN)
-                            {
-                                listTypeItem_SingleFight = item;
-                                // _ui.m_comListType1.m_listType.ScrollToView(i);
-                                break;
-                            }
-                        }
-                        else if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
+                        // if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
+                        // {
+
+                        //     if (dressUpMenuItemCfg1.type == ConstDressUpItemType.SHANG_YI)
+                        //     {
+                        //         listTypeItem_SingleFight_Sy = item;
+                        //         // _ui.m_comListType1.m_listType.ScrollToView(i);
+                        //         // break;
+                        //         syIndex = i;
+                        //     }
+                        //     if (dressUpMenuItemCfg1.type == ConstDressUpItemType.XIA_ZHUANG)
+                        //     {
+                        //         listTypeItem_SingleFight_Xz = item;
+                        //         // _ui.m_comListType1.m_listType.ScrollToView(i);
+                        //         // break;
+                        //         xzIndex = i;
+
+                        //     }
+                        // }
+                        // else 
+
+                        if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
                         {
                             int type = 0;
                             if (_fightCfg.needItemId > 0) type = ItemUtilCS.GetItemSubType(_fightCfg.needItemId);
@@ -891,7 +906,7 @@ namespace GFGGame
                             if (_fightCfg.needSuitId > 0) type = ConstDressUpItemType.TAO_ZHUANG;
 
 
-                            if (dressUpMenuItemCfg1.type == type)
+                            if (listTypeItem_BuyClothing == null && dressUpMenuItemCfg1.type == type)
                             {
                                 listTypeItem_BuyClothing = item;
                                 // _ui.m_comListType1.m_listType.ScrollToView(i);
@@ -902,10 +917,42 @@ namespace GFGGame
                 }
             }
 
-            if (listTypeItem_SingleFight != null) GuideController.TryGuide(listTypeItem_SingleFight.target, ConstGuideId.SINGLE_FIGHT, 3, "点击相应的分类,可以快速找到服饰", -1, true, (int)listTypeItem_SingleFight.target.y);
-
-            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.SINGLE_FIGHT, 4, "找到这条裙子了,换上看看吧", -1, true, (int)_ui.m_partsList.m_list.y);
-            GuideController.TryGuide(_ui.m_btnNext, ConstGuideId.SINGLE_FIGHT, 5, "接下来验证一下,换上的服饰是否符合需求");
+            int syIndex = 0;
+            int xzIndex = 0;
+            int len = _ui.m_comListType1.m_listType.numChildren;
+            for (int i = 0; i < len; i++)
+            {
+                UI_TypeItem item = UI_TypeItem.Proxy(_ui.m_comListType1.m_listType.GetChildAt(i));
+                if (item != null)
+                {
+                    int menuID = (int)item.target.data;
+                    DressUpMenuItemCfg1 dressUpMenuItemCfg1 = DressUpMenuItemCfg1Array.Instance.GetCfg(menuID);
+                    if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0 && dressUpMenuItemCfg1.type == ConstDressUpItemType.LIAN_YI_QUN)
+                    {
+                        syIndex = i;
+                    }
+                    if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0 && dressUpMenuItemCfg1.type == ConstDressUpItemType.XIE_ZI)
+                    {
+                        xzIndex = i;
+                    }
+                }
+            }
+            int djcId = 10476;//点绛唇Id
+            int djcIndex = 0;
+            for (int i = 0; i < _currentList3.Count; i++)
+            {
+                if (_currentList3[i] == djcId)
+                {
+                    djcIndex = i;
+                    break;
+                }
+            }
+            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.SINGLE_FIGHT, 3, "点击相应的分类,可以快速找到服饰", syIndex);
+            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.SINGLE_FIGHT, 4, "", 0, true, (int)_ui.m_partsList.m_list.y);
+            GuideController.TryGuide(_ui.m_btnGuide, ConstGuideId.SINGLE_FIGHT, 5, "", -1, true, 0, 0, 0, false);
+            // GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.SINGLE_FIGHT, 6, "接下来把裙子也换上", xzIndex);
+            // GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.SINGLE_FIGHT, 7, "", 0, true, (int)_ui.m_partsList.m_list.y);
+            GuideController.TryGuide(_ui.m_btnNext, ConstGuideId.SINGLE_FIGHT, 6, "穿着完毕,来验证一下,换上的服饰是否符合需求");
 
             GuideController.TryGuide(_ui.m_compNeed.target, ConstGuideId.BUY_CLOTHING, 1, "当提示有“必需品”时,需要穿上对应物品才能通关", -1, true, 170);
             if (listTypeItem_BuyClothing != null) GuideController.TryGuide(listTypeItem_BuyClothing.target, ConstGuideId.BUY_CLOTHING, 5, "在相应分类里就可以找到必需品啦", -1, true, (int)listTypeItem_BuyClothing.target.y);

+ 3 - 1
GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -89,6 +89,8 @@ namespace GFGGame
             _ui.m_rectFrameTemp.height = _ui.m_mask.target.height;
             _ui.m_rectFrameTemp.x = 0;
             _ui.m_rectFrameTemp.y = 0;
+
+            _ui.m_rectFrameTemp.visible = showAni;
             if (guideTarget != null)
             {
 
@@ -155,7 +157,7 @@ namespace GFGGame
 
                     if (Mathf.Abs(_ui.m_rectFrameTemp.width - _ui.m_rectFrame.target.width) > targetWidth && Mathf.Abs(_ui.m_rectFrameTemp.height - _ui.m_rectFrame.target.height) > targetWidth)
                     {
-                        _ui.m_rectFrameTemp.visible = true;
+                        // _ui.m_rectFrameTemp.visible = showAni;
                         float duration = 0.5f;
                         _ui.m_rectFrameTemp.TweenResize(new Vector2(_ui.m_rectFrame.target.width, _ui.m_rectFrame.target.height), duration);
                         _ui.m_rectFrameTemp.TweenMove(new Vector2(_ui.m_rectFrame.target.x, _ui.m_rectFrame.target.y), duration);

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

@@ -421,13 +421,13 @@ namespace GFGGame
             float scaleX = _gameObject7.transform.localScale.x;
             if (scaleX == _prefectScale)
             {
-                bool isGuide = GuideController.TryGuide(_ui.m_comClickCircle.target, ConstGuideId.SINGLE_FIGHT, 6, "服饰比较繁琐,适当的整理会更加分,点击为各部位修整吧");
+                bool isGuide = GuideController.TryGuide(_ui.m_comClickCircle.target, ConstGuideId.SINGLE_FIGHT, 7, "服饰比较繁琐,适当的整理会更加分,点击为各部位修整吧");
                 if (isGuide)
                 {
                     _ui.m_comClickCircle.target.touchable = true;
                 }
             }
-            GuideController.TryCompleteGuide(ConstGuideId.SINGLE_FIGHT, 6);
+            GuideController.TryCompleteGuide(ConstGuideId.SINGLE_FIGHT, 7);
         }
     }
 }

二进制
GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes