zhaoyang 2 år sedan
förälder
incheckning
dd8acfb610
24 ändrade filer med 185 tillägg och 74 borttagningar
  1. 4 2
      FGUIProject/assets/Guide/GuideUI.xml
  2. 9 9
      FGUIProject/assets/Guide/components/ComHolder.xml
  3. 1 1
      FGUIProject/assets/Guide/components/Component2.xml
  4. BIN
      FGUIProject/assets/Guide/images/yd_tykuang_2.png
  5. BIN
      FGUIProject/assets/Guide/images/yd_tykuang_4.png
  6. 16 8
      FGUIProject/assets/XiuFang/components/Component.xml
  7. 12 0
      FGUIProject/assets/XiuFang/components/Component1.xml
  8. 1 0
      FGUIProject/assets/XiuFang/package.xml
  9. 19 6
      GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs
  10. 12 20
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/XiuFang/UI_Component.cs
  11. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/XiuFang/UI_Component1.cs
  12. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/XiuFang/UI_Component1.cs.meta
  13. 2 9
      GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs
  14. 1 1
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/GoodsItemTipsView.cs
  15. 9 7
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs
  16. 11 11
      GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs
  17. BIN
      GameClient/Assets/ResIn/UI/Guide/Guide_atlas0!a.png
  18. BIN
      GameClient/Assets/ResIn/UI/Guide/Guide_atlas0.png
  19. BIN
      GameClient/Assets/ResIn/UI/Guide/Guide_fui.bytes
  20. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0!a.png
  21. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0.png
  22. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0_1!a.png
  23. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0_1.png
  24. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_fui.bytes

+ 4 - 2
FGUIProject/assets/Guide/GuideUI.xml

@@ -7,7 +7,9 @@
     <loader id="n20_v95q" name="loaMask" xy="0,0" size="1080,1920">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <component id="n19_bd1c" name="comHolder" src="axdii" fileName="components/ComHolder.xml" xy="540,959" pivot="0.5,0.5" anchor="true" touchable="false"/>
-    <component id="n17_tu96" name="compTxt" src="tu96d" fileName="components/Component1.xml" xy="80,1182" visible="false" touchable="false"/>
+    <component id="n19_bd1c" name="comHolder" src="axdii" fileName="components/ComHolder.xml" xy="540,1272" pivot="0.5,0.5" anchor="true" touchable="false"/>
+    <component id="n17_tu96" name="compTxt" src="tu96d" fileName="components/Component1.xml" xy="80,1614" visible="false" touchable="false">
+      <relation target="" sidePair="center-center"/>
+    </component>
   </displayList>
 </component>

+ 9 - 9
FGUIProject/assets/Guide/components/ComHolder.xml

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="210,215">
+<component size="190,190">
   <controller name="c1" pages="0,,1,,2," selected="1"/>
   <displayList>
-    <graph id="n19_bd1c" name="holder" xy="55,57" pivot="0.5,0.5" size="100,100" touchable="false">
+    <graph id="n19_bd1c" name="holder" xy="45,44" pivot="0.5,0.5" size="100,100" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <image id="n20_v95q" name="n20" src="tu96c" fileName="images/yd_tykuang_2.png" xy="-33,-31" group="n24_v95q">
-      <gearXY controller="c1" pages="0,1,2" values="-34,-31|-33,-31|-31,-29"/>
+    <image id="n20_v95q" name="n20" src="tu96c" fileName="images/yd_tykuang_2.png" xy="-26,-25" group="n24_v95q">
+      <gearXY controller="c1" pages="0,1,2" values="-26,-25|-26,-25|-26,-25"/>
     </image>
-    <image id="n22_v95q" name="n22" src="v95qk" fileName="images/yd_tykuang_4.png" xy="121,51" group="n24_v95q">
+    <image id="n22_v95q" name="n22" src="v95qk" fileName="images/yd_tykuang_4.png" xy="85,56" group="n24_v95q">
       <gearDisplay controller="c1" pages="0,1"/>
-      <gearXY controller="c1" pages="0,1" values="-67,51|121,51" default="154,82"/>
+      <gearXY controller="c1" pages="0,1" values="-41,63|85,56" default="154,82"/>
     </image>
-    <image id="n23_v95q" name="n23" src="o139g" fileName="images/yd_tykuang_3.png" xy="-69,125" pivot="0.5,0.5" group="n24_v95q" scale="-1,1">
+    <image id="n23_v95q" name="n23" src="o139g" fileName="images/yd_tykuang_3.png" xy="-50,131" pivot="0.5,0.5" group="n24_v95q" scale="-1,1">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <image id="n21_v95q" name="n21" src="o139g" fileName="images/yd_tykuang_3.png" xy="179,125" pivot="0.5,0.5" group="n24_v95q">
+    <image id="n21_v95q" name="n21" src="o139g" fileName="images/yd_tykuang_3.png" xy="139,131" pivot="0.5,0.5" group="n24_v95q">
       <gearDisplay controller="c1" pages="1"/>
     </image>
-    <group id="n24_v95q" name="n24" xy="-69,-31" size="353,273" advanced="true"/>
+    <group id="n24_v95q" name="n24" xy="-50,-25" size="289,261" advanced="true"/>
   </displayList>
   <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
     <item time="0" type="Scale" target="n21_v95q" tween="true" startValue="1,1" endValue="1.3,1.3" duration="18" ease="Linear"/>

+ 1 - 1
FGUIProject/assets/Guide/components/Component2.xml

@@ -4,6 +4,6 @@
     <graph id="n13_v95q" name="n13" xy="0,0" size="1080,1920" alpha="0.4" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <graph id="n11" name="guideArea" xy="540,960" pivot="0.5,0.5" anchor="true" size="210,210" aspect="true" touchable="false" type="eclipse" lineSize="0"/>
+    <graph id="n11" name="guideArea" xy="540,1272" pivot="0.5,0.5" anchor="true" size="180,180" aspect="true" touchable="false" type="eclipse" lineSize="0"/>
   </displayList>
 </component>

BIN
FGUIProject/assets/Guide/images/yd_tykuang_2.png


BIN
FGUIProject/assets/Guide/images/yd_tykuang_4.png


+ 16 - 8
FGUIProject/assets/XiuFang/components/Component.xml

@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1000,1246" overflow="scroll" scroll="horizontal">
   <displayList>
-    <loader id="n4_9xlo" name="btnClothingShop" xy="0,0" size="320,1246" url="ui://kv0ad4wy9xlo3" autoSize="true"/>
-    <loader id="n6_9xlo" name="btnSuitSynthetic" xy="320,0" size="320,1246" url="ui://kv0ad4wy9xlo6" autoSize="true"/>
-    <loader id="n5_9xlo" name="btnClothingUpgrade" xy="640,0" size="320,1246" url="ui://kv0ad4wy9xlo4" autoSize="true"/>
-    <loader id="n8_wlc2" name="btnDecompose" xy="958,0" size="320,1246" url="ui://kv0ad4wyqyr69" autoSize="true"/>
-    <loader id="n9_v95q" name="loaLockIcon0" xy="160,623" pivot="0.5,0.5" anchor="true" size="320,1246" touchable="false" url="ui://kv0ad4wyv95qb" autoSize="true"/>
-    <loader id="n15_v95q" name="loaLockIcon1" xy="480,623" pivot="0.5,0.5" anchor="true" size="320,1246" touchable="false" url="ui://kv0ad4wyv95qa" autoSize="true"/>
-    <loader id="n12_v95q" name="loaLockIcon2" xy="800,623" pivot="0.5,0.5" anchor="true" size="320,1246" touchable="false" url="ui://kv0ad4wyv95qd" autoSize="true"/>
-    <loader id="n18_v95q" name="loaLockIcon3" xy="1120,623" pivot="0.5,0.5" anchor="true" size="320,1246" touchable="false" url="ui://kv0ad4wyv95qc" autoSize="true"/>
+    <component id="n4_9xlo" name="btnClothingShop" src="v95qe" fileName="components/Component1.xml" xy="0,0">
+      <property target="loaIcon" propertyId="1" value="ui://kv0ad4wy9xlo3"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://kv0ad4wyv95qb"/>
+    </component>
+    <component id="n19_v95q" name="btnSuitSynthetic" src="v95qe" fileName="components/Component1.xml" xy="320,0">
+      <property target="loaIcon" propertyId="1" value="ui://kv0ad4wy9xlo6"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://kv0ad4wyv95qa"/>
+    </component>
+    <component id="n20_v95q" name="btnClothingUpgrade" src="v95qe" fileName="components/Component1.xml" xy="640,0">
+      <property target="loaIcon" propertyId="1" value="ui://kv0ad4wy9xlo4"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://kv0ad4wyv95qd"/>
+    </component>
+    <component id="n21_v95q" name="btnDecompose" src="v95qe" fileName="components/Component1.xml" xy="960,0">
+      <property target="loaIcon" propertyId="1" value="ui://kv0ad4wyqyr69"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://kv0ad4wyv95qc"/>
+    </component>
   </displayList>
 </component>

+ 12 - 0
FGUIProject/assets/XiuFang/components/Component1.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="320,1246">
+  <controller name="c1" pages="0,,1," selected="0"/>
+  <displayList>
+    <loader id="n4_9xlo" name="loaIcon" xy="0,0" size="320,1246" url="ui://kv0ad4wy9xlo3" autoSize="true"/>
+    <loader id="n9_v95q" name="loaLockIcon" xy="160,623" pivot="0.5,0.5" anchor="true" size="320,1246" touchable="false" url="ui://kv0ad4wyv95qb" autoSize="true">
+      <gearDisplay controller="c1" pages="0"/>
+    </loader>
+  </displayList>
+  <customProperty target="loaIcon" propertyId="1"/>
+  <customProperty target="loaLockIcon" propertyId="1"/>
+</component>

+ 1 - 0
FGUIProject/assets/XiuFang/package.xml

@@ -14,6 +14,7 @@
     <image id="v95qb" name="tzhc_fzd_an.png" path="/images/"/>
     <image id="v95qc" name="tzhc_fzfj_an.png" path="/images/"/>
     <image id="v95qd" name="tzhc_fzsj_an.png" path="/images/"/>
+    <component id="v95qe" name="Component1.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\XiuFang" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 19 - 6
GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -62,8 +62,8 @@ namespace GFGGame
             return false;
 
         }
-
-        public static bool TryGuide(GObject target, string guideKey, int index, string guideStr = null, int listIndex = -1, bool checkPriorIndex = true, float yTxt = 0, bool justHint = false)
+        private static GList targetList = null;
+        public static bool TryGuide(GComponent target, string guideKey, int index, string guideStr = null, int listIndex = -1, bool checkPriorIndex = true, float yTxt = 0, bool justHint = false)
         {
             // if (ViewManager.isViewOpen(typeof(RoleLvUpView).Name)) return false;
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(guideKey);
@@ -99,10 +99,15 @@ namespace GFGGame
 
                     if (target.asList.numItems > 0)
                     {
-                        GObject item = (target.asList).GetChildAt(listIndex);
+                        GComponent item = (target.asList).GetChildAt(listIndex).asCom;
                         if (item != null)
                         {
-                            target.asList.ScrollToView(listIndex);
+                            targetList = target as GList;
+                            targetList.ScrollToView(listIndex);
+                            if (targetList.scrollPane != null)
+                            {
+                                targetList.scrollPane.touchEffect = false;//引导中禁止拖动
+                            }
                             target = item;
                             // target.asList.ScrollToView(listIndex);
                         }
@@ -144,7 +149,11 @@ namespace GFGGame
             HideGuide();
             if (GuideDataManager.TryCompleteGuideIndex(guideId, index))
             {
-                // GRoot.inst.touchable = false;
+                if (targetList != null && targetList.scrollPane != null)
+                {
+                    targetList.scrollPane.touchEffect = true;
+                    targetList = null;
+                }
                 MainDataManager.Instance.CanSwipe = true;
 
                 EventAgent.DispatchEvent(ConstMessage.FINSH_GUIDE_INDEX);
@@ -162,7 +171,11 @@ namespace GFGGame
             result = await GuideDataManager.TryCompleteGuide(cfg.id);
             if (result)
             {
-                // GRoot.inst.touchable = true;
+                if (targetList != null && targetList.scrollPane != null)
+                {
+                    targetList.scrollPane.touchEffect = true;
+                    targetList = null;
+                }
                 MainDataManager.Instance.CanSwipe = true;
 
                 GuideDataManager.currentGuideId = 0;

+ 12 - 20
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/XiuFang/UI_Component.cs

@@ -7,14 +7,10 @@ namespace UI.XiuFang
     public partial class UI_Component
     {
         public GComponent target;
-        public GLoader m_btnClothingShop;
-        public GLoader m_btnSuitSynthetic;
-        public GLoader m_btnClothingUpgrade;
-        public GLoader m_btnDecompose;
-        public GLoader m_loaLockIcon0;
-        public GLoader m_loaLockIcon1;
-        public GLoader m_loaLockIcon2;
-        public GLoader m_loaLockIcon3;
+        public UI_Component1 m_btnClothingShop;
+        public UI_Component1 m_btnSuitSynthetic;
+        public UI_Component1 m_btnClothingUpgrade;
+        public UI_Component1 m_btnDecompose;
         public const string URL = "ui://kv0ad4wywlc28";
         public const string PACKAGE_NAME = "XiuFang";
         public const string RES_NAME = "Component";
@@ -62,25 +58,21 @@ namespace UI.XiuFang
 
         private void Init(GComponent comp)
         {
-            m_btnClothingShop = (GLoader)comp.GetChild("btnClothingShop");
-            m_btnSuitSynthetic = (GLoader)comp.GetChild("btnSuitSynthetic");
-            m_btnClothingUpgrade = (GLoader)comp.GetChild("btnClothingUpgrade");
-            m_btnDecompose = (GLoader)comp.GetChild("btnDecompose");
-            m_loaLockIcon0 = (GLoader)comp.GetChild("loaLockIcon0");
-            m_loaLockIcon1 = (GLoader)comp.GetChild("loaLockIcon1");
-            m_loaLockIcon2 = (GLoader)comp.GetChild("loaLockIcon2");
-            m_loaLockIcon3 = (GLoader)comp.GetChild("loaLockIcon3");
+            m_btnClothingShop = (UI_Component1)UI_Component1.Create(comp.GetChild("btnClothingShop"));
+            m_btnSuitSynthetic = (UI_Component1)UI_Component1.Create(comp.GetChild("btnSuitSynthetic"));
+            m_btnClothingUpgrade = (UI_Component1)UI_Component1.Create(comp.GetChild("btnClothingUpgrade"));
+            m_btnDecompose = (UI_Component1)UI_Component1.Create(comp.GetChild("btnDecompose"));
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_btnClothingShop.Dispose();
             m_btnClothingShop = null;
+            m_btnSuitSynthetic.Dispose();
             m_btnSuitSynthetic = null;
+            m_btnClothingUpgrade.Dispose();
             m_btnClothingUpgrade = null;
+            m_btnDecompose.Dispose();
             m_btnDecompose = null;
-            m_loaLockIcon0 = null;
-            m_loaLockIcon1 = null;
-            m_loaLockIcon2 = null;
-            m_loaLockIcon3 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/XiuFang/UI_Component1.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.XiuFang
+{
+    public partial class UI_Component1
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaIcon;
+        public GLoader m_loaLockIcon;
+        public const string URL = "ui://kv0ad4wyv95qe";
+        public const string PACKAGE_NAME = "XiuFang";
+        public const string RES_NAME = "Component1";
+        private static UI_Component1 _proxy;
+
+        public static UI_Component1 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component1();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Component1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component1();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaIcon = null;
+            m_loaLockIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/XiuFang/UI_Component1.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 37b953343911bd54eb348ac333eff042
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 9
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -448,16 +448,9 @@ namespace GFGGame
             bool guide = GuideController.TryGuide(_ui.m_listClothing, ConstGuideId.CLOTHING_SYNTHETIC, 4, "找到需要合成的物品。", itemIndex);
             if (guide) _ui.m_listClothing.ScrollToView(itemIndex);
 
-            if (_ui.m_listMaterias.numChildren > 0)
-            {
-                listTypeItem_CloSynthetic = UI_MateriasListItem.Proxy(_ui.m_listMaterias.GetChildAt(0));
+            GuideController.TryGuide(_ui.m_listMaterias, ConstGuideId.CLOTHING_SYNTHETIC, 5, "这里可以查看合成需要的材料,和材料的获取途径。", 0);
+            UI_MateriasListItem.ProxyEnd();
 
-            }
-            if (listTypeItem_CloSynthetic != null)
-            {
-                GuideController.TryGuide(listTypeItem_CloSynthetic.m_loaderIcon, ConstGuideId.CLOTHING_SYNTHETIC, 5, "这里可以查看合成需要的材料,和材料的获取途径。");
-                UI_MateriasListItem.ProxyEnd();
-            }
             GuideController.TryGuide(_ui.m_btnProduction, ConstGuideId.CLOTHING_SYNTHETIC, 6, "点击获得新的服饰。");
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_SYNTHETIC, 7, "获得新衣服啦,继续通关主线剧情吧。");
         }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/CommonGame/GoodsItemTipsView.cs

@@ -128,7 +128,7 @@ namespace GFGGame
                     break;
                 }
             }
-            GuideController.TryGuide(obj, ConstGuideId.BUY_CLOTHING, 4, "该物品可以在服装店购买,点开服装店看看。");
+            GuideController.TryGuide(obj.asCom, ConstGuideId.BUY_CLOTHING, 4, "该物品可以在服装店购买,点开服装店看看。");
         }
     }
 }

+ 9 - 7
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -77,6 +77,7 @@ namespace GFGGame
             _compChapter = (GComponent)UIPackage.CreateObject("Main", "CompChapter" + _chapterID);
             StoryChapterCfg cfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID);
             _compChapter.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath(cfg.bgRes);
+            _ui.m_chapter.scrollPane.touchEffect = true;
             _ui.m_chapter.AddChild(_compChapter);
             InitChapter();
             _valueBarController.OnShown();
@@ -285,16 +286,17 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-
-            GuideController.TryGuide(_unPasslevelItem, ConstGuideId.START_FIGHT, 1, "尝试换上一套衣服吧。");
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.FREEDOM_DRESS, 1, "获得的服饰随时可以查看和试穿。");
-            GuideController.TryGuide(_unPasslevelItem, ConstGuideId.ENTER_CHAPTER, 5, "来继续我们的旅程吧。");
+            bool isGuide0 = GuideController.TryGuide(_unPasslevelItem.asCom, ConstGuideId.START_FIGHT, 1, "尝试换上一套衣服吧。");
+            bool isGuide1 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.FREEDOM_DRESS, 1, "获得的服饰随时可以查看和试穿。");
+            bool isGuide2 = GuideController.TryGuide(_unPasslevelItem.asCom, ConstGuideId.ENTER_CHAPTER, 5, "来继续我们的旅程吧。");
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER, 5);
 
-            GuideController.TryGuide(_unPasslevelItem, ConstGuideId.BUY_CLOTHING, 1, "衣服被弄脏了,到机场更衣室换身衣服吧。");
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_LV, 1, "点击返回主界面。");
+            bool isGuide4 = GuideController.TryGuide(_unPasslevelItem.asCom, ConstGuideId.BUY_CLOTHING, 1, "衣服被弄脏了,到机场更衣室换身衣服吧。");
+            bool isGuide5 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_LV, 1, "点击返回主界面。");
+
+            bool isGuide6 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_DECOMPOSE, 1, "点击返回主界面。");
+            _ui.m_chapter.scrollPane.touchEffect = !isGuide0 && !isGuide1 && !isGuide2 && !isGuide4 && !isGuide5 && !isGuide6;
 
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_DECOMPOSE, 1, "点击返回主界面。");
         }
         protected override void TryCompleteGuide()
         {

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

@@ -30,10 +30,10 @@ namespace GFGGame
             isfullScreen = true;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            _ui.m_component.m_btnClothingShop.onClick.Add(OnClickBtnClothingShop);
-            _ui.m_component.m_btnSuitSynthetic.onClick.Add(OnClickBtnSuitSynthetic);
-            _ui.m_component.m_btnClothingUpgrade.onClick.Add(OnClickBtnClothingUpgrade);
-            _ui.m_component.m_btnDecompose.onClick.Add(OnClickBtnDecompose);
+            _ui.m_component.m_btnClothingShop.target.onClick.Add(OnClickBtnClothingShop);
+            _ui.m_component.m_btnSuitSynthetic.target.onClick.Add(OnClickBtnSuitSynthetic);
+            _ui.m_component.m_btnClothingUpgrade.target.onClick.Add(OnClickBtnClothingUpgrade);
+            _ui.m_component.m_btnDecompose.target.onClick.Add(OnClickBtnDecompose);
         }
 
         protected override void OnShown()
@@ -41,10 +41,10 @@ namespace GFGGame
             base.OnShown();
 
             _ui.m_component.target.scrollPane.SetPosX(0, false);
-            _ui.m_component.m_loaLockIcon0.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ClothingShopView).Name, false);
-            _ui.m_component.m_loaLockIcon1.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SuitSyntheticView).Name, false);
-            _ui.m_component.m_loaLockIcon2.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ClothingListView).Name, false);
-            _ui.m_component.m_loaLockIcon3.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ClothingDecomposeView).Name, false);
+            _ui.m_component.m_btnClothingShop.m_c1.selectedIndex = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ClothingShopView).Name, false) ? 1 : 0;
+            _ui.m_component.m_btnSuitSynthetic.m_c1.selectedIndex = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SuitSyntheticView).Name, false) ? 1 : 0;
+            _ui.m_component.m_btnClothingUpgrade.m_c1.selectedIndex = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ClothingListView).Name, false) ? 1 : 0;
+            _ui.m_component.m_btnDecompose.m_c1.selectedIndex = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ClothingDecomposeView).Name, false) ? 1 : 0;
 
 
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.CLOTHING_DECOMPOSE);
@@ -115,11 +115,11 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_component.m_btnSuitSynthetic, ConstGuideId.CLOTHING_SYNTHETIC, 2, "这里可以查看已获得的服饰图谱。");
+            GuideController.TryGuide(_ui.m_component.m_btnSuitSynthetic.target, ConstGuideId.CLOTHING_SYNTHETIC, 2, "这里可以查看已获得的服饰图谱。");
 
-            GuideController.TryGuide(_ui.m_component.m_btnDecompose, ConstGuideId.CLOTHING_DECOMPOSE, 3, "这里可以消耗重复获得的服饰。");
+            GuideController.TryGuide(_ui.m_component.m_btnDecompose.target, ConstGuideId.CLOTHING_DECOMPOSE, 3, "这里可以消耗重复获得的服饰。");
 
-            GuideController.TryGuide(_ui.m_component.m_btnClothingUpgrade, ConstGuideId.SUIT_LIST_VIEW, 2, "");
+            GuideController.TryGuide(_ui.m_component.m_btnClothingUpgrade.target, ConstGuideId.SUIT_LIST_VIEW, 2, "");
         }
     }
 }

BIN
GameClient/Assets/ResIn/UI/Guide/Guide_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Guide/Guide_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Guide/Guide_fui.bytes


BIN
GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0.png


BIN
GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/XiuFang/XiuFang_fui.bytes