千山万水

FGUIProject/assets/Main/MainUI.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920" designImage="ui://mfvz4q8kv482fw" designImageOffsetX="1080">
+<component size="1080,1920" designImage="ui://mfvz4q8kv482fw" designImageOffsetX="1080" designImageOffsetY="-240">
   <displayList>
     <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90"/>
     <list id="n41_wg7t" name="list" xy="916,308" size="97,158" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" vAlign="middle" foldInvisibleItems="true">
@@ -46,24 +46,24 @@
       <Button icon="ui://mfvz4q8kv482fm"/>
     </component>
     <group id="n52_qqat" name="grpLeft" xy="0,160" size="1080,1718" group="n59_oju1" advanced="true"/>
-    <component id="n44_n3xh" name="btnStudio" src="q08xu" fileName="components/ButtonModle1.xml" xy="1892,628" size="77,255" group="n58_oju1">
+    <component id="n44_n3xh" name="btnStudio" src="q08xu" fileName="components/ButtonModle1.xml" xy="1838,640" size="77,255" group="n58_oju1">
       <relation target="" sidePair="middle-middle"/>
       <Button icon="ui://mfvz4q8kv482ft"/>
     </component>
-    <component id="n45_kqhd" name="btnField" src="q08xu" fileName="components/ButtonModle1.xml" xy="1982,1571" size="77,256" group="n58_oju1">
+    <component id="n45_kqhd" name="btnField" src="q08xu" fileName="components/ButtonModle1.xml" xy="1998,1571" size="77,256" group="n58_oju1">
       <relation target="" sidePair="middle-middle"/>
       <Button icon="ui://mfvz4q8kv482fv"/>
     </component>
-    <component id="n51_v482" name="btnPoem" src="q08xu" fileName="components/ButtonModle1.xml" xy="1293,1143" size="77,256" group="n58_oju1">
+    <component id="n51_v482" name="btnPoem" src="q08xu" fileName="components/ButtonModle1.xml" xy="1576,1450" size="77,256" group="n58_oju1">
       <relation target="" sidePair="middle-middle"/>
       <Button icon="ui://mfvz4q8kv482fr"/>
     </component>
-    <component id="n60_wono" name="btnTravel" src="q08xu" fileName="components/ButtonModle1.xml" xy="2028,1218" size="77,255" group="n58_oju1">
+    <component id="n60_wono" name="btnTravel" src="q08xu" fileName="components/ButtonModle1.xml" xy="2005,859" size="77,255" group="n58_oju1">
       <relation target="" sidePair="middle-middle"/>
       <Button icon="ui://mfvz4q8kwonohg"/>
     </component>
-    <group id="n58_oju1" name="grpRight" xy="1293,628" size="812,1199" group="n59_oju1" advanced="true"/>
-    <group id="n59_oju1" name="grpMove" xy="0,160" size="2105,1718" advanced="true"/>
+    <group id="n58_oju1" name="grpRight" xy="1576,640" size="506,1187" group="n59_oju1" advanced="true"/>
+    <group id="n59_oju1" name="grpMove" xy="0,160" size="2082,1718" advanced="true"/>
   </displayList>
   <transition name="t1">
     <item time="0" type="Alpha" target="n57_oju1" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>

FGUIProject/assets/Travel/TravelDressupUI.xml

@@ -5,7 +5,7 @@
     <image id="n24_wono" name="n24" src="wono12" fileName="images/xqfs_xnk_3.png" xy="34,281"/>
     <image id="n28_wono" name="n28" src="wono12" fileName="images/xqfs_xnk_3.png" xy="34,741"/>
     <image id="n9_wono" name="n9" src="wonox" fileName="images/xqfs_xnbt_1.png" xy="250,50"/>
-    <text id="n10_wono" name="n10" xy="374,55" size="186,62" font="ui://eg2y0ldpwonotja" fontSize="46" color="#947b4c" text="收拾行囊"/>
+    <text id="n10_wono" name="n10" xy="374,55" size="186,61" font="ui://eg2y0ldpwonotja" fontSize="46" color="#947b4c" text="收拾行囊"/>
     <image id="n12_wono" name="n12" src="wonot" fileName="images/xqfs_xnts.png" xy="286,155"/>
     <image id="n13_wono" name="n13" src="wonot" fileName="images/xqfs_xnts.png" xy="624,155"/>
     <text id="n11_wono" name="n11" xy="328,140" size="273,46" fontSize="34" color="#c4b691" text="请为游历准备服装"/>
@@ -15,15 +15,9 @@
     <image id="n25_wono" name="n25" src="wonoy" fileName="images/xqfs_xnbt_2.png" xy="54,690" group="n27_wono"/>
     <text id="n26_wono" name="n26" xy="113,673" size="92,59" group="n27_wono" fontSize="44" color="#9c8351" text="行囊"/>
     <group id="n27_wono" name="n27" xy="54,673" size="151,59"/>
-    <image id="n29_wono" name="n29" src="wono11" fileName="images/xqfs_xnk_2.png" xy="60,309" group="n32_wono"/>
-    <component id="n3_wono" name="comDress2" src="wonof" fileName="components/ComDress.xml" xy="60,309" group="n32_wono"/>
-    <group id="n32_wono" name="grpDress3" xy="60,309" size="234,290"/>
-    <image id="n30_wono" name="n30" src="wono11" fileName="images/xqfs_xnk_2.png" xy="352,309" group="n31_wono"/>
-    <component id="n2_wono" name="comDress1" src="wonof" fileName="components/ComDress.xml" xy="352,309" group="n31_wono"/>
-    <group id="n31_wono" name="grpDress1" xy="352,309" size="234,290"/>
-    <component id="n1_wono" name="comDress0" src="wonof" fileName="components/ComDress.xml" xy="644,309" group="n33_wono"/>
-    <image id="n17_wono" name="n17" src="wonou" fileName="images/xqfs_bdbd.png" xy="645,310" group="n33_wono"/>
-    <group id="n33_wono" name="grpDress0" xy="644,309" size="235,291"/>
+    <component id="n1_wono" name="comDress0" src="wonof" fileName="components/ComDress.xml" xy="66,309"/>
+    <component id="n2_wono" name="comDress1" src="wonof" fileName="components/ComDress.xml" xy="351,309"/>
+    <component id="n3_wono" name="comDress2" src="wonof" fileName="components/ComDress.xml" xy="635,309"/>
     <list id="n7_wono" name="list" xy="56,768" size="826,300" layout="row" overflow="scroll" scroll="horizontal" colGap="32" defaultItem="ui://jitclg1gwonof" autoClearItems="true">
       <item/>
       <item/>

FGUIProject/assets/Travel/TravelRewardUI.xml

@@ -1,24 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <graph id="n1_wono" name="n1" xy="0,0" size="1080,1920" alpha="0.3" type="rect" lineSize="0" fillColor="#ff000000">
+    <graph id="n1_wono" name="n1" xy="0,0" size="1080,1920" alpha="0.4" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </graph>
-    <image id="n3_wono" name="n3" src="wono15" fileName="images/xqfs_yldwd.png" xy="87,398" group="n11_wono"/>
-    <graph id="n5_wono" name="n5" xy="116,426" size="848,569" group="n6_wono" type="rect" lineSize="0" fillColor="#ffe6cca0"/>
-    <component id="n2_wono" name="n2" src="wono10e" fileName="components/ComTravel.xml" xy="540,711" pivot="0.5,0.5" anchor="true" group="n6_wono" scale="0.7,0.7"/>
-    <group id="n6_wono" name="n6" xy="-60,311" size="1200,800" group="n11_wono"/>
-    <image id="n7_wono" name="n7" src="wono18" fileName="images/xqfs_yldw.png" xy="140,1062" group="n9_wono"/>
-    <text id="n8_wono" name="txtLocationName" xy="209,1057" size="148,64" group="n9_wono" font="ui://eg2y0ldpwonotja" fontSize="48" color="#a47f3e" text="莫高窟"/>
-    <group id="n9_wono" name="n9" xy="140,1057" size="217,64" group="n11_wono"/>
-    <text id="n10_wono" name="txtTime" xy="740,1057" size="196,64" group="n11_wono" font="ui://eg2y0ldpwonotja" fontSize="48" color="#a47f3e" text="2022.08.01"/>
-    <group id="n11_wono" name="n11" xy="-60,311" size="1200,865" group="n14_wono"/>
-    <component id="n12_wono" name="comReward" src="wono19" fileName="components/ComReward.xml" xy="428,1236" group="n14_wono"/>
-    <component id="n13_wono" name="btnGet" src="wono5" fileName="components/Button3.xml" xy="393,1520" group="n14_wono">
+    <component id="n3_wono" name="comPostCard" src="wono1d" fileName="components/ComPostcard.xml" xy="540,743" pivot="0.5,0.5" anchor="true"/>
+    <list id="n15_wono" name="list" xy="36,1194" size="1008,249" layout="row" overflow="scroll" colGap="20" defaultItem="ui://jitclg1gwono19" align="center" vAlign="middle">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n13_wono" name="btnGet" src="wono5" fileName="components/Button3.xml" xy="393,1476">
       <Button title="收下" icon="ui://jitclg1gwonom"/>
     </component>
-    <group id="n14_wono" name="n14" xy="-60,311" size="1200,1298" advanced="true" layout="vt" lineGap="60" excludeInvisibles="true">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </group>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="Scale" target="n3_wono" tween="true" startValue="1,1" endValue="0,0" duration="18" ease="Linear"/>
+    <item time="0" type="Visible" target="n13_wono" value="false"/>
+    <item time="0" type="Visible" target="n15_wono" value="false"/>
+    <item time="0" type="Visible" target="n1_wono" value="false"/>
+    <item time="0" type="XY" target="n3_wono" label="start" tween="true" startValue="540,743" endValue="266,1519" duration="18" label2="end" ease="Back.In"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Visible" target="n13_wono" value="true"/>
+    <item time="0" type="Visible" target="n15_wono" value="true"/>
+    <item time="0" type="XY" target="n3_wono" value="540,743"/>
+  </transition>
 </component>

FGUIProject/assets/Travel/TravelUI.xml

@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1,,2," selected="2">
+  <controller name="c1" pages="0,,1,,2," selected="0">
     <remark page="0" value="准备"/>
     <remark page="1" value="游历中"/>
     <remark page="2" value="游历结束"/>
   </controller>
   <controller name="c2" pages="0,,1," selected="0"/>
   <displayList>
-    <graph id="n9_wono" name="n9" xy="0,0" size="1080,1920" alpha="0.3" type="rect" lineSize="0" fillColor="#ff000000">
+    <graph id="n9_wono" name="n9" xy="0,0" size="1080,1920" alpha="0.4" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
+    <component id="n15_wono" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90"/>
     <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"/>
+      <property target="loaTitle" propertyId="1" value="ui://jitclg1gwono1a"/>
     </component>
-    <component id="n15_wono" name="n15" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,69"/>
     <image id="n8_wono" name="n8" src="wonoo" fileName="images/xqfs_yldik_1.png" xy="2,254" group="n16_wono"/>
     <component id="n1_wono" name="btnTips" src="wono3" fileName="components/Button1.xml" xy="926,346" group="n16_wono">
       <Button title="tips" controller="c2" page="1"/>

FGUIProject/assets/Travel/components/Button2.xml

@@ -4,7 +4,7 @@
   <displayList>
     <image id="n4_wono" name="n4" src="wonok" fileName="images/xqfs_ylshul_2.png" xy="0,0"/>
     <image id="n5_wono" name="n5" src="wonop" fileName="images/xqfs_ylshul_1.png" xy="-94,140"/>
-    <loader id="n6_wono" name="icon" xy="45,167" size="60,60" url="ui://eg2y0ldpkztethq" autoSize="true"/>
+    <loader id="n6_wono" name="loaIcon" xy="45,167" size="60,60" url="ui://eg2y0ldpkztethq" autoSize="true"/>
     <text id="n7_wono" name="txtCount" xy="119,168" size="44,56" font="ui://eg2y0ldpwonotj9" fontSize="42" color="#f7f2da" strokeColor="#cba461" strokeSize="2" text="-3"/>
   </displayList>
   <Button/>

FGUIProject/assets/Travel/components/ComDress.xml

@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="234,290">
+  <controller name="c1" pages="0,,1,,2," selected="2"/>
   <displayList>
-    <image id="n2_wono" name="n2" src="wono10" fileName="images/xqfs_xnk_1.png" xy="0,0"/>
-    <loader id="n1_wono" name="loaDress" xy="17,10" size="200,200" url="ui://eg2y0ldpwonotjb" autoSize="true"/>
-    <loader id="n6_wono" name="loaRarity" xy="183,9" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <text id="n4_wono" name="txtName" xy="48,233" pivot="0.5,0" size="138,46" font="ui://eg2y0ldpwonotja" fontSize="34" color="#9b7642" text="丹霄织金"/>
+    <image id="n8_wono" name="n8" src="wono11" fileName="images/xqfs_xnk_2.png" xy="0,0"/>
+    <image id="n2_wono" name="n2" src="wono10" fileName="images/xqfs_xnk_1.png" xy="0,0" group="n9_wono"/>
+    <loader id="n1_wono" name="loaDress" xy="17,10" size="200,200" group="n9_wono" url="ui://eg2y0ldpwonotjb" autoSize="true"/>
+    <loader id="n6_wono" name="loaRarity" xy="183,9" size="44,94" group="n9_wono" url="ui://eg2y0ldpd4iw50" autoSize="true"/>
+    <text id="n4_wono" name="txtName" xy="81,233" pivot="0.5,0" size="71,46" group="n9_wono" font="ui://eg2y0ldpwonotja" fontSize="34" color="#9b7642" text="默认"/>
+    <group id="n9_wono" name="n9" xy="0,0" size="234,290" advanced="true">
+      <gearDisplay controller="c1" pages="1,2"/>
+    </group>
+    <image id="n7_wono" name="n7" src="wonou" fileName="images/xqfs_bdbd.png" xy="0,0">
+      <gearDisplay controller="c1" pages="2"/>
+    </image>
   </displayList>
 </component>

FGUIProject/assets/Travel/components/ComPostcard.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="906,778">
+  <displayList>
+    <image id="n3_wono" name="n3" src="wono15" fileName="images/xqfs_yldwd.png" xy="0,0"/>
+    <graph id="n5_wono" name="n5" xy="29,28" size="848,569" type="rect" lineSize="0" fillColor="#ffe6cca0"/>
+    <image id="n7_wono" name="n7" src="wono18" fileName="images/xqfs_yldw.png" xy="53,664"/>
+    <component id="n2_wono" name="comTravel" src="wono10e" fileName="components/ComTravel.xml" xy="453,313" pivot="0.5,0.5" anchor="true" scale="0.7,0.7"/>
+    <text id="n8_wono" name="txtLocationName" xy="122,659" size="148,64" font="ui://eg2y0ldpwonotja" fontSize="48" color="#a47f3e" text="莫高窟"/>
+    <text id="n10_wono" name="txtTime" xy="653,659" size="196,64" font="ui://eg2y0ldpwonotja" fontSize="48" color="#a47f3e" text="2022.08.01"/>
+  </displayList>
+</component>

FGUIProject/assets/Travel/components/ListDressItem.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="148,146">
-  <displayList>
-    <component id="n8_wono" name="ListDressItem" src="wonof" fileName="components/ComDress.xml" xy="0,0"/>
-  </displayList>
-</component>

FGUIProject/assets/Travel/package.xml

@@ -20,7 +20,6 @@
     <component id="wonof" name="ComDress.xml" path="/components/"/>
     <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/"/>
@@ -48,6 +47,7 @@
     <image id="wono1a" name="xz_wss.png" path="/images/"/>
     <image id="wono1b" name="xqfs_ylxftb.png" path="/images/"/>
     <component id="wono1c" name="Button6.xml" path="/components/"/>
+    <component id="wono1d" name="ComPostcard.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Travel" packageCount="2" genCode="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Data/VO/TravelData.cs

@@ -36,7 +36,7 @@ namespace GFGGame
         /// <summary>
         /// Q版套装人物资源下标
         /// </summary>
-        public int TravelSuitResourceIndex;
+        public int SuitResIndex;
 
         /// <summary>
         /// 本次游历获得的物品

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

@@ -7,6 +7,7 @@ namespace UI.Travel
     public partial class UI_Button2
     {
         public GButton target;
+        public GLoader m_loaIcon;
         public GTextField m_txtCount;
         public const string URL = "ui://jitclg1gwono4";
         public const string PACKAGE_NAME = "Travel";
@@ -55,10 +56,12 @@ namespace UI.Travel
 
         private void Init(GComponent comp)
         {
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_loaIcon = null;
             m_txtCount = null;
             if(disposeTarget && target != null)
             {

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

@@ -7,6 +7,7 @@ namespace UI.Travel
     public partial class UI_ComDress
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_loaDress;
         public GLoader m_loaRarity;
         public GTextField m_txtName;
@@ -57,12 +58,14 @@ namespace UI.Travel
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_loaDress = (GLoader)comp.GetChild("loaDress");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_loaDress = null;
             m_loaRarity = null;
             m_txtName = null;

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

@@ -0,0 +1,78 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Travel
+{
+    public partial class UI_ComPostcard
+    {
+        public GComponent target;
+        public UI_ComTravel m_comTravel;
+        public GTextField m_txtLocationName;
+        public GTextField m_txtTime;
+        public const string URL = "ui://jitclg1gwono1d";
+        public const string PACKAGE_NAME = "Travel";
+        public const string RES_NAME = "ComPostcard";
+        private static UI_ComPostcard _proxy;
+
+        public static UI_ComPostcard Create(GObject gObject = null)
+        {
+            var ui = new UI_ComPostcard();
+            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_ComPostcard Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComPostcard();
+            }
+            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_comTravel = (UI_ComTravel)UI_ComTravel.Create(comp.GetChild("comTravel"));
+            m_txtLocationName = (GTextField)comp.GetChild("txtLocationName");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comTravel.Dispose();
+            m_comTravel = null;
+            m_txtLocationName = null;
+            m_txtTime = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_ComPostcard.cs.meta

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

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

@@ -7,9 +7,9 @@ namespace UI.Travel
     public partial class UI_TravelDressupUI
     {
         public GComponent target;
-        public UI_ComDress m_comDress2;
-        public UI_ComDress m_comDress1;
         public UI_ComDress m_comDress0;
+        public UI_ComDress m_comDress1;
+        public UI_ComDress m_comDress2;
         public GList m_list;
         public GButton m_btnCancle;
         public GButton m_btnGo;
@@ -60,21 +60,21 @@ namespace UI.Travel
 
         private void Init(GComponent comp)
         {
-            m_comDress2 = (UI_ComDress)UI_ComDress.Create(comp.GetChild("comDress2"));
-            m_comDress1 = (UI_ComDress)UI_ComDress.Create(comp.GetChild("comDress1"));
             m_comDress0 = (UI_ComDress)UI_ComDress.Create(comp.GetChild("comDress0"));
+            m_comDress1 = (UI_ComDress)UI_ComDress.Create(comp.GetChild("comDress1"));
+            m_comDress2 = (UI_ComDress)UI_ComDress.Create(comp.GetChild("comDress2"));
             m_list = (GList)comp.GetChild("list");
             m_btnCancle = (GButton)comp.GetChild("btnCancle");
             m_btnGo = (GButton)comp.GetChild("btnGo");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comDress2.Dispose();
-            m_comDress2 = null;
-            m_comDress1.Dispose();
-            m_comDress1 = null;
             m_comDress0.Dispose();
             m_comDress0 = null;
+            m_comDress1.Dispose();
+            m_comDress1 = null;
+            m_comDress2.Dispose();
+            m_comDress2 = null;
             m_list = null;
             m_btnCancle = null;
             m_btnGo = null;

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

@@ -7,10 +7,11 @@ namespace UI.Travel
     public partial class UI_TravelRewardUI
     {
         public GComponent target;
-        public GTextField m_txtLocationName;
-        public GTextField m_txtTime;
-        public UI_ComReward m_comReward;
+        public UI_ComPostcard m_comPostCard;
+        public GList m_list;
         public GButton m_btnGet;
+        public Transition m_t0;
+        public Transition m_t1;
         public const string URL = "ui://jitclg1gwono2";
         public const string PACKAGE_NAME = "Travel";
         public const string RES_NAME = "TravelRewardUI";
@@ -58,18 +59,20 @@ namespace UI.Travel
 
         private void Init(GComponent comp)
         {
-            m_txtLocationName = (GTextField)comp.GetChild("txtLocationName");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_comReward = (UI_ComReward)UI_ComReward.Create(comp.GetChild("comReward"));
+            m_comPostCard = (UI_ComPostcard)UI_ComPostcard.Create(comp.GetChild("comPostCard"));
+            m_list = (GList)comp.GetChild("list");
             m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtLocationName = null;
-            m_txtTime = null;
-            m_comReward.Dispose();
-            m_comReward = null;
+            m_comPostCard.Dispose();
+            m_comPostCard = null;
+            m_list = null;
             m_btnGet = null;
+            m_t0 = null;
+            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -9,6 +9,7 @@ namespace UI.Travel
         public GComponent target;
         public Controller m_c1;
         public Controller m_c2;
+        public GComponent m_comValueBar;
         public GButton m_btnback;
         public GButton m_btnTips;
         public GTextField m_txtTips;
@@ -68,6 +69,7 @@ namespace UI.Travel
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
+            m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnback = (GButton)comp.GetChild("btnback");
             m_btnTips = (GButton)comp.GetChild("btnTips");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
@@ -83,6 +85,7 @@ namespace UI.Travel
         {
             m_c1 = null;
             m_c2 = null;
+            m_comValueBar = null;
             m_btnback = null;
             m_btnTips = null;
             m_txtTips = null;

GameClient/Assets/Game/HotUpdate/ServerProxy/TravelSProxy.cs

@@ -32,7 +32,7 @@ namespace GFGGame
                     travelData.TravelCount = response.TravelGuideInfo.TravelCount;
                     travelData.TravelSuitId = response.TravelGuideInfo.TravelSuitId;
                     travelData.PositionIndex = response.TravelGuideInfo.PositionIndex;
-                    travelData.TravelSuitResourceIndex = response.TravelGuideInfo.PositionIndex;
+                    travelData.SuitResIndex = response.TravelGuideInfo.PositionIndex;
                     travelData.RewardItems = ItemUtil.CreateItemDataList(response.TravelGuideInfo.RewardItem);
                     TravelDataManager.Instance.TravelData = travelData;
 
@@ -60,7 +60,7 @@ namespace GFGGame
                     travelData.TravelCount = response.TravelGuideInfo.TravelCount;
                     travelData.TravelSuitId = response.TravelGuideInfo.TravelSuitId;
                     travelData.PositionIndex = response.TravelGuideInfo.PositionIndex;
-                    travelData.TravelSuitResourceIndex = response.TravelGuideInfo.PositionIndex;
+                    travelData.SuitResIndex = response.TravelGuideInfo.PositionIndex;
                     travelData.RewardItems = ItemUtil.CreateItemDataList(response.TravelGuideInfo.RewardItem);
                     TravelDataManager.Instance.TravelData = travelData;
                     return true;

GameClient/Assets/Game/HotUpdate/Utils/TimeUtil.cs

@@ -75,5 +75,16 @@ namespace GFGGame
 
             return str;
         }
+        /// <summary>
+        /// 将时间戳转换成yyyy.MM.dd格式
+        /// </summary>
+        /// <param name="timeSec"></param>
+        public static string FormattingTime2(long timeSec)
+        {
+            DateTime date = TimeInfo.Instance.ToDateTime(timeSec);
+            string str = date.ToString("yyyy.MM.dd");
+
+            return str;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/ValueBarController.cs

@@ -54,6 +54,10 @@ namespace GFGGame
                 ItemUtil.ExchangeItemById(luckyBoxCfg.costID, 1, true);
 
             }));
+            _valueBar.m_btnTravel.onClick.Add(() =>
+            {
+
+            });
         }
 
         public void Dispose()
@@ -72,6 +76,7 @@ namespace GFGGame
             UpdateNumeric();
             UpdateCJExchange();
             UpdateCJ(LuckyBoxDataManager.Instance.currentBoxId);
+            UpdateTravel();
             EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateNumeric);
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateItem);
         }
@@ -88,9 +93,10 @@ namespace GFGGame
 
         private void UpdateItem()
         {
+            UpdateCurrency();
             UpdateCJExchange();
             UpdateCJ(LuckyBoxDataManager.Instance.currentBoxId);
-            UpdateCurrency();
+            UpdateTravel();
         }
         private void UpdateCurrency()
         {
@@ -133,5 +139,13 @@ namespace GFGGame
 
 
         }
+
+        private void UpdateTravel()
+        {
+            int itemId = GlobalCfgArray.globalCfg.travelCostArr[0];
+            _valueBar.m_btnTravel.text = "" + ItemDataManager.GetItemNum(itemId);
+            _valueBar.m_btnTravel.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(itemId).res);
+
+        }
     }
 }

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

@@ -28,12 +28,20 @@ namespace GFGGame
             packageName = UI_TravelDressupUI.PACKAGE_NAME;
             _ui = UI_TravelDressupUI.Create();
             this.viewCom = _ui.target;
-            isfullScreen = true;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_list.onClickItem.Add(OnListItemClick);
+
             _ui.m_btnCancle.onClick.Add(Hide);
             _ui.m_btnGo.onClick.Add(OnBtnGoClick);
             _ui.m_comDress0.target.onClick.Add(OnComDressClick0);
             _ui.m_comDress1.target.onClick.Add(OnComDressClick);
             _ui.m_comDress2.target.onClick.Add(OnComDressClick);
+
+            _ui.m_comDress0.m_c1.selectedIndex = 2;
         }
         protected override void AddEventListener()
         {
@@ -71,10 +79,42 @@ namespace GFGGame
                 }
             }
             _ui.m_list.numItems = _travelSuitIds.Count;
+
+            _ui.m_comDress1.m_c1.selectedIndex = _ui.m_comDress1.target.data == null ? 0 : 1;
+            if (_ui.m_comDress1.target.data != null)
+            {
+                UpdateComDress(_ui.m_comDress1.target, (int)_ui.m_comDress1.target.data);
+            }
+            _ui.m_comDress2.m_c1.selectedIndex = _ui.m_comDress2.target.data == null ? 0 : 1;
+            if (_ui.m_comDress2.target.data != null)
+            {
+                UpdateComDress(_ui.m_comDress2.target, (int)_ui.m_comDress2.target.data);
+            }
+
+        }
+
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            UI_ComDress item = UI_ComDress.Proxy(obj);
+            item.m_c1.selectedIndex = 1;
+            UI_ComDress.ProxyEnd();
+            UpdateComDress(obj, _travelSuitIds[index]);
         }
 
+        private void UpdateComDress(GObject obj, int travelSuitId)
+        {
+            TravelSuitCfg travelSuitCfg = TravelSuitCfgArray.Instance.GetCfg(travelSuitId);
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(travelSuitCfg.suitId);
 
+            UI_ComDress item = UI_ComDress.Proxy(obj);
+            item.m_txtName.text = suitCfg.name;
+            item.m_loaDress.url = ResPathUtil.GetIconPath(suitCfg.res, "png");
+            RarityIconController.UpdateRarityIcon(item.m_loaRarity, suitCfg.id, false, true);
+            item.target.data = travelSuitCfg.id;
 
+            UI_ComDress.ProxyEnd();
+        }
 
         private void OnListItemClick(EventContext context)
         {
@@ -83,15 +123,17 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("行囊已满");
                 return;
             }
-            GObject obj = context.sender as GObject;
-            if (obj.data == null)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("请选择游历要带的服装");
-                return;
-            }
+            GObject obj = context.data as GObject;
             int travelSuitId = (int)obj.data;
             _selectTravelSuitIds.Add(travelSuitId);
-
+            if (_ui.m_comDress1.target.data == null)
+            {
+                _ui.m_comDress1.target.data = travelSuitId;
+            }
+            else
+            {
+                _ui.m_comDress2.target.data = travelSuitId;
+            }
             UpdateView();
         }
 
@@ -103,6 +145,12 @@ namespace GFGGame
         private void OnComDressClick(EventContext context)
         {
             GObject obj = context.sender as GObject;
+
+            if (obj.data == null)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("请选择游历要带的服装");
+                return;
+            }
             int travelSuitId = (int)obj.data;
             _selectTravelSuitIds.Remove(travelSuitId);
             obj.data = null;

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

@@ -28,6 +28,10 @@ namespace GFGGame
             _ui = UI_TravelRewardUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+
+            _ui.m_list.itemRenderer = RenderListItem;
+
+            _ui.m_btnGet.onClick.Add(OnBtnGetClick);
         }
         protected override void AddEventListener()
         {
@@ -37,12 +41,14 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
+            UpdateView();
         }
 
         protected override void OnHide()
         {
+            _ui.m_t1.Play();
             base.OnHide();
+
         }
 
         protected override void RemoveEventListener()
@@ -50,6 +56,43 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
+        private void UpdateView()
+        {
+            TravelLoactionCfg loactionCfg = TravelLoactionCfgArray.Instance.GetCfg(TravelDataManager.Instance.TravelData.TravelLocationId);
+            TravelSuitCfg travelSuitCfg = TravelSuitCfgArray.Instance.GetCfg(TravelDataManager.Instance.TravelData.TravelSuitId);
+
+            _ui.m_comPostCard.m_comTravel.m_loaBg.url = ResPathUtil.GetTravelBgPath(loactionCfg.res);
+            _ui.m_comPostCard.m_comTravel.m_loaRole.url = ResPathUtil.GetTravelBgPath(travelSuitCfg.reourcesArr[TravelDataManager.Instance.TravelData.SuitResIndex]);
+            _ui.m_comPostCard.m_txtLocationName.text = loactionCfg.name;
+            _ui.m_comPostCard.m_txtTime.text = TimeUtil.FormattingTime2(TravelDataManager.Instance.TravelData.CreationTime);
+
+            _ui.m_list.numItems = TravelDataManager.Instance.TravelData.RewardItems.Count;
+        }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+
+            ItemData itemData = TravelDataManager.Instance.TravelData.RewardItems[index];
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
+
+            UI_ComReward item = UI_ComReward.Proxy(obj);
+            item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            item.m_txtCount.text = itemData.num.ToString();
+            UI_ComReward.ProxyEnd();
+        }
+
+        private async void OnBtnGetClick()
+        {
+            bool result = await TravelSProxy.ReqGetTravelReward();
+            if (result)
+            {
+                UI_TravelUI travelViewUI = UI_TravelUI.Proxy(ViewManager.GetUIView(typeof(TravelView).FullName).viewCom);
+
+                Vector2 vector2 = travelViewUI.target.TransformPoint(travelViewUI.m_btnPhoto.xy, _ui.target);
+                _ui.m_t0.SetValue("end", vector2.x, vector2.y);
+                _ui.m_t0.Play(this.Hide);
+            }
+        }
 
     }
 }

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

@@ -8,9 +8,15 @@ namespace GFGGame
     public class TravelView : BaseWindow
     {
         private UI_TravelUI _ui;
+        private ValueBarController _valueBarController;
 
         public override void Dispose()
         {
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -27,8 +33,10 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
+            _valueBarController = new ValueBarController(_ui.m_comValueBar);
+
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
-            _ui.m_btnTips.onClick.Add(OnBtnTipsClick);
+            // _ui.m_btnTips.onClick.Add(OnBtnTipsClick);
             _ui.m_btnGo.target.onClick.Add(OnBtnGoClick);
             _ui.m_btnGet.onClick.Add(OnBtnGetClick);
             _ui.m_btnPhoto.onClick.Add(OnBtnPhotoClick);
@@ -45,12 +53,16 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _valueBarController.OnShown();
+            _valueBarController.Controller(7);
+
             UpdateView();
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            _valueBarController.OnHide();
 
         }
 
@@ -62,8 +74,14 @@ namespace GFGGame
 
         private void UpdateView()
         {
-            _ui.m_c1.selectedIndex = TravelDataManager.Instance.TravelData.Status;
-            if (_ui.m_c1.selectedIndex == (int)TravelGuideType.Travel)
+            _ui.m_c1.selectedIndex = 2;// TravelDataManager.Instance.TravelData.Status;
+            if (_ui.m_c1.selectedIndex == (int)TravelGuideType.NoTravel)
+            {
+                ItemCfg cfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.travelCostArr[0]);
+                _ui.m_btnGo.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res);
+                _ui.m_btnGo.m_txtCount.text = string.Format("-{0}", GlobalCfgArray.globalCfg.travelCostArr[1]);
+            }
+            else if (_ui.m_c1.selectedIndex == (int)TravelGuideType.Travel)
             {
                 long endTime = TravelDataManager.Instance.TravelData.CreationTime + TravelDataManager.Instance.TravelData.TravelNeedHour * TimeUtil.SECOND_PER_HOUR;
                 _ui.m_txtTime.text = string.Format("大约{0}后归来", TimeUtil.FormattingTime(TimeHelper.ServerNowSecs, (int)endTime));
@@ -72,22 +90,22 @@ namespace GFGGame
 
         private void OnBtnBackClick()
         {
-            ViewManager.GoBackFrom(typeof(PoemView).FullName);
+            ViewManager.GoBackFrom(typeof(TravelView).FullName);
         }
 
-        private void OnBtnTipsClick()
-        {
+        // private void OnBtnTipsClick()
+        // {
 
-        }
+        // }
 
         private void OnBtnGoClick()
         {
-            ViewManager.Show<TravelDressupView>(PictureSourceType.WanShuiQianShan, new object[] { typeof(TravelView).FullName, this.viewData });
+            ViewManager.Show<TravelDressupView>(null, new object[] { typeof(TravelView).FullName, this.viewData });
         }
 
         private void OnBtnGetClick()
         {
-            ViewManager.Show<TravelRewardView>(PictureSourceType.WanShuiQianShan, new object[] { typeof(TravelView).FullName, this.viewData });
+            ViewManager.Show<TravelRewardView>(null, new object[] { typeof(TravelView).FullName, this.viewData });
         }
 
         private void OnBtnPhotoClick()