zhaoyang 3 years ago
parent
commit
8095fc2451

+ 18 - 6
FGUIProject/assets/Main/MainUI.xml

@@ -70,26 +70,38 @@
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
     </component>
     <group id="n58_oju1" name="grpRight" xy="1576,621" size="516,1225" group="n59_oju1" advanced="true"/>
-    <group id="n59_oju1" name="grpMove" xy="24,160" size="2068,1701" advanced="true"/>
-    <image id="n62_v95q" name="n62" src="v95qhy" fileName="images/zjm_gsmh.png" xy="974,-240" group="n64_v95q"/>
-    <image id="n63_v95q" name="n63" src="v95qhx" fileName="images/zjm_qhqh.png" xy="1045,960" pivot="0.5,0.5" anchor="true" group="n64_v95q"/>
-    <group id="n64_v95q" name="n64" xy="945,-240" size="291,2400" visible="false" advanced="true"/>
+    <image id="n62_v95q" name="n62" src="v95qhy" fileName="images/zjm_gsmh.png" xy="956,-240" group="n64_v95q"/>
+    <image id="n63_v95q" name="n63" src="v95qhx" fileName="images/zjm_qhqh.png" xy="1037,960" pivot="0.5,0.5" anchor="true" group="n64_v95q"/>
+    <image id="n65_v95q" name="n65" src="v95qhx" fileName="images/zjm_qhqh.png" xy="1151,960" pivot="0.5,0.5" anchor="true" group="n64_v95q" scale="-1,1"/>
+    <group id="n64_v95q" name="n64" xy="937,-240" size="314,2400" group="n59_oju1" advanced="true">
+      <relation target="" sidePair="middle-middle"/>
+    </group>
+    <group id="n59_oju1" name="grpMove" xy="24,-240" size="2068,2400" advanced="true"/>
+    <loader id="n66_v95q" name="loaGuidestudio" xy="0,0" size="1080,1920" visible="false"/>
   </displayList>
   <transition name="t1">
     <item time="0" type="Alpha" target="n57_oju1" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
     <item time="0" type="Alpha" target="n58_oju1" value="0"/>
-    <item time="0" type="XY" target="n59_oju1" tween="true" startValue="0,160" endValue="-1080,160" duration="24" ease="Circ.InOut"/>
+    <item time="0" type="Visible" target="n63_v95q" value="true"/>
+    <item time="0" type="Visible" target="n65_v95q" value="false"/>
+    <item time="0" type="XY" target="n59_oju1" tween="true" startValue="0,-240" endValue="-1080,-240" duration="24" ease="Circ.InOut"/>
     <item time="6" type="Alpha" target="n52_qqat" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
     <item time="6" type="Visible" target="n57_oju1" value="false"/>
+    <item time="12" type="Visible" target="n63_v95q" value="false"/>
     <item time="15" type="Alpha" target="n58_oju1" tween="true" startValue="0" endValue="1" duration="7" ease="Linear"/>
+    <item time="24" type="Visible" target="n65_v95q" value="true"/>
   </transition>
   <transition name="t2">
     <item time="0" type="Alpha" target="n52_qqat" value="0"/>
     <item time="0" type="Alpha" target="n57_oju1" value="0"/>
-    <item time="0" type="XY" target="n59_oju1" tween="true" startValue="-1080,160" endValue="0,160" duration="24" ease="Circ.InOut"/>
+    <item time="0" type="Visible" target="n63_v95q" value="false"/>
+    <item time="0" type="Visible" target="n65_v95q" value="true"/>
+    <item time="0" type="XY" target="n59_oju1" tween="true" startValue="-1080,-240" endValue="0,-240" duration="24" ease="Circ.InOut"/>
     <item time="6" type="Alpha" target="n58_oju1" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
     <item time="12" type="Alpha" target="n52_qqat" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="12" type="Visible" target="n65_v95q" value="false"/>
     <item time="18" type="Alpha" target="n57_oju1" tween="true" startValue="0" endValue="1" duration="5" ease="Linear"/>
     <item time="18" type="Visible" target="n57_oju1" value="true"/>
+    <item time="24" type="Visible" target="n63_v95q" value="true"/>
   </transition>
 </component>

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -25,6 +25,7 @@ namespace UI.Main
         public UI_ButtonModle1 m_btnTravel;
         public GGroup m_grpRight;
         public GGroup m_grpMove;
+        public GLoader m_loaGuidestudio;
         public Transition m_t1;
         public Transition m_t2;
         public const string URL = "ui://mfvz4q8kq08x0";
@@ -92,6 +93,7 @@ namespace UI.Main
             m_btnTravel = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnTravel"));
             m_grpRight = (GGroup)comp.GetChild("grpRight");
             m_grpMove = (GGroup)comp.GetChild("grpMove");
+            m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
         }
@@ -127,6 +129,7 @@ namespace UI.Main
             m_btnTravel = null;
             m_grpRight = null;
             m_grpMove = null;
+            m_loaGuidestudio = null;
             m_t1 = null;
             m_t2 = null;
             if(disposeTarget && target != null)

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

@@ -96,6 +96,13 @@ namespace GFGGame
 
             }
 
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_METAL);
+            if (guideId == cfg.id && guideIndex == 2)
+            {
+                _ui.m_loaMask.visible = false;
+                MainDataManager.Instance.CanSwipe = true;
+                Timers.inst.AddUpdate(UpdateStudioMetalGuide);
+            }
         }
 
         protected override void OnHide()
@@ -104,10 +111,9 @@ namespace GFGGame
             base.OnHide();
             _ui.m_comHolder.target.visible = false;
             _ui.m_compTxt.target.visible = false;
-
-            // guideTarget.onClick.Remove(OnClickTarget);
             guideTarget = null;
             Timers.inst.Remove(UpdateGuideRect);
+            Timers.inst.Remove(UpdateStudioMetalGuide);
         }
 
         private void UpdateComTxt(string txtContent)
@@ -179,7 +185,13 @@ namespace GFGGame
 
             }
         }
-
+        private void UpdateStudioMetalGuide(object param)
+        {
+            if (MainDataManager.Instance.ViewType == 1)
+            {
+                OnClickTarget();
+            }
+        }
 
         private void OnClickTarget()
         {

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

@@ -189,9 +189,9 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER, 4, "", 0);
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_METAL, 1, "点击返回主界面。");
 
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_DECOMPOSE, 1, "点击返回主界面。");
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_LV, 1, "点击返回主界面。");
 
 
 

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

@@ -290,8 +290,8 @@ namespace GFGGame
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER, 5);
 
             GuideController.TryGuide(_unPasslevelItem, ConstGuideId.BUY_CLOTHING, 1, "衣服被弄脏了,到机场更衣室换身衣服吧。");
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_LV, 1, "点击返回主界面。");
 
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_METAL, 1, "点击返回主界面。");
             // GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.LUCKY_BOX, 1, "点击返回主界面。");
         }
         protected override void TryCompleteGuide()

+ 9 - 3
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.FREEDOM_DRESS);
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_METAL);
             // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + cfg.id, 0).Coroutine();
             // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + cfg.id, 1).Coroutine();
 
@@ -612,12 +612,18 @@ namespace GFGGame
 
             GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_LV, 2, "“词牌”可进行升级和管理。", -1, false);
 
-            bool isGuide = GuideController.TryGuide(_ui.target, ConstGuideId.STUDIO_METAL, 3, "向左滑动界面。", -1, false);
+            bool isGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_METAL, 2, "向左滑动界面。", -1, false, _ui.target.height - 700);
             if (isGuide)
             {
+                _ui.m_loaGuidestudio.visible = true;
                 MainDataManager.Instance.CanSwipe = true;
             }
-            if (MainDataManager.Instance.ViewType == 1) GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_METAL, 2, "工作室开门啦,进去看看~");
+            if (MainDataManager.Instance.ViewType == 1)
+            {
+                _ui.m_loaGuidestudio.visible = false;
+                GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_METAL, 3, "工作室开门啦,进去看看~");
+            }
+
 
             GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.SUIT_LIST_VIEW, 1, "获得“天衣”服饰后,可进行养护和焕新,到绣坊看看");
             // GuideController.TryCompleteGuide(ConstGuideId.STUDIO_OPEN, 3);

BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes