千山万水

FGUIProject/assets/CommonGame/package.xml

@@ -228,7 +228,7 @@
     <image id="qqattj2" name="zjm_gnkuang.png" path="/images/"/>
     <image id="uyuxtj3" name="tujian_zkanniu.png" path="/images/" exported="true"/>
     <image id="uyuxtj4" name="xcpz_fhfh.png" path="/imagesExport/" exported="true"/>
-    <component id="uyuxtj5" name="BtnBack.xml" path="/components/" exported="true"/>
+    <component id="uyuxtj5" name="ButtonBack.xml" path="/components/" exported="true"/>
     <image id="uyuxtj6" name="xz_wss.png" path="/images/"/>
     <image id="uyuxtj7" name="xc_bto_1.png" path="/images/"/>
     <image id="uyuxtj8" name="xc_bto.png" path="/images/"/>

FGUIProject/assets/FieldGuide/TravelShowUI.xml

@@ -4,12 +4,15 @@
     <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"/>
-    <list id="n20_wono" name="list" xy="89,243" size="902,1434" overflow="scroll" defaultItem="ui://vqq9h9h4wono2m">
+    <component id="n9_pjip" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="34,60"/>
+    <list id="n20_wono" name="list" xy="52,264" size="976,1656" overflow="scroll" lineGap="50" defaultItem="ui://vqq9h9h4wono2m">
+      <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n21_wono" name="btnReward" src="wono2n" fileName="components/Button5.xml" xy="915,83"/>
+    <component id="n21_wono" name="btnReward" src="wono2n" fileName="components/Button5.xml" xy="933,75">
+      <relation target="" sidePair="right-right,top-top"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/FieldGuide/components/Button5.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="99,98" extention="Button">
+<component size="116,116" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n0_jj4d" name="n0" src="pjip1j" fileName="imagesExport/tujian_lwlw_1.png" xy="0,0">
+    <image id="n0_jj4d" name="n0" src="wono2t" fileName="images/xqfs_dztb.png" xy="-8,-9" size="133,134">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_jj4d" name="n1" src="pjip1c" fileName="imagesExport/tujian_lwlw_2.png" xy="0,0">
+    <image id="n1_jj4d" name="n1" src="wono34" fileName="images/xqfs_dztb_1.png" xy="0,0">
       <gearDisplay controller="c1" pages="0"/>
     </image>
   </displayList>

FGUIProject/assets/FieldGuide/components/ComTravel.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="772,296" overflow="hidden" mask="n24_wono">
+  <displayList>
+    <loader id="n17_s61p" name="loaLocation" xy="386,148" pivot="0.5,0.5" anchor="true" size="774,298" url="ui://vqq9h9h4wono31" align="center" vAlign="middle" fill="scaleMatchWidth">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <image id="n24_wono" name="n24" src="wono33" fileName="images/xqfs_dzdi_5.png" xy="0,0" size="772,296"/>
+  </displayList>
+</component>

FGUIProject/assets/FieldGuide/components/ListTravelLocationItem.xml

@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="740,622">
+<component size="976,354">
   <displayList>
-    <loader id="n17_s61p" name="loaLocation" xy="370,310" pivot="0.5,0.5" anchor="true" size="740,622" url="ui://vqq9h9h4s61p2c" align="center" vAlign="middle" fill="scaleMatchHeight">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
-    <text id="n18_s61p" name="txtName" xy="434,24" size="292,64" fontSize="48" color="#816b4d" text="白金黑松露精">
+    <image id="n20_wono" name="n20" src="wono2u" fileName="images/xqfs_dzdi_1.png" xy="0,0"/>
+    <component id="n17_s61p" name="loaLocation" src="wono32" fileName="components/ComTravel.xml" xy="164,29"/>
+    <image id="n24_wono" name="n24" src="wono2s" fileName="images/xqfs_dzdi_4.png" xy="162,27"/>
+    <image id="n21_wono" name="n21" src="wono2v" fileName="images/xqfs_dzdi_2.png" xy="44,37"/>
+    <image id="n22_wono" name="n22" src="wono2r" fileName="images/xqfs_dzdi_3.png" xy="487,263"/>
+    <text id="n18_s61p" name="txtName" xy="58,85" pivot="0.5,0.5" size="50,183" fontSize="48" color="#816b4d" align="center" vAlign="middle" leading="0" autoSize="none" text="莫高窟">
       <relation target="" sidePair="left-left,top-bottom"/>
     </text>
-    <text id="n19_s61p" name="txtCount" xy="267,563" pivot="0.5,0" size="206,49" fontSize="36" color="#907656" text="已到达：2次">
+    <text id="n19_s61p" name="txtCount" xy="686,270" pivot="0.5,0" size="206,49" fontSize="36" color="#907656" text="已到达：2次">
       <relation target="" sidePair="left-left,top-bottom"/>
     </text>
   </displayList>

FGUIProject/assets/FieldGuide/package.xml

@@ -82,6 +82,10 @@
     <image id="wono2t" name="xqfs_dztb.png" path="/images/"/>
     <image id="wono2u" name="xqfs_dzdi_1.png" path="/images/"/>
     <image id="wono2v" name="xqfs_dzdi_2.png" path="/images/"/>
+    <image id="wono31" name="mogaoku_yewan.png" path="/images/"/>
+    <component id="wono32" name="ComTravel.xml" path="/components/"/>
+    <image id="wono33" name="xqfs_dzdi_5.png" path="/images/"/>
+    <image id="wono34" name="xqfs_dztb_1.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\FieldGuide" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Travel/TravelUI.xml

@@ -6,13 +6,18 @@
     <remark page="2" value="游历结束"/>
   </controller>
   <displayList>
-    <loader id="n0_wono" 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="n1_wono" name="btnTips" src="wono3" fileName="components/Button1.xml" xy="943,43" size="100,64">
+    <graph id="n9_wono" name="n9" xy="0,0" size="1080,1920" alpha="0.3" type="rect" lineSize="0" fillColor="#ff000000">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <image id="n8_wono" name="n8" src="wonoo" fileName="images/xqfs_yldik_1.png" xy="2,254"/>
+    <component id="n7_wono" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="34,60">
+      <relation target="" sidePair="left-left,top-top"/>
+      <Button icon="ui://eg2y0ldpuyuxtj4"/>
+    </component>
+    <component id="n1_wono" name="btnTips" src="wono3" fileName="components/Button1.xml" xy="926,346">
       <Button title="tips"/>
     </component>
-    <component id="n2_wono" name="btnGo" src="wono4" fileName="components/Button2.xml" xy="489,1436" size="100,86">
+    <component id="n2_wono" name="btnGo" src="wono4" fileName="components/Button2.xml" xy="562,961" size="100,86">
       <gearDisplay controller="c1" pages="0"/>
       <Button title="游历"/>
     </component>
@@ -23,15 +28,12 @@
     <text id="n4_wono" name="txtTime" xy="425,1463" pivot="0.5,0" size="230,41" fontSize="30" text="大约5小时后归来">
       <gearDisplay controller="c1" pages="1"/>
     </text>
-    <component id="n5_wono" name="btnPhoto" src="wono5" fileName="components/Button3.xml" xy="194,1682" size="227,132">
+    <component id="n5_wono" name="btnPhoto" src="wono5" fileName="components/Button3.xml" xy="190,1470">
       <Button title="相册"/>
     </component>
-    <component id="n6_wono" name="btnFieldGuide" src="wono5" fileName="components/Button3.xml" xy="687,1682" size="227,132">
-      <Button title="图鉴"/>
-    </component>
-    <component id="n7_wono" name="btnback" src="uyuxtj5" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="34,60">
-      <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://eg2y0ldpuyuxtj4"/>
+    <component id="n6_wono" name="btnFieldGuide" src="wono5" fileName="components/Button3.xml" xy="608,1470">
+      <Button title="图鉴" icon="ui://jitclg1gwonom"/>
     </component>
+    <image id="n10_wono" name="n10" src="wonoq" fileName="images/xqfs_yltsts.png" xy="342,194"/>
   </displayList>
 </component>

FGUIProject/assets/Travel/components/Button1.xml

@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,20" extention="Button">
+<component size="72,72" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <graph id="n0_wono" name="n0" xy="0,0" size="100,20" touchable="false" type="rect" lineSize="0" fillColor="#fff0f0f0">
-      <gearDisplay controller="button" pages="0"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <graph id="n1_wono" name="n1" xy="0,0" size="100,20" touchable="false" type="rect" lineSize="0" fillColor="#fffafafa">
-      <gearDisplay controller="button" pages="2"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <graph id="n2_wono" name="n2" xy="0,0" size="100,20" touchable="false" type="rect" lineSize="0" fillColor="#ffcccccc">
-      <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <text id="n3_wono" name="title" xy="45,-11" pivot="0.5,0.5" size="10,42" fontSize="30" text="">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </text>
+    <image id="n4_wono" name="n4" src="wonol" fileName="images/xqfs_gth.png" xy="0,0"/>
   </displayList>
-  <Button/>
+  <Button mode="Radio"/>
 </component>

FGUIProject/assets/Travel/components/Button3.xml

@@ -1,20 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,20" extention="Button">
+<component size="294,89" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <graph id="n0_wono" name="n0" xy="0,0" size="100,20" touchable="false" type="rect" lineSize="0" fillColor="#fff0f0f0">
-      <gearDisplay controller="button" pages="0"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <graph id="n1_wono" name="n1" xy="0,0" size="100,20" touchable="false" type="rect" lineSize="0" fillColor="#fffafafa">
-      <gearDisplay controller="button" pages="2"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <graph id="n2_wono" name="n2" xy="0,0" size="100,20" touchable="false" type="rect" lineSize="0" fillColor="#ffcccccc">
-      <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <text id="n3_wono" name="title" xy="45,-11" pivot="0.5,0.5" size="10,42" fontSize="30" text="">
+    <loader id="n5_wono" name="icon" xy="0,0" size="294,89" url="ui://jitclg1gwonon" autoSize="true"/>
+    <text id="n3_wono" name="title" xy="101,8" pivot="0.5,0.5" size="92,59" fontSize="44" color="#eef8f7" text="相册">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
   </displayList>

FGUIProject/assets/Travel/package.xml

@@ -21,6 +21,14 @@
     <component id="wonoh" name="Button4.xml" path="/components/"/>
     <component id="wonoi" name="Button5.xml" path="/components/"/>
     <component id="wonoj" name="ListDressItem.xml" path="/components/"/>
+    <image id="wonok" name="xqfs_ylshul_2.png" path="/images/"/>
+    <image id="wonol" name="xqfs_gth.png" path="/images/"/>
+    <image id="wonom" name="xqfs_ylau_1.png" path="/images/"/>
+    <image id="wonon" name="xqfs_ylau_2.png" path="/images/"/>
+    <image id="wonoo" name="xqfs_yldik_1.png" path="/images/"/>
+    <image id="wonop" name="xqfs_ylshul_1.png" path="/images/"/>
+    <image id="wonoq" name="xqfs_yltsts.png" path="/images/"/>
+    <image id="wonor" name="xqfs_ylglsj.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Travel" packageCount="2" genCode="true"/>
 </packageDescription>

GameClient/Assets/Editor/Excel/CodeBuilder.cs

@@ -200,7 +200,7 @@ namespace GFGEditor
             foreach (string key in keyNames.Keys)
             {
                 string cfgsDicName = string.Format("_cfgsDicBy{0}", string.Join("And", keyNames[key]));
-                string singleStr = CodeTemplateFactory.FunctionAllSingleBlockTemplate;
+                string singleStr = CodeTemplateFactory.FunctionAllKeyBlockTemplate;
                 singleStr = singleStr.Replace("{cfgsDicName}", cfgsDicName);
                 singleStr = singleStr.Replace("{combinedKey}", "cfg.combinedKey_" + key);
                 singleStrArry.Add(singleStr);

GameClient/Assets/Editor/Excel/CodeTemplateFactory.cs

@@ -15,6 +15,7 @@ namespace GFGEditor
         public static string FunctionGroupTemplate { get; private set; }
         public static string FunctionAllTemplate { get; private set; }
         public static string FunctionAllSingleBlockTemplate { get; private set; }
+        public static string FunctionAllKeyBlockTemplate { get; private set; }
         public static string FunctionAllGroupBlockTemplate { get; private set; }
         public static string DisposeAllCfgsCacheTemplate { get; private set; }
         public static string FunctionDisposeTemplate { get; private set; }
@@ -61,6 +62,10 @@ namespace GFGEditor
             {
                 FunctionAllSingleBlockTemplate = sr.ReadToEnd();
             }
+            using (StreamReader sr = new StreamReader(ExcelConfig.templatePath + "FunctionAllKeyBlock.txt"))
+            {
+                FunctionAllKeyBlockTemplate = sr.ReadToEnd();
+            }
             using (StreamReader sr = new StreamReader(ExcelConfig.templatePath + "FunctionAllGroupBlock.txt"))
             {
                 FunctionAllGroupBlockTemplate = sr.ReadToEnd();

GameClient/Assets/Editor/Excel/Template/FunctionAllKeyBlock.txt

@@ -0,0 +1,11 @@
+            
+            List<string> {cfgsDicName}List = new List<string>();
+            string[] {cfgsDicName}KeyGroup = {combinedKey}.Split('_');
+            for (int i = 0; i < {cfgsDicName}KeyGroup.Length; i++)
+            {
+                FieldInfo info = cfg.GetType().GetField({cfgsDicName}KeyGroup[i]);
+                {cfgsDicName}List.Add(info.GetValue(cfg).ToString());
+            }
+
+            string {cfgsDicName}Key = string.Join("_", {cfgsDicName}List);            
+            {cfgsDicName}[{cfgsDicName}Key] = cfg;

GameClient/Assets/Editor/Excel/Template/FunctionAllKeyBlock.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d66c674e5b9f3fe42a1ae1dced895cb3
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_ComTravel
+    {
+        public GComponent target;
+        public GLoader m_loaLocation;
+        public const string URL = "ui://vqq9h9h4wono32";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "ComTravel";
+        private static UI_ComTravel _proxy;
+
+        public static UI_ComTravel Create(GObject gObject = null)
+        {
+            var ui = new UI_ComTravel();
+            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_ComTravel Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComTravel();
+            }
+            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_loaLocation = (GLoader)comp.GetChild("loaLocation");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaLocation = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -7,7 +7,7 @@ namespace UI.FieldGuide
     public partial class UI_ListTravelLocationItem
     {
         public GComponent target;
-        public GLoader m_loaLocation;
+        public UI_ComTravel m_loaLocation;
         public GTextField m_txtName;
         public GTextField m_txtCount;
         public const string URL = "ui://vqq9h9h4wono2m";
@@ -57,12 +57,13 @@ namespace UI.FieldGuide
 
         private void Init(GComponent comp)
         {
-            m_loaLocation = (GLoader)comp.GetChild("loaLocation");
+            m_loaLocation = (UI_ComTravel)UI_ComTravel.Create(comp.GetChild("loaLocation"));
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_loaLocation.Dispose();
             m_loaLocation = null;
             m_txtName = null;
             m_txtCount = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_TravelUI.cs

@@ -8,14 +8,13 @@ namespace UI.Travel
     {
         public GComponent target;
         public Controller m_c1;
-        public GLoader m_loaBg;
+        public GButton m_btnback;
         public GButton m_btnTips;
         public GButton m_btnGo;
         public GButton m_btnGet;
         public GTextField m_txtTime;
         public GButton m_btnPhoto;
         public GButton m_btnFieldGuide;
-        public GButton m_btnback;
         public const string URL = "ui://jitclg1gwono0";
         public const string PACKAGE_NAME = "Travel";
         public const string RES_NAME = "TravelUI";
@@ -64,26 +63,24 @@ namespace UI.Travel
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnback = (GButton)comp.GetChild("btnback");
             m_btnTips = (GButton)comp.GetChild("btnTips");
             m_btnGo = (GButton)comp.GetChild("btnGo");
             m_btnGet = (GButton)comp.GetChild("btnGet");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnPhoto = (GButton)comp.GetChild("btnPhoto");
             m_btnFieldGuide = (GButton)comp.GetChild("btnFieldGuide");
-            m_btnback = (GButton)comp.GetChild("btnback");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_loaBg = null;
+            m_btnback = null;
             m_btnTips = null;
             m_btnGo = null;
             m_btnGet = null;
             m_txtTime = null;
             m_btnPhoto = null;
             m_btnFieldGuide = null;
-            m_btnback = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -40,7 +40,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
+            TravelLoactionCfg[] cfgs = TravelLoactionCfgArray.Instance.dataArray;
             _ui.m_list.numItems = TravelGuideCfgArray.Instance.dataArray.Length;
         }
 

GameClient/Assets/Game/HotUpdate/Views/Travel/TravelView.cs

@@ -34,7 +34,6 @@ namespace GFGGame
             _ui.m_btnPhoto.onClick.Add(OnBtnPhotoClick);
             _ui.m_btnFieldGuide.onClick.Add(OnBtnFieldGuideClick);
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
 
         }
         protected override void AddEventListener()

GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_2!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 2585cac32a2451444a174b8b9af42ebd
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_2.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: d0fbe2f48c0dc37479c4a5d7d3505d5d
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Travel/Travel_atlas0.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 43b36bdbd5ebc814ea174e01cdd1998a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: