引导

FGUIProject/assets/DressUp/PhotographUI.xml

@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" overflow="hidden" scroll="both">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <loader id="n8_g3xa" name="btnBg" xy="0,0" size="1080,1136">
       <relation target="" sidePair="height-height"/>
     </loader>
-    <loader id="n11_o139" name="loaGuide" xy="148,153" size="783,972">
-      <relation target="" sidePair="bottom-bottom"/>
-    </loader>
-    <loader id="n12_o139" name="loaGuide1" xy="148,154" size="783,1580">
-      <relation target="" sidePair="width-width,height-height,bottom-bottom"/>
-    </loader>
     <component id="n9_g3xa" name="comSelectBox" src="g3xa4l" fileName="components/ComChecked.xml" xy="420,728" pivot="0.5,0.5" anchor="true"/>
     <component id="n1_yd72" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n10_i3ix" name="btnPhotograph" src="g3xa4h" fileName="components/Button8.xml" xy="940,409" group="n16_9ico">

FGUIProject/assets/Guide/GuideUI.xml

@@ -4,9 +4,10 @@
     <component id="n0" name="mask" src="tu96e" fileName="components/Component2.xml" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <component id="n15_tu96" name="rectFrame" src="tu96f" fileName="components/Component3.xml" xy="404,798" visible="false" touchable="false"/>
-    <component id="n17_tu96" name="compTxt" src="tu96d" fileName="components/Component1.xml" xy="261,1099" touchable="false"/>
-    <image id="n18_a5x3" name="rectFrameTemp" src="tu96c" fileName="images/yd_tykuang_2.png" xy="272,822" visible="false"/>
-    <component id="n19_bd1c" name="comHolder" src="axdii" fileName="components/ComHolder.xml" xy="400,1285" touchable="false"/>
+    <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" touchable="false"/>
   </displayList>
 </component>

FGUIProject/assets/Guide/components/ComHolder.xml

@@ -1,8 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,100">
+<component size="210,215">
+  <controller name="c1" pages="0,,1,,2," selected="1"/>
   <displayList>
-    <graph id="n19_bd1c" name="holder" xy="0,0" pivot="0.5,0.5" size="100,100" touchable="false">
+    <graph id="n19_bd1c" name="holder" xy="55,57" 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>
+    <image id="n22_v95q" name="n22" src="v95qk" fileName="images/yd_tykuang_4.png" xy="121,51" group="n24_v95q">
+      <gearDisplay controller="c1" pages="0,1"/>
+      <gearXY controller="c1" pages="0,1" values="-67,51|121,51" 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">
+      <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">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <group id="n24_v95q" name="n24" xy="-69,-31" size="353,273" 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"/>
+    <item time="0" type="Scale" target="n23_v95q" tween="true" startValue="-1,1" endValue="-1.3,1.3" duration="18" ease="Linear"/>
+    <item time="18" type="Scale" target="n21_v95q" tween="true" startValue="1.3,1.3" endValue="1,1" duration="18" ease="Linear"/>
+    <item time="18" type="Scale" target="n23_v95q" tween="true" startValue="-1.3,1.3" endValue="-1,1" duration="18" ease="Linear"/>
+  </transition>
 </component>

FGUIProject/assets/Guide/components/Component1.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="558,160" restrictSize="0,0,200,0">
+<component size="920,181" restrictSize="0,0,200,0">
   <displayList>
-    <image id="n17_tu96" name="txtBg" src="tu96b" fileName="images/yd_tykuang_1.png" xy="-14,0" size="587,160"/>
-    <text id="n18_tu96" name="txt" xy="20,16" pivot="0.5,0" size="517,128" fontSize="32" color="#9b7853" autoSize="none" autoClearText="true" text="，集齐了第一套套装，快去换装界面穿上试试吧！快去换装界面快去换装界面快去换装界面"/>
+    <image id="n17_tu96" name="txtBg" src="tu96b" fileName="images/yd_tykuang_1.png" xy="155,0" size="791,182"/>
+    <text id="n18_tu96" name="txt" xy="248,35" pivot="0.5,0" size="583,96" fontSize="36" color="#9f7e52" autoSize="height" autoClearText="true" text="收拾行囊出发游历，可获得随机地点 的明信片，并有概率获得特殊奖励。"/>
+    <image id="n19_v95q" name="n19" src="v95qj" fileName="images/yd_tyafu.png" xy="0,-75">
+      <relation target="n17_tu96" sidePair="bottom-bottom"/>
+    </image>
   </displayList>
+  <relation target="n17_tu96" sidePair="height-height"/>
 </component>

FGUIProject/assets/Guide/components/Component2.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" mask="n11" reversedMask="true">
   <displayList>
-    <graph id="n0" name="n0" xy="0,0" size="1080,1920" type="rect" lineSize="0" fillColor="#00000000">
-      <relation target="" sidePair="height-height,width-width"/>
+    <graph id="n13_v95q" name="n13" xy="0,0" size="1080,1920" alpha="0.6" type="rect" lineSize="0" fillColor="#ff000000">
+      <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <graph id="n11" name="guideArea" xy="419,813" size="268,200" touchable="false" type="rect" lineSize="0"/>
+    <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"/>
   </displayList>
 </component>

FGUIProject/assets/Guide/package.xml

@@ -5,13 +5,15 @@
     <image id="ga167" name="yd_tsbq.png" path="/images/"/>
     <component id="ga169" name="ArrowRight.xml" path="/animations/"/>
     <component id="ga16a" name="ArrowLeft.xml" path="/animations/"/>
-    <image id="tu96b" name="yd_tykuang_1.png" path="/images/" scale="9grid" scale9grid="7,32,213,61"/>
+    <image id="tu96b" name="yd_tykuang_1.png" path="/images/" scale="9grid" scale9grid="34,32,186,61"/>
     <image id="tu96c" name="yd_tykuang_2.png" path="/images/" scale="9grid" scale9grid="25,25,50,50"/>
     <component id="tu96d" name="Component1.xml" path="/components/"/>
     <component id="tu96e" name="Component2.xml" path="/components/"/>
     <component id="tu96f" name="Component3.xml" path="/components/"/>
     <image id="o139g" name="yd_tykuang_3.png" path="/images/"/>
     <component id="axdii" name="ComHolder.xml" path="/components/"/>
+    <image id="v95qj" name="yd_tyafu.png" path="/images/"/>
+    <image id="v95qk" name="yd_tykuang_4.png" path="/images/"/>
   </resources>
   <publish name="Guide" path="..\GameClient\Assets\ResIn\UI\Guide" packageCount="2" genCode="true" extractAlpha="true">
     <atlas name="默认" index="0"/>

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

@@ -63,7 +63,7 @@ namespace GFGGame
 
         }
 
-        public static bool TryGuide(GObject target, string guideKey, int index, string guideStr = null, int listIndex = -1, bool checkPriorIndex = true, int yTxt = 0, float devWidth = 0, float devHeight = 0, bool showAni = true, bool showEffect = true, bool isOptionalGuide = false)
+        public static bool TryGuide(GObject target, string guideKey, int index, string guideStr = null, int listIndex = -1, bool checkPriorIndex = true, float yTxt = 0)
         {
             // if (ViewManager.isViewOpen(typeof(RoleLvUpView).Name)) return false;
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(guideKey);
@@ -109,12 +109,11 @@ namespace GFGGame
                     }
                     else
                     {
-                        GRoot.inst.touchable = true;
+                        // GRoot.inst.touchable = true;
                         return false;
                     }
                 }
-                bool _isOptionalGuide = isOptionalGuide ? isOptionalGuide : cfg.optionalGuide == 1;
-                ShowGuideByIndex(target, guideStr, yTxt, _isOptionalGuide, devWidth, devHeight, GuideDataManager.currentGuideId, GuideDataManager.currentGuideIdIndex, showAni, showEffect);
+                ShowGuideByIndex(target, guideStr, GuideDataManager.currentGuideId, GuideDataManager.currentGuideIdIndex, yTxt);
                 if (!checkPriorIndex)
                 {
                     for (int i = 1; i < index; i++)
@@ -124,12 +123,12 @@ namespace GFGGame
                 }
                 return true;
             }
-            GRoot.inst.touchable = true;
+            // GRoot.inst.touchable = true;
             MainDataManager.Instance.CanSwipe = true;
 
             return false;
         }
-        private static void ShowGuideByIndex(GObject target, string guideStr = null, int yTxt = 0, bool isOptionalGuide = false, float devWidth = 0, float devHeight = 0, int guideId = 0, int index = 0, bool showAni = true, bool showEffect = true)
+        private static void ShowGuideByIndex(GObject target, string guideStr = null, int guideId = 0, int index = 0, float yTxt = 0)
         {
             HideGuide();
             if (GameGlobal.skipGuide)
@@ -137,7 +136,7 @@ namespace GFGGame
                 return;
             }
             LogServerHelper.SendNodeLog(GuideDataManager.currentGuideId * 100 + 1);
-            ViewManager.Show(ViewName.GUIDE_VIEW, new List<object> { target, guideStr, yTxt, isOptionalGuide, devWidth, devHeight, guideId, index, showAni, showEffect });
+            ViewManager.Show(ViewName.GUIDE_VIEW, new List<object> { target, guideStr, guideId, index, yTxt });
         }
         public static bool TryCompleteGuideIndex(int guideId, int index)
         {
@@ -145,7 +144,7 @@ namespace GFGGame
             HideGuide();
             if (GuideDataManager.TryCompleteGuideIndex(guideId, index))
             {
-                GRoot.inst.touchable = false;
+                // GRoot.inst.touchable = false;
                 MainDataManager.Instance.CanSwipe = true;
 
                 EventAgent.DispatchEvent(ConstMessage.FINSH_GUIDE_INDEX);
@@ -163,7 +162,7 @@ namespace GFGGame
             result = await GuideDataManager.TryCompleteGuide(cfg.id);
             if (result)
             {
-                GRoot.inst.touchable = true;
+                // GRoot.inst.touchable = true;
                 MainDataManager.Instance.CanSwipe = true;
 
                 GuideDataManager.currentGuideId = 0;

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

@@ -71,7 +71,7 @@ namespace GFGGame
                     }
                     if (LauncherConfig.onDebug >= 0)
                     {
-                        ViewManager.Show(ViewName.LOG_VIEW);
+                        // ViewManager.Show(ViewName.LOG_VIEW);
                     }
                     break;
                 default:
@@ -109,7 +109,7 @@ namespace GFGGame
         }
         private void OnBtnLogClick()
         {
-            ViewManager.Show(ViewName.LOG_VIEW);
+            // ViewManager.Show(ViewName.LOG_VIEW);
             _btnLog.m_c1.selectedIndex = 0;
             _btnLog.target.alpha = 0;
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PhotographUI.cs

@@ -9,8 +9,6 @@ namespace UI.DressUp
         public GComponent target;
         public Controller m_c1;
         public GLoader m_btnBg;
-        public GLoader m_loaGuide;
-        public GLoader m_loaGuide1;
         public UI_ComChecked m_comSelectBox;
         public GButton m_btnBack;
         public GButton m_btnPhotograph;
@@ -69,8 +67,6 @@ namespace UI.DressUp
         {
             m_c1 = comp.GetController("c1");
             m_btnBg = (GLoader)comp.GetChild("btnBg");
-            m_loaGuide = (GLoader)comp.GetChild("loaGuide");
-            m_loaGuide1 = (GLoader)comp.GetChild("loaGuide1");
             m_comSelectBox = (UI_ComChecked)UI_ComChecked.Create(comp.GetChild("comSelectBox"));
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnPhotograph = (GButton)comp.GetChild("btnPhotograph");
@@ -85,8 +81,6 @@ namespace UI.DressUp
         {
             m_c1 = null;
             m_btnBg = null;
-            m_loaGuide = null;
-            m_loaGuide1 = null;
             m_comSelectBox.Dispose();
             m_comSelectBox = null;
             m_btnBack = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Guide/UI_ComHolder.cs

@@ -7,7 +7,9 @@ namespace UI.Guide
     public partial class UI_ComHolder
     {
         public GComponent target;
+        public Controller m_c1;
         public GGraph m_holder;
+        public Transition m_t0;
         public const string URL = "ui://vxxz0ya7axdii";
         public const string PACKAGE_NAME = "Guide";
         public const string RES_NAME = "ComHolder";
@@ -55,11 +57,15 @@ namespace UI.Guide
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_holder = (GGraph)comp.GetChild("holder");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_holder = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Guide/UI_Component3.cs

@@ -1,74 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Guide
-{
-    public partial class UI_Component3
-    {
-        public GComponent target;
-        public GImage m_rectFrame;
-        public Transition m_t0;
-        public const string URL = "ui://vxxz0ya7tu96f";
-        public const string PACKAGE_NAME = "Guide";
-        public const string RES_NAME = "Component3";
-        private static UI_Component3 _proxy;
-
-        public static UI_Component3 Create(GObject gObject = null)
-        {
-            var ui = new UI_Component3();
-            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_Component3 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_Component3();
-            }
-            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_rectFrame = (GImage)comp.GetChild("rectFrame");
-            m_t0 = comp.GetTransition("t0");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_rectFrame = null;
-            m_t0 = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Guide/UI_Component3.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Guide/UI_GuideUI.cs

@@ -8,10 +8,9 @@ namespace UI.Guide
     {
         public GComponent target;
         public UI_Component2 m_mask;
-        public UI_Component3 m_rectFrame;
-        public UI_Component1 m_compTxt;
-        public GImage m_rectFrameTemp;
+        public GLoader m_loaMask;
         public UI_ComHolder m_comHolder;
+        public UI_Component1 m_compTxt;
         public const string URL = "ui://vxxz0ya7rpol4";
         public const string PACKAGE_NAME = "Guide";
         public const string RES_NAME = "GuideUI";
@@ -60,22 +59,19 @@ namespace UI.Guide
         private void Init(GComponent comp)
         {
             m_mask = (UI_Component2)UI_Component2.Create(comp.GetChild("mask"));
-            m_rectFrame = (UI_Component3)UI_Component3.Create(comp.GetChild("rectFrame"));
-            m_compTxt = (UI_Component1)UI_Component1.Create(comp.GetChild("compTxt"));
-            m_rectFrameTemp = (GImage)comp.GetChild("rectFrameTemp");
+            m_loaMask = (GLoader)comp.GetChild("loaMask");
             m_comHolder = (UI_ComHolder)UI_ComHolder.Create(comp.GetChild("comHolder"));
+            m_compTxt = (UI_Component1)UI_Component1.Create(comp.GetChild("compTxt"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_mask.Dispose();
             m_mask = null;
-            m_rectFrame.Dispose();
-            m_rectFrame = null;
-            m_compTxt.Dispose();
-            m_compTxt = null;
-            m_rectFrameTemp = null;
+            m_loaMask = null;
             m_comHolder.Dispose();
             m_comHolder = null;
+            m_compTxt.Dispose();
+            m_compTxt = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -168,7 +168,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_listCard, ConstGuideId.UP_CARD_LV, 3, "选择可升级的词牌。", 0, true, 0, 0, 0, true, true);
+            GuideController.TryGuide(_ui.m_listCard, ConstGuideId.UP_CARD_LV, 3, "选择可升级的词牌。", 0);
         }
     }
 }

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

@@ -823,8 +823,8 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_ComFosterBottom.m_listLvConsume, ConstGuideId.UP_CARD_LV, 4, "长按材料图标，可持续给词牌增加经验。", 0, true, 0, 0, 0, true, true);
-            GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnUpLv, ConstGuideId.UP_CARD_LV, 5, "点击升级。", -1, true, 0, 0, 0, true, true);
+            GuideController.TryGuide(_ui.m_ComFosterBottom.m_listLvConsume, ConstGuideId.UP_CARD_LV, 4, "长按材料图标，可持续给词牌增加经验。", 0);
+            GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnUpLv, ConstGuideId.UP_CARD_LV, 5, "点击升级。");
             // GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnUpStar, ConstGuideId.UP_CARD_STAR, 5, "升满5星后，可解锁词牌的隐藏卡面哦");
             GuideController.TryCompleteGuide(ConstGuideId.UP_CARD_LV, 5);
         }

GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -422,7 +422,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.BUY_CLOTHING, 6, "回到换装。", -1, true, 140);
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.BUY_CLOTHING, 6, "回到换装。");
         }
 
 

GameClient/Assets/Game/HotUpdate/Views/ClothingShop/GalleryShopView.cs

@@ -138,7 +138,7 @@ namespace GFGGame
                 ShopDataManager.Instance.BuyItem(_cfgSelected.id, _selectedItemCount, _storeId, _cfgSelected);
             }
 
-            Timers.inst.AddUpdate(CheckGuide);
+
         }
 
         protected override void OnHide()
@@ -147,7 +147,6 @@ namespace GFGGame
             _valueBarController.OnHide();
 
             _selectedItemId = 0;
-            Timers.inst.Remove(CheckGuide);
 
         }
         protected override void RemoveEventListener()
@@ -338,25 +337,6 @@ namespace GFGGame
             _ui.m_txtDesc.text = itemCfg.desc;
         }
 
-        private void CheckGuide(object param)
-        {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
-            {
-                UpdateToCheckGuide(null);
-            }
-            else
-            {
-                Timers.inst.Remove(CheckGuide);
-            }
-        }
-        protected override void UpdateToCheckGuide(object param)
-        {
-            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-
-            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.BUY_CLOTHING, 6, "回到换装。", -1, true, 140);
-        }
-
-
 
     }
 }

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

@@ -128,7 +128,7 @@ namespace GFGGame
                     break;
                 }
             }
-            GuideController.TryGuide(obj, ConstGuideId.BUY_CLOTHING, 4, "该物品可以在服装店购买，点开服装店看看。", -1, true, (int)(this.viewCom.y + this.viewCom.height + 10));
+            GuideController.TryGuide(obj, ConstGuideId.BUY_CLOTHING, 4, "该物品可以在服装店购买，点开服装店看看。");
         }
     }
 }

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

@@ -997,9 +997,9 @@ namespace GFGGame
 
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
-            // || GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0
-            // || GuideDataManager.IsGuideFinish(ConstGuideId.FIGHT_TIPS) <= 0)
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)
             {
                 UpdateToCheckGuide(null);
             }
@@ -1013,11 +1013,9 @@ namespace GFGGame
 
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            // int syIndex = 0;
-            // int xzIndex = 0;
             int buyClothingIndex = 0;
             int buyClothingSubIndex = 0;
-
+            int taozhuangIndex = 0;
             int len = _ui.m_comListType1.m_listType.numChildren;
             for (int i = 0; i < len; i++)
             {
@@ -1026,74 +1024,32 @@ namespace GFGGame
                 {
                     int menuID = (int)item.target.data;
                     DressUpMenuItemCfg1 dressUpMenuItemCfg1 = DressUpMenuItemCfg1Array.Instance.GetCfg(menuID);
-                    // if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0 && dressUpMenuItemCfg1.type == ConstDressUpItemType.SHANG_YI)
-                    // {
-                    //     syIndex = i;
-                    // }
-                    // if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0 && dressUpMenuItemCfg1.type == ConstDressUpItemType.XIA_ZHUANG)
-                    // {
-                    //     xzIndex = i;
-                    // }
-                    if (_fightCfg.needItemId > 0)
+                    if (GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0 && dressUpMenuItemCfg1.type == ConstDressUpItemType.TAO_ZHUANG)
                     {
-                        int type = ItemUtilCS.GetItemSubType(_fightCfg.needItemId);
-
-
-                        if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0 && ItemUtil.CheckMenuType1(_fightCfg.needItemId, _fightCfg.needSuitId, dressUpMenuItemCfg1.id))
-                        {
-                            buyClothingIndex = i;
-                        }
+                        taozhuangIndex = i;
+                        break;
                     }
-                }
-                UI_TypeItem.ProxyEnd();
-            }
-            int len1 = _ui.m_comListType2.m_listType.numChildren;
-            for (int i = 0; i < len1; i++)
-            {
-                UI_TypeItem item = UI_TypeItem.Proxy(_ui.m_comListType2.m_listType.GetChildAt(i));
-                if (item != null)
-                {
-                    int menuID = (int)item.target.data;
-                    DressUpMenuItemCfg2 dressUpMenuItemCfg2 = DressUpMenuItemCfg2Array.Instance.GetCfg(menuID);
-                    var subType = ItemUtilCS.GetItemSubType(_fightCfg.needItemId);
-                    if (subType == dressUpMenuItemCfg2.type)
+                    if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0 && _fightCfg.needItemId > 0)
                     {
-                        buyClothingSubIndex = i;
+                        buyClothingIndex = i;
+                        break;
                     }
                 }
                 UI_TypeItem.ProxyEnd();
             }
-            int djcId = 10476;//点绛唇Id
-            int djcIndex = 0;
-            int buyClothingIdIndex = 0;
+            buyClothingSubIndex = _currentList3.IndexOf(_fightCfg.needItemId);
 
-            for (int i = 0; i < _currentList3.Count; i++)
-            {
-                if (_currentList3[i] == djcId)
-                {
-                    djcIndex = i;
-                }
-                if (_fightCfg.needItemId > 0 && _currentList3[i] == _fightCfg.needItemId)
-                {
-                    buyClothingIdIndex = i;
-                }
-            }
-            // 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, 8, "穿着完毕，来验证一下，换上的服饰是否符合需求。");
-
-            GuideController.TryGuide(_ui.m_compNeed.target, ConstGuideId.BUY_CLOTHING, 3, "当提示有“必需品”时，需要穿上对应物品才能通关。", -1, true, 170);
-            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.BUY_CLOTHING, 7, "按照指示就可以找到必需品啦。", buyClothingIndex);
-            GuideController.TryGuide(_ui.m_comListType2.m_listType, ConstGuideId.BUY_CLOTHING, 8, "", buyClothingSubIndex);
-            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.BUY_CLOTHING, 9, "点击换上吧。", buyClothingIdIndex, true, 170);
-            GuideController.TryCompleteGuide(ConstGuideId.BUY_CLOTHING, 9);
+            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.START_FIGHT, 3, "点击相应的分类，可以快速找到服饰。", taozhuangIndex);
+            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.START_FIGHT, 4, "", 0);
+            GuideController.TryGuide(_ui.m_btnNext, ConstGuideId.START_FIGHT, 5, "穿着完毕，来验证一下，换上的服饰是否符合需求。");
+            GuideController.TryCompleteGuide(ConstGuideId.START_FIGHT, 5);
 
-            // GuideController.TryGuide(_ui.m_btnHint, ConstGuideId.FIGHT_TIPS, 1, "这次换装需要获得别人的认可呢。");
-            // GuideController.TryCompleteGuide(ConstGuideId.FIGHT_TIPS, 1);
+            GuideController.TryGuide(_ui.m_compNeed.target, ConstGuideId.BUY_CLOTHING, 3, "当提示有“必需品”时，需要穿上对应物品才能通关。");
+            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.BUY_CLOTHING, 7, "按照指示就可以找到必需品啦。", buyClothingIndex);
+            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.BUY_CLOTHING, 8, "", buyClothingSubIndex);
+            GuideController.TryCompleteGuide(ConstGuideId.BUY_CLOTHING, 8);
 
+            GuideController.TryGuide(_ui.m_btnHint, ConstGuideId.TARGET_FIGHT, 1, "这次换装需要获得别人的认可呢。");
 
         }
     }

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

@@ -895,8 +895,8 @@ namespace GFGGame
         }
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.FREEDOM_DRESS) <= 0)
-            // || GuideDataManager.IsGuideFinish(ConstGuideId.PHOTOGRAPH) <= 0)
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.FREEDOM_DRESS) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER) <= 0)
             {
                 UpdateToCheckGuide(null);
             }
@@ -929,13 +929,12 @@ namespace GFGGame
                     UI_TypeItem.ProxyEnd();
                 }
             }
-            if (listTypeItem_FreedomDress != null) GuideController.TryGuide(listTypeItem_FreedomDress.target, ConstGuideId.FREEDOM_DRESS, 3, "套装分类里，可以查看集齐成套的服饰。");
-            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.FREEDOM_DRESS, 4, "点击一键换上。", 0, true, 330);
-            GuideController.TryGuide(_ui.m_btnSave, ConstGuideId.FREEDOM_DRESS, 5, "搭配好的服饰，可以保存随时查看。");
-            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.FREEDOM_DRESS, 6, "保存成功，回主界面看看吧。");
-            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 6);
+            if (listTypeItem_FreedomDress != null) GuideController.TryGuide(listTypeItem_FreedomDress.target, ConstGuideId.FREEDOM_DRESS, 3, "套装分类里，可以查看集齐成套的服饰，点击一键换上。");
+            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.FREEDOM_DRESS, 4, "", 0);
+            GuideController.TryGuide(_ui.m_btnSave, ConstGuideId.FREEDOM_DRESS, 5, "搭配好的服饰，可以保存到主界面显示。");
+            GuideController.TryGuide(_ui.m_btnPhoto, ConstGuideId.FREEDOM_DRESS, 6, "辛苦搭配完，去拍个照片留念呀~~");
 
-            // GuideController.TryGuide(_ui.m_btnPhoto, ConstGuideId.PHOTOGRAPH, 1, "完成心水搭配后，可以拍照留下纪念哦。");
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER, 2, "");
 
         }
     }

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

@@ -74,8 +74,7 @@ namespace GFGGame
             isfullScreen = true;
 
             _ui.m_btnBg.onClick.Add(OnClickBtnBg);
-            _ui.m_loaGuide.onClick.Add(OnClickLoaGuide);
-            _ui.m_loaGuide1.onClick.Add(OnClickLoaGuide1);
+
             _ui.m_btnChoose.onClick.Add(SetUIView);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnPhotograph.onClick.Add(OnClickBtnPhotograph);
@@ -144,8 +143,7 @@ namespace GFGGame
             _ui.m_txtCount.text = string.Format("{0}/{1}", PoemGalleryDataManager.Instance.MyWorksCountOfTheme, GlobalCfgArray.globalCfg.maxGalleryWorksCount);
             // if (GuideDataManager.IsGuideFinish(ConstGuideId.PHOTOGRAPH) > 0)
             // {
-            _ui.m_loaGuide.enabled = false;
-            _ui.m_loaGuide1.enabled = false;
+
             // }
             // else
             // {
@@ -478,17 +476,7 @@ namespace GFGGame
         {
             _ui.m_ComSelectRes.target.visible = false;
         }
-        private void OnClickLoaGuide()
-        {
-            _ui.m_loaGuide1.enabled = true;
-            _ui.m_loaGuide.enabled = false;
-            _ui.m_ComSelectRes.target.visible = false;
-        }
-        private void OnClickLoaGuide1()
-        {
-            _ui.m_loaGuide1.enabled = false;
-            _ui.m_ComSelectRes.target.visible = false;
-        }
+
         private void OnTouchBtnFlipBegin()//翻转
         {
             Transform transform = memoryHitGameObj.transform;
@@ -628,27 +616,26 @@ namespace GFGGame
 
         private void CheckGuide(object param)
         {
-            // if (GuideDataManager.IsGuideFinish(ConstGuideId.PHOTOGRAPH) <= 0)
-            // {
-            //     UpdateToCheckGuide(null);
-            //     GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.PHOTOGRAPH);
-            //     if (GuideDataManager.IsGuideIndexFinish(cfg.id, 3))
-            //     {
-            //         GuideController.TryCompleteGuide(ConstGuideId.PHOTOGRAPH, 3);
-            //     }
-            // }
-            // else
-            // {
-            //     Timers.inst.Remove(CheckGuide);
-            // }
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.FREEDOM_DRESS) <= 0 ||
+            GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER) <= 0)
+            {
+                UpdateToCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
         }
 
         protected override void UpdateToCheckGuide(object param)
         {
-            // if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            // GuideController.TryGuide(_ui.m_ComSelectRes.m_comBtnTab.m_btn0, ConstGuideId.PHOTOGRAPH, 2, "在这里可以选择已获得的背景、道具等，也可以放大缩小物品，增加画面丰富度。");
-            // GuideController.TryGuide(_ui.m_btnPhotograph, ConstGuideId.PHOTOGRAPH, 3, "来记录下这一刻吧。");
-            // GuideController.TryCompleteGuide(ConstGuideId.PHOTOGRAPH, 3);
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(null, ConstGuideId.FREEDOM_DRESS, 7, "在这里可以选择已获得的背景、道具等，也可以放大缩小物品，增加画面丰富度。", -1, true, _ui.target.height - _ui.m_ComSelectRes.target.height - 250);
+            GuideController.TryGuide(_ui.m_btnPhotograph, ConstGuideId.FREEDOM_DRESS, 8, "来记录下这一刻吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 8);
+
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER, 1, "");
+
         }
     }
 }

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

@@ -10,17 +10,12 @@ namespace GFGGame
     public class GuideView : BaseView
     {
         private UI_GuideUI _ui;
-        private bool _needUpdate;
-        private GObject guideTarget = null;
-        private float devWidth;
-        private float devHeight;
-        private int yTxt;
-        private bool showAni;
-        private bool showEffect;
 
+        private GObject guideTarget = null;
         private int guideId;
         private int guideIndex;
-        private bool isOptionalGuide = false;//弱引导，点击任意地方都可关闭
+        private bool justHint;//仅提示，不提示点击，无遮罩，点击任何地方可关闭引导
+        private float compTxtY = 0;//提示语位置
 
         private GameObject _gameObject;
         private GoWrapper _wrapper;
@@ -45,174 +40,137 @@ namespace GFGGame
             this.viewCom = _ui.target;
             this.layer = ConstViewLayer.GUIDE;
             isfullScreen = true;
-            _ui.m_rectFrameTemp.visible = false;
-            _ui.m_rectFrame.target.visible = false;
-            _ui.m_rectFrame.target.AddRelation(_ui.m_mask.m_guideArea, RelationType.Width);
-            _ui.m_rectFrame.target.AddRelation(_ui.m_mask.m_guideArea, RelationType.Height);
-            _ui.m_rectFrame.target.AddRelation(_ui.m_mask.m_guideArea, RelationType.Left_Left);
-            _ui.m_rectFrame.target.AddRelation(_ui.m_mask.m_guideArea, RelationType.Top_Top);
-            _ui.m_mask.target.onClick.Add(() =>
-            {
-                if (ViewManager.isViewOpen(typeof(RoleLvUpView).Name))
-                {
-                    ViewManager.Hide(typeof(RoleLvUpView).Name);
-                }
-                if (isOptionalGuide) this.OnClickTarget();
-            });
-
+            // _ui.m_rectFrameTemp.visible = false;
+            // _ui.m_rectFrame.target.visible = false;
+            // _ui.m_rectFrame.target.AddRelation(_ui.m_mask.m_guideArea, RelationType.Width);
+            // _ui.m_rectFrame.target.AddRelation(_ui.m_mask.m_guideArea, RelationType.Height);
+            // _ui.m_rectFrame.target.AddRelation(_ui.m_mask.m_guideArea, RelationType.Left_Left);
+            // _ui.m_rectFrame.target.AddRelation(_ui.m_mask.m_guideArea, RelationType.Top_Top);
+            // _ui.m_mask.target.onClick.Add(() =>
+            // {
+            //     if (ViewManager.isViewOpen(typeof(RoleLvUpView).Name))
+            //     {
+            //         ViewManager.Hide(typeof(RoleLvUpView).Name);
+            //     }
+            // });
+            _ui.m_loaMask.onClick.Add(OnClickTarget);
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-            // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_OPEN);
-
-            // if (GuideDataManager.currentGuideId == cfg.id && GuideDataManager.currentGuideIdIndex == 1)
-            // {
-            //     string resPath1 = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_dj_2");
-            //     SceneController.AddObjectToView(_gameObject, _wrapper, _ui.m_comHolder.m_holder, resPath1, out _gameObject, out _wrapper);
-            // }
-            // else
-            // {
-            //     string resPath0 = ResPathUtil.GetViewEffectPath("ui_yd/ui_yd_y", "ui_yd_y");
-            //     SceneController.AddObjectToView(_gameObject, _wrapper, _ui.m_comHolder.m_holder, resPath0, out _gameObject, out _wrapper);
-            // }
 
             List<object> dataList = viewData as List<object>;
             guideTarget = dataList[0] as GObject;
             string txtContent = (string)dataList[1];
-            yTxt = (int)dataList[2];
-            isOptionalGuide = (bool)dataList[3];
-            devWidth = (float)dataList[4];
-            devHeight = (float)dataList[5];
 
-            guideId = (int)dataList[6];
-            guideIndex = (int)dataList[7];
-            showAni = (bool)dataList[8];
-            showEffect = (bool)dataList[9];
+            guideId = (int)dataList[2];
+            guideIndex = (int)dataList[3];
+            compTxtY = (float)dataList[4];
 
-            if (txtContent != null && txtContent.Length > 0)
-            {
-                _ui.m_compTxt.m_txt.text = txtContent;
-                if (this._ui.m_compTxt.m_txt.textHeight > this._ui.m_compTxt.m_txt.textFormat.size * 2)
-                {
-                    this._ui.m_compTxt.m_txt.align = AlignType.Left;
-                }
-                else
-                {
-                    this._ui.m_compTxt.m_txt.align = AlignType.Center;
-                }
-                _ui.m_compTxt.target.visible = true;
-            }
-            else
-            {
-                _ui.m_compTxt.target.visible = false;
-            }
-            _ui.m_comHolder.target.visible = false;
-            _ui.m_rectFrameTemp.width = _ui.m_mask.target.width;
-            _ui.m_rectFrameTemp.height = _ui.m_mask.target.height;
-            _ui.m_rectFrameTemp.x = 0;
-            _ui.m_rectFrameTemp.y = 0;
-            _ui.m_rectFrameTemp.visible = showAni;
 
-            GRoot.inst.touchable = true;
+            // GRoot.inst.touchable = true;
             MainDataManager.Instance.CanSwipe = false;
 
+            UpdateComTxt(txtContent);
+            _ui.m_comHolder.target.visible = false;
+            _ui.m_mask.target.visible = false;
+            _ui.m_loaMask.visible = false;
             if (guideTarget != null)
             {
 
-                UpdateGuideRect();
                 Timers.inst.AddUpdate(UpdateGuideRect);
+                _ui.m_comHolder.target.visible = true;
                 _ui.m_mask.target.visible = true;
-                _ui.m_mask.m_guideArea.visible = false;
                 guideTarget.onClick.Add(OnClickTarget);
-                if (guideTarget == null) OnClickTarget();
-
             }
             else
             {
-                _ui.m_comHolder.target.visible = false;
-                _ui.m_mask.target.visible = false;
-                _ui.m_rectFrameTemp.visible = false;
-
-            }
-            if (!showEffect)
-            {
-                _ui.m_comHolder.target.visible = showEffect;
+                _ui.m_loaMask.visible = true;
+                if (compTxtY > 0)
+                {
+                    _ui.m_compTxt.target.y = compTxtY;
+                }
             }
-            _ui.m_compTxt.target.y = Math.Min(yTxt, GRoot.inst.height - _ui.m_compTxt.target.height - 3);
+
         }
 
         protected override void OnHide()
         {
-            Timers.inst.Remove(UpdateGuideRect);
+
             base.OnHide();
-            if (!isOptionalGuide && guideTarget == null)
+            guideTarget = null;
+            Timers.inst.Remove(UpdateGuideRect);
+        }
+
+        private void UpdateComTxt(string txtContent)
+        {
+            if (String.IsNullOrEmpty(txtContent))
             {
-                OnClickTarget();
+                _ui.m_compTxt.target.visible = false;
             }
-            guideTarget = null;
+            else
+            {
+                _ui.m_compTxt.m_txt.text = txtContent;
+                if (this._ui.m_compTxt.m_txt.textHeight > this._ui.m_compTxt.m_txt.textFormat.size * 2)
+                {
+                    this._ui.m_compTxt.m_txt.align = AlignType.Left;
+                }
+                else
+                {
+                    this._ui.m_compTxt.m_txt.align = AlignType.Center;
+                }
+                _ui.m_compTxt.target.visible = true;
 
+                this._ui.m_compTxt.m_txtBg.height = this._ui.m_compTxt.m_txtBg.initHeight;
+                if (this._ui.m_compTxt.m_txt.textHeight > this._ui.m_compTxt.m_txt.textFormat.size * 3)
+                {
+                    this._ui.m_compTxt.m_txtBg.height = this._ui.m_compTxt.m_txtBg.height + this._ui.m_compTxt.m_txt.textFormat.size;
+                }
+            }
         }
 
-
         private void UpdateGuideRect(object param = null)
         {
             if (guideTarget != null)
             {
-
-                Rect rect = guideTarget.TransformRect(new Rect(0 + devWidth, devHeight, guideTarget.width, guideTarget.height), _ui.target);
-
-                _ui.m_mask.m_guideArea.size = new Vector2((int)rect.size.x, (int)rect.size.y);
-                _ui.m_mask.m_guideArea.position = new Vector2((int)rect.position.x, (int)rect.position.y);
-
-                _ui.m_comHolder.target.position = _ui.m_mask.m_guideArea.position;
-                _ui.m_comHolder.target.size = _ui.m_mask.m_guideArea.size;
-                int padding = 90;
-                bool atBottom = _ui.m_mask.m_guideArea.y + _ui.m_mask.m_guideArea.height + padding + _ui.m_compTxt.target.height + padding > GRoot.inst.height;
-                if (yTxt == 0)
+                Vector2 pos = guideTarget.LocalToGlobal(Vector2.zero);
+                pos.x = pos.x + guideTarget.width / 2;
+                pos.y = pos.y + guideTarget.height / 2;
+                if (_ui.m_mask.m_guideArea.xy == pos)
                 {
-                    if (atBottom)
-                    {
-                        _ui.m_compTxt.target.y = _ui.m_mask.m_guideArea.y - _ui.m_compTxt.target.height - padding;
-                    }
-                    else
-                    {
-                        _ui.m_compTxt.target.y = _ui.m_mask.m_guideArea.y + _ui.m_mask.m_guideArea.height + padding;
-                    }
+                    Timers.inst.Remove(UpdateGuideRect);
+                    return;
                 }
-                int targetWidth = 20;
+                _ui.m_mask.m_guideArea.SetXY(pos.x, pos.y);
+                _ui.m_comHolder.target.position = _ui.m_mask.m_guideArea.position;
 
-                if (showAni)
+                if (pos.x > GRoot.inst.width / 2)
+                {
+                    _ui.m_comHolder.m_c1.selectedIndex = 0;//手在左边
+                }
+                else
                 {
+                    _ui.m_comHolder.m_c1.selectedIndex = 1;//手在右边
+                }
 
-                    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 = 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);
-                    }
-                    else
-                    {
-
-                        _ui.m_comHolder.target.visible = true;
-                        _ui.m_rectFrameTemp.visible = false;
-                        _ui.m_mask.m_guideArea.visible = true;
-
-                    }
+                int padding = 200;
+                if (pos.y < GRoot.inst.height - 700)
+                {
+                    _ui.m_compTxt.target.y = pos.y + padding;
                 }
                 else
                 {
-                    _ui.m_comHolder.target.visible = true;
-                    _ui.m_mask.m_guideArea.visible = true;
+                    _ui.m_compTxt.target.y = pos.y - padding - _ui.m_compTxt.target.height;
                 }
-                if (!showEffect)
+                if (compTxtY > 0)
                 {
-                    _ui.m_comHolder.target.visible = showEffect;
+                    _ui.m_compTxt.target.y = compTxtY;
                 }
             }
         }
+
+
         private void OnClickTarget()
         {
             if (guideTarget != null) guideTarget.onClick.Remove(OnClickTarget);

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

@@ -345,8 +345,7 @@ namespace GFGGame
         }
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.FREEDOM_DRESS) <= 0)
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0)
             {
                 UpdateToCheckGuide(null);
             }
@@ -362,8 +361,6 @@ namespace GFGGame
             GButton btnBuyTen = _ui.m_listBg.GetChildAt(0).asCom.GetChild("btnBuyTen").asButton;
 
             GuideController.TryGuide(btnBuyTen, ConstGuideId.LUCKY_BOX, 3, "点击摘取十次。");
-
-            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.FREEDOM_DRESS, 1, "获得一套完整的服装啦，马上去试穿一下。");
         }
     }
 }

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

@@ -188,9 +188,10 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER, 4, "", 0);
 
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_DECOMPOSE, 1, "点击返回主界面。");
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_LV, 1, "点击返回主界面。", -1, true, 0, 0, 0, true, true);
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_LV, 1, "点击返回主界面。", -1);
 
         }
 

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

@@ -266,9 +266,9 @@ namespace GFGGame
         }
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
-            // || GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0
+            || GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0)
             {
                 UpdateToCheckGuide(null);
             }
@@ -282,10 +282,15 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            // GuideController.TryGuide(_unPasslevelItem, ConstGuideId.SINGLE_FIGHT, 1, "遇到意外事件了，暂时解释不清，先按请求换上服饰吧。");
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.LUCKY_BOX, 1, "点击返回主界面。");
+            GuideController.TryGuide(_unPasslevelItem, ConstGuideId.START_FIGHT, 1, "尝试换上一套衣服吧。");
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.FREEDOM_DRESS, 1, "获得的服饰随时可以查看和试穿。");
+            GuideController.TryGuide(_unPasslevelItem, ConstGuideId.ENTER_CHAPTER, 5, "来继续我们的旅程吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER, 5);
+
+            GuideController.TryGuide(_unPasslevelItem, ConstGuideId.BUY_CLOTHING, 1, "衣服被弄脏了，到机场更衣室换身衣服吧。");
 
-            GuideController.TryGuide(_unPasslevelItem, ConstGuideId.BUY_CLOTHING, 1, "");
+
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.LUCKY_BOX, 1, "点击返回主界面。");
         }
 
     }

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

@@ -770,7 +770,7 @@ namespace GFGGame
 
             if (playStop)
             {
-                GuideController.TryGuide(_ui.m_comMineCircle.target, ConstGuideId.TARGET_FIGHT, 1, "这里可以观察双方的分数计算。", -1, true, 0, -128f, -128f);
+                GuideController.TryGuide(_ui.m_comMineCircle.target, ConstGuideId.TARGET_FIGHT, 1, "这里可以观察双方的分数计算。");
             }
             GuideController.TryGuide(_ui.m_btnSkill0.target, ConstGuideId.TARGET_FIGHT, 2, "使用技能，可以增加胜出的几率哦，点击看看。");
             GuideController.TryCompleteGuide(ConstGuideId.TARGET_FIGHT, 2);

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

@@ -304,8 +304,8 @@ namespace GFGGame
         private void CheckGuide(object param)
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.OPEN_TAGS) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
-            // ||GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
+            || GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0)
 
             {
                 UpdateToCheckGuide(null);
@@ -321,13 +321,11 @@ namespace GFGGame
 
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            // GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.SINGLE_FIGHT, 2, "点击开启换装。");
-
-            GuideController.TryGuide(_ui.m_listTag, ConstGuideId.OPEN_TAGS, 1, "选择相应的关卡标签，可提高分数。", -1, true, (int)(this.viewCom.y + _ui.m_listBonus.y), 0, 0, false);
+            GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.START_FIGHT, 2, "点击开启换装。");
+            GuideController.TryGuide(_ui.m_listTag, ConstGuideId.OPEN_TAGS, 1, "选择相应的关卡标签，可提高分数。", -1, true, (int)(this.viewCom.y + _ui.m_listBonus.y));
             GuideController.TryCompleteGuide(ConstGuideId.OPEN_TAGS, 1);
             GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.BUY_CLOTHING, 2, "");
 
-
         }
 
         protected override void TryCompleteGuide()

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

@@ -143,10 +143,14 @@ namespace GFGGame
             swipeGesture = new SwipeGesture(_ui.target);
             swipeGesture.onAction.Add(OnSwipe);
             swipeGesture.actionDistance = swipeDistance;
-            // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + 4, 0).Coroutine();
             _ui.m_list.ResizeToFit();
             _ui.m_btnChange.m_c1.selectedIndex = 1;
             _ui.m_btnChange.target.selected = true;
+
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER);
+            // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + cfg.id, 0).Coroutine();
+            StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + cfg.id, 1).Coroutine();
+
         }
         protected override void AddEventListener()
         {
@@ -628,7 +632,7 @@ namespace GFGGame
             || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_DECOMPOSE) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_SYNTHETIC) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0
-            // || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_OPEN) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.SUIT_LIST_VIEW) <= 0)
             {
                 UpdateToCheckGuide(null);
@@ -642,17 +646,18 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_btnZhaiXing.target, ConstGuideId.LUCKY_BOX, 2, "“摘星”里可以通过星辰的力量获得服饰。", -1, false);
 
-            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 6);
-            GuideController.TryGuide(_ui.m_btnHuanZhuang.target, ConstGuideId.FREEDOM_DRESS, 2, "在这里，可以自由搭配服饰和分享。", -1, false);
+            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);
             GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SYNTHETIC, 7);
 
-            GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_LV, 2, "获得了一张“词牌”，点击查看。", -1, false, 0, 0, 0, true, true);
+            GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_LV, 2, "获得了一张“词牌”，点击查看。", -1, false);
 
             // bool isGuide = GuideController.TryGuide(_ui.target, ConstGuideId.STUDIO_OPEN, 1, "滑动界面看看。", -1, false, (int)(this.viewCom.height - 600), 0, 0, false);
             // if (isGuide)