zhaoyang 2 éve
szülő
commit
c3b6d892c7
100 módosított fájl, 613 hozzáadás és 169 törlés
  1. BIN
      FGUIProject/assets/CommonGame/NANSONG.TTF
  2. 1 1
      FGUIProject/assets/CommonGame/RewardPreviewUI.xml
  3. BIN
      FGUIProject/assets/CommonGame/YUNJINSONG.TTF
  4. 9 3
      FGUIProject/assets/CommonGame/components/ComponentValueBar.xml
  5. BIN
      FGUIProject/assets/CommonGame/imgItemIcon/lyq_yunhubl.png
  6. 3 0
      FGUIProject/assets/CommonGame/package.xml
  7. 4 2
      FGUIProject/assets/FieldGuide/TravelGuideUI.xml
  8. 1 1
      FGUIProject/assets/FieldGuide/TravelShowUI.xml
  9. 12 5
      FGUIProject/assets/FieldGuide/components/ListTravelLocationItem.xml
  10. BIN
      FGUIProject/assets/FieldGuide/components/xqfs_wddw.png
  11. BIN
      FGUIProject/assets/FieldGuide/images/xz_wss.png
  12. BIN
      FGUIProject/assets/FieldGuide/imagesExport/tujian_taoz_3.png
  13. BIN
      FGUIProject/assets/FieldGuide/imagesExport/tujian_taoz_8.png
  14. BIN
      FGUIProject/assets/FieldGuide/imagesExport/tujian_tup_3.png
  15. 5 1
      FGUIProject/assets/FieldGuide/package.xml
  16. 2 2
      FGUIProject/assets/Main/MainUI.xml
  17. BIN
      FGUIProject/assets/Main/images/zjm_e_5.png
  18. 1 0
      FGUIProject/assets/Main/package.xml
  19. 32 10
      FGUIProject/assets/Travel/TravelDressupUI.xml
  20. 18 2
      FGUIProject/assets/Travel/TravelRewardUI.xml
  21. 23 12
      FGUIProject/assets/Travel/TravelUI.xml
  22. 1 1
      FGUIProject/assets/Travel/components/Button1.xml
  23. 5 16
      FGUIProject/assets/Travel/components/Button2.xml
  24. 3 14
      FGUIProject/assets/Travel/components/Button4.xml
  25. 3 14
      FGUIProject/assets/Travel/components/Button5.xml
  26. 10 0
      FGUIProject/assets/Travel/components/Button6.xml
  27. 5 2
      FGUIProject/assets/Travel/components/ComDress.xml
  28. 9 0
      FGUIProject/assets/Travel/components/ComReward.xml
  29. 5 3
      FGUIProject/assets/Travel/components/ComTravel.xml
  30. BIN
      FGUIProject/assets/Travel/images/xqfs_bdbd.png
  31. BIN
      FGUIProject/assets/Travel/images/xqfs_dw_jl.png
  32. BIN
      FGUIProject/assets/Travel/images/xqfs_dwewjl.png
  33. BIN
      FGUIProject/assets/Travel/images/xqfs_ssxnan_1.png
  34. BIN
      FGUIProject/assets/Travel/images/xqfs_ssxnan_2.png
  35. BIN
      FGUIProject/assets/Travel/images/xqfs_xnbt_1.png
  36. BIN
      FGUIProject/assets/Travel/images/xqfs_xnbt_2.png
  37. BIN
      FGUIProject/assets/Travel/images/xqfs_xndik.png
  38. BIN
      FGUIProject/assets/Travel/images/xqfs_xnk_1.png
  39. BIN
      FGUIProject/assets/Travel/images/xqfs_xnk_2.png
  40. BIN
      FGUIProject/assets/Travel/images/xqfs_xnk_3.png
  41. BIN
      FGUIProject/assets/Travel/images/xqfs_xnts.png
  42. BIN
      FGUIProject/assets/Travel/images/xqfs_yldw.png
  43. BIN
      FGUIProject/assets/Travel/images/xqfs_yldwd.png
  44. BIN
      FGUIProject/assets/Travel/images/xqfs_ylxftb.png
  45. BIN
      FGUIProject/assets/Travel/images/xz_wss.png
  46. 19 0
      FGUIProject/assets/Travel/package.xml
  47. BIN
      FGUIProject/assets/Travel/xqfs_ylglsj.png
  48. 2 0
      GameClient/Assets/Game/HotUpdate/Controller/GameController.cs
  49. 1 0
      GameClient/Assets/Game/HotUpdate/Data/DressUpMenuSuitDataManager.cs
  50. 4 4
      GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs
  51. 35 2
      GameClient/Assets/Game/HotUpdate/Data/TravelDataManager.cs
  52. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ButtonBack.cs
  53. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ButtonBack.cs.meta
  54. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComponentValueBar.cs
  55. 7 4
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ListTravelLocationItem.cs
  56. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_Button2.cs
  57. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_Button2.cs.meta
  58. 6 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_ComDress.cs
  59. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_ComReward.cs
  60. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_ComReward.cs.meta
  61. 14 12
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_ComTravel.cs
  62. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_ComTravel.cs.meta
  63. 11 14
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_TravelDressupUI.cs
  64. 13 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_TravelRewardUI.cs
  65. 18 5
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_TravelUI.cs
  66. 7 5
      GameClient/Assets/Game/HotUpdate/ServerProxy/TravelSProxy.cs
  67. 10 1
      GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs
  68. 1 1
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/FieldGuideView.cs
  69. 5 4
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/TravelGuideView.cs
  70. 31 5
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/TravelShowView.cs
  71. 1 1
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  72. 0 8
      GameClient/Assets/Game/HotUpdate/Views/Travel/TravelDressupView.cs
  73. 0 1
      GameClient/Assets/Game/HotUpdate/Views/Travel/TravelRewardView.cs
  74. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Travel/TravelView.cs
  75. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  76. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  77. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  78. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  79. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  80. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0!a.png
  81. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0.png
  82. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1!a.png
  83. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1.png
  84. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_2!a.png
  85. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_2.png
  86. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_fui.bytes
  87. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  88. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  89. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  90. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  91. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png
  92. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png
  93. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  94. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  95. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png
  96. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png
  97. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes
  98. BIN
      GameClient/Assets/ResIn/UI/Travel/Travel_atlas0.png
  99. BIN
      GameClient/Assets/ResIn/UI/Travel/Travel_atlas0_1.png
  100. 96 0
      GameClient/Assets/ResIn/UI/Travel/Travel_atlas0_1.png.meta

BIN
FGUIProject/assets/CommonGame/NANSONG.TTF


+ 1 - 1
FGUIProject/assets/CommonGame/RewardPreviewUI.xml

@@ -10,6 +10,6 @@
       <item/>
       <item/>
     </list>
-    <text id="n5_kzte" name="txtDesc" xy="281,488" size="374,54" fontSize="40" color="#aa946b" text="满足20活跃度可领取"/>
+    <text id="n5_kzte" name="txtDesc" xy="281,488" pivot="0.5,0" size="374,54" fontSize="40" color="#aa946b" text="满足20活跃度可领取"/>
   </displayList>
 </component>

BIN
FGUIProject/assets/CommonGame/YUNJINSONG.TTF


+ 9 - 3
FGUIProject/assets/CommonGame/components/ComponentValueBar.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,47">
-  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7," selected="2">
+  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8," selected="7">
     <remark page="2" value="抽卡兑换"/>
     <remark page="3" value="抽卡活动兑换"/>
     <remark page="4" value="抽卡"/>
     <remark page="5" value="卡牌"/>
     <remark page="6" value="分解"/>
+    <remark page="7" value="千山万水"/>
   </controller>
   <displayList>
-    <component id="n43_vek8" name="btnCJLuoXing" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,2">
+    <component id="n43_vek8" name="btnCJLuoXing" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
       <gearDisplay controller="c1" pages="3"/>
       <gearXY controller="c1" pages="3" values="688,2" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
@@ -40,7 +41,12 @@
     </component>
     <component id="n41_r9gf" name="btnDiamondPurple" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
       <gearDisplay controller="c1" pages="0,1,5,6"/>
-      <gearXY controller="c1" pages="0,1,5,6" values="814,2|684,2|684,2|684,2" default="688,5"/>
+      <gearXY controller="c1" pages="0,1,5,6,8" values="814,2|684,2|684,2|684,2|688,5" default="688,5"/>
+      <Button title="100" icon="ui://eg2y0ldpq08x5"/>
+    </component>
+    <component id="n47_wono" name="btnTravel" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,2">
+      <gearDisplay controller="c1" pages="8"/>
+      <gearXY controller="c1" pages="0,1,5,6,8" values="814,2|684,2|684,2|684,2|814,2" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x5"/>
     </component>
   </displayList>

BIN
FGUIProject/assets/CommonGame/imgItemIcon/lyq_yunhubl.png


+ 3 - 0
FGUIProject/assets/CommonGame/package.xml

@@ -232,6 +232,9 @@
     <image id="uyuxtj6" name="xz_wss.png" path="/images/"/>
     <image id="uyuxtj7" name="xc_bto_1.png" path="/images/"/>
     <image id="uyuxtj8" name="xc_bto.png" path="/images/"/>
+    <font id="wonotj9" name="YUNJINSONG.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
+    <font id="wonotja" name="NANSONG.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
+    <image id="wonotjb" name="lyq_yunhubl.png" path="/imgItemIcon/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 4 - 2
FGUIProject/assets/FieldGuide/TravelGuideUI.xml

@@ -4,10 +4,12 @@
     <loader id="n0_s61p" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n2_s61p" name="btnBack" src="uyuxtj5" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="34,60">
+    <component id="n2_s61p" 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://vqq9h9h4wono3b"/>
     </component>
-    <list id="n9_s61p" name="list" xy="50,264" size="980,1656" layout="flow_hz" overflow="scroll" lineGap="45" colGap="22" defaultItem="ui://vqq9h9h4wono2l">
+    <list id="n9_s61p" name="list" xy="50,264" size="980,1656" layout="flow_hz" overflow="scroll" lineGap="45" colGap="22" defaultItem="ui://vqq9h9h4wono2l" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>

+ 1 - 1
FGUIProject/assets/FieldGuide/TravelShowUI.xml

@@ -5,7 +5,7 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n9_pjip" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="34,60"/>
-    <list id="n20_wono" name="list" xy="52,264" size="976,1656" overflow="scroll" lineGap="50" defaultItem="ui://vqq9h9h4wono2m">
+    <list id="n20_wono" name="list" xy="52,264" size="976,1656" overflow="scroll" lineGap="50" defaultItem="ui://vqq9h9h4wono2m" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>

+ 12 - 5
FGUIProject/assets/FieldGuide/components/ListTravelLocationItem.xml

@@ -1,16 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="976,354">
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
     <image id="n20_wono" name="n20" src="wono2u" fileName="images/xqfs_dzdi_1.png" xy="0,0"/>
-    <component id="n17_s61p" name="loaLocation" src="wono32" fileName="components/ComTravel.xml" xy="164,29"/>
+    <component id="n17_s61p" name="comLocation" src="wono32" fileName="components/ComTravel.xml" xy="164,29"/>
     <image id="n24_wono" name="n24" src="wono2s" fileName="images/xqfs_dzdi_4.png" xy="162,27"/>
     <image id="n21_wono" name="n21" src="wono2v" fileName="images/xqfs_dzdi_2.png" xy="44,37"/>
-    <image id="n22_wono" name="n22" src="wono2r" fileName="images/xqfs_dzdi_3.png" xy="487,263"/>
-    <text id="n18_s61p" name="txtName" xy="58,85" pivot="0.5,0.5" size="50,183" fontSize="48" color="#816b4d" align="center" vAlign="middle" leading="0" autoSize="none" text="莫高窟">
-      <relation target="" sidePair="left-left,top-bottom"/>
+    <text id="n18_s61p" name="txtName" xy="58,35" pivot="0.5,0.5" size="50,329" font="ui://eg2y0ldpwonotj9" fontSize="48" color="#c89f5c" align="center" vAlign="middle" leading="-6" autoSize="height" strokeColor="#eeddb1" autoClearText="true" text="莫高窟高窟">
+      <relation target="" sidePair="middle-middle"/>
     </text>
-    <text id="n19_s61p" name="txtCount" xy="686,270" pivot="0.5,0" size="206,49" fontSize="36" color="#907656" text="已到达:2次">
+    <image id="n22_wono" name="n22" src="wono2r" fileName="images/xqfs_dzdi_3.png" xy="487,263" group="n26_wono"/>
+    <text id="n19_s61p" name="txtCount" xy="687,270" pivot="0.5,0" size="204,49" group="n26_wono" font="ui://eg2y0ldpwonotj9" fontSize="36" color="#a8833c" text="已到达:0次">
       <relation target="" sidePair="left-left,top-bottom"/>
     </text>
+    <group id="n26_wono" name="n26" xy="487,263" size="449,62" advanced="true">
+      <gearDisplay controller="c1" pages="1"/>
+    </group>
+    <image id="n25_wono" name="n25" src="wono3a" fileName="components/xqfs_wddw.png" xy="1,2">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
   </displayList>
 </component>

BIN
FGUIProject/assets/FieldGuide/components/xqfs_wddw.png


BIN
FGUIProject/assets/FieldGuide/images/xz_wss.png


BIN
FGUIProject/assets/FieldGuide/imagesExport/tujian_taoz_3.png


BIN
FGUIProject/assets/FieldGuide/imagesExport/tujian_taoz_8.png


BIN
FGUIProject/assets/FieldGuide/imagesExport/tujian_tup_3.png


+ 5 - 1
FGUIProject/assets/FieldGuide/package.xml

@@ -6,7 +6,7 @@
     <image id="pjip3" name="tujian_sjdu.png" path="/images/"/>
     <image id="pjip4" name="tujian_taoz_1.png" path="/imagesExport/" exported="true"/>
     <image id="pjip5" name="tujian_taoz_2.png" path="/imagesExport/" exported="true"/>
-    <image id="pjip6" name="tujian_taoz_3.png" path="/imagesExport/" exported="true"/>
+    <image id="pjip6" name="tujian_taoz_8.png" path="/imagesExport/" exported="true"/>
     <image id="pjip7" name="tujian_taoz_4.png" path="/imagesExport/" exported="true"/>
     <image id="pjip8" name="tujian_taoz_5.png" path="/imagesExport/" exported="true"/>
     <image id="pjip9" name="tujian_dikuang_1.png" path="/images/"/>
@@ -86,6 +86,10 @@
     <component id="wono32" name="ComTravel.xml" path="/components/"/>
     <image id="wono33" name="xqfs_dzdi_5.png" path="/images/"/>
     <image id="wono34" name="xqfs_dztb_1.png" path="/images/"/>
+    <image id="wono36" name="tujian_taoz_3.png" path="/imagesExport/" exported="true"/>
+    <image id="wono37" name="tujian_tup_3.png" path="/imagesExport/" exported="true"/>
+    <image id="wono3a" name="xqfs_wddw.png" path="/components/"/>
+    <image id="wono3b" name="xz_wss.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\FieldGuide" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 2 - 2
FGUIProject/assets/Main/MainUI.xml

@@ -58,9 +58,9 @@
       <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,256" group="n58_oju1">
+    <component id="n60_wono" name="btnTravel" src="q08xu" fileName="components/ButtonModle1.xml" xy="2028,1218" size="77,255" group="n58_oju1">
       <relation target="" sidePair="middle-middle"/>
-      <Button icon="ui://mfvz4q8kv482fr"/>
+      <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"/>

BIN
FGUIProject/assets/Main/images/zjm_e_5.png


+ 1 - 0
FGUIProject/assets/Main/package.xml

@@ -433,6 +433,7 @@
     <component id="wonohd" name="ComRoleResult2.xml" path="/components/"/>
     <component id="wonohe" name="ComRoleResult3.xml" path="/components/"/>
     <component id="wonohf" name="ComRoleResult4.xml" path="/components/"/>
+    <image id="wonohg" name="zjm_e_5.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 32 - 10
FGUIProject/assets/Travel/TravelDressupUI.xml

@@ -1,18 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
+<component size="935,1335">
   <displayList>
-    <loader id="n0_wono" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
-    </loader>
-    <component id="n1_wono" name="comDress0" src="wonof" fileName="components/ComDress.xml" xy="88,335"/>
-    <component id="n2_wono" name="comDress1" src="wonof" fileName="components/ComDress.xml" xy="442,406"/>
-    <component id="n3_wono" name="comDress2" src="wonof" fileName="components/ComDress.xml" xy="772,357"/>
-    <component id="n5_wono" name="btnCancle" src="wonoh" fileName="components/Button4.xml" xy="250,1590" size="129,103">
+    <image id="n8_wono" name="n8" src="wonoz" fileName="images/xqfs_xndik.png" xy="0,0"/>
+    <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="收拾行囊"/>
+    <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="请为游历准备服装"/>
+    <image id="n21_wono" name="n21" src="wonoy" fileName="images/xqfs_xnbt_2.png" xy="54,229" group="n23_wono"/>
+    <text id="n22_wono" name="n22" xy="113,212" size="92,59" group="n23_wono" fontSize="44" color="#9c8351" text="行囊"/>
+    <group id="n23_wono" name="n23" xy="54,212" size="151,59"/>
+    <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"/>
+    <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/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n5_wono" name="btnCancle" src="wonoh" fileName="components/Button4.xml" xy="116,1190">
       <Button title="暂不出发"/>
     </component>
-    <component id="n6_wono" name="btnGo" src="wonoi" fileName="components/Button5.xml" xy="661,1595" size="145,98">
+    <component id="n6_wono" name="btnGo" src="wonoi" fileName="components/Button5.xml" xy="548,1190">
       <Button title="塞进行囊"/>
     </component>
-    <list id="n7_wono" name="list" xy="163,1138" size="753,300" overflow="scroll" defaultItem="ui://jitclg1gwonoj"/>
   </displayList>
 </component>

+ 18 - 2
FGUIProject/assets/Travel/TravelRewardUI.xml

@@ -1,8 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <loader id="n0_wono" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
+    <graph id="n1_wono" name="n1" xy="0,0" size="1080,1920" alpha="0.3" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
-    </loader>
+    </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">
+      <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>
 </component>

+ 23 - 12
FGUIProject/assets/Travel/TravelUI.xml

@@ -1,39 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1,,2," selected="0">
+  <controller name="c1" pages="0,,1,,2," selected="2">
     <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">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <image id="n8_wono" name="n8" src="wonoo" fileName="images/xqfs_yldik_1.png" xy="2,254"/>
     <component id="n7_wono" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="34,60">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
-    <component id="n1_wono" name="btnTips" src="wono3" fileName="components/Button1.xml" xy="926,346">
-      <Button title="tips"/>
+    <component 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"/>
     </component>
-    <component id="n2_wono" name="btnGo" src="wono4" fileName="components/Button2.xml" xy="562,961" size="100,86">
+    <image id="n10_wono" name="n10" src="wonoq" fileName="images/xqfs_yltsts.png" xy="342,194" group="n12_wono"/>
+    <text id="n11_wono" name="txtTips" xy="363,210" size="589,104" group="n12_wono" fontSize="36" color="#b28e4f" autoSize="none" text="收拾行囊出发游历,可获得随机地点 的明信片,并有概率获得特殊奖励。"/>
+    <group id="n12_wono" name="grpTips" xy="342,194" size="625,161" group="n16_wono" advanced="true">
+      <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小时后归来"/>
+    <group id="n14_wono" name="grpTime" xy="93,1273" size="894,64" group="n16_wono" advanced="true">
+      <gearDisplay controller="c1" pages="1"/>
+    </group>
+    <component id="n2_wono" name="btnGo" src="wono4" fileName="components/Button2.xml" xy="428,1206" group="n16_wono">
       <gearDisplay controller="c1" pages="0"/>
       <Button title="游历"/>
     </component>
-    <component id="n3_wono" name="btnGet" src="wono4" fileName="components/Button2.xml" xy="453,1442" size="173,86">
+    <component id="n3_wono" name="btnGet" src="wono1c" fileName="components/Button6.xml" xy="428,1206" group="n16_wono">
       <gearDisplay controller="c1" pages="2"/>
       <Button title="游历结束"/>
     </component>
-    <text id="n4_wono" name="txtTime" xy="425,1463" pivot="0.5,0" size="230,41" fontSize="30" text="大约5小时后归来">
-      <gearDisplay controller="c1" pages="1"/>
-    </text>
-    <component id="n5_wono" name="btnPhoto" src="wono5" fileName="components/Button3.xml" xy="190,1470">
+    <component id="n5_wono" name="btnPhoto" src="wono5" fileName="components/Button3.xml" xy="190,1470" group="n16_wono">
       <Button title="相册"/>
     </component>
-    <component id="n6_wono" name="btnFieldGuide" src="wono5" fileName="components/Button3.xml" xy="608,1470">
+    <component id="n6_wono" name="btnFieldGuide" src="wono5" fileName="components/Button3.xml" xy="608,1470" group="n16_wono">
       <Button title="图鉴" icon="ui://jitclg1gwonom"/>
     </component>
-    <image id="n10_wono" name="n10" src="wonoq" fileName="images/xqfs_yltsts.png" xy="342,194"/>
+    <group id="n16_wono" name="n16" xy="2,194" size="1076,1471" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
   </displayList>
 </component>

+ 1 - 1
FGUIProject/assets/Travel/components/Button1.xml

@@ -4,5 +4,5 @@
   <displayList>
     <image id="n4_wono" name="n4" src="wonol" fileName="images/xqfs_gth.png" xy="0,0"/>
   </displayList>
-  <Button mode="Radio"/>
+  <Button mode="Check"/>
 </component>

+ 5 - 16
FGUIProject/assets/Travel/components/Button2.xml

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

+ 3 - 14
FGUIProject/assets/Travel/components/Button4.xml

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

+ 3 - 14
FGUIProject/assets/Travel/components/Button5.xml

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

+ 10 - 0
FGUIProject/assets/Travel/components/Button6.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="221,222" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_wono" src="wono1b" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

+ 5 - 2
FGUIProject/assets/Travel/components/ComDress.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="148,146">
+<component size="234,290">
   <displayList>
-    <loader id="n1_wono" name="loaDress" xy="0,0" size="148,146"/>
+    <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="丹霄织金"/>
   </displayList>
 </component>

+ 9 - 0
FGUIProject/assets/Travel/components/ComReward.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="223,224">
+  <displayList>
+    <image id="n12_wono" name="n12" src="wono16" fileName="images/xqfs_dw_jl.png" xy="0,0"/>
+    <loader id="n14_wono" name="loaIcon" xy="36,37" size="150,150" aspect="true" url="ui://eg2y0ldpwonotjb" fill="scale"/>
+    <image id="n13_wono" name="n13" src="wono17" fileName="images/xqfs_dwewjl.png" xy="-5,0"/>
+    <text id="n15_wono" name="txtCount" xy="133,163" pivot="0.5,0.5" size="75,39" font="ui://eg2y0ldpwonotj9" fontSize="28" color="#fbf6eb" strokeColor="#997d4d" strokeSize="2" text="x999"/>
+  </displayList>
+</component>

+ 5 - 3
FGUIProject/assets/Travel/components/ComTravel.xml

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1200,800">
+<component size="1200,800" 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="width-width,height-height,center-center,middle-middle"/>
+      <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">
+      <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <loader id="n11_wono" name="loaRole" xy="142,800" pivot="0,1" anchor="true" size="532,739" url="ui://jitclg1gwonoa" fill="scaleMatchWidth" autoSize="true"/>
   </displayList>
 </component>

BIN
FGUIProject/assets/Travel/images/xqfs_bdbd.png


BIN
FGUIProject/assets/Travel/images/xqfs_dw_jl.png


BIN
FGUIProject/assets/Travel/images/xqfs_dwewjl.png


BIN
FGUIProject/assets/Travel/images/xqfs_ssxnan_1.png


BIN
FGUIProject/assets/Travel/images/xqfs_ssxnan_2.png


BIN
FGUIProject/assets/Travel/images/xqfs_xnbt_1.png


BIN
FGUIProject/assets/Travel/images/xqfs_xnbt_2.png


BIN
FGUIProject/assets/Travel/images/xqfs_xndik.png


BIN
FGUIProject/assets/Travel/images/xqfs_xnk_1.png


BIN
FGUIProject/assets/Travel/images/xqfs_xnk_2.png


BIN
FGUIProject/assets/Travel/images/xqfs_xnk_3.png


BIN
FGUIProject/assets/Travel/images/xqfs_xnts.png


BIN
FGUIProject/assets/Travel/images/xqfs_yldw.png


BIN
FGUIProject/assets/Travel/images/xqfs_yldwd.png


BIN
FGUIProject/assets/Travel/images/xqfs_ylxftb.png


BIN
FGUIProject/assets/Travel/images/xz_wss.png


+ 19 - 0
FGUIProject/assets/Travel/package.xml

@@ -29,6 +29,25 @@
     <image id="wonop" name="xqfs_ylshul_1.png" path="/images/"/>
     <image id="wonoq" name="xqfs_yltsts.png" path="/images/"/>
     <image id="wonor" name="xqfs_ylglsj.png" path="/images/"/>
+    <image id="wonos" name="xqfs_ylglsj.png" path="/"/>
+    <image id="wonot" name="xqfs_xnts.png" path="/images/"/>
+    <image id="wonou" name="xqfs_bdbd.png" path="/images/"/>
+    <image id="wonov" name="xqfs_ssxnan_1.png" path="/images/"/>
+    <image id="wonow" name="xqfs_ssxnan_2.png" path="/images/"/>
+    <image id="wonox" name="xqfs_xnbt_1.png" path="/images/"/>
+    <image id="wonoy" name="xqfs_xnbt_2.png" path="/images/"/>
+    <image id="wonoz" name="xqfs_xndik.png" path="/images/"/>
+    <image id="wono10" name="xqfs_xnk_1.png" path="/images/"/>
+    <image id="wono11" name="xqfs_xnk_2.png" path="/images/"/>
+    <image id="wono12" name="xqfs_xnk_3.png" path="/images/"/>
+    <image id="wono15" name="xqfs_yldwd.png" path="/images/"/>
+    <image id="wono16" name="xqfs_dw_jl.png" path="/images/"/>
+    <image id="wono17" name="xqfs_dwewjl.png" path="/images/"/>
+    <image id="wono18" name="xqfs_yldw.png" path="/images/"/>
+    <component id="wono19" name="ComReward.xml" path="/components/"/>
+    <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/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Travel" packageCount="2" genCode="true"/>
 </packageDescription>

BIN
FGUIProject/assets/Travel/xqfs_ylglsj.png


+ 2 - 0
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -239,6 +239,8 @@ namespace GFGGame
             FriendSProxy.ReqAllFriendInfos().Coroutine();
             RoleInfoSProxy.ReqPersonalInfo().Coroutine();
             PoemPhotoSProxy.ReqAllPhotoInfos().Coroutine();
+            TravelSProxy.ReqTravelInfo().Coroutine();
+            TravelSProxy.ReqTravelGuideInfo().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             EquipDataCache.cacher.autoPlay = storageAutoPlay <= 0 ? false : true;

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Data/DressUpMenuSuitDataManager.cs

@@ -96,6 +96,7 @@ namespace GFGGame
             }
         }
 
+
         // public static void GetSuitProgressByItemId(int itemID, out int suitId, out int count)
         // {
         //     suitId = SuitCfgManager.Instance.GetItemSuitId(itemID);

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 
 namespace GFGGame
@@ -180,7 +181,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetTravelGuideRed()
         {
-            if (TravelDataManager.Instance.ListTravelAreaRewardState == null) return false;
+            if (TravelDataManager.Instance.ListTravelAreaRewardState == null || TravelDataManager.Instance.ListTravelAreaRewardState.Count == 0) return false;
             for (int i = 0; i < TravelDataManager.Instance.ListTravelAreaRewardState.Count; i++)
             {
                 if (TravelDataManager.Instance.ListTravelAreaRewardState[i] == ConstBonusStatus.CAN_GET)
@@ -197,9 +198,8 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetTravelGuideAreaRed(int areaId)
         {
-            if (TravelDataManager.Instance.ListTravelAreaRewardState == null) return false;
-
-            return TravelDataManager.Instance.ListTravelAreaRewardState[areaId - 1] == ConstBonusStatus.CAN_GET;
+            if (TravelDataManager.Instance.ListTravelAreaRewardState == null || TravelDataManager.Instance.ListTravelAreaRewardState.Count == 0) return false;
+            return TravelDataManager.Instance.GetGuideRewardStateByAreaId(areaId) == ConstBonusStatus.CAN_GET;
 
         }
     }

+ 35 - 2
GameClient/Assets/Game/HotUpdate/Data/TravelDataManager.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using FairyGUI;
 using UnityEngine;
@@ -7,14 +8,46 @@ namespace GFGGame
     public class TravelDataManager : SingletonBase<TravelDataManager>
     {
         public TravelData TravelData { get; set; }
-        public List<int> ListTravelLoactionCount = new List<int>();//下标对应TravelLoactionCfg表格id
+        public List<int> ListTravelLocationCount = new List<int>();//下标对应TravelLoactionCfg表格id
         public List<int> ListTravelAreaRewardState = new List<int>();//下标对应TravelGuide表格id
 
         public void Clear()
         {
             TravelData = null;
-            ListTravelLoactionCount.Clear();
+            ListTravelLocationCount.Clear();
             ListTravelAreaRewardState.Clear();
         }
+
+        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);
+            return ListTravelLocationCount[index];
+        }
+
+        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);
+            return TravelDataManager.Instance.ListTravelAreaRewardState[index];
+        }
+
+        public void GetTotalTravelProgress(out int count, out int totalCount)
+        {
+            totalCount = 1;
+            count = 0;
+            if (ListTravelLocationCount == null) return;
+
+            for (int i = 0; i < ListTravelLocationCount.Count; i++)
+            {
+                if (ListTravelLocationCount[i] > 0)
+                {
+                    count++;
+                }
+            }
+        }
     }
 }

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnBack.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ButtonBack.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_BtnBack
+    public partial class UI_ButtonBack
     {
         public GButton target;
         public Controller m_c1;
@@ -12,12 +12,12 @@ namespace UI.CommonGame
         public GLoader m_loaTitle;
         public const string URL = "ui://eg2y0ldpuyuxtj5";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "BtnBack";
-        private static UI_BtnBack _proxy;
+        public const string RES_NAME = "ButtonBack";
+        private static UI_ButtonBack _proxy;
 
-        public static UI_BtnBack Create(GObject gObject = null)
+        public static UI_ButtonBack Create(GObject gObject = null)
         {
-            var ui = new UI_BtnBack();
+            var ui = new UI_ButtonBack();
             if(gObject == null)
             	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_BtnBack Proxy(GObject gObject = null)
+        public static UI_ButtonBack Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_BtnBack();
+                _proxy = new UI_ButtonBack();
             }
             var ui = _proxy;
             if(gObject == null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnBack.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ButtonBack.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 470c880c142aedb4e8ce3832e2a03b39
+guid: ac2467cb7c9ccf04fb54ccf2ca189206
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComponentValueBar.cs

@@ -15,6 +15,7 @@ namespace UI.CommonGame
         public GButton m_btnGold;
         public GButton m_btnDiamondRed;
         public GButton m_btnDiamondPurple;
+        public GButton m_btnTravel;
         public const string URL = "ui://eg2y0ldpv3541v";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComponentValueBar";
@@ -70,6 +71,7 @@ namespace UI.CommonGame
             m_btnGold = (GButton)comp.GetChild("btnGold");
             m_btnDiamondRed = (GButton)comp.GetChild("btnDiamondRed");
             m_btnDiamondPurple = (GButton)comp.GetChild("btnDiamondPurple");
+            m_btnTravel = (GButton)comp.GetChild("btnTravel");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -81,6 +83,7 @@ namespace UI.CommonGame
             m_btnGold = null;
             m_btnDiamondRed = null;
             m_btnDiamondPurple = null;
+            m_btnTravel = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 7 - 4
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ListTravelLocationItem.cs

@@ -7,7 +7,8 @@ namespace UI.FieldGuide
     public partial class UI_ListTravelLocationItem
     {
         public GComponent target;
-        public UI_ComTravel m_loaLocation;
+        public Controller m_c1;
+        public UI_ComTravel m_comLocation;
         public GTextField m_txtName;
         public GTextField m_txtCount;
         public const string URL = "ui://vqq9h9h4wono2m";
@@ -57,14 +58,16 @@ namespace UI.FieldGuide
 
         private void Init(GComponent comp)
         {
-            m_loaLocation = (UI_ComTravel)UI_ComTravel.Create(comp.GetChild("loaLocation"));
+            m_c1 = comp.GetController("c1");
+            m_comLocation = (UI_ComTravel)UI_ComTravel.Create(comp.GetChild("comLocation"));
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaLocation.Dispose();
-            m_loaLocation = null;
+            m_c1 = null;
+            m_comLocation.Dispose();
+            m_comLocation = null;
             m_txtName = null;
             m_txtCount = null;
             if(disposeTarget && target != null)

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_Button2.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Travel
+{
+    public partial class UI_Button2
+    {
+        public GButton target;
+        public GTextField m_txtCount;
+        public const string URL = "ui://jitclg1gwono4";
+        public const string PACKAGE_NAME = "Travel";
+        public const string RES_NAME = "Button2";
+        private static UI_Button2 _proxy;
+
+        public static UI_Button2 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button2();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button2();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_txtCount = (GTextField)comp.GetChild("txtCount");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtCount = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_ListDressItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_Button2.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: db11cb6cdbed0da49aa05d220e4cef1d
+guid: c475168bfc1d5264ca50c15b52743fac
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 6 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_ComDress.cs

@@ -8,6 +8,8 @@ namespace UI.Travel
     {
         public GComponent target;
         public GLoader m_loaDress;
+        public GLoader m_loaRarity;
+        public GTextField m_txtName;
         public const string URL = "ui://jitclg1gwonof";
         public const string PACKAGE_NAME = "Travel";
         public const string RES_NAME = "ComDress";
@@ -56,10 +58,14 @@ namespace UI.Travel
         private void Init(GComponent comp)
         {
             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_loaDress = null;
+            m_loaRarity = null;
+            m_txtName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_ComReward.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Travel
+{
+    public partial class UI_ComReward
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtCount;
+        public const string URL = "ui://jitclg1gwono19";
+        public const string PACKAGE_NAME = "Travel";
+        public const string RES_NAME = "ComReward";
+        private static UI_ComReward _proxy;
+
+        public static UI_ComReward Create(GObject gObject = null)
+        {
+            var ui = new UI_ComReward();
+            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_ComReward Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComReward();
+            }
+            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_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)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_ComReward.cs.meta

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

+ 14 - 12
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_ListDressItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_ComTravel.cs

@@ -4,18 +4,19 @@ using FairyGUI;
 
 namespace UI.Travel
 {
-    public partial class UI_ListDressItem
+    public partial class UI_ComTravel
     {
         public GComponent target;
-        public UI_ComDress m_ListDressItem;
-        public const string URL = "ui://jitclg1gwonoj";
+        public GLoader m_loaBg;
+        public GLoader m_loaRole;
+        public const string URL = "ui://jitclg1gwono10e";
         public const string PACKAGE_NAME = "Travel";
-        public const string RES_NAME = "ListDressItem";
-        private static UI_ListDressItem _proxy;
+        public const string RES_NAME = "ComTravel";
+        private static UI_ComTravel _proxy;
 
-        public static UI_ListDressItem Create(GObject gObject = null)
+        public static UI_ComTravel Create(GObject gObject = null)
         {
-            var ui = new UI_ListDressItem();
+            var ui = new UI_ComTravel();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +25,11 @@ namespace UI.Travel
             return ui;
         }
 
-        public static UI_ListDressItem Proxy(GObject gObject = null)
+        public static UI_ComTravel Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListDressItem();
+                _proxy = new UI_ComTravel();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,12 +56,13 @@ namespace UI.Travel
 
         private void Init(GComponent comp)
         {
-            m_ListDressItem = (UI_ComDress)UI_ComDress.Create(comp.GetChild("ListDressItem"));
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_loaRole = (GLoader)comp.GetChild("loaRole");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_ListDressItem.Dispose();
-            m_ListDressItem = null;
+            m_loaBg = null;
+            m_loaRole = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_ComTravel.cs.meta

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

+ 11 - 14
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_TravelDressupUI.cs

@@ -7,13 +7,12 @@ namespace UI.Travel
     public partial class UI_TravelDressupUI
     {
         public GComponent target;
-        public GLoader m_loaBg;
-        public UI_ComDress m_comDress0;
-        public UI_ComDress m_comDress1;
         public UI_ComDress m_comDress2;
+        public UI_ComDress m_comDress1;
+        public UI_ComDress m_comDress0;
+        public GList m_list;
         public GButton m_btnCancle;
         public GButton m_btnGo;
-        public GList m_list;
         public const string URL = "ui://jitclg1gwono1";
         public const string PACKAGE_NAME = "Travel";
         public const string RES_NAME = "TravelDressupUI";
@@ -61,26 +60,24 @@ namespace UI.Travel
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
-            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_comDress1 = (UI_ComDress)UI_ComDress.Create(comp.GetChild("comDress1"));
+            m_comDress0 = (UI_ComDress)UI_ComDress.Create(comp.GetChild("comDress0"));
+            m_list = (GList)comp.GetChild("list");
             m_btnCancle = (GButton)comp.GetChild("btnCancle");
             m_btnGo = (GButton)comp.GetChild("btnGo");
-            m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
-            m_comDress0.Dispose();
-            m_comDress0 = null;
-            m_comDress1.Dispose();
-            m_comDress1 = null;
             m_comDress2.Dispose();
             m_comDress2 = null;
+            m_comDress1.Dispose();
+            m_comDress1 = null;
+            m_comDress0.Dispose();
+            m_comDress0 = null;
+            m_list = null;
             m_btnCancle = null;
             m_btnGo = null;
-            m_list = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 13 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_TravelRewardUI.cs

@@ -7,7 +7,10 @@ namespace UI.Travel
     public partial class UI_TravelRewardUI
     {
         public GComponent target;
-        public GLoader m_loaBg;
+        public GTextField m_txtLocationName;
+        public GTextField m_txtTime;
+        public UI_ComReward m_comReward;
+        public GButton m_btnGet;
         public const string URL = "ui://jitclg1gwono2";
         public const string PACKAGE_NAME = "Travel";
         public const string RES_NAME = "TravelRewardUI";
@@ -55,11 +58,18 @@ namespace UI.Travel
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_txtLocationName = (GTextField)comp.GetChild("txtLocationName");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_comReward = (UI_ComReward)UI_ComReward.Create(comp.GetChild("comReward"));
+            m_btnGet = (GButton)comp.GetChild("btnGet");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
+            m_txtLocationName = null;
+            m_txtTime = null;
+            m_comReward.Dispose();
+            m_comReward = null;
+            m_btnGet = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 18 - 5
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_TravelUI.cs

@@ -8,11 +8,15 @@ namespace UI.Travel
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_c2;
         public GButton m_btnback;
         public GButton m_btnTips;
-        public GButton m_btnGo;
-        public GButton m_btnGet;
+        public GTextField m_txtTips;
+        public GGroup m_grpTips;
         public GTextField m_txtTime;
+        public GGroup m_grpTime;
+        public UI_Button2 m_btnGo;
+        public GButton m_btnGet;
         public GButton m_btnPhoto;
         public GButton m_btnFieldGuide;
         public const string URL = "ui://jitclg1gwono0";
@@ -63,22 +67,31 @@ namespace UI.Travel
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
             m_btnback = (GButton)comp.GetChild("btnback");
             m_btnTips = (GButton)comp.GetChild("btnTips");
-            m_btnGo = (GButton)comp.GetChild("btnGo");
-            m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_grpTips = (GGroup)comp.GetChild("grpTips");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_grpTime = (GGroup)comp.GetChild("grpTime");
+            m_btnGo = (UI_Button2)UI_Button2.Create(comp.GetChild("btnGo"));
+            m_btnGet = (GButton)comp.GetChild("btnGet");
             m_btnPhoto = (GButton)comp.GetChild("btnPhoto");
             m_btnFieldGuide = (GButton)comp.GetChild("btnFieldGuide");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
             m_btnback = null;
             m_btnTips = null;
+            m_txtTips = null;
+            m_grpTips = null;
+            m_txtTime = null;
+            m_grpTime = null;
+            m_btnGo.Dispose();
             m_btnGo = null;
             m_btnGet = null;
-            m_txtTime = null;
             m_btnPhoto = null;
             m_btnFieldGuide = null;
             if(disposeTarget && target != null)

+ 7 - 5
GameClient/Assets/Game/HotUpdate/ServerProxy/TravelSProxy.cs

@@ -69,7 +69,7 @@ namespace GFGGame
             return false;
         }
         //领取游历奖励
-        public static async ETTask<bool> ReqGetTravelReward(int pictureType)
+        public static async ETTask<bool> ReqGetTravelReward()
         {
             S2C_ReceiveTravelGuideReward response = null;
             response = (S2C_ReceiveTravelGuideReward)await MessageHelper.SendToServer(new C2S_ReceiveTravelGuideReward() { });
@@ -93,7 +93,7 @@ namespace GFGGame
 
                     TravelDataManager inst = TravelDataManager.Instance;
                     inst.TravelData.Status = (int)TravelGuideType.NoTravel;
-                    inst.ListTravelLoactionCount[inst.TravelData.TravelLocationId - 1] = inst.TravelData.TravelCount;
+                    inst.ListTravelLocationCount[inst.TravelData.TravelLocationId - 1] = inst.TravelData.TravelCount;
 
                     EventAgent.DispatchEvent(ConstMessage.TRAVEL_STATE_CHANGE);
 
@@ -110,7 +110,7 @@ namespace GFGGame
                             for (int j = 0; j < travelGuide.locationsArr.Length; j++)
                             {
                                 int loactionId = TravelLoactionCfgArray.Instance.GetCfgBylocation(travelGuide.locationsArr[j]).id;
-                                if (inst.ListTravelLoactionCount[loactionId - 1] == 0)
+                                if (inst.ListTravelLocationCount[loactionId - 1] == 0)
                                 {
                                     //仍有未到达的地点
                                     isRed = false;
@@ -132,7 +132,7 @@ namespace GFGGame
         }
 
         //获取游历图鉴记录
-        public static async ETTask<bool> ReqTravelGuideInfo(int pictureType)
+        public static async ETTask<bool> ReqTravelGuideInfo()
         {
             S2C_GetTravelGuideRecordAll response = null;
             response = (S2C_GetTravelGuideRecordAll)await MessageHelper.SendToServer(new C2S_GetTravelGuideRecordAll() { });
@@ -141,7 +141,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    TravelDataManager.Instance.ListTravelLoactionCount = new List<int>(response.TglLocationRecordList.ToArray());
+                    TravelDataManager.Instance.ListTravelLocationCount = new List<int>(response.TglLocationRecordList.ToArray());
                     TravelDataManager.Instance.ListTravelAreaRewardState = new List<int>(response.TglAreaRecordList.ToArray());
                     return true;
                 }
@@ -159,6 +159,8 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     TravelDataManager.Instance.ListTravelAreaRewardState[areaId - 1] = (int)ConstBonusStatus.GOT;
+                    List<ItemData> rewards = ItemUtil.CreateItemDataList(response.RewardItem);
+                    BonusController.TryShowBonusList(rewards);
                     EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }

+ 10 - 1
GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -39,7 +39,8 @@ namespace GFGGame
         public static string GetBgImgPath(string res, string extName = "png")
         {
             return $"{TEXTURE_DIR_PATH}/BgImg/{res}.{extName}";
-        }public static string GetFightBgImgPath(string res, string extName = "png")
+        }
+        public static string GetFightBgImgPath(string res, string extName = "png")
         {
             return $"{TEXTURE_FIGHT_DIR_PATH}/{res}.{extName}";
         }
@@ -124,5 +125,13 @@ namespace GFGGame
         {
             return $"{TEXTURE_DIR_PATH}/Activity/Show1/{res}.{extName}";
         }
+        public static string GetTravelBgPath(string res, string extName = "png")
+        {
+            return $"{TEXTURE_DIR_PATH}/Travel/Bg/{res}.{extName}";
+        }
+        public static string GetTravelRolePath(string res, string extName = "png")
+        {
+            return $"{TEXTURE_DIR_PATH}/Travel/Role/{res}.{extName}";
+        }
     }
 }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/FieldGuideView.cs

@@ -148,7 +148,7 @@ namespace GFGGame
                     InstanceZonesDataManager.GetTotalProgress(out haveCount, out totalCount);
                     break;
                 case ConstFieldGuideId.TRAVEL_GUIDE:
-                    InstanceZonesDataManager.GetTotalProgress(out haveCount, out totalCount);
+                    TravelDataManager.Instance.GetTotalTravelProgress(out haveCount, out totalCount);
                     break;
                 default:
                     haveCount = 0;

+ 5 - 4
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/TravelGuideView.cs

@@ -30,7 +30,7 @@ namespace GFGGame
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.onClickItem.Add(OnListItemClick);
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hc_bj_1");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xqfs_bj");
 
         }
         protected override void AddEventListener()
@@ -62,16 +62,17 @@ namespace GFGGame
         {
             TravelGuideCfg cfg = TravelGuideCfgArray.Instance.dataArray[index];
             UI_ListTravelAreaItem item = UI_ListTravelAreaItem.Proxy(obj);
-
+            item.m_loaIcon.url = string.Format("ui://FieldGuide/{0}", cfg.res);
             item.target.data = cfg;
+            RedDotController.Instance.SetComRedDot(item.target, RedDotDataManager.Instance.GetTravelGuideAreaRed(cfg.id));
             UI_ListTravelAreaItem.ProxyEnd();
         }
         private void OnListItemClick(EventContext context)
         {
-            GObject obj = context.sender as GObject;
+            GObject obj = context.data as GObject;
             TravelGuideCfg cfg = obj.data as TravelGuideCfg;
 
-            ViewManager.Show<TravelShowView>(cfg, new object[] { typeof(TravelShowView).FullName, this.viewData });
+            ViewManager.Show<TravelShowView>(cfg, new object[] { typeof(TravelGuideView).FullName, this.viewData });
         }
     }
 }

+ 31 - 5
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/TravelShowView.cs

@@ -2,12 +2,14 @@ using UI.FieldGuide;
 using FairyGUI;
 using UnityEngine;
 using System.Collections.Generic;
+using System;
 
 namespace GFGGame
 {
     public class TravelShowView : BaseWindow
     {
         private UI_TravelShowUI _ui;
+
         private TravelGuideCfg _cfg;
 
         public override void Dispose()
@@ -33,7 +35,7 @@ namespace GFGGame
 
             _ui.m_list.itemRenderer = RenderListItem;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjtj_bjbj");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xqfs_bj");
 
         }
 
@@ -47,15 +49,19 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRewardState);
 
         }
         protected override void OnHide()
         {
             base.OnHide();
+            if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(0);
         }
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRewardState);
+
         }
         private void OnClickBtnBack()
         {
@@ -64,22 +70,42 @@ namespace GFGGame
 
         private void UpdateView()
         {
+            _ui.m_list.numItems = _cfg.locationsArr.Length;
+            UpdateRewardState();
+        }
+        private void UpdateRewardState()
+        {
+            // int state = TravelDataManager.Instance.ListTravelAreaRewardState[_index];
+            _ui.m_btnReward.m_c1.selectedIndex = TravelDataManager.Instance.GetGuideRewardStateByAreaId(_cfg.id) == ConstBonusStatus.GOT ? 0 : 1;
+            RedDotController.Instance.SetComRedDot(_ui.m_btnReward.target, RedDotDataManager.Instance.GetTravelGuideAreaRed(_cfg.id));
 
         }
 
         private void RenderListItem(int index, GObject obj)
         {
+            TravelLoactionCfg locationCfg = TravelLoactionCfgArray.Instance.GetCfgBylocation(_cfg.locationsArr[index]);
             UI_ListTravelLocationItem item = UI_ListTravelLocationItem.Proxy(obj);
-
-
+            item.m_txtName.text = locationCfg.name;
+            item.m_comLocation.m_loaLocation.url = ResPathUtil.GetTravelBgPath(locationCfg.res);
+            int count = TravelDataManager.Instance.GetTravelCountByLocationId(locationCfg.id);
+            item.m_txtCount.text = string.Format("已到达:{0}次", count);
+            item.m_c1.selectedIndex = count > 0 ? 1 : 0;
             UI_ListTravelLocationItem.ProxyEnd();
         }
 
         private void OnBtnRewardClick()
         {
+            int state = TravelDataManager.Instance.GetGuideRewardStateByAreaId(_cfg.id);
+            if (state == ConstBonusStatus.CAN_NOT_GET)
+            {
 
-            List<ItemData> rewards = ItemUtil.CreateItemDataList(_cfg.rewardsArr);
-            ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", "到达该区域所有地点时可领取" });
+                List<ItemData> rewards = ItemUtil.CreateItemDataList(_cfg.rewardsArr);
+                ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", "到达该区域所有地点时可领取" });
+            }
+            else if (state == ConstBonusStatus.CAN_GET)
+            {
+                TravelSProxy.ReqGetTravelGuideReward(_cfg.id).Coroutine();
+            }
         }
     }
 }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -568,7 +568,7 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_btnRenWu, RedDotDataManager.Instance.GetTaskRed());
             RedDotController.Instance.SetComRedDot(_ui.m_btnDailyLogin.target, RedDotDataManager.Instance.GetDailyLoginRed());
             RedDotController.Instance.SetComRedDot(_btnYouJian, RedDotDataManager.Instance.GetMailRed());
-            RedDotController.Instance.SetComRedDot(_btnTuJian, RedDotDataManager.Instance.GetFieldGuideRed());
+            RedDotController.Instance.SetComRedDot(_btnTuJian, RedDotDataManager.Instance.GetFieldGuideRed() || RedDotDataManager.Instance.GetTravelGuideRed());
             RedDotController.Instance.SetComRedDot(_btnHaoYou, RedDotDataManager.Instance.GetFriendRed());
             RedDotController.Instance.SetComRedDot(_btnStore, RedDotDataManager.Instance.GetRechargeGiftFreeRed());
             RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed());

+ 0 - 8
GameClient/Assets/Game/HotUpdate/Views/Travel/TravelDressupView.cs

@@ -34,7 +34,6 @@ namespace GFGGame
             _ui.m_comDress0.target.onClick.Add(OnComDressClick0);
             _ui.m_comDress1.target.onClick.Add(OnComDressClick);
             _ui.m_comDress2.target.onClick.Add(OnComDressClick);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
         }
         protected override void AddEventListener()
         {
@@ -75,14 +74,7 @@ namespace GFGGame
         }
 
 
-        private void RenderListItem(int index, GObject obj)
-        {
-            TravelSuitCfg travelSuitCfg = TravelSuitCfgArray.Instance.GetCfg(_travelSuitIds[index]);
-            UI_ListDressItem item = UI_ListDressItem.Proxy(obj);
 
-            item.target.data = _travelSuitIds[index];
-            UI_ListDressItem.ProxyEnd();
-        }
 
         private void OnListItemClick(EventContext context)
         {

+ 0 - 1
GameClient/Assets/Game/HotUpdate/Views/Travel/TravelRewardView.cs

@@ -28,7 +28,6 @@ namespace GFGGame
             _ui = UI_TravelRewardUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
         }
         protected override void AddEventListener()
         {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Travel/TravelView.cs

@@ -29,7 +29,7 @@ namespace GFGGame
 
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
             _ui.m_btnTips.onClick.Add(OnBtnTipsClick);
-            _ui.m_btnGo.onClick.Add(OnBtnGoClick);
+            _ui.m_btnGo.target.onClick.Add(OnBtnGoClick);
             _ui.m_btnGet.onClick.Add(OnBtnGetClick);
             _ui.m_btnPhoto.onClick.Add(OnBtnPhotoClick);
             _ui.m_btnFieldGuide.onClick.Add(OnBtnFieldGuideClick);

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1.png


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


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


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png


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


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


BIN
GameClient/Assets/ResIn/UI/Travel/Travel_atlas0_1.png


+ 96 - 0
GameClient/Assets/ResIn/UI/Travel/Travel_atlas0_1.png.meta

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

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott