千山万水图鉴

FGUIProject/assets/FieldGuide/TravelGuideUI.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <loader id="n0_s61p" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </loader>
+    <image id="n1_s61p" name="n1" src="pq5x5z" fileName="images/kp_bejing_di.png" pkg="eg2y0ldp" xy="28,264" size="1024,1586">
+      <relation target="" sidePair="width-width,height-height,center-center"/>
+    </image>
+    <component id="n2_s61p" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
+      <relation target="" sidePair="left-left,top-top"/>
+    </component>
+    <image id="n3_s61p" name="n3" src="s61p24" fileName="images/bwtj_bti.png" xy="162,96"/>
+    <list id="n9_s61p" name="list" xy="56,281" size="967,1536" layout="flow_hz" overflow="scroll" lineGap="40" colGap="50" defaultItem="ui://vqq9h9h4wono2l">
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

FGUIProject/assets/FieldGuide/TravelShowUI.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <loader id="n15_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </loader>
+    <component id="n9_pjip" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <loader id="n17_s61p" name="loaItem" xy="540,960" pivot="0.5,0.5" anchor="true" size="740,1210" url="ui://vqq9h9h4s61p2c" autoSize="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <text id="n18_s61p" name="txtTitle" xy="71,1550" size="292,64" fontSize="48" color="#816b4d" text="白金黑松露精">
+      <relation target="" sidePair="left-left,top-bottom"/>
+    </text>
+    <text id="n19_s61p" name="txtDesc" xy="80,1648" size="932,142" fontSize="36" color="#907656" autoSize="none" text="那些打不倒你的，/终将积聚成你内在的能量。当能量足够强 大，何必再借光，你就是光！与我一起开启@雅诗兰黛 全新 #白金黑松露精华# 的强大内核能量">
+      <relation target="" sidePair="left-left,top-bottom"/>
+    </text>
+  </displayList>
+</component>

FGUIProject/assets/FieldGuide/components/ListTrevalItem.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="457,551">
+  <displayList>
+    <loader id="n10_wono" name="loaIcon" xy="0,0" size="457,551" url="ui://vqq9h9h4s61p20" autoSize="true"/>
+  </displayList>
+</component>

FGUIProject/assets/FieldGuide/package.xml

@@ -69,6 +69,9 @@
     <image id="s61p2g" name="chapter_4.png" path="/imagesExport/" exported="true"/>
     <image id="s61p2h" name="chapter_5.png" path="/imagesExport/" exported="true"/>
     <component id="s61p2i" name="ChapterItemShowUI.xml" path="/" exported="true"/>
+    <component id="wono2j" name="TravelGuideUI.xml" path="/" exported="true"/>
+    <component id="wono2k" name="TravelShowUI.xml" path="/" exported="true"/>
+    <component id="wono2l" name="ListTrevalItem.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\FieldGuide" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Travel/TravelUI.xml

@@ -13,11 +13,15 @@
       <Button title="tips"/>
     </component>
     <component id="n2_wono" name="btnGo" src="wono4" fileName="components/Button2.xml" xy="489,1436" size="100,86">
+      <gearDisplay controller="c1" pages="0"/>
       <Button title="游历"/>
     </component>
     <component id="n3_wono" name="btnGet" src="wono4" fileName="components/Button2.xml" xy="453,1442" size="173,86">
+      <gearDisplay controller="c1" pages="2"/>
       <Button title="游历结束"/>
     </component>
-    <text id="n4_wono" name="n4" xy="316,1463" size="40,19" fontSize="12" text=""/>
+    <text id="n4_wono" name="txtTime" xy="425,1463" pivot="0.5,0" size="230,42" fontSize="30" text="大约5小时后归来">
+      <gearDisplay controller="c1" pages="1"/>
+    </text>
   </displayList>
 </component>

GameClient/Assets/Game/HotUpdate/Constant/ConstFieldGuideId.cs

@@ -4,5 +4,6 @@ namespace GFGGame
     {
         public const int SUIT_GUIDE = 1;//套装图鉴
         public const int CHAPTER_ITEM = 2;//博物图鉴
+        public const int TRAVEL_GUIDE = 3;//千山万水
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_TravelGuideUI.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_TravelGuideUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GList m_list;
+        public const string URL = "ui://vqq9h9h4wono2j";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "TravelGuideUI";
+        private static UI_TravelGuideUI _proxy;
+
+        public static UI_TravelGuideUI Create(GObject gObject = null)
+        {
+            var ui = new UI_TravelGuideUI();
+            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_TravelGuideUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_TravelGuideUI();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_TravelGuideUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_TravelShowUI.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_TravelShowUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GLoader m_loaItem;
+        public GTextField m_txtTitle;
+        public GTextField m_txtDesc;
+        public const string URL = "ui://vqq9h9h4wono2k";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "TravelShowUI";
+        private static UI_TravelShowUI _proxy;
+
+        public static UI_TravelShowUI Create(GObject gObject = null)
+        {
+            var ui = new UI_TravelShowUI();
+            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_TravelShowUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_TravelShowUI();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_loaItem = (GLoader)comp.GetChild("loaItem");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_loaItem = null;
+            m_txtTitle = null;
+            m_txtDesc = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_TravelShowUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/FieldGuideView.cs

@@ -131,6 +131,9 @@ namespace GFGGame
                 case ConstFieldGuideId.CHAPTER_ITEM:
                     ViewManager.Show<ChapterItemGuideView>(null, new object[] { ViewName.FIELD_GUIDE_VIEW, this.viewData });
                     break;
+                case ConstFieldGuideId.TRAVEL_GUIDE:
+                    ViewManager.Show<TravelGuideView>(null, new object[] { ViewName.FIELD_GUIDE_VIEW, this.viewData });
+                    break;
             }
         }
 
@@ -144,6 +147,9 @@ namespace GFGGame
                 case ConstFieldGuideId.CHAPTER_ITEM:
                     InstanceZonesDataManager.GetTotalProgress(out haveCount, out totalCount);
                     break;
+                case ConstFieldGuideId.TRAVEL_GUIDE:
+                    InstanceZonesDataManager.GetTotalProgress(out haveCount, out totalCount);
+                    break;
                 default:
                     haveCount = 0;
                     totalCount = 1;

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/TravelGuideView.cs

@@ -0,0 +1,68 @@
+using System.Collections.Generic;
+using FairyGUI;
+using UI.FieldGuide;
+
+namespace GFGGame
+{
+    public class TravelGuideView : BaseWindow
+    {
+
+        private UI_TravelGuideUI _ui;
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_TravelGuideUI.PACKAGE_NAME;
+            _ui = UI_TravelGuideUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_list.onClickItem.Add(OnListItemClick);
+
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hc_bj_1");
+
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(TravelGuideView).FullName);
+        }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+
+        }
+        private void OnListItemClick(EventContext context)
+        {
+
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/TravelGuideView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/TravelShowView.cs

@@ -0,0 +1,67 @@
+using UI.FieldGuide;
+using FairyGUI;
+using UnityEngine;
+using System.Collections.Generic;
+
+namespace GFGGame
+{
+    public class TravelShowView : BaseWindow
+    {
+        private UI_TravelShowUI _ui;
+        private CulturalRelicCfg _cfg;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            _ui = UI_TravelShowUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjtj_bjbj");
+
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+
+            UpdateView();
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(TravelShowView).FullName);
+        }
+
+        private void UpdateView()
+        {
+
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/TravelShowView.cs.meta

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

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

@@ -3,9 +3,9 @@ namespace GFGGame
     //主线剧情专用类
     public class StoryController
     {
-        public static void ShowLevelView(int levelCfgId)
+        public static void ShowLevelView(int levelCfgId, int needitemId = 0, int needItemCount = 0)
         {
-            InstanceZonesController.ShowLevelView(levelCfgId, OnFinishStoryLevel);
+            InstanceZonesController.ShowLevelView(levelCfgId, OnFinishStoryLevel, needitemId, needItemCount);
         }
         public static void OnFinishStoryLevel(int levelCfgId, bool firstPass, bool success)
         {