千山万水

FGUIProject/assets/Travel/TravelRewardUI.xml

@@ -4,26 +4,30 @@
     <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>
-    <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">
+    <component id="n3_wono" name="comPostCard" src="wono1d" fileName="components/ComPostcard.xml" xy="540,746" pivot="0.5,0.5" anchor="true" group="n17_wono"/>
+    <list id="n15_wono" name="list" xy="36,1197" size="1008,249" group="n17_wono" 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">
+    <component id="n13_wono" name="btnGet" src="wono5" fileName="components/Button3.xml" xy="540,1517" pivot="0.5,0.5" anchor="true" group="n17_wono">
       <Button title="收下" icon="ui://jitclg1gwonom"/>
     </component>
+    <group id="n17_wono" name="n17" xy="36,357" size="1008,1205" advanced="true">
+      <relation target="" sidePair="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="Scale" target="n3_wono" tween="true" startValue="1,1" endValue="0,0" duration="12" 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"/>
+    <item time="0" type="XY" target="n3_wono" label="start" tween="true" startValue="540,743" endValue="266,1519" duration="12" label2="end" ease="Back.In"/>
   </transition>
   <transition name="t1">
+    <item time="0" type="Scale" target="n3_wono" value="1,1"/>
     <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"/>
+    <item time="0" type="Visible" target="n3_wono" value="true"/>
+    <item time="0" type="XY" target="n3_wono" label="start" value="540,743"/>
   </transition>
 </component>

FGUIProject/assets/Travel/TravelUI.xml

@@ -26,7 +26,7 @@
       <gearDisplay controller="c2" pages="1"/>
     </group>
     <image id="n13_wono" name="n13" src="wonos" fileName="xqfs_ylglsj.png" xy="93,1283" group="n14_wono"/>
-    <text id="n4_wono" name="txtTime" xy="365,1273" pivot="0.5,0" size="370,64" group="n14_wono" fontSize="48" color="#ad8a4e" text="大约5小时后归来"/>
+    <text id="n4_wono" name="txtTime" xy="365,1273" pivot="0.5,0" size="370,64" group="n14_wono" fontSize="48" color="#ad8a4e" autoClearText="true" text="大约5小时后归来"/>
     <group id="n14_wono" name="grpTime" xy="93,1273" size="894,64" group="n16_wono" advanced="true">
       <gearDisplay controller="c1" pages="1"/>
     </group>

FGUIProject/assets/Travel/components/ComPostcard.xml

@@ -4,7 +4,7 @@
     <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"/>
+    <component id="n2_wono" name="comTravel" src="wono10e" fileName="components/ComTravel.xml" xy="453,313" pivot="0.5,0.5" anchor="true"/>
     <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>

FGUIProject/assets/Travel/components/ComTravel.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1200,800" overflow="hidden">
+<component size="840,560" overflow="hidden">
   <displayList>
-    <loader id="n10_wono" name="loaBg" xy="0,0" size="1200,800" url="ui://jitclg1gwonoc" align="center" vAlign="middle" fill="scaleMatchWidth">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
-    <loader id="n11_wono" name="loaRole" xy="142,61" pivot="0,1" size="532,739" url="ui://jitclg1gwonoa" vAlign="bottom" fill="scaleMatchWidth" autoSize="true">
+    <loader id="n10_wono" name="loaBg" xy="0,0" size="840,560" aspect="true" url="ui://jitclg1gwonod" align="center" vAlign="middle" fill="scaleMatchWidth" clearOnPublish="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
+    <loader id="n11_wono" name="loaRole" xy="400,560" pivot="0,1" anchor="true" size="508,800" aspect="true" scale="0.7,0.7" url="ui://jitclg1gwono6" vAlign="bottom" fill="scaleMatchWidth" autoSize="true" clearOnPublish="true"/>
   </displayList>
 </component>

FGUIProject/assets/poem/PoemPhotoPreviewUI.xml

@@ -1,10 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
     <graph id="n14_uyux" name="grhBg" xy="0,0" size="1080,1920" alpha="0.5" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
     <list id="n4_v482" name="list" xy="40,150" size="1000,1620" layout="pagination" overflow="scroll" scroll="horizontal" scrollBarFlags="138" defaultItem="ui://iyz778gkv482b">
+      <gearDisplay controller="c1" pages="0"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n17_wono" name="listTravel" xy="87,570" size="906,779" layout="pagination" overflow="scroll" scroll="horizontal" scrollBarFlags="138" defaultItem="ui://iyz778gkwono10t">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="middle-middle"/>
       <item/>
       <item/>
       <item/>

FGUIProject/assets/poem/PoemPhotoShareUI.xml

@@ -1,19 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
     <loader id="n0_v482" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,1920" align="center" vAlign="middle" fill="scaleMatchWidth">
+      <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
+    <graph id="n6_wono" name="graBg" xy="0,0" size="1080,1920" alpha="0.6" type="rect" lineSize="0" fillColor="#ff000000">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </graph>
     <component id="n1_v482" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,60">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
-    <component id="n2_v482" name="btnSave" src="v482e" fileName="components/Button5.xml" xy="879,1756" group="n4_mdd9"/>
-    <component id="n3_v482" name="btnShare" src="v482e" fileName="components/Button5.xml" xy="1059,1756" group="n4_mdd9" visible="false">
+    <component id="n2_v482" name="btnSave" src="v482e" fileName="components/Button5.xml" xy="666,1391" group="n4_mdd9"/>
+    <component id="n3_v482" name="btnShare" src="v482e" fileName="components/Button5.xml" xy="846,1391" group="n4_mdd9">
       <Button icon="ui://iyz778gkuyuxzk"/>
     </component>
-    <group id="n4_mdd9" name="n4" xy="879,1756" size="140,116" advanced="true" layout="hz" colGap="40" excludeInvisibles="true">
+    <group id="n4_mdd9" name="n4" xy="666,1391" size="320,116" advanced="true" layout="hz" colGap="40" excludeInvisibles="true">
+      <gearXY controller="c1" pages="1" values="666,1391" default="699,1756"/>
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </group>
+    <component id="n5_wono" name="comPostcard" src="wono10t" fileName="components/ComPostcard.xml" xy="540,960" pivot="0.5,0.5" anchor="true">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="middle-middle"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/poem/PoemPhotoUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
   <controller name="c2" pages="0,,1," selected="0"/>
   <displayList>
     <loader id="n0_v482" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
@@ -8,13 +8,25 @@
     </loader>
     <image id="n13_uyux" name="n13" src="uyuxzx" fileName="photImages/xc_xzdik.png" xy="265,212" group="n14_uyux"/>
     <component id="n11_11rzz" name="btnTab0" src="11rzzf" fileName="components/Button6.xml" xy="263,210" group="n14_uyux">
-      <Button checked="true" icon="ui://iyz778gkuyux108" selectedIcon="ui://iyz778gkuyuxzv" controller="c1" page="0"/>
+      <Button icon="ui://iyz778gkuyux108" selectedIcon="ui://iyz778gkuyuxzv" controller="c1" page="0"/>
     </component>
     <component id="n12_11rzz" name="btnTab1" src="11rzzf" fileName="components/Button6.xml" xy="536,210" group="n14_uyux">
-      <Button icon="ui://iyz778gkuyux109" selectedIcon="ui://iyz778gkuyuxzw" controller="c1" page="1"/>
+      <Button checked="true" icon="ui://iyz778gkuyux109" selectedIcon="ui://iyz778gkuyuxzw" controller="c1" page="1"/>
     </component>
     <group id="n14_uyux" name="n14" xy="263,210" size="553,82"/>
     <list id="n8_v482" name="list" xy="36,338" size="1008,1434" layout="flow_hz" overflow="scroll" lineGap="16" colGap="15" defaultItem="ui://iyz778gkv4828">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n25_wono" name="listTravel" xy="32,338" size="1015,1434" layout="flow_hz" overflow="scroll" lineGap="20" colGap="15" defaultItem="ui://iyz778gkwono10g">
+      <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
@@ -37,7 +49,7 @@
     <group id="n17_uyux" name="n17" xy="0,1775" size="1080,145" advanced="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
-    <component id="n21_uyux" name="btnback" src="uyuxtj5" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="34,60" controller="c1,1">
+    <component id="n21_uyux" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="34,60" controller="c1,1">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
       <property target="loaTitle" propertyId="1" value="ui://iyz778gkuyux10a"/>

FGUIProject/assets/poem/components/ComIcon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="465,655" mask="n13_uyux">
+<component size="512,694" mask="n13_uyux">
   <displayList>
-    <loader id="n4_v482" name="loaIcon" xy="0,-30" size="465,826" aspect="true" url="ui://iyz778gkuyux102" align="center" vAlign="middle" fill="scaleMatchWidth">
+    <loader id="n4_v482" name="loaIcon" xy="19,-10" size="474,841" aspect="true" url="ui://iyz778gkuyux102" align="center" vAlign="middle" fill="scaleMatchWidth">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <image id="n13_uyux" name="n13" src="uyux107" fileName="photImages/xc_xzxd.png" xy="0,0"/>

FGUIProject/assets/poem/components/ComPhotoPostcard.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="500,348">
+  <displayList>
+    <image id="n3_wono" name="n3" src="wono10h" fileName="components/xqfs_yldwd.png" xy="250,174" pivot="0.5,0.5" anchor="true" size="500,348" group="n11_wono"/>
+    <graph id="n5_wono" name="n5" xy="250,172" pivot="0.5,0.5" anchor="true" size="464,314" group="n11_wono" type="rect" lineSize="0" fillColor="#ffe6cca0"/>
+    <component id="n2_wono" name="comTravel" src="wono10q" fileName="components/ComTravel.xml" xy="250,172" pivot="0.5,0.5" anchor="true" group="n11_wono" scale="0.54,0.54"/>
+    <component id="n13_wono" name="btnLock" src="v4826" fileName="components/Button1.xml" xy="295,242" group="n11_wono"/>
+    <component id="n12_wono" name="btnUp" src="v4827" fileName="components/Button2.xml" xy="390,242" group="n11_wono"/>
+    <group id="n11_wono" name="n11" xy="-170,-108" size="840,560"/>
+    <image id="n14_wono" name="imgSelect" src="wono10p" fileName="photImages/xc_xzxd_1.png" xy="0,0"/>
+  </displayList>
+</component>

FGUIProject/assets/poem/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="wono10h" 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="wono10i" fileName="images/xqfs_yldw.png" xy="53,664"/>
+    <component id="n2_wono" name="comTravel" src="wono10q" fileName="components/ComTravel.xml" xy="453,313" pivot="0.5,0.5" anchor="true"/>
+    <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/poem/components/ComTravel.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="840,560" overflow="hidden">
+  <displayList>
+    <loader id="n10_wono" name="loaBg" xy="0,0" size="840,560" aspect="true" url="ui://iyz778gkwono10r" align="center" vAlign="middle" fill="scaleMatchWidth" clearOnPublish="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <loader id="n11_wono" name="loaRole" xy="400,560" pivot="0,1" anchor="true" size="798,800" aspect="true" scale="0.7,0.7" url="ui://iyz778gkwono10s" vAlign="bottom" fill="scaleMatchWidth" autoSize="true" clearOnPublish="true"/>
+  </displayList>
+</component>

FGUIProject/assets/poem/components/ListPhotoItem.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="493,740">
   <displayList>
-    <component id="n4_v482" name="comIcon" src="uyux101" fileName="components/ComIcon.xml" xy="14,8"/>
-    <image id="n12_uyux" name="n12" src="uyuxzr" fileName="photImages/xc_kuangdi.png" xy="0,0"/>
-    <component id="n5_v482" name="btnLock" src="v4826" fileName="components/Button1.xml" xy="262,549"/>
-    <component id="n6_v482" name="btnUp" src="v4827" fileName="components/Button2.xml" xy="356,549"/>
+    <component id="n4_v482" name="comIcon" src="uyux101" fileName="components/ComIcon.xml" xy="-9,0"/>
+    <image id="n12_uyux" name="n12" src="uyuxzr" fileName="photImages/xc_kuangdi.png" xy="-9,0"/>
     <text id="n7_v482" name="txtTime" xy="79,691" pivot="0.5,0" size="335,49" fontSize="36" color="#aa8c61" align="center" text="2022-1-8 17:14:30"/>
-    <image id="n15_uyux" name="imgSelect" src="uyux107" fileName="photImages/xc_xzxd.png" xy="14,12"/>
+    <image id="n15_uyux" name="imgSelect" src="uyux107" fileName="photImages/xc_xzxd.png" xy="-9,0"/>
+    <component id="n5_v482" name="btnLock" src="v4826" fileName="components/Button1.xml" xy="286,563" group="n16_wono"/>
+    <component id="n6_v482" name="btnUp" src="v4827" fileName="components/Button2.xml" xy="380,563" group="n16_wono"/>
+    <group id="n16_wono" name="n16" xy="286,563" size="171,76"/>
   </displayList>
 </component>

FGUIProject/assets/poem/components/ListTravelItem.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1080,720">
-  <displayList>
-    <component id="n18_wono" name="n18" src="wono10e" fileName="components/ComTravel.xml" xy="0,0" pkg="jitclg1g"/>
-  </displayList>
-</component>

FGUIProject/assets/poem/package.xml

@@ -42,7 +42,16 @@
     <image id="uyux10b" name="xc_xzxzz.png" path="/photImages/"/>
     <image id="uyux10c" name="xc_xcan.png" path="/photImages/"/>
     <component id="uyux10d" name="Button8.xml" path="/components/"/>
-    <component id="wono10f" name="ListTravelItem.xml" path="/components/"/>
+    <component id="wono10g" name="ComPhotoPostcard.xml" path="/components/"/>
+    <image id="wono10h" name="xqfs_yldwd.png" path="/images/" scale="9grid" scale9grid="226,194,452,388"/>
+    <image id="wono10i" name="xqfs_yldw.png" path="/images/"/>
+    <image id="wono10k" name="mogaoku_yewan.png" path="/images/"/>
+    <image id="wono10l" name="moren_zhanli.png" path="/images/"/>
+    <image id="wono10p" name="xc_xzxd_1.png" path="/photImages/"/>
+    <component id="wono10q" name="ComTravel.xml" path="/components/"/>
+    <image id="wono10r" name="dayanta.png" path="/images/"/>
+    <image id="wono10s" name="damengdh.png" path="/images/"/>
+    <component id="wono10t" name="ComPostcard.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Poem" packageCount="2" genCode="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Data/TravelDataManager.cs

@@ -18,20 +18,40 @@ namespace GFGGame
             ListTravelAreaRewardState.Clear();
         }
 
+        public int GetTravelIndexByLocationId(int locationId)
+        {
+            for (int i = 0; i < TravelLoactionCfgArray.Instance.dataArray.Length; i++)
+            {
+                if (TravelLoactionCfgArray.Instance.dataArray[i].id == locationId)
+                {
+                    return i;
+                }
+            }
+            return -1;
+        }
         public int GetTravelCountByLocationId(int locationId)
         {
             if (ListTravelLocationCount.Count == 0) return 0;
-            TravelLoactionCfg locationCfg = TravelLoactionCfgArray.Instance.GetCfg(locationId);
-            int index = Array.IndexOf(TravelLoactionCfgArray.Instance.dataArray, locationCfg);
+            int index = GetTravelIndexByLocationId(locationId);
             return ListTravelLocationCount[index];
         }
 
+        public int GetGuideIndexByAreaId(int areaId)
+        {
+            for (int i = 0; i < TravelGuideCfgArray.Instance.dataArray.Length; i++)
+            {
+                if (TravelGuideCfgArray.Instance.dataArray[i].id == areaId)
+                {
+                    return i;
+                }
+            }
+            return -1;
+        }
         public int GetGuideRewardStateByAreaId(int areaId)
         {
 
             if (ListTravelAreaRewardState.Count == 0) return ConstBonusStatus.CAN_NOT_GET;
-            TravelGuideCfg travelGuideCfg = TravelGuideCfgArray.Instance.GetCfg(areaId);
-            int index = Array.IndexOf(TravelGuideCfgArray.Instance.dataArray, travelGuideCfg);
+            int index = GetGuideIndexByAreaId(areaId);
             return TravelDataManager.Instance.ListTravelAreaRewardState[index];
         }
 

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

@@ -24,6 +24,11 @@ namespace GFGGame
         /// 锁定状态
         /// </summary>
         public bool LockingStatus;
+        /// <summary>
+        /// 来源
+        /// </summary>
+        public int SourceType;
+
 
         /// <summary>
         /// 个人相册_照片临时下载路径,出于流量安全,每个下载文件的路径都是限时的,暂限5MIN
@@ -50,7 +55,7 @@ namespace GFGGame
         /// <summary>
         /// Q版套装人物资源下标
         /// </summary>
-        public int ResourceIndex;
+        public int SuitResIndex;
         /// <summary>
         /// Q版人物位置下标
         /// </summary>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComPhotoPostcard.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Poem
+{
+    public partial class UI_ComPhotoPostcard
+    {
+        public GComponent target;
+        public UI_ComTravel m_comTravel;
+        public UI_Button1 m_btnLock;
+        public UI_Button2 m_btnUp;
+        public GImage m_imgSelect;
+        public const string URL = "ui://iyz778gkwono10g";
+        public const string PACKAGE_NAME = "Poem";
+        public const string RES_NAME = "ComPhotoPostcard";
+        private static UI_ComPhotoPostcard _proxy;
+
+        public static UI_ComPhotoPostcard Create(GObject gObject = null)
+        {
+            var ui = new UI_ComPhotoPostcard();
+            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_ComPhotoPostcard Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComPhotoPostcard();
+            }
+            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_btnLock = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLock"));
+            m_btnUp = (UI_Button2)UI_Button2.Create(comp.GetChild("btnUp"));
+            m_imgSelect = (GImage)comp.GetChild("imgSelect");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comTravel.Dispose();
+            m_comTravel = null;
+            m_btnLock.Dispose();
+            m_btnLock = null;
+            m_btnUp.Dispose();
+            m_btnUp = null;
+            m_imgSelect = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComPhotoPostcard.cs.meta

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

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

@@ -0,0 +1,78 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Poem
+{
+    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://iyz778gkwono10t";
+        public const string PACKAGE_NAME = "Poem";
+        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/poem/UI_ComPostcard.cs.meta

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

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Poem
+{
+    public partial class UI_ComTravel
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GLoader m_loaRole;
+        public const string URL = "ui://iyz778gkwono10q";
+        public const string PACKAGE_NAME = "Poem";
+        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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_loaRole = (GLoader)comp.GetChild("loaRole");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_loaRole = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ListPhotoItem.cs

@@ -8,10 +8,10 @@ namespace UI.Poem
     {
         public GComponent target;
         public UI_ComIcon m_comIcon;
-        public UI_Button1 m_btnLock;
-        public UI_Button2 m_btnUp;
         public GTextField m_txtTime;
         public GImage m_imgSelect;
+        public UI_Button1 m_btnLock;
+        public UI_Button2 m_btnUp;
         public const string URL = "ui://iyz778gkv4828";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "ListPhotoItem";
@@ -60,21 +60,21 @@ namespace UI.Poem
         private void Init(GComponent comp)
         {
             m_comIcon = (UI_ComIcon)UI_ComIcon.Create(comp.GetChild("comIcon"));
-            m_btnLock = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLock"));
-            m_btnUp = (UI_Button2)UI_Button2.Create(comp.GetChild("btnUp"));
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_imgSelect = (GImage)comp.GetChild("imgSelect");
+            m_btnLock = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLock"));
+            m_btnUp = (UI_Button2)UI_Button2.Create(comp.GetChild("btnUp"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_comIcon.Dispose();
             m_comIcon = null;
+            m_txtTime = null;
+            m_imgSelect = null;
             m_btnLock.Dispose();
             m_btnLock = null;
             m_btnUp.Dispose();
             m_btnUp = null;
-            m_txtTime = null;
-            m_imgSelect = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemPhotoPreviewUI.cs

@@ -7,8 +7,10 @@ namespace UI.Poem
     public partial class UI_PoemPhotoPreviewUI
     {
         public GComponent target;
+        public Controller m_c1;
         public GGraph m_grhBg;
         public GList m_list;
+        public GList m_listTravel;
         public GButton m_btnLeft;
         public GButton m_btnRight;
         public UI_Button1 m_btnLock;
@@ -62,8 +64,10 @@ namespace UI.Poem
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_grhBg = (GGraph)comp.GetChild("grhBg");
             m_list = (GList)comp.GetChild("list");
+            m_listTravel = (GList)comp.GetChild("listTravel");
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
             m_btnRight = (GButton)comp.GetChild("btnRight");
             m_btnLock = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLock"));
@@ -73,8 +77,10 @@ namespace UI.Poem
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_grhBg = null;
             m_list = null;
+            m_listTravel = null;
             m_btnLeft = null;
             m_btnRight = null;
             m_btnLock.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemPhotoShareUI.cs

@@ -7,10 +7,13 @@ namespace UI.Poem
     public partial class UI_PoemPhotoShareUI
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_loaBg;
+        public GGraph m_graBg;
         public GButton m_btnback;
         public GButton m_btnSave;
         public GButton m_btnShare;
+        public UI_ComPostcard m_comPostcard;
         public const string URL = "ui://iyz778gkv482d";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "PoemPhotoShareUI";
@@ -58,17 +61,24 @@ namespace UI.Poem
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_graBg = (GGraph)comp.GetChild("graBg");
             m_btnback = (GButton)comp.GetChild("btnback");
             m_btnSave = (GButton)comp.GetChild("btnSave");
             m_btnShare = (GButton)comp.GetChild("btnShare");
+            m_comPostcard = (UI_ComPostcard)UI_ComPostcard.Create(comp.GetChild("comPostcard"));
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_loaBg = null;
+            m_graBg = null;
             m_btnback = null;
             m_btnSave = null;
             m_btnShare = null;
+            m_comPostcard.Dispose();
+            m_comPostcard = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemPhotoUI.cs

@@ -13,6 +13,7 @@ namespace UI.Poem
         public GButton m_btnTab0;
         public GButton m_btnTab1;
         public GList m_list;
+        public GList m_listTravel;
         public UI_Button7 m_btnConfirmDelete;
         public GButton m_btnDelete;
         public GTextField m_txtCount;
@@ -70,6 +71,7 @@ namespace UI.Poem
             m_btnTab0 = (GButton)comp.GetChild("btnTab0");
             m_btnTab1 = (GButton)comp.GetChild("btnTab1");
             m_list = (GList)comp.GetChild("list");
+            m_listTravel = (GList)comp.GetChild("listTravel");
             m_btnConfirmDelete = (UI_Button7)UI_Button7.Create(comp.GetChild("btnConfirmDelete"));
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
@@ -83,6 +85,7 @@ namespace UI.Poem
             m_btnTab0 = null;
             m_btnTab1 = null;
             m_list = null;
+            m_listTravel = null;
             m_btnConfirmDelete.Dispose();
             m_btnConfirmDelete = null;
             m_btnDelete = null;

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

@@ -31,6 +31,7 @@ namespace GFGGame
                         photoData.CreationTime = response.PictureInfosA[i].CreationTime;
                         photoData.ToppingStatus = response.PictureInfosA[i].ToppingStatus;
                         photoData.LockingStatus = response.PictureInfosA[i].LockingStatus;
+                        photoData.SourceType = response.PictureInfosA[i].SourceType;
 
                         photoData.PictureTempUrl = response.PictureInfosA[i].PictureTempUrl;
                         Timers.inst.StartCoroutine(DownloadFile(photoData));
@@ -43,10 +44,11 @@ namespace GFGGame
                         photoData.CreationTime = response.PictureInfosB[i].CreationTime;
                         photoData.ToppingStatus = response.PictureInfosB[i].ToppingStatus;
                         photoData.LockingStatus = response.PictureInfosB[i].LockingStatus;
+                        photoData.SourceType = response.PictureInfosB[i].SourceType;
 
                         photoData.TravelLocationId = response.PictureInfosB[i].TravelLocationId;
                         photoData.TravelSuitId = response.PictureInfosB[i].TravelSuitId;
-                        photoData.ResourceIndex = response.PictureInfosB[i].TravelSuitResourceIndex;
+                        photoData.SuitResIndex = response.PictureInfosB[i].TravelSuitResourceIndex;
                         photoData.PositionIndex = response.PictureInfosB[i].PositionIndex;
                         // Timers.inst.StartCoroutine(DownloadFile(photoData));
 

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.SuitResIndex = response.TravelGuideInfo.PositionIndex;
+                    travelData.SuitResIndex = response.TravelGuideInfo.TravelSuitResourceIndex;
                     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.SuitResIndex = response.TravelGuideInfo.PositionIndex;
+                    travelData.SuitResIndex = response.TravelGuideInfo.TravelSuitResourceIndex;
                     travelData.RewardItems = ItemUtil.CreateItemDataList(response.TravelGuideInfo.RewardItem);
                     TravelDataManager.Instance.TravelData = travelData;
                     EventAgent.DispatchEvent(ConstMessage.TRAVEL_STATE_CHANGE);
@@ -86,16 +86,19 @@ namespace GFGGame
                     photoData.CreationTime = response.PictureInfo.CreationTime;
                     photoData.ToppingStatus = response.PictureInfo.ToppingStatus;
                     photoData.LockingStatus = response.PictureInfo.LockingStatus;
+                    photoData.SourceType = response.PictureInfo.SourceType;
 
                     photoData.TravelLocationId = response.PictureInfo.TravelLocationId;
                     photoData.TravelSuitId = response.PictureInfo.TravelSuitId;
-                    photoData.ResourceIndex = response.PictureInfo.TravelSuitResourceIndex;
+                    photoData.SuitResIndex = response.PictureInfo.TravelSuitResourceIndex;
                     photoData.PositionIndex = response.PictureInfo.PositionIndex;
                     PoemPhotoDataManager.Instance.Add(photoData, (int)PictureSourceType.WanShuiQianShan);
 
                     TravelDataManager inst = TravelDataManager.Instance;
                     inst.TravelData.Status = (int)TravelGuideType.NoTravel;
-                    inst.ListTravelLocationCount[inst.TravelData.TravelLocationId - 1] = inst.TravelData.TravelCount;
+
+                    int index = TravelDataManager.Instance.GetTravelIndexByLocationId(inst.TravelData.TravelLocationId);
+                    inst.ListTravelLocationCount[index] = inst.TravelData.TravelCount;
 
                     EventAgent.DispatchEvent(ConstMessage.TRAVEL_STATE_CHANGE);
 
@@ -112,7 +115,8 @@ namespace GFGGame
                             for (int j = 0; j < travelGuide.locationsArr.Length; j++)
                             {
                                 int loactionId = TravelLoactionCfgArray.Instance.GetCfgBylocation(travelGuide.locationsArr[j]).id;
-                                if (inst.ListTravelLocationCount[loactionId - 1] == 0)
+                                int _index = TravelDataManager.Instance.GetTravelIndexByLocationId(loactionId);
+                                if (inst.ListTravelLocationCount[_index] == 0)
                                 {
                                     //仍有未到达的地点
                                     isRed = false;
@@ -160,7 +164,8 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    TravelDataManager.Instance.ListTravelAreaRewardState[areaId - 1] = (int)ConstBonusStatus.GOT;
+                    int index = TravelDataManager.Instance.GetGuideIndexByAreaId(areaId);
+                    TravelDataManager.Instance.ListTravelAreaRewardState[index] = (int)ConstBonusStatus.GOT;
                     List<ItemData> rewards = ItemUtil.CreateItemDataList(response.RewardItem);
                     BonusController.TryShowBonusList(rewards);
                     EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);

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

@@ -23,7 +23,7 @@ namespace GFGGame
             {
                 return string.Format("{0}分钟", minutes);
             }
-            return string.Format("{0}秒", minutes);
+            return string.Format("{0}秒", time);
         }
 
         public static void FormattingTime(int curTime, int endTime, out int num, out string str)

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoPreView.cs

@@ -9,6 +9,7 @@ namespace GFGGame
     public class PoemPhotoPreView : BaseWindow
     {
         private UI_PoemPhotoPreviewUI _ui;
+        private GList _list;
         private List<PoemPhotoData> _photoInfos;
         private int _curIndex = 0;
         private int _sourceType = 0;
@@ -37,6 +38,11 @@ namespace GFGGame
             _ui.m_list.SetVirtual();
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.scrollPane.onScrollEnd.Add(OnListScrollEnd);
+
+            _ui.m_listTravel.SetVirtual();
+            _ui.m_listTravel.itemRenderer = RenderListTravelItem;
+            _ui.m_listTravel.scrollPane.onScrollEnd.Add(OnListScrollEnd);
+
             _ui.m_btnLeft.onClick.Add(OnBtnLeftClick);
             _ui.m_btnRight.onClick.Add(OnBtnRightClick);
             _ui.m_btnLock.target.onClick.Add(OnBtnLockClick);
@@ -55,8 +61,20 @@ namespace GFGGame
             _curIndex = (int)(this.viewData as object[])[0];
             List<PoemPhotoData> photoInfos = (this.viewData as object[])[1] as List<PoemPhotoData>;
             _photoInfos = new List<PoemPhotoData>(photoInfos.ToArray());
-            _ui.m_list.numItems = _photoInfos.Count;
-            _ui.m_list.height = _ui.m_list.GetChildAt(0).height;
+
+             _sourceType = (int)(this.viewData as object[])[2];
+            _ui.m_c1.selectedIndex = _sourceType;
+            if (_sourceType == (int)PictureSourceType.PersonalAlbum)
+            {
+                _list = _ui.m_list;
+                _list.numItems = _photoInfos.Count;
+                _list.height = _list.GetChildAt(0).height;
+            }
+            else if (_sourceType == (int)PictureSourceType.WanShuiQianShan)
+            {
+                _list = _ui.m_listTravel;
+                _list.numItems = _photoInfos.Count;
+            }
             UpdateView();
         }
 
@@ -80,12 +98,12 @@ namespace GFGGame
         private void UpdateView(bool ani = false)
         {
             _ui.m_btnLeft.enabled = _curIndex > 0;
-            _ui.m_btnRight.enabled = _curIndex < _ui.m_list.numItems - 1;
+            _ui.m_btnRight.enabled = _curIndex < _list.numItems - 1;
             _ui.m_txtTime.text = TimeUtil.FormattingTime1(_photoInfos[_curIndex].CreationTime);
             _ui.m_btnLock.m_c1.selectedIndex = _photoInfos[_curIndex].LockingStatus ? 1 : 0;
             _ui.m_btnUp.m_c1.selectedIndex = _photoInfos[_curIndex].ToppingStatus ? 1 : 0;
 
-            if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(_curIndex, ani);
+            if (_list.numItems > 0) _list.ScrollToView(_curIndex, ani);
 
             if (_ui.m_btnLock.target.data == null)
             {
@@ -109,6 +127,27 @@ namespace GFGGame
 
             UI_ListPhotoPreviewItem.ProxyEnd();
         }
+        private void RenderListTravelItem(int index, GObject obj)
+        {
+            UI_ComPostcard item = UI_ComPostcard.Proxy(obj);
+
+            PoemPhotoData photoData = _photoInfos[_curIndex];
+            TravelLoactionCfg loactionCfg = TravelLoactionCfgArray.Instance.GetCfg(photoData.TravelLocationId);
+
+            item.m_comTravel.m_loaBg.url = ResPathUtil.GetTravelBgPath(loactionCfg.res);
+            item.m_txtLocationName.text = loactionCfg.name;
+            item.m_txtTime.text = TimeUtil.FormattingTime2(photoData.CreationTime);
+
+            if (photoData.TravelSuitId > 0)
+            {
+                TravelSuitCfg travelSuitCfg = TravelSuitCfgArray.Instance.GetCfg(photoData.TravelSuitId);
+                item.m_comTravel.m_loaRole.url = ResPathUtil.GetTravelRolePath(travelSuitCfg.reourcesArr[photoData.SuitResIndex]);
+                item.m_comTravel.m_loaRole.SetXY(loactionCfg.positionsArr[photoData.PositionIndex][0], loactionCfg.positionsArr[photoData.PositionIndex][1]);
+            }
+
+
+            UI_ComPostcard.ProxyEnd();
+        }
 
         private void OnBtnLeftClick()
         {
@@ -121,13 +160,13 @@ namespace GFGGame
         private void OnBtnRightClick()
         {
             _curIndex++;
-            _curIndex = Mathf.Min(_ui.m_list.numItems - 1, _curIndex);
+            _curIndex = Mathf.Min(_list.numItems - 1, _curIndex);
 
             UpdateView(true);
         }
         private void OnListScrollEnd()
         {
-            _curIndex = _ui.m_list.ChildIndexToItemIndex(0);
+            _curIndex = _list.ChildIndexToItemIndex(0);
             UpdateView();
         }
         private void OnBtnLockClick()
@@ -196,7 +235,12 @@ namespace GFGGame
 
         private void OnBtnShareClick()
         {
-            ViewManager.Show<PoemPhotoShareView>(_curPhotoData, new object[] { typeof(PoemPhotoPreView).FullName, new object[] { _curIndex, _photoInfos } });
+            if (_sourceType == (int)PictureSourceType.WanShuiQianShan)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("暂时没有可以分享的对象");
+                return;
+            }
+            ViewManager.Show<PoemPhotoShareView>(_curPhotoData, new object[] { typeof(PoemPhotoPreView).FullName, new object[] { _curIndex, _photoInfos, _sourceType } });
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoShareView.cs

@@ -9,7 +9,6 @@ namespace GFGGame
     public class PoemPhotoShareView : BaseWindow
     {
         private UI_PoemPhotoShareUI _ui;
-        private List<PoemPhotoData> _photoInfos;
         private PoemPhotoData _curPhotoData;
 
         private int _curIndex = 0;
@@ -35,6 +34,7 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xc_bjbj");
 
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
+            _ui.m_graBg.onClick.Add(OnBtnBackClick);
             _ui.m_btnSave.onClick.Add(OnBtnSaveClick);
             _ui.m_btnShare.onClick.Add(OnBtnShareClick);
 
@@ -49,9 +49,34 @@ namespace GFGGame
             base.OnShown();
 
             _curPhotoData = this.viewData as PoemPhotoData;
+            _ui.m_c1.selectedIndex = _curPhotoData.SourceType;
+
+            if (_curPhotoData.SourceType == (int)PictureSourceType.PersonalAlbum)
+            {
+                _ui.m_loaBg.texture = _curPhotoData.Ntexture;
+                _ui.m_loaBg.SetSize(_ui.m_loaBg.width, _ui.m_loaBg.texture.height * _ui.m_loaBg.width / _ui.m_loaBg.texture.width);
+            }
+            else if (_curPhotoData.SourceType == (int)PictureSourceType.WanShuiQianShan)
+            {
+                // UI_ComPostcard item = UI_ComPostcard.Proxy(_ui.m_comPostcard);
+
+                TravelLoactionCfg loactionCfg = TravelLoactionCfgArray.Instance.GetCfg(_curPhotoData.TravelLocationId);
+
+                _ui.m_comPostcard.m_comTravel.m_loaBg.url = ResPathUtil.GetTravelBgPath(loactionCfg.res);
+                _ui.m_comPostcard.m_txtLocationName.text = loactionCfg.name;
+                _ui.m_comPostcard.m_txtTime.text = TimeUtil.FormattingTime2(_curPhotoData.CreationTime);
+
+                if (_curPhotoData.TravelSuitId > 0)
+                {
+                    TravelSuitCfg travelSuitCfg = TravelSuitCfgArray.Instance.GetCfg(_curPhotoData.TravelSuitId);
+                    _ui.m_comPostcard.m_comTravel.m_loaRole.url = ResPathUtil.GetTravelRolePath(travelSuitCfg.reourcesArr[_curPhotoData.SuitResIndex]);
+                    _ui.m_comPostcard.m_comTravel.m_loaRole.SetXY(loactionCfg.positionsArr[_curPhotoData.PositionIndex][0], loactionCfg.positionsArr[_curPhotoData.PositionIndex][1]);
+                }
+
+
+                // UI_ComPostcard.ProxyEnd();
+            }
 
-            _ui.m_loaBg.texture = _curPhotoData.Ntexture;
-            _ui.m_loaBg.SetSize(_ui.m_loaBg.width, _ui.m_loaBg.texture.height * _ui.m_loaBg.width / _ui.m_loaBg.texture.width);
 
         }
 

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoView.cs

@@ -2,7 +2,6 @@ using System.Collections.Generic;
 using ET;
 using FairyGUI;
 using UI.Poem;
-using UnityEngine;
 
 namespace GFGGame
 {
@@ -35,6 +34,8 @@ namespace GFGGame
 
             _ui.m_list.SetVirtual();
             _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_listTravel.SetVirtual();
+            _ui.m_listTravel.itemRenderer = RenderListTravelItem;
 
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
             _ui.m_btnDelete.onClick.Add(OnBtnDeleteClick);
@@ -107,13 +108,16 @@ namespace GFGGame
             {
                 _photoInfos = PoemPhotoDataManager.Instance.PersonalPhotoInfos;
                 _sourceType = (int)PictureSourceType.PersonalAlbum;
+                _ui.m_list.numItems = _photoInfos.Count;
+
             }
             else
             {
                 _photoInfos = PoemPhotoDataManager.Instance.WsqsPhotoInfos;
                 _sourceType = (int)PictureSourceType.WanShuiQianShan;
+                _ui.m_listTravel.numItems = _photoInfos.Count;
+
             }
-            _ui.m_list.numItems = _photoInfos.Count;
 
             _ui.m_txtCount.text = string.Format("（{0}/{1}）", _photoInfos.Count, GlobalCfgArray.globalCfg.maxPhotoCount);
             _ui.m_btnConfirmDelete.m_txtTitle.text = string.Format("删除（{0}/{1}）", _listDelete.Count, _photoInfos.Count);
@@ -153,6 +157,44 @@ namespace GFGGame
             item.m_comIcon.target.data = index;
             UI_ListPhotoItem.ProxyEnd();
         }
+        private void RenderListTravelItem(int index, GObject obj)
+        {
+            PoemPhotoData poemPhotoData = _photoInfos[index];
+            TravelLoactionCfg loactionCfg = TravelLoactionCfgArray.Instance.GetCfg(poemPhotoData.TravelLocationId);
+
+            UI_ComPhotoPostcard item = UI_ComPhotoPostcard.Proxy(obj);
+
+            item.m_imgSelect.visible = _ui.m_c2.selectedIndex == 1 && _listDelete.IndexOf(_photoInfos[index].PictureId) >= 0;
+            item.m_comTravel.m_loaBg.url = ResPathUtil.GetTravelBgPath(loactionCfg.res);
+            if (poemPhotoData.TravelSuitId > 0)
+            {
+                TravelSuitCfg travelSuitCfg = TravelSuitCfgArray.Instance.GetCfg(poemPhotoData.TravelSuitId);
+                item.m_comTravel.m_loaRole.url = ResPathUtil.GetTravelRolePath(travelSuitCfg.reourcesArr[poemPhotoData.SuitResIndex]);
+                item.m_comTravel.m_loaRole.SetXY(loactionCfg.positionsArr[poemPhotoData.PositionIndex][0], loactionCfg.positionsArr[poemPhotoData.PositionIndex][1]);
+
+            }
+
+            item.m_btnLock.m_c1.selectedIndex = _photoInfos[index].LockingStatus ? 1 : 0;
+            item.m_btnUp.m_c1.selectedIndex = _photoInfos[index].ToppingStatus ? 1 : 0;
+            if (item.m_btnLock.target.data == null)
+            {
+                item.m_btnLock.target.onClick.Add(OnBtnLockClick);
+            }
+            item.m_btnLock.target.data = index;
+
+            if (item.m_btnUp.target.data == null)
+            {
+                item.m_btnUp.target.onClick.Add(OnBtnUpClick);
+            }
+            item.m_btnUp.target.data = index;
+
+            if (item.m_comTravel.target.data == null)
+            {
+                item.m_comTravel.target.onClick.Add(OnLoaIconClick);
+            }
+            item.m_comTravel.target.data = index;
+            UI_ComPhotoPostcard.ProxyEnd();
+        }
 
         private void OnLoaIconClick(EventContext context)
         {
@@ -161,7 +203,7 @@ namespace GFGGame
             PoemPhotoData photoData = _photoInfos[index];
             if (_ui.m_c2.selectedIndex == 0)
             {
-                ViewManager.Show<PoemPhotoPreView>(new object[] { index, _photoInfos }, new object[] { typeof(PoemView).FullName, this.viewData });
+                ViewManager.Show<PoemPhotoPreView>(new object[] { index, _photoInfos, _sourceType }, new object[] { typeof(PoemPhotoView).FullName, _sourceType });
             }
             else if (_ui.m_c2.selectedIndex == 1)
             {

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

@@ -60,6 +60,8 @@ namespace GFGGame
             _selectTravelSuitIds.Clear();
             _travelSuitIds.Clear();
             if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(0);
+            _ui.m_comDress1.target.data = null;
+            _ui.m_comDress2.target.data = null;
         }
 
         protected override void RemoveEventListener()

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

@@ -58,15 +58,21 @@ namespace GFGGame
         }
         private void UpdateView()
         {
-            TravelLoactionCfg loactionCfg = TravelLoactionCfgArray.Instance.GetCfg(TravelDataManager.Instance.TravelData.TravelLocationId);
-            TravelSuitCfg travelSuitCfg = TravelSuitCfgArray.Instance.GetCfg(TravelDataManager.Instance.TravelData.TravelSuitId);
+            TravelData travelData = TravelDataManager.Instance.TravelData;
+            TravelLoactionCfg loactionCfg = TravelLoactionCfgArray.Instance.GetCfg(travelData.TravelLocationId);
 
             _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_comPostCard.m_txtTime.text = TimeUtil.FormattingTime2(travelData.CreationTime);
 
-            _ui.m_list.numItems = TravelDataManager.Instance.TravelData.RewardItems.Count;
+            if (travelData.TravelSuitId > 0)
+            {
+                TravelSuitCfg travelSuitCfg = TravelSuitCfgArray.Instance.GetCfg(travelData.TravelSuitId);
+                _ui.m_comPostCard.m_comTravel.m_loaRole.url = ResPathUtil.GetTravelRolePath(travelSuitCfg.reourcesArr[travelData.SuitResIndex]);
+                _ui.m_comPostCard.m_comTravel.m_loaRole.SetXY(loactionCfg.positionsArr[travelData.PositionIndex][0], loactionCfg.positionsArr[travelData.PositionIndex][1]);
+            }
+
+            _ui.m_list.numItems = travelData.RewardItems.Count;
         }
 
         private void RenderListItem(int index, GObject obj)
@@ -77,7 +83,7 @@ namespace GFGGame
 
             UI_ComReward item = UI_ComReward.Proxy(obj);
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
-            item.m_txtCount.text = itemData.num.ToString();
+            item.m_txtCount.text = "x" + itemData.num.ToString();
             UI_ComReward.ProxyEnd();
         }
 
@@ -86,10 +92,13 @@ namespace GFGGame
             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);
+                // GComponent travelViewUI = ViewManager.GetUIView(typeof(TravelView).Name).viewCom;
+                // GButton btnPhoto = travelViewUI.GetChild("btnPhoto").asButton;
+                // // UI_TravelUI travelViewUI = UI_TravelUI.Proxy(ViewManager.GetUIView(typeof(TravelView).Name).viewCom);
+                // Vector2 vector2 = travelViewUI.TransformPoint(btnPhoto.xy, _ui.target);
+                _ui.m_t1.SetValue("start", _ui.m_comPostCard.target.x, _ui.m_comPostCard.target.y);
+                _ui.m_t0.SetValue("start", _ui.m_comPostCard.target.x, _ui.m_comPostCard.target.y);
+                _ui.m_t0.SetValue("end", _ui.m_btnGet.x - 240, _ui.m_btnGet.y);
                 _ui.m_t0.Play(this.Hide);
             }
         }

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

@@ -83,17 +83,27 @@ namespace GFGGame
             }
             else if (_ui.m_c1.selectedIndex == (int)TravelGuideType.Travel)
             {
-                long endTime = (TravelDataManager.Instance.TravelData.CreationTime / 1000) + TravelDataManager.Instance.TravelData.TravelNeedHour * TimeUtil.SECOND_PER_HOUR;
-                _ui.m_txtTime.text = string.Format("大约{0}后归来", TimeUtil.FormattingTime(TimeHelper.ServerNowSecs, (int)endTime));
+                int endTime = (int)(TravelDataManager.Instance.TravelData.CreationTime / 1000) + TravelDataManager.Instance.TravelData.TravelNeedHour * 5;// * 
+                int curTime = TimeHelper.ServerNowSecs;
 
-                Timers.inst.Add(1, (int)endTime - TimeHelper.ServerNowSecs, UpdateTime);
+                Timers.inst.Add(1, endTime - curTime + 1, UpdateTime);
             }
         }
 
         private void UpdateTime(object param)
         {
-            TravelDataManager.Instance.TravelData.Status = (int)TravelGuideType.TravelComplete;
-            UpdateView();
+            int endTime = (int)(TravelDataManager.Instance.TravelData.CreationTime / 1000) + TravelDataManager.Instance.TravelData.TravelNeedHour * 5;// * TimeUtil.SECOND_PER_HOUR
+
+            int curTime = TimeHelper.ServerNowSecs;
+            if (curTime >= endTime)
+            {
+                Timers.inst.Remove(UpdateTime);
+                TravelDataManager.Instance.TravelData.Status = (int)TravelGuideType.TravelComplete;
+                UpdateView();
+
+            }
+            _ui.m_txtTime.text = string.Format("大约{0}后归来", TimeUtil.FormattingTime(curTime, endTime));
+
         }
         private void OnBtnBackClick()
         {
@@ -107,6 +117,11 @@ namespace GFGGame
 
         private void OnBtnGoClick()
         {
+            if (PoemPhotoDataManager.Instance.WsqsPhotoInfos.Count >= GlobalCfgArray.globalCfg.maxTravelCount)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("明信片装不下了,先删除一些再去游历吧");
+                return;
+            }
             ViewManager.Show<TravelDressupView>(null, new object[] { typeof(TravelView).FullName, this.viewData });
         }
 

GameClient/Assets/ResIn/UI/Travel/Travel_atlas0_3.png.meta → GameClient/Assets/ResIn/UI/Poem/Poem_atlas0_1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8db187d035a1b014b88c8971db763c7b
+guid: 9fca567d45e9e6d49938d66246c14be5
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

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

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: d7e1fb6aed2725349b441346c0a1d0d9
-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: