zhaoyang 2 éve
szülő
commit
5714bf9a65
21 módosított fájl, 81 hozzáadás és 53 törlés
  1. 18 13
      FGUIProject/assets/ClothingSynthetic/ClothingSyntheticUI.xml
  2. 1 1
      FGUIProject/assets/ClothingSynthetic/package.xml
  3. 1 1
      GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs
  4. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_ClothingSyntheticUI.cs
  5. 6 1
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs
  6. 8 7
      GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs
  7. 1 1
      GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs
  8. 8 3
      GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertWindow.cs
  9. 2 2
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs
  10. 4 3
      GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs
  11. 12 1
      GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs
  12. 1 1
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs
  13. 1 1
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs
  14. 2 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs
  15. 4 8
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  16. 2 2
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs
  17. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs
  18. 5 2
      GameClient/Assets/Game/HotUpdate/Views/Travel/TravelView.cs
  19. 1 1
      GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs
  20. BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  21. BIN
      GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_fui.bytes

+ 18 - 13
FGUIProject/assets/ClothingSynthetic/ClothingSyntheticUI.xml

@@ -7,35 +7,37 @@
     <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,220"/>
     <component id="n2_j539" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" pivot="1,0" controller="c1,6"/>
+    <component id="n40_ja9w" name="compHolder" src="ja9w1c" fileName="components/Component1.xml" xy="0,229">
+      <relation target="" sidePair="middle-middle"/>
+    </component>
+    <component id="n6_j539" name="compItemInfo" src="ja9w1f" fileName="components/CompItemInfo.xml" xy="735,237"/>
     <image id="n3_j539" name="n3" src="vek81n" fileName="images/hc_btkuang.png" xy="146,343" group="n46_v95q"/>
     <text id="n4_j539" name="txtSuitName" xy="162,387" size="46,199" group="n46_v95q" font="ui://eg2y0ldpwonotja" fontSize="38" color="#b38d58" autoSize="height" text="套装名字">
       <relation target="n3_j539" sidePair="center-center,middle-middle"/>
     </text>
     <group id="n46_v95q" name="n46" xy="146,343" size="78,418"/>
-    <component id="n40_ja9w" name="compHolder" src="ja9w1c" fileName="components/Component1.xml" xy="0,145"/>
-    <component id="n6_j539" name="compItemInfo" src="ja9w1f" fileName="components/CompItemInfo.xml" xy="735,237"/>
     <image id="n51_v95q" name="n51" src="v95q2c" fileName="images/hc_zzjsdi.png" xy="874,575" group="n53_v95q"/>
     <text id="n52_v95q" name="n52" xy="911,633" size="122,42" group="n53_v95q" fontSize="30" color="#c09d6b" text="制作进度"/>
     <text id="n27_j539" name="txtProgress" xy="920,680" pivot="0.5,0" size="102,44" group="n53_v95q" font="ui://eg2y0ldpwonotjc" fontSize="32" color="#d7847e" ubb="true" vars="true" text="10/20">
       <relation target="" sidePair="center-center"/>
     </text>
     <group id="n53_v95q" name="n53" xy="874,575" size="200,200"/>
-    <image id="n23_j539" name="n23" src="j539v" fileName="images/hc_kuang_5.png" xy="0,774"/>
-    <image id="n54_v95q" name="n54" src="j539s" fileName="images/hc_kuang_1.png" xy="15,985" group="n58_v95q"/>
-    <image id="n55_v95q" name="n55" src="j539s" fileName="images/hc_kuang_1.png" xy="286,985" group="n58_v95q"/>
-    <image id="n56_v95q" name="n56" src="j539s" fileName="images/hc_kuang_1.png" xy="557,985" group="n58_v95q"/>
-    <image id="n57_v95q" name="n57" src="j539s" fileName="images/hc_kuang_1.png" xy="828,985" group="n58_v95q"/>
-    <group id="n58_v95q" name="n58" xy="15,985" size="1051,291" advanced="true" layout="hz" colGap="33" excludeInvisibles="true"/>
-    <component id="n49_v95q" name="n49" src="v95qtjx" fileName="components/ComTopTitle.xml" pkg="eg2y0ldp" xy="342,829">
+    <image id="n23_j539" name="n23" src="j539v" fileName="images/hc_kuang_5.png" xy="0,853" size="1080,1067" group="n59_v95q"/>
+    <image id="n54_v95q" name="n54" src="j539s" fileName="images/hc_kuang_1.png" xy="15,1029" group="n58_v95q"/>
+    <image id="n55_v95q" name="n55" src="j539s" fileName="images/hc_kuang_1.png" xy="286,1029" group="n58_v95q"/>
+    <image id="n56_v95q" name="n56" src="j539s" fileName="images/hc_kuang_1.png" xy="557,1029" group="n58_v95q"/>
+    <image id="n57_v95q" name="n57" src="j539s" fileName="images/hc_kuang_1.png" xy="828,1029" group="n58_v95q"/>
+    <group id="n58_v95q" name="n58" xy="15,1029" size="1051,291" group="n59_v95q" advanced="true" layout="hz" colGap="33" excludeInvisibles="true"/>
+    <component id="n49_v95q" name="n49" src="v95qtjx" fileName="components/ComTopTitle.xml" pkg="eg2y0ldp" xy="342,914" group="n59_v95q">
       <property target="title" propertyId="0" value="所需材料"/>
     </component>
-    <list id="n37_ja9w" name="listMaterias" xy="0,969" size="1080,319" layout="row" scroll="horizontal" defaultItem="ui://4f294tdkv95q28">
+    <list id="n37_ja9w" name="listMaterias" xy="0,1012" size="1080,319" group="n59_v95q" layout="row" scroll="horizontal" defaultItem="ui://4f294tdkv95q28">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n30_j539" name="listClothing" xy="0,1590" size="1080,275" layout="row" overflow="scroll" scroll="horizontal" lineGap="30" defaultItem="ui://4f294tdkv95q2e" align="center" autoClearItems="true">
+    <list id="n30_j539" name="listClothing" xy="0,1590" size="1080,275" group="n59_v95q" layout="row" overflow="scroll" scroll="horizontal" lineGap="30" defaultItem="ui://4f294tdkv95q2e" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -43,9 +45,12 @@
       <item/>
       <item/>
     </list>
-    <component id="n21_j539" name="btnProduction" src="oqa1tjt" fileName="components/Button21.xml" pkg="eg2y0ldp" xy="355,1435">
+    <component id="n21_j539" name="btnProduction" src="oqa1tjt" fileName="components/Button21.xml" pkg="eg2y0ldp" xy="368,1435" group="n59_v95q">
       <Button title="制作"/>
     </component>
-    <component id="n48_v95q" name="comCostCurrency" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="418,1355"/>
+    <component id="n48_v95q" name="comCostCurrency" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="418,1369" group="n59_v95q"/>
+    <group id="n59_v95q" name="n59" xy="0,853" size="1080,1067" advanced="true">
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
   </displayList>
 </component>

+ 1 - 1
FGUIProject/assets/ClothingSynthetic/package.xml

@@ -27,7 +27,7 @@
     <image id="j539r" name="hc_jdut_2.png" path="/images/"/>
     <image id="j539s" name="hc_kuang_1.png" path="/images/"/>
     <image id="j539u" name="hc_kuang_4.png" path="/imagesExport/" exported="true"/>
-    <image id="j539v" name="hc_kuang_5.png" path="/images/" scale="9grid" scale9grid="49,48,98,96"/>
+    <image id="j539v" name="hc_kuang_5.png" path="/images/" scale="9grid" scale9grid="49,261,98,337"/>
     <image id="j53911" name="hc_xiant_1.png" path="/images/"/>
     <image id="j53912" name="hc_yyy.png" path="/images/"/>
     <component id="j53918" name="Button3.xml" path="/components/"/>

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -55,7 +55,7 @@ namespace GFGGame
         private static bool CheckSpecialGuideOpen(GuideCfg cfg)
         {
             if (cfg.special <= 0) return false;
-            if (cfg.key == ConstGuideId.SUIT_LIST_VIEW)
+            if (cfg.guideKey == ConstGuideId.SUIT_LIST_VIEW)
             {
                 return FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ClothingListView).Name, false);
             }

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_ClothingSyntheticUI.cs

@@ -11,9 +11,9 @@ namespace UI.ClothingSynthetic
         public GButton m_btnBack;
         public GButton m_btnHome;
         public GComponent m_valueBar;
-        public GTextField m_txtSuitName;
         public UI_Component1 m_compHolder;
         public UI_CompItemInfo m_compItemInfo;
+        public GTextField m_txtSuitName;
         public GTextField m_txtProgress;
         public GList m_listMaterias;
         public GList m_listClothing;
@@ -70,9 +70,9 @@ namespace UI.ClothingSynthetic
             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_compHolder = (UI_Component1)UI_Component1.Create(comp.GetChild("compHolder"));
             m_compItemInfo = (UI_CompItemInfo)UI_CompItemInfo.Create(comp.GetChild("compItemInfo"));
+            m_txtSuitName = (GTextField)comp.GetChild("txtSuitName");
             m_txtProgress = (GTextField)comp.GetChild("txtProgress");
             m_listMaterias = (GList)comp.GetChild("listMaterias");
             m_listClothing = (GList)comp.GetChild("listClothing");
@@ -85,11 +85,11 @@ namespace UI.ClothingSynthetic
             m_btnBack = null;
             m_btnHome = null;
             m_valueBar = null;
-            m_txtSuitName = null;
             m_compHolder.Dispose();
             m_compHolder = null;
             m_compItemInfo.Dispose();
             m_compItemInfo = null;
+            m_txtSuitName = null;
             m_txtProgress = null;
             m_listMaterias = null;
             m_listClothing = null;

+ 6 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -247,6 +247,11 @@ namespace GFGGame
 
         private void OnClickListFosterItem(EventContext context)
         {
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.SUIT_LIST_VIEW);
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.SUIT_LIST_VIEW) <= 0 && GuideDataManager.currentGuideId == cfg.id)
+            {
+                return;
+            }
             int index = (int)(context.data as GObject).data;
             int state = SuitFosterDataManager.Instance.GetFosterState(_suitId, index);
             if (state == 0)
@@ -432,7 +437,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_btnTabFoster, ConstGuideId.SUIT_LIST_VIEW, 4, "点击进行服饰养护工作。");
+            GuideController.TryGuide(_ui.m_listFoster, ConstGuideId.SUIT_LIST_VIEW, 4, "点击进行服饰养护工作。", 0);
             GuideController.TryGuide(_ui.m_btnTabRenew, ConstGuideId.SUIT_LIST_VIEW, 5, "完成养护流程后,可以对服饰进行焕新,获得更多新的套装配件哦。");
             GuideController.TryCompleteGuide(ConstGuideId.SUIT_LIST_VIEW, 5);
 

+ 8 - 7
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -109,6 +109,7 @@ namespace GFGGame
             _ui.m_listClothing.onClickItem.Add(OnClickListClothingItem);
 
             _ui.m_listMaterias.itemRenderer = RenderListMateriasItem;
+            _ui.m_listMaterias.onClickItem.Add(OnClickMateriasItemPlus);
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnProduction.onClick.Add(OnClickBtnProcuction);
@@ -365,11 +366,11 @@ namespace GFGGame
             listItem.m_txtProgess.text = numSynthetic + "/" + itemData.num;
             listItem.m_loaderIcon.visible = true;
             listItem.m_txtProgess.visible = true;
-            listItem.target.onClick.Clear();
-            if (listItem.target.data == null)
-            {
-                listItem.target.onClick.Add(OnClickMateriasItemPlus);
-            }
+            // listItem.target.onClick.Clear();
+            // if (listItem.target.data == null)
+            // {
+            //     listItem.target.onClick.Add(OnClickMateriasItemPlus);
+            // }
             listItem.target.data = index;
             UI_MateriasListItem.ProxyEnd();
         }
@@ -380,7 +381,7 @@ namespace GFGGame
             {
                 return;
             }
-            int index = (int)(context.sender as GObject).data;
+            int index = (int)(context.data as GObject).data;
             _ui.m_listMaterias.selectedIndex = index;
             ItemData itemData = _materiarsOfSelectedItem[index];
             object[] sourceDatas = new object[] { itemData.id, new object[] { ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { _suitId, _selectedItemId } }, itemData.num };
@@ -430,7 +431,7 @@ namespace GFGGame
             }
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            int itemId = 10114;
+            int itemId = 10044;
             int itemIndex = 0;
             for (int i = 0; i < _ui.m_listClothing.numItems; i++)
             {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs

@@ -210,7 +210,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            int suitId = 200017;
+            int suitId = 200004;
             int suitIndex = 0;
             for (int i = 0; i < _suitListIds.Count; i++)
             {

+ 8 - 3
GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertWindow.cs

@@ -248,12 +248,17 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            if (GameGlobal.DataInited)
+            GuideController.TryGuide(_ui.m_btnRight.asCom, ConstGuideId.LUCKY_BOX, 3, "");
+        }
+
+        protected override void TryCompleteGuide()
+        {
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX);
+            if (GuideDataManager.currentGuideId == cfg.id)
             {
-                GuideController.TryGuide(_ui.m_btnRight, ConstGuideId.LUCKY_BOX, 3, "");
+                GuideController.TryCompleteGuideIndex(cfg.id, 3);
                 GuideController.TryCompleteGuide(ConstGuideId.LUCKY_BOX, 3);
             }
         }
-
     }
 }

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

@@ -168,7 +168,7 @@ namespace GFGGame
             InstanceZonesDataManager.currentScoreType = _fightCfg.scoreType;
             //一级菜单
             _ui.m_comListType1.m_listType.RemoveChildrenToPool();
-            _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length - 1;
+            _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length - 2;
             //_ui.m_comListType1.m_listType1.ResizeToFit(_ui.m_listType1.numItems);
             float maxHeight = _ui.target.height - _ui.m_comListType1.m_listType.y - DressUpView.BOTTOM_BLANK;
             if (_ui.m_comListType1.m_listType.height > maxHeight)
@@ -507,7 +507,7 @@ namespace GFGGame
         {
             _currentList2 = null;
             currentListType = DressUpListType.List1;
-            _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length - 1;
+            _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length - 2;
             GTween.To(_ui.target.width, listType1X, 0.5f)
                 .SetTarget(_ui.m_comListType1.target)
                 .OnUpdate((GTweener t) =>

+ 4 - 3
GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs

@@ -75,15 +75,16 @@ namespace GFGGame
                 _ui.target.GetChild("btn" + i).asButton.GetChild("imgLock").asImage.visible = !isPass;
             }
             UpdateView();
-            Timers.inst.Add(1, 0, UpdateShowTime);
-
 
+            Timers.inst.Add(1, 0, UpdateShowTime);
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
         {
             base.OnHide();
             Timers.inst.Remove(UpdateShowTime);
+            Timers.inst.Remove(CheckGuide);
             _valueBarController.OnHide();
         }
         protected override void RemoveEventListener()
@@ -190,7 +191,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(_ui.m_btn0.target, ConstGuideId.FIELD, 3, "开始考察吧。");
-            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_METAL, 3);
+            GuideController.TryCompleteGuide(ConstGuideId.FIELD, 3);
         }
     }
 }

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

@@ -15,6 +15,7 @@ namespace GFGGame
         private int guideId;
         private int guideIndex;
         private bool justHint;//仅提示,无遮罩,点击任何地方可关闭引导
+
         private float compTxtY = 0;//提示语位置
         private string txtContent = "";
         private GameObject _gameObject;
@@ -84,6 +85,14 @@ namespace GFGGame
                 _ui.m_compTxt.target.visible = !String.IsNullOrEmpty(txtContent);
 
             }
+
+            if (justHint)
+            {
+                _ui.m_mask.target.visible = false;
+                _ui.m_loaMask.visible = true;
+            }
+
+            //一些特殊引导
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_METAL);
             GuideCfg cfg1 = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_FILING);
             GuideCfg cfg2 = GuideCfgArray.Instance.GetCfg(ConstGuideId.FIELD);
@@ -93,9 +102,11 @@ namespace GFGGame
                 MainDataManager.Instance.CanSwipe = true;
                 Timers.inst.AddUpdate(UpdateStudioMetalGuide);
             }
-            if (justHint)
+            GuideCfg cfg3 = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX_LINE);
+            if (guideId == cfg3.id && guideIndex == 1)
             {
                 _ui.m_mask.target.visible = false;
+                _ui.m_loaMask.visible = false;
             }
         }
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs

@@ -363,7 +363,7 @@ namespace GFGGame
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX_LINE);
             // GuideController.TryCompleteGuide(ConstGuideId.LUCKY_BOX, 4);
-            GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX_LINE, 1, "点击将星连接在一起。", -1, true, (int)(this.viewCom.height - 150));
+            GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX_LINE, 1, "点击将星连接在一起。", -1, true, (int)(this.viewCom.height - 200), true);
             TryCompleteGuide();
         }
         protected override void TryCompleteGuide()

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -360,7 +360,7 @@ namespace GFGGame
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GButton btnBuyTen = _ui.m_listBg.GetChildAt(0).asCom.GetChild("btnBuyTen").asButton;
 
-            GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX, 1, "“摘星”里可以通过星辰的力量获得服饰。");
+            GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX, 1, "“摘星”里可以通过星辰的力量获得服饰。", -1, true, _ui.target.height - 600);
             GuideController.TryGuide(btnBuyTen, ConstGuideId.LUCKY_BOX, 2, "点击摘取十次。");
         }
     }

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

@@ -5,6 +5,7 @@ using UI.CommonGame;
 using System;
 using ET;
 using UI_ListRewardItem = UI.Main.UI_ListRewardItem;
+using UnityEngine;
 
 namespace GFGGame
 {
@@ -324,7 +325,7 @@ namespace GFGGame
 
             GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.START_FIGHT, 2, "点击开启换装。");
             GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.BUY_CLOTHING, 2, "");
-            GuideController.TryGuide(_ui.m_listTag, ConstGuideId.OPEN_TAGS, 1, "选择相应的关卡标签,可提高分数。", -1, true, (int)(this.viewCom.y + _ui.m_listBonus.y), true);
+            GuideController.TryGuide(_ui.m_listTag, ConstGuideId.OPEN_TAGS, 1, "选择相应的关卡标签,可提高分数。", -1, true, _ui.m_btnStart.LocalToGlobal(Vector2.zero).y + _ui.m_btnStart.height + 400, true);
             GuideController.TryCompleteGuide(ConstGuideId.OPEN_TAGS, 1);
 
         }

+ 4 - 8
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -147,7 +147,7 @@ namespace GFGGame
             _ui.m_btnChange.m_c1.selectedIndex = 1;
             _ui.m_btnChange.target.selected = true;
 
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_METAL);
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.OPEN_TAGS);
             // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + cfg.id, 0).Coroutine();
             // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + cfg.id, 1).Coroutine();
 
@@ -585,6 +585,9 @@ namespace GFGGame
             || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_SYNTHETIC) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.FIELD) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_METAL) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.SUIT_LIST_VIEW) <= 0)
             {
                 UpdateToCheckGuide(null);
@@ -602,8 +605,6 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnHuanZhuang.target, ConstGuideId.FREEDOM_DRESS, 2, "在这里,自由搭配服饰和分享哦~", -1, false);
             GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER, 3, "海市蜃楼,镜花水月,是所有故事开始的地方。", -1, false);
 
-
-            // GuideController.TryGuide(_ui.m_btnZhaiXing.target, ConstGuideId.LUCKY_BOX, 2, "“摘星”里可以通过星辰的力量获得服饰。", -1, false);
             GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_DECOMPOSE, 2, "绣坊里增添了新功能。", -1, false);
 
             GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_SYNTHETIC, 1, "进入绣坊界面。", -1, false);
@@ -630,10 +631,5 @@ namespace GFGGame
             }
 
         }
-        protected override void TryCompleteGuide()
-        {
-            // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_OPEN);
-            // GuideController.TryCompleteGuideIndex(cfg.id, 1);
-        }
     }
 }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -215,8 +215,8 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_list, ConstGuideId.STUDIO_FILING, 4, "从尊贵的辟邪开始吧~~", 0);
-            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_FILING, 4);
+            GuideController.TryGuide(_ui.m_list, ConstGuideId.STUDIO_FILING, 5, "从尊贵的辟邪开始吧~~", 0);
+            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_FILING, 5);
 
         }
     }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs

@@ -129,7 +129,7 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_comMetal.target, ConstGuideId.STUDIO_METAL, 4, "通关相应副本,可以获得各种升级材料哦,快开始今天的日常工作吧~");
             GuideController.TryCompleteGuide(ConstGuideId.STUDIO_METAL, 4);
 
-            GuideController.TryGuide(_ui.m_comMetal.target, ConstGuideId.STUDIO_FILING, 4, "完成小伙伴的心愿,获得服饰碎片哦。");
+            GuideController.TryGuide(_ui.m_comFiling.target, ConstGuideId.STUDIO_FILING, 4, "完成小伙伴的心愿,获得服饰碎片哦。");
 
         }
 

+ 5 - 2
GameClient/Assets/Game/HotUpdate/Views/Travel/TravelView.cs

@@ -58,6 +58,8 @@ namespace GFGGame
             // _valueBarController.Controller(7);
 
             UpdateView();
+
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
@@ -65,6 +67,7 @@ namespace GFGGame
             base.OnHide();
             _valueBarController.OnHide();
             Timers.inst.Remove(UpdateTime);
+            Timers.inst.Remove(CheckGuide);
         }
 
         protected override void RemoveEventListener()
@@ -158,8 +161,8 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(null, ConstGuideId.TRAVEL, 1, "四方关津已经打通,带上心仪的服饰,就可以外出游历啦!", -1, true, _ui.m_btnPhoto.y + _ui.m_btnPhoto.height);
-            GuideController.TryCompleteGuide(ConstGuideId.TRAVEL, 2);
+            GuideController.TryGuide(null, ConstGuideId.TRAVEL, 1, "四方关津已经打通,带上心仪的服饰,就可以外出游历啦!", -1, true, _ui.m_btnPhoto.y + _ui.m_btnPhoto.height + 100);
+            GuideController.TryCompleteGuide(ConstGuideId.TRAVEL, 1);
         }
     }
 }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -73,7 +73,7 @@ namespace GFGGame
         {
             LogServerHelper.SendNodeLog((int)PlayParticipationEnum.FU_ZHUANG_DIAN, 1);
             ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, null, new object[] { ViewName.XIU_FANG_VIEW, this.viewData }, false, true);
-            // this.Hide();
+            this.Hide();
 
         }
 

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


BIN
GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_fui.bytes